Merge pull request #64 from Darkhax-Forked/1.16

Moved patreon check off the server.

.gitignore

@@ -23,3 +23,4 @@ usernamecache.json
 *.stackdump
 secrets.json
 changelog.md
+*.launch

build.gradle

@@ -51,6 +51,7 @@ minecraft {
             workingDirectory project.file('run')
             property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
             property 'forge.logging.console.level', 'debug'
+            taskName 'ControllingClient'
             mods {
                 examplemod {
                     source sourceSets.main
@@ -61,6 +62,7 @@ minecraft {
             workingDirectory project.file('run')
             property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
             property 'forge.logging.console.level', 'debug'
+            taskName 'ControllingServer'
             mods {
                 examplemod {
                     source sourceSets.main

src/main/java/com/blamejared/controlling/Controlling.java

@@ -22,6 +22,9 @@ public class Controlling {
     public Controlling() {
         ModLoadingContext.get().registerExtensionPoint(ExtensionPoint.DISPLAYTEST, () -> Pair.of(() -> FMLNetworkConstants.IGNORESERVERONLY, (a, b) -> true));
         FMLJavaModLoadingContext.get().getModEventBus().addListener(this::init);
+    }
+    
+    private void init(final FMLClientSetupEvent event) {
         new Thread(() -> {
             try {
                 URL url = new URL("https://blamejared.com/patrons.txt");
@@ -36,9 +39,6 @@ public class Controlling {
                 e.printStackTrace();
             }
         }).start();
-    }
-    
-    private void init(final FMLClientSetupEvent event) {
         MinecraftForge.EVENT_BUS.register(new ClientEventHandler());
     }
 }

src/main/java/com/blamejared/controlling/client/gui/GuiCheckBox.java

@@ -46,7 +46,7 @@ public class GuiCheckBox extends Button {
             }
             
             if(this.isChecked)
-                this.drawCenteredString(stack, mc.fontRenderer, "x", this.x + this.boxWidth / 2 + 1, this.y + 1, 14737632);
+                drawCenteredString(stack, mc.fontRenderer, "x", this.x + this.boxWidth / 2 + 1, this.y + 1, 14737632);
             mc.fontRenderer.func_238407_a_(stack, getMessage().func_241878_f(), this.x + this.boxWidth + 2, this.y + 2, color);
         }
     }

src/main/java/com/blamejared/controlling/client/gui/GuiNewControls.java

@@ -137,9 +137,9 @@ public class GuiNewControls extends ControlsScreen {
             private boolean wasHovered;
 
             @Override
-            public void render(MatrixStack stack, int p_render_1_, int p_render_2_, float p_render_3_) {
+            public void render(MatrixStack stack, int mouseX, int mouseY, float partialTicks) {
                 if (this.visible) {
-                    this.isHovered = p_render_1_ >= this.x && p_render_2_ >= this.y && p_render_1_ < this.x + this.width && p_render_2_ < this.y + this.height;
+                    this.isHovered = mouseX >= this.x && mouseY >= this.y && mouseX < this.x + this.width && mouseY < this.y + this.height;
                     if (this.wasHovered != this.isHovered()) {
                         if (this.isHovered()) {
                             if (this.isFocused()) {
@@ -153,7 +153,7 @@ public class GuiNewControls extends ControlsScreen {
                     }
 
                     if (this.visible) {
-                        this.renderButton(stack, p_render_1_, p_render_2_, p_render_3_);
+                        this.renderButton(stack, mouseX, mouseY, partialTicks);
                     }
 
                     this.narrate();
@@ -178,6 +178,7 @@ public class GuiNewControls extends ControlsScreen {
         return search.charTyped(var1, var2);
     }
 
+    @Override
     public void tick() {
         this.search.tick();
         if (!lastSearch.equals(search.getText())) {
@@ -256,10 +257,11 @@ public class GuiNewControls extends ControlsScreen {
     /**
      * Draws the screen and all the components in it.
      */
+    @Override
     public void render(MatrixStack stack, int mouseX, int mouseY, float partialTicks) {
         this.renderBackground(stack);
         this.keyBindingList.render(stack, mouseX, mouseY, partialTicks);
-        this.drawCenteredString(stack, this.font, this.title.getString(), this.width / 2, 8, 16777215);
+        drawCenteredString(stack, this.font, this.title.getString(), this.width / 2, 8, 16777215);
         boolean flag = false;
 
         for (KeyBinding keybinding : this.options.keyBindings) {
@@ -287,6 +289,7 @@ public class GuiNewControls extends ControlsScreen {
         }
     }
 
+    @Override
     public boolean mouseClicked(double mx, double my, int mb) {
         boolean valid;
         if (this.buttonId != null) {
@@ -328,6 +331,7 @@ public class GuiNewControls extends ControlsScreen {
         return valid;
     }
 
+    @Override
     public boolean mouseReleased(double mx, double my, int mb) {
         if (mb == 0 && this.keyBindingList.mouseReleased(mx, my, mb)) {
             this.setDragging(false);
@@ -340,7 +344,8 @@ public class GuiNewControls extends ControlsScreen {
         }
     }
 
-    public boolean keyPressed(int p_keyPressed_1_, int p_keyPressed_2_, int p_keyPressed_3_) {
+    @Override
+    public boolean keyPressed(int keyCode, int scanCode, int modifier) {
         if (!search.isFocused() && this.buttonId == null) {
             if (hasControlDown()) {
                 if (InputMappings.isKeyDown(Minecraft.getInstance().getMainWindow().getHandle(), GLFW.GLFW_KEY_F)) {
@@ -349,22 +354,22 @@ public class GuiNewControls extends ControlsScreen {
                 }
             }
         }
-        if (search.keyPressed(p_keyPressed_1_, p_keyPressed_2_, p_keyPressed_3_)) {
+        if (search.keyPressed(keyCode, scanCode, modifier)) {
             return true;
         }
         if (search.isFocused()) {
-            if (p_keyPressed_1_ == 256) {
+            if (keyCode == 256) {
                 search.setFocused2(false);
                 return true;
             }
         }
         if (this.buttonId != null) {
-            if (p_keyPressed_1_ == 256) {
+            if (keyCode == 256) {
                 this.buttonId.setKeyModifierAndCode(net.minecraftforge.client.settings.KeyModifier.getActiveModifier(), InputMappings.INPUT_INVALID);
                 this.options.setKeyBindingCode(this.buttonId, InputMappings.INPUT_INVALID);
             } else {
-                this.buttonId.setKeyModifierAndCode(net.minecraftforge.client.settings.KeyModifier.getActiveModifier(), InputMappings.getInputByCode(p_keyPressed_1_, p_keyPressed_2_));
-                this.options.setKeyBindingCode(this.buttonId, InputMappings.getInputByCode(p_keyPressed_1_, p_keyPressed_2_));
+                this.buttonId.setKeyModifierAndCode(net.minecraftforge.client.settings.KeyModifier.getActiveModifier(), InputMappings.getInputByCode(keyCode, scanCode));
+                this.options.setKeyBindingCode(this.buttonId, InputMappings.getInputByCode(keyCode, scanCode));
             }
 
             if (!net.minecraftforge.client.settings.KeyModifier.isKeyCodeModifier(this.buttonId.getKey()))
@@ -373,7 +378,7 @@ public class GuiNewControls extends ControlsScreen {
             KeyBinding.resetKeyBindingArrayAndHash();
             return true;
         } else {
-            return super.keyPressed(p_keyPressed_1_, p_keyPressed_2_, p_keyPressed_3_);
+            return super.keyPressed(keyCode, scanCode, modifier);
         }
     }
 

src/main/java/com/blamejared/controlling/client/gui/GuiNewKeyBindingList.java

@@ -68,10 +68,12 @@ public class GuiNewKeyBindingList extends KeyBindingList {
         allEntries.add(ent);
     }
 
+    @Override
     protected int getScrollbarPosition() {
         return super.getScrollbarPosition() + 15 + 20;
     }
 
+    @Override
     public int getRowWidth() {
         return super.getRowWidth() + 32;
     }
@@ -124,6 +126,7 @@ public class GuiNewKeyBindingList extends KeyBindingList {
             this.btnChangeKeyBinding = new Button(0, 0, 75 + 20 /*Forge: add space*/, 20, new StringTextComponent(this.keyDesc), (p_214386_2_) -> {
                 GuiNewKeyBindingList.this.controlsScreen.buttonId = name;
             }) {
+            	@Override
                 protected IFormattableTextComponent getNarrationMessage() {
                     return name.isInvalid() ? new TranslationTextComponent("narrator.controls.unbound", GuiNewKeyBindingList.KeyEntry.this.keyDesc) : new TranslationTextComponent("narrator.controls.bound", GuiNewKeyBindingList.KeyEntry.this.keyDesc, super.getNarrationMessage());
                 }
@@ -133,6 +136,7 @@ public class GuiNewKeyBindingList extends KeyBindingList {
                 GuiNewKeyBindingList.this.minecraft.gameSettings.setKeyBindingCode(name, name.getDefault());
                 KeyBinding.resetKeyBindingArrayAndHash();
             }) {
+            	@Override
                 protected IFormattableTextComponent getNarrationMessage() {
                     return new TranslationTextComponent("narrator.controls.reset", GuiNewKeyBindingList.KeyEntry.this.keyDesc);
                 }
@@ -185,16 +189,18 @@ public class GuiNewKeyBindingList extends KeyBindingList {
             return ImmutableList.of(this.btnChangeKeyBinding, this.btnResetKeyBinding);
         }
 
-        public boolean mouseClicked(double p_mouseClicked_1_, double p_mouseClicked_3_, int p_mouseClicked_5_) {
-            if (this.btnChangeKeyBinding.mouseClicked(p_mouseClicked_1_, p_mouseClicked_3_, p_mouseClicked_5_)) {
+        @Override
+        public boolean mouseClicked(double mouseX, double mouseY, int buttonId) {
+            if (this.btnChangeKeyBinding.mouseClicked(mouseX, mouseY, buttonId)) {
                 return true;
             } else {
-                return this.btnResetKeyBinding.mouseClicked(p_mouseClicked_1_, p_mouseClicked_3_, p_mouseClicked_5_);
+                return this.btnResetKeyBinding.mouseClicked(mouseX, mouseY, buttonId);
             }
         }
 
-        public boolean mouseReleased(double p_mouseReleased_1_, double p_mouseReleased_3_, int p_mouseReleased_5_) {
-            return this.btnChangeKeyBinding.mouseReleased(p_mouseReleased_1_, p_mouseReleased_3_, p_mouseReleased_5_);
+        @Override
+        public boolean mouseReleased(double mouseX, double mouseY, int buttonId) {
+            return this.btnChangeKeyBinding.mouseReleased(mouseX, mouseY, buttonId);
         }
 
         public KeyBinding getKeybinding() {