From 4e11a8cc7c384238124c57bae70b53e92531ac36 Mon Sep 17 00:00:00 2001
From: BlayTheNinth <1933180+BlayTheNinth@users.noreply.github.com>
Date: Thu, 28 Dec 2023 19:05:21 +0100
Subject: [PATCH] feat: Update to Minecraft 1.20.4

---
 CHANGELOG.md                                  |  2 +-
 .../compat/ModMenuIntegration.java            |  2 +-
 .../compat/RoughlyEnoughItemsIntegration.java |  2 +-
 fabric/src/main/resources/fabric.mod.json     | 12 ++++-----
 gradle.properties                             | 26 +++++++++----------
 .../src/main/resources/META-INF/mods.toml     |  6 ++---
 6 files changed, 25 insertions(+), 25 deletions(-)
 rename fabric/src/main/java/net/blay09/mods/trashslot/{ => fabric}/compat/ModMenuIntegration.java (91%)
 rename fabric/src/main/java/net/blay09/mods/trashslot/{ => fabric}/compat/RoughlyEnoughItemsIntegration.java (96%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 942670a..f5740db 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1 +1 @@
-- Updated to Minecraft 1.20.2
\ No newline at end of file
+- Updated to Minecraft 1.20.4
\ No newline at end of file
diff --git a/fabric/src/main/java/net/blay09/mods/trashslot/compat/ModMenuIntegration.java b/fabric/src/main/java/net/blay09/mods/trashslot/fabric/compat/ModMenuIntegration.java
similarity index 91%
rename from fabric/src/main/java/net/blay09/mods/trashslot/compat/ModMenuIntegration.java
rename to fabric/src/main/java/net/blay09/mods/trashslot/fabric/compat/ModMenuIntegration.java
index 278819a..773d0fa 100644
--- a/fabric/src/main/java/net/blay09/mods/trashslot/compat/ModMenuIntegration.java
+++ b/fabric/src/main/java/net/blay09/mods/trashslot/fabric/compat/ModMenuIntegration.java
@@ -1,4 +1,4 @@
-package net.blay09.mods.trashslot.compat;
+package net.blay09.mods.trashslot.fabric.compat;
 
 import com.terraformersmc.modmenu.api.ConfigScreenFactory;
 import com.terraformersmc.modmenu.api.ModMenuApi;
diff --git a/fabric/src/main/java/net/blay09/mods/trashslot/compat/RoughlyEnoughItemsIntegration.java b/fabric/src/main/java/net/blay09/mods/trashslot/fabric/compat/RoughlyEnoughItemsIntegration.java
similarity index 96%
rename from fabric/src/main/java/net/blay09/mods/trashslot/compat/RoughlyEnoughItemsIntegration.java
rename to fabric/src/main/java/net/blay09/mods/trashslot/fabric/compat/RoughlyEnoughItemsIntegration.java
index 2e2e9c7..c97f7d9 100644
--- a/fabric/src/main/java/net/blay09/mods/trashslot/compat/RoughlyEnoughItemsIntegration.java
+++ b/fabric/src/main/java/net/blay09/mods/trashslot/fabric/compat/RoughlyEnoughItemsIntegration.java
@@ -1,4 +1,4 @@
-package net.blay09.mods.trashslot.compat;
+package net.blay09.mods.trashslot.fabric.compat;
 
 import me.shedaniel.math.Rectangle;
 import me.shedaniel.rei.api.client.plugins.REIClientPlugin;
diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
index a1a9c81..d5f97f1 100644
--- a/fabric/src/main/resources/fabric.mod.json
+++ b/fabric/src/main/resources/fabric.mod.json
@@ -20,21 +20,21 @@
   "environment": "*",
   "entrypoints": {
     "main": [
-      "net.blay09.mods.${mod_id}.fabric.Fabric${mod_main}"
+      "net.blay09.mods.trashslot.fabric.FabricTrashSlot"
     ],
     "client": [
-      "net.blay09.mods.${mod_id}.fabric.client.Fabric${mod_main}Client"
+      "net.blay09.mods.trashslot.fabric.client.FabricTrashSlotClient"
     ],
     "modmenu": [
-      "net.blay09.mods.${mod_id}.fabric.compat.ModMenuIntegration"
+      "net.blay09.mods.trashslot.fabric.compat.ModMenuIntegration"
     ],
     "rei_client": [
-      "net.blay09.mods.trashslot.compat.RoughlyEnoughItemsIntegration"
+      "net.blay09.mods.trashslot.fabric.compat.RoughlyEnoughItemsIntegration"
     ]
   },
   "mixins": [
-    "${mod_id}.mixins.json",
-    "${mod_id}.fabric.mixins.json"
+    "trashslot.mixins.json",
+    "trashslot.fabric.mixins.json"
   ],
 
   "depends": {
diff --git a/gradle.properties b/gradle.properties
index 30bbce8..82946be 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,36 +18,36 @@ modrinth_release_type = release
 modrinth_project_id = vRYk0bv7
 
 # 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_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
 jei_minecraft_version=1.19.2
 jei_version=11.4.0.288
 rei_version=10.0.581
 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
index 7f33361..66ed4c9 100644
--- 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"