1.15 port

build.gradle

@@ -21,8 +21,8 @@ archivesBaseName = 'Controlling'
 sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8'
 
 minecraft {
-    mappings channel: 'snapshot', version: '20190621-1.14.2'
-    accessTransformer = file('build/resources/main/META-INF/accesstransformer.cfg')
+    mappings channel: 'snapshot', version: '20190719-1.14.3'
+    accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
 
     runs {
         client {
@@ -49,7 +49,7 @@ minecraft {
 }
 
 dependencies {
-    minecraft 'net.minecraftforge:forge:1.14.3-27.0.13'
+    minecraft 'net.minecraftforge:forge:1.15.1-30.0.30'
 }
 
 jar {

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

@@ -45,7 +45,7 @@ public class GuiNewControls extends ControlsScreen {
     protected void init() {
         
         this.addButton(new Button(this.width / 2 - 155, 18, 150, 20, I18n.format("options.mouse_settings"), (p_213126_1_) -> {
-            this.minecraft.displayGuiScreen(new MouseSettingsScreen(this));
+            this.minecraft.displayGuiScreen(new MouseSettingsScreen(this, options));
         }));
         this.addButton(AbstractOption.AUTO_JUMP.createWidget(this.minecraft.gameSettings, this.width / 2 - 155 + 160, 18, 150));
         

src/main/java/com/blamejared/controlling/events/ClientEventHandler.java

@@ -13,7 +13,7 @@ public class ClientEventHandler {
         try {
             if(event.getGui() instanceof ControlsScreen && !(event.getGui() instanceof GuiNewControls)) {
                 ControlsScreen gui = (ControlsScreen) event.getGui();
-                event.setGui(new GuiNewControls(gui.parentScreen, Minecraft.getInstance().gameSettings));
+                event.setGui(new GuiNewControls(gui.field_228182_a_, Minecraft.getInstance().gameSettings));
             }
         } catch(Exception e) {
             e.printStackTrace();

src/main/resources/META-INF/accesstransformer.cfg

@@ -1,2 +1,2 @@
 public net.minecraft.client.gui.screen.ControlsScreen field_146494_r # keyBindingList
-public net.minecraft.client.gui.screen.ControlsScreen field_146496_h # parentScreen
+public net.minecraft.client.gui.screen.SettingsScreen field_228182_a_ # parentScreen

src/main/resources/META-INF/mods.toml

@@ -1,11 +1,11 @@
 modLoader="javafml" #mandatory
-loaderVersion="[27,)" #mandatory
+loaderVersion="[30,)" #mandatory
 issueTrackerURL="https://github.com/jaredlll08/Controlling/issues" #optional
 displayURL="https://minecraft.curseforge.com/projects/controlling" #optional
 authors="Jaredlll08" #optional
 [[mods]] #mandatory
 modId="controlling" #mandatory
-version="5.0.4" #mandatory
+version="6.0.0" #mandatory
 displayName="Controlling" #mandatory
 description='''
 Adds the ability to search for keybinds using their name in the KeyBinding menu, this allows players to easily find a key binding in the menu.
@@ -17,7 +17,7 @@ Adds the ability to search for keybinds using their name in the KeyBinding menu,
     # Does this dependency have to exist - if not, ordering below must be specified
     mandatory=true #mandatory
     # The version range of the dependency
-    versionRange="[27,)" #mandatory
+    versionRange="[30,)" #mandatory
     # An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory
     ordering="NONE"
     # Side this dependency is applied on - BOTH, CLIENT or SERVER