Support MinecraftForge 1.20.2

6 files changed, 14 insertions, 11 deletions

diff --git a/fabric/build.gradle b/fabric/build.gradle
index a8f0e5c9c..518452b7e 100644
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -131,7 +131,7 @@ unifiedPublishing {
             curseforge {
                 token = project.hasProperty("danielshe_curse_api_key") ? project.property("danielshe_curse_api_key") : System.getenv("danielshe_curse_api_key")
                 id = "310111"
-                gameVersions.addAll "Java 17", "1.20.2-Snapshot"
+                gameVersions.addAll "Java 17", "1.20.2-Snapshot", project.minecraft_version
             }
         }
 
diff --git a/forge/build.gradle b/forge/build.gradle
index ac6b33686..98386dd26 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -215,7 +215,7 @@ unifiedPublishing {
     project {
         displayName = "[Forge $rootProject.supported_version] v$project.version"
         releaseType = "beta"
-        gameVersions = ["1.20", "1.20.1"]
+        gameVersions = []
         gameLoaders = ["forge"]
         changelog = rootProject.releaseChangelog
 
@@ -237,6 +237,7 @@ unifiedPublishing {
                 token = project.hasProperty("danielshe_curse_api_key") ? project.property("danielshe_curse_api_key") : System.getenv("danielshe_curse_api_key")
                 id = "310111"
                 gameVersions.addAll "Java 17"
+                gameVersions.addAll project.minecraft_version
 
                 relations {
                     depends "roughly-enough-items-hacks"
@@ -249,6 +250,7 @@ unifiedPublishing {
                 token = project.hasProperty("modrinth_key") ? project.property("modrinth_key") : System.getenv("modrinth_key")
                 id = "nfn13YXA"
                 version = "$project.version+$project.name"
+                gameVersions.addAll project.minecraft_version
             }
         }
     }
@@ -277,6 +279,7 @@ unifiedPublishing {
                 token = project.hasProperty("danielshe_curse_api_key") ? project.property("danielshe_curse_api_key") : System.getenv("danielshe_curse_api_key")
                 id = "567899"
                 gameVersions.addAll "Java 17"
+                gameVersions.addAll project.minecraft_version
             }
         }
 
diff --git a/forge/src/main/java/me/shedaniel/rei/mixin/forge/MixinClientPacketListener.java b/forge/src/main/java/me/shedaniel/rei/mixin/forge/MixinClientPacketListener.java
index 989b0eb63..333f8fdbc 100644
--- a/forge/src/main/java/me/shedaniel/rei/mixin/forge/MixinClientPacketListener.java
+++ b/forge/src/main/java/me/shedaniel/rei/mixin/forge/MixinClientPacketListener.java
@@ -25,8 +25,8 @@ package me.shedaniel.rei.mixin.forge;
 
 import me.shedaniel.rei.RoughlyEnoughItemsCoreClient;
 import net.minecraft.client.multiplayer.ClientPacketListener;
+import net.minecraft.network.protocol.common.ClientboundUpdateTagsPacket;
 import net.minecraft.network.protocol.game.ClientboundUpdateRecipesPacket;
-import net.minecraft.network.protocol.game.ClientboundUpdateTagsPacket;
 import net.minecraft.world.item.crafting.RecipeManager;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
diff --git a/gradle.properties b/gradle.properties
index 041599849..ea725e0fa 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,14 +1,14 @@
 org.gradle.jvmargs=-Xmx6G
 base_version=13.0
 unstable=false
-supported_version=1.20.2-rc1
-minecraft_version=1.20.2-rc1
+supported_version=1.20.2
+minecraft_version=1.20.2
 forgeEnabled=false
-forge_version=46.0.1
+forge_version=48.0.1
 fabricloader_version=0.14.22
-cloth_config_version=12.0.107
+cloth_config_version=12.0.109
 modmenu_version=7.0.0
-fabric_api=0.88.5+1.20.2
-architectury_version=10.0.7
+fabric_api=0.89.2+1.20.2
+architectury_version=10.0.8
 api_exculde=
 #api_include=me.shedaniel.cloth:cloth-events,me.shedaniel.cloth:config-2,me.sargunvohra.mcmods:autoconfig1u,org.jetbrains:annotations,net.fabricmc.fabric-api:fabric
diff --git a/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsNetwork.java b/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsNetwork.java
index 6795cfdb9..a54325403 100644
--- a/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsNetwork.java
+++ b/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsNetwork.java
@@ -171,7 +171,7 @@ public class RoughlyEnoughItemsNetwork {
             try {
                 boolean shift = packetByteBuf.readBoolean();
                 try {
-                    CompoundTag nbt = packetByteBuf.readAnySizeNbt();
+                    CompoundTag nbt = packetByteBuf.readNbt();
                     List<InputIngredient<ItemStack>> inputs = readInputs(nbt.getCompound("Inputs"));
                     List<SlotAccessor> input = readSlots(container, player, nbt.getList("InputSlots", Tag.TAG_COMPOUND));
                     List<SlotAccessor> inventory = readSlots(container, player, nbt.getList("InventorySlots", Tag.TAG_COMPOUND));
diff --git a/settings.gradle b/settings.gradle
index 857bbede0..937a949bf 100755
--- a/settings.gradle
+++ b/settings.gradle
@@ -13,4 +13,4 @@ include "api"
 include "default-plugin"
 include "runtime"
 include "fabric"
-//include "forge"
+include "forge"