Various fixes

Author: simon816

src/main/java/com/simon816/chatui/impl/ImplementationConfig.java

@@ -16,7 +16,7 @@
 public class ImplementationConfig {
 
     private enum SupportedType {
-        SPONGE("sponge") {
+        SPONGE("Sponge") {
 
             @Override
             protected ConfigEditTab.ActionHandler createHandler() {
@@ -84,7 +84,9 @@ private SupportedType(String id) {
     static {
         SupportedType type = null;
         for (SupportedType testType : SupportedType.values()) {
-            if (Sponge.getPlatform().getContainer(Platform.Component.IMPLEMENTATION).getId().equals(testType.implId)) {
+            if (Sponge.getPlatform().getContainer(Platform.Component.IMPLEMENTATION).getId().equals(testType.implId)
+                    // also check CommonName for spongecommon-based
+                    || testType.implId.equals(Sponge.getPlatform().asMap().get("CommonName"))) {
                 type = testType;
                 break;
             }

src/main/java/com/simon816/chatui/impl/ImplementationPagination.java

@@ -1,6 +1,5 @@
 package com.simon816.chatui.impl;
 
-import org.spongepowered.api.Platform;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.command.CommandSource;
 import org.spongepowered.api.service.pagination.PaginationService;
@@ -10,7 +9,7 @@
 public class ImplementationPagination {
 
     public static void modify(PaginationService service, CommandSource oldSource, CommandSource newSource) {
-        if (Sponge.getPlatform().getContainer(Platform.Component.IMPLEMENTATION).getId().equals("sponge")) {
+        if (Sponge.getPlatform().asMap().get("CommonName").equals("Sponge")) {
             if (service instanceof SpongePaginationService) {
                 SpongePaginationAccessor.replaceActivePagination((SpongePaginationService) service, oldSource, newSource);
             }

src/main/java/com/simon816/chatui/pagination/TabbedPaginationBuilder.java

@@ -2,7 +2,6 @@
 
 import com.simon816.chatui.lib.config.PlayerSettings;
 import org.spongepowered.api.service.pagination.PaginationList;
-import org.spongepowered.api.service.pagination.PaginationList.Builder;
 import org.spongepowered.api.service.pagination.PaginationService;
 import org.spongepowered.api.text.Text;
 
@@ -22,47 +21,56 @@ public TabbedPaginationBuilder(PaginationService service) {
 
     @Override
     public PaginationList.Builder contents(Iterable<Text> contents) {
-        return this.builder.contents(contents);
+        this.builder.contents(contents);
+        return this;
     }
 
     @Override
     public PaginationList.Builder contents(Text... contents) {
-        return this.builder.contents(contents);
+        this.builder.contents(contents);
+        return this;
     }
 
     @Override
     public PaginationList.Builder title(Text title) {
-        return this.builder.title(title);
+        this.builder.title(title);
+        return this;
     }
 
     @Override
     public PaginationList.Builder header(Text header) {
-        return this.builder.header(header);
+        this.builder.header(header);
+        return this;
     }
 
     @Override
     public PaginationList.Builder footer(Text footer) {
-        return this.builder.footer(footer);
+        this.builder.footer(footer);
+        return this;
     }
 
     @Override
-    public Builder from(PaginationList value) {
-        return this.builder.from(value);
+    public PaginationList.Builder from(PaginationList value) {
+        this.builder.from(value);
+        return this;
     }
 
     @Override
-    public Builder reset() {
-        return this.builder.reset();
+    public PaginationList.Builder reset() {
+        this.builder.reset();
+        return this;
     }
 
     @Override
-    public Builder padding(Text padding) {
-        return this.builder.padding(padding);
+    public PaginationList.Builder padding(Text padding) {
+         this.builder.padding(padding);
+        return this;
     }
 
     @Override
-    public Builder linesPerPage(int linesPerPage) {
-        return this.builder.linesPerPage(linesPerPage - this.removedHeight);
+    public PaginationList.Builder linesPerPage(int linesPerPage) {
+        this.builder.linesPerPage(linesPerPage - this.removedHeight);
+        return this;
     }
 
     @Override

src/main/java/com/simon816/chatui/tabs/perm/EntryDisplayer.java

@@ -150,7 +150,7 @@ public void draw(PlayerContext ctx, LineFactory lineFactory) {
                                         }, EntryDisplayer.this.tab)).build(),
                                 Text.builder(EntryDisplayer.this.addMode ? " [Cancel]" : " [Add]")
                                         .color(EntryDisplayer.this.addMode ? TextColors.RED : TextColors.GREEN)
-                                        .onClick(ExtraUtils.clickAction(() -> EntryDisplayer.this.addMode = !EntryDisplayer.this.addMode,
+                                        .onClick(ExtraUtils.clickAction((Runnable) () -> EntryDisplayer.this.addMode = !EntryDisplayer.this.addMode,
                                                 EntryDisplayer.this.tab))
                                         .build(),
                                 Text.builder(" [Scroll Up]").color(EntryDisplayer.this.scroll.canScrollUp() ? TextColors.WHITE : TextColors.GRAY)

src/main/java/com/simon816/chatui/tabs/perm/SubjectListPane.java

@@ -61,7 +61,7 @@ public void draw(PlayerContext ctx, LineFactory lineFactory) {
                                 }, SubjectListPane.this.tab)).build(),
                                 Text.builder(SubjectListPane.this.addMode ? " [Cancel]" : " [Add]")
                                         .color(SubjectListPane.this.addMode ? TextColors.RED : TextColors.GREEN)
-                                        .onClick(ExtraUtils.clickAction(() -> SubjectListPane.this.addMode = !SubjectListPane.this.addMode,
+                                        .onClick(ExtraUtils.clickAction((Runnable) () -> SubjectListPane.this.addMode = !SubjectListPane.this.addMode,
                                                 SubjectListPane.this.tab))
                                         .build(),
                                 Text.builder(" [Scroll Up]")