feat: Update to Minecraft 1.20.4

TwelveIterationMods · Dec 28, 2023 · f9a6768 · f9a6768
1 parent 938a100
commit f9a6768
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 29 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,2 +1 @@
-- Fix remainder items being voided when compressing items
-- Added Swedish Translation (by Regnander)
+- Updated to Minecraft 1.20.4
diff --git a/...tingtweaks/compat/ModMenuIntegration.java → ...aks/fabric/compat/ModMenuIntegration.java b/...tingtweaks/compat/ModMenuIntegration.java → ...aks/fabric/compat/ModMenuIntegration.java
@@ -1,4 +1,4 @@
-package net.blay09.mods.craftingtweaks.compat;
+package net.blay09.mods.craftingtweaks.fabric.compat;
 
 import com.terraformersmc.modmenu.api.ConfigScreenFactory;
 import com.terraformersmc.modmenu.api.ModMenuApi;

diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
@@ -20,18 +20,18 @@
   "environment": "*",
   "entrypoints": {
     "main": [
-      "net.blay09.mods.${mod_id}.fabric.Fabric${mod_main}"
+      "net.blay09.mods.craftingtweaks.fabric.FabricCraftingTweaks"
     ],
     "client": [
-      "net.blay09.mods.${mod_id}.fabric.client.Fabric${mod_main}Client"
+      "net.blay09.mods.craftingtweaks.fabric.client.FabricCraftingTweaksClient"
     ],
     "modmenu": [
-      "net.blay09.mods.${mod_id}.fabric.compat.ModMenuIntegration"
+      "net.blay09.mods.craftingtweaks.fabric.compat.ModMenuIntegration"
     ]
   },
   "mixins": [
-    "${mod_id}.mixins.json",
-    "${mod_id}.fabric.mixins.json"
+    "craftingtweaks.mixins.json",
+    "craftingtweaks.fabric.mixins.json"
   ],
 
   "depends": {

diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@ mod_id = craftingtweaks
 mod_name = Crafting Tweaks
 mod_main=CraftingTweaks
 description=Allows you to rotate, balance or clear the crafting matrix by the press of a button, in any (supported) crafting window.
-version = 19.0.2
+version = 20.0.0
 group = net.blay09.mods
 homepage=https://mods.twelveiterations.com/mc/craftingtweaks
 sources=https://github.com/TwelveIterationMods/CraftingTweaks
@@ -18,34 +18,33 @@ modrinth_release_type = release
 modrinth_project_id = DMu0oBKf
 
 # Minecraft
-minecraft_version = 1.20.2
-minecraft_versions = 1.20.2
-minecraft_version_range=[1.20.2,1.21)
+minecraft_version = 1.20.4
+minecraft_versions = 1.20.4
+minecraft_version_range=[1.20.4,1.21)
 pack_format_number=18
 java_version = 17
 
 # Balm
-balm_version = 8.1.0-SNAPSHOT
-balm_version_range = [8.0.0,)
+balm_version = 9.1.0-SNAPSHOT
+balm_version_range = [9.0.0,)
 
 # Forge
-forge_version = 48.0.1
-forge_version_range=[48.0.0,)
-forge_loader_version_range=[48,)
-forge_mixins=true
+forge_version = 49.0.10
+forge_version_range=[49,)
+forge_loader_version_range=[49,)
 
 # NeoForge
-neoforge_version = 20.2.86
-neoforge_version_range=[20.2,)
+neoforge_version = 20.4.47-beta
+neoforge_version_range=[20.4,)
 neoforge_loader_version_range=[1,)
 
 # Fabric
-fabric_version = 0.89.0+1.20.2
-fabric_loader_version = 0.14.22
+fabric_version = 0.91.3+1.20.4
+fabric_loader_version = 0.15.3
 
 # Dependencies
 mixin_version=0.8.5
-modmenu_version=8.0.0
+modmenu_version=9.0.0
 
 # Gradle
 org.gradle.jvmargs=-Xmx3G

diff --git a/neoforge/src/main/resources/META-INF/mods.toml b/neoforge/src/main/resources/META-INF/mods.toml
@@ -17,19 +17,19 @@ config = "${mod_id}.mixins.json"
 config = "${mod_id}.neoforge.mixins.json"
 [[dependencies.${mod_id}]]
 modId="neoforge"
-mandatory=true
+type="required"
 versionRange="${neoforge_version_range}"
 ordering="NONE"
 side="BOTH"
 [[dependencies.${mod_id}]]
 modId="minecraft"
-mandatory=true
+type="required"
 versionRange="${minecraft_version_range}"
 ordering="NONE"
 side="BOTH"
 [[dependencies.${mod_id}]]
 modId="balm"
-mandatory=true
+type="required"
 versionRange="${balm_version_range}"
 ordering="NONE"
 side="BOTH"
diff --git a/shared/src/main/java/net/blay09/mods/craftingtweaks/client/GuiTweakButton.java b/shared/src/main/java/net/blay09/mods/craftingtweaks/client/GuiTweakButton.java
@@ -59,7 +59,7 @@ public void onClick(double mouseX, double mouseY) {
     protected abstract void onTweakButtonClicked(Player player, AbstractContainerMenu container, CraftingGrid grid, TweakType tweak);
 
     @Override
-    public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTicks) {
+    public void renderWidget(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTicks) {
         setTooltip(Screen.hasShiftDown() ? altTooltip : normalTooltip);
 
         if (screen != null) {

diff --git a/shared/src/main/java/net/blay09/mods/craftingtweaks/command/CraftingTweaksCommand.java b/shared/src/main/java/net/blay09/mods/craftingtweaks/command/CraftingTweaksCommand.java
@@ -4,7 +4,6 @@
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.context.CommandContext;
 import net.blay09.mods.craftingtweaks.CraftingTweaks;
-import net.minecraft.commands.CommandRuntimeException;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.Commands;
 import net.minecraft.network.chat.Component;
@@ -17,7 +16,7 @@ public static void register(CommandDispatcher<CommandSourceStack> dispatcher) {
         );
     }
 
-    private static int toggleCraftingTweaksDebug(CommandContext<CommandSourceStack> context) throws CommandRuntimeException {
+    private static int toggleCraftingTweaksDebug(CommandContext<CommandSourceStack> context) {
         CommandSourceStack source = context.getSource();
         CraftingTweaks.debugMode = !CraftingTweaks.debugMode;
         source.sendSuccess(() -> Component.literal("Crafting Tweaks debug mode: " + CraftingTweaks.debugMode), true);