Add a permissions manager GUI

Author: simon816

build.gradle

@@ -18,7 +18,7 @@ apply plugin: 'eclipse'
 sourceCompatibility = "1.8"
 targetCompatibility = "1.8"
 
-version = "0.1.0"
+version = "0.3.0"
 
 group = "com.simon816.chatui"
 
@@ -41,20 +41,20 @@ compileJava.options.encoding = 'UTF-8'
 compileJava.options.compilerArgs += '-proc:none'
 
 minecraft {
-    version = "1890"
+    version = "2098"
     runDir = "run"
-    mappings = "stable_22"
+    mappings = "stable_26"
 }
 
 dependencies {
-    compile 'org.spongepowered:spongeapi:4.1.0'
-    compile 'net.sf.trove4j:trove4j:3.0.3' // From spongecommon
-    compile 'org.spongepowered:spongeforge:1.8.9-1890-4.1.0-BETA-1399:dev'
+    compile 'org.spongepowered:spongeapi:5.0.0'
+    compile 'net.sf.trove4j:trove4j:3.0.3' // From spongeforge
+    compile 'org.spongepowered:spongeforge:1.10.2-2098-5.0.0-BETA-1808:dev'
 }
 
 processResources {
     from('src/main/resources') {
         include 'mcmod.info'
-        expand(version: project.version, apiVersionRange: '[4.0.0,5.0.0]')
+        expand(version: project.version, apiVersionRange: '[5.0.0,6.0.0)')
     }
 }

src/main/java/com/simon816/chatui/ActivePlayerChatView.java

@@ -4,15 +4,17 @@
 import com.simon816.chatui.impl.ImplementationConfig;
 import com.simon816.chatui.tabs.GlobalTab;
 import com.simon816.chatui.tabs.NewTab;
-import com.simon816.chatui.tabs.PermissionsTab;
 import com.simon816.chatui.tabs.SceneTab;
 import com.simon816.chatui.tabs.Tab;
 import com.simon816.chatui.tabs.TextBufferTab;
 import com.simon816.chatui.tabs.TextFileTab;
 import com.simon816.chatui.tabs.config.ConfigEditTab;
+import com.simon816.chatui.tabs.perm.PermissionsTab;
 import ninja.leaping.configurate.ConfigurationNode;
+import org.spongepowered.api.Sponge;
 import org.spongepowered.api.command.CommandSource;
 import org.spongepowered.api.entity.living.player.Player;
+import org.spongepowered.api.service.permission.PermissionService;
 import org.spongepowered.api.text.Text;
 import org.spongepowered.api.text.chat.ChatType;
 
@@ -78,12 +80,15 @@ private void showNewTabAdminButtons() {
             this.newTab.addButton("Edit Config", new NewTab.LaunchTabAction(() -> new ConfigEditTab(ImplementationConfig.getRootNode(),
                     Text.of("Sponge Config"), ConfigEditTab.Options.DEFAULTS, ImplementationConfig.getHandler())));
         }
-        this.newTab.addButton("Permissions", new NewTab.LaunchTabAction(() -> new PermissionsTab()));
+        Optional<PermissionService> optService = Sponge.getServiceManager().provide(PermissionService.class);
+        if (optService.isPresent()) {
+            this.newTab.addButton("Permissions", new NewTab.LaunchTabAction(() -> new PermissionsTab(optService.get())));
+        }
     }
 
     @Override
     public Player getPlayer() {
-        return this.playerContext.player;
+        return this.playerContext.getPlayer();
     }
 
     public PlayerContext getContext() {
@@ -103,7 +108,7 @@ public NewTab getNewTab() {
     @Override
     public void update() {
         this.isUpdating = true;
-        this.playerContext.player.sendMessage(this.window.draw(this.playerContext));
+        this.playerContext.getPlayer().sendMessage(this.window.draw(this.playerContext));
         this.isUpdating = false;
     }
 
@@ -166,7 +171,7 @@ private void disable() {
         // Force clear the screen
         this.isUpdating = true;
         for (int i = 0; i < this.playerContext.height; i++) {
-            this.playerContext.player.sendMessage(Text.NEW_LINE);
+            this.playerContext.getPlayer().sendMessage(Text.NEW_LINE);
         }
         this.isUpdating = false;
         ChatUI.instance().initialize(getPlayer());

src/main/java/com/simon816/chatui/PlayerContext.java

@@ -3,46 +3,53 @@
 import static com.google.common.base.Preconditions.checkArgument;
 
 import com.google.common.base.Objects;
+import org.spongepowered.api.Sponge;
 import org.spongepowered.api.entity.living.player.Player;
 
 import java.util.Locale;
+import java.util.UUID;
 
 public class PlayerContext {
 
-    public final Player player;
     public final int height;
     public final int width;
     public final boolean forceUnicode;
 
+    private final UUID playerUUID;
+
     public PlayerContext(Player player, int width, int height, boolean forceUnicode) {
-        this.player = player;
+        this.playerUUID = player.getUniqueId();
         this.width = width;
         this.height = height;
         this.forceUnicode = forceUnicode;
     }
 
+    public Player getPlayer() {
+        return Sponge.getServer().getPlayer(this.playerUUID).get();
+    }
+
     public PlayerContext withHeight(int height) {
         checkArgument(height >= 1, "Height must be at least one");
-        return new PlayerContext(this.player, this.width, height, this.forceUnicode);
+        return new PlayerContext(this.getPlayer(), this.width, height, this.forceUnicode);
     }
 
     public PlayerContext withWidth(int width) {
         checkArgument(width >= 1, "Width must be at least one");
-        return new PlayerContext(this.player, width, this.height, this.forceUnicode);
+        return new PlayerContext(this.getPlayer(), width, this.height, this.forceUnicode);
     }
 
     public PlayerContext withUnicode(boolean forceUnicode) {
-        return new PlayerContext(this.player, this.width, this.height, forceUnicode);
+        return new PlayerContext(this.getPlayer(), this.width, this.height, forceUnicode);
     }
 
     public Locale getLocale() {
-        return this.player.getLocale();
+        return this.getPlayer().getLocale();
     }
 
     @Override
     public String toString() {
         return Objects.toStringHelper(this)
-                .add("player", this.player)
+                .add("player", this.getPlayer())
                 .add("width", this.width)
                 .add("height", this.height)
                 .toString();

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

@@ -2,29 +2,18 @@
 
 import com.simon816.chatui.PlayerChatView;
 import com.simon816.chatui.tabs.PaginationTab;
+import com.simon816.chatui.util.ForwardingSource;
 import org.spongepowered.api.command.CommandSource;
-import org.spongepowered.api.command.source.ProxySource;
-import org.spongepowered.api.service.context.Context;
-import org.spongepowered.api.service.permission.Subject;
-import org.spongepowered.api.service.permission.SubjectCollection;
-import org.spongepowered.api.service.permission.SubjectData;
 import org.spongepowered.api.text.Text;
-import org.spongepowered.api.text.channel.MessageChannel;
-import org.spongepowered.api.util.Tristate;
 
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-
-public class PaginationSourceWrapper implements ProxySource {
+public class PaginationSourceWrapper extends ForwardingSource {
 
     public final PlayerChatView view;
-    private final CommandSource actualSource;
     private final PaginationTab tab;
 
     public PaginationSourceWrapper(PlayerChatView view, CommandSource actualSource, Text title) {
+        super(actualSource);
         this.view = view;
-        this.actualSource = actualSource;
         this.tab = new PaginationTab(this, title == null ? Text.of("Pagination") : title);
         view.getWindow().addTab(this.tab, true);
         view.update();
@@ -45,94 +34,4 @@ public void sendMessages(Text... messages) {
         this.tab.setPage(messages);
     }
 
-    @Override
-    public String getName() {
-        return this.actualSource.getName();
-    }
-
-    @Override
-    public MessageChannel getMessageChannel() {
-        return this.actualSource.getMessageChannel();
-    }
-
-    @Override
-    public void setMessageChannel(MessageChannel channel) {
-        this.actualSource.setMessageChannel(channel);
-    }
-
-    @Override
-    public Optional<CommandSource> getCommandSource() {
-        return this.actualSource.getCommandSource();
-    }
-
-    @Override
-    public SubjectCollection getContainingCollection() {
-        return this.actualSource.getContainingCollection();
-    }
-
-    @Override
-    public SubjectData getSubjectData() {
-        return this.actualSource.getSubjectData();
-    }
-
-    @Override
-    public SubjectData getTransientSubjectData() {
-        return this.actualSource.getTransientSubjectData();
-    }
-
-    @Override
-    public boolean hasPermission(Set<Context> contexts, String permission) {
-        return this.actualSource.hasPermission(contexts, permission);
-    }
-
-    @Override
-    public boolean hasPermission(String permission) {
-        return this.actualSource.hasPermission(permission);
-    }
-
-    @Override
-    public Tristate getPermissionValue(Set<Context> contexts, String permission) {
-        return this.actualSource.getPermissionValue(contexts, permission);
-    }
-
-    @Override
-    public boolean isChildOf(Subject parent) {
-        return this.actualSource.isChildOf(parent);
-    }
-
-    @Override
-    public boolean isChildOf(Set<Context> contexts, Subject parent) {
-        return this.actualSource.isChildOf(contexts, parent);
-    }
-
-    @Override
-    public List<Subject> getParents() {
-        return this.actualSource.getParents();
-    }
-
-    @Override
-    public List<Subject> getParents(Set<Context> contexts) {
-        return this.actualSource.getParents(contexts);
-    }
-
-    @Override
-    public Optional<String> getOption(Set<Context> contexts, String key) {
-        return this.actualSource.getOption(contexts, key);
-    }
-
-    @Override
-    public String getIdentifier() {
-        return this.actualSource.getIdentifier();
-    }
-
-    @Override
-    public Set<Context> getActiveContexts() {
-        return this.actualSource.getActiveContexts();
-    }
-
-    @Override
-    public CommandSource getOriginalSource() {
-        return this.actualSource;
-    }
-
 }

src/main/java/com/simon816/chatui/tabs/NewTab.java

@@ -6,7 +6,7 @@
 import com.simon816.chatui.PlayerChatView;
 import com.simon816.chatui.PlayerContext;
 import com.simon816.chatui.ui.Button;
-import com.simon816.chatui.ui.HboxUI;
+import com.simon816.chatui.ui.HBoxUI;
 import com.simon816.chatui.ui.VBoxUI;
 import org.spongepowered.api.text.Text;
 
@@ -42,7 +42,7 @@ public Text draw(PlayerContext ctx) {
         while (maxButtonRows < Math.ceil(this.buttons.size() / (float) columns)) {
             columns++;
         }
-        HboxUI colBox = new HboxUI();
+        HBoxUI colBox = new HBoxUI();
         int index = 0;
         for (int i = 0; i < columns; i++) {
             VBoxUI rowBox = new VBoxUI();