Updated to 1.20.4

GirafiStudios · Dec 31, 2023 · 5ce2f11 · 5ce2f11
1 parent 0dd9e61
commit 5ce2f11
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 22 deletions.
diff --git a/common/src/main/java/com/girafi/minemenu/menu/list/GuiControlList.java b/common/src/main/java/com/girafi/minemenu/menu/list/GuiControlList.java
@@ -29,7 +29,7 @@ public class GuiControlList extends ContainerObjectSelectionList<KeyBindsList.En
     private int maxWidth = 0;
 
     public GuiControlList(Screen parent, Minecraft mc) {
-        super(mc, parent.width + 32, parent.height, 25, parent.height - 20, 20);
+        super(mc, parent.width + 32, parent.height - 20, 20, 20);
         this.mc = mc;
 
         KeyMapping[] keyBindings = Minecraft.getInstance().options.keyMappings;

diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'java'
     id 'idea'
-    id 'fabric-loom' version '1.2-SNAPSHOT'
+    id 'fabric-loom' version '1.4-SNAPSHOT'
 }
 
 base {

diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
@@ -24,11 +24,11 @@
         ]
     },
     "depends": {
-        "fabricloader": ">=0.14",
+        "fabricloader": ">=0.15.3",
         "fabric-api": "*",
-        "minecraft": "1.20.2",
+        "minecraft": "~1.20.4",
         "java": ">=17",
-        "forgeconfigapiport": ">=9.1.2"
+        "forgeconfigapiport": ">=2.4.0"
     },
     "suggests": {
         "another-mod": "*"

diff --git a/forge/build.gradle b/forge/build.gradle
@@ -60,6 +60,12 @@ minecraft {
 
 sourceSets.main.resources.srcDir 'src/generated/resources'
 
+sourceSets.each {
+    def dir = layout.buildDirectory.dir("sourcesSets/$it.name")
+    it.output.resourcesDir = dir
+    it.java.destinationDirectory = dir
+}
+
 jarJar.enable()
 dependencies {
     minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"

diff --git a/forge/src/main/java/com/girafi/minemenu/MineMenu.java b/forge/src/main/java/com/girafi/minemenu/MineMenu.java
@@ -1,10 +1,13 @@
 package com.girafi.minemenu;
 
+import com.girafi.minemenu.util.Config;
 import com.girafi.minemenu.util.MineMenuKeybinds;
 import net.minecraftforge.client.event.RegisterKeyMappingsEvent;
 import net.minecraftforge.eventbus.api.EventPriority;
 import net.minecraftforge.eventbus.api.IEventBus;
+import net.minecraftforge.fml.ModLoadingContext;
 import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.config.ModConfig;
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 import net.minecraftforge.fml.loading.FMLPaths;

diff --git a/gradle.properties b/gradle.properties
@@ -1,33 +1,33 @@
 # Project
-version=1.13.0
+version=1.13.1
 group=com.girafi.minemenu
 
 # Common
-minecraft_version=1.20.2
+minecraft_version=1.20.4
 mod_name=MineMenu
 mod_author=Girafi
 mod_id=minemenu
 license=MIT
 credits=dmillerw, the original creator of the mod.
 description=MineMenu supports key bindings, commands, and creative functions to make your life easier.
-minecraft_version_range=[1.20.2, 1.21)
+minecraft_version_range=[1.20.4, 1.21)
 
 # Fabric
-fabric_version=0.91.1+1.20.2
-fabric_loader_version=0.15.0
+fabric_version=0.92.0+1.20.4
+fabric_loader_version=0.15.3
 
 # Forge
-forge_version=48.0.49
-forge_loader_version_range=[48,)
-forge_version_range=[48,)
+forge_version=49.0.12
+forge_loader_version_range=[49,)
+forge_version_range=[49,)
 
 # NeoForge
-neoforge_version=20.2.86
+neoforge_version=20.4.69-beta
 neoforge_loader_version_range=[1,)
 
 # Libs
-common_networking=1.0.4
-forge_config_api_port=9.1.2
+common_networking=1.0.5
+forge_config_api_port=20.4.0
 
 # Gradle
 org.gradle.jvmargs=-Xmx4G

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/neoforge/build.gradle b/neoforge/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'idea'
-    id 'net.neoforged.gradle.userdev' version '7.0.41'
+    id 'net.neoforged.gradle.userdev' version '7.0.57'
     id 'java-library'
 }
 

diff --git a/neoforge/src/main/java/com/girafi/minemenu/MineMenu.java b/neoforge/src/main/java/com/girafi/minemenu/MineMenu.java
@@ -15,8 +15,7 @@
 @Mod(Constants.MOD_ID)
 public class MineMenu {
 
-    public MineMenu() {
-        final IEventBus modBus  = FMLJavaModLoadingContext.get().getModEventBus();
+    public MineMenu(IEventBus modBus) {
         modBus.addListener(EventPriority.LOWEST, this::loadMenuLoader);
         modBus.addListener(this::registerKeybind);
 

diff --git a/neoforge/src/main/resources/META-INF/mods.toml b/neoforge/src/main/resources/META-INF/mods.toml
@@ -15,14 +15,14 @@ description = '''${description}''' #mandatory (Supports multiline text)
 
 [[dependencies.${mod_id}]] #optional
 modId = "neoforge" #mandatory
-mandatory = true #mandatory
+type = "required" #mandatory
 versionRange = "${neoforge_loader_version_range}" #mandatory
 ordering = "NONE" # The order that this dependency should load in relation to your mod, required to be either 'BEFORE' or 'AFTER' if the dependency is not mandatory
 side = "BOTH" # Side this dependency is applied on - 'BOTH', 'CLIENT' or 'SERVER'
 
 [[dependencies.${mod_id}]]
 modId = "minecraft"
-mandatory = true
+type = "required"
 versionRange = "${minecraft_version_range}"
 ordering = "NONE"
 side = "BOTH"