From 624f920f19c56259701a4812dc16f2763f49268f Mon Sep 17 00:00:00 2001 From: FlorianMichael Date: Tue, 3 Dec 2024 23:11:18 +0100 Subject: [PATCH] Start working on 1.21.4 --- build.gradle | 8 ++++---- gradle.properties | 10 +++++----- .../viafabricplus/fixes/data/ItemRegistryDiff.java | 11 +++++++++++ .../fixes/viaversion/ViaFabricPlusProtocol.java | 3 ++- .../protocoltranslator/ProtocolTranslator.java | 2 +- 5 files changed, 23 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index 44873da2..b37023b3 100644 --- a/build.gradle +++ b/build.gradle @@ -67,11 +67,11 @@ dependencies { modCompileOnly "com.terraformersmc:modmenu:12.0.0" - jij "com.viaversion:viaversion-common:5.2.0" + jij "com.viaversion:viaversion-common:5.2.1-SNAPSHOT" jij "com.viaversion:viabackwards-common:5.2.0" - jij "net.raphimc:viaaprilfools-common:3.0.4" - jij "net.raphimc:ViaLegacy:3.0.6" - jij ("net.raphimc:ViaBedrock:0.0.14-20241206.155528-1") { + jij "net.raphimc:viaaprilfools-common:3.0.5-SNAPSHOT" + jij "net.raphimc:ViaLegacy:3.0.7-SNAPSHOT" + jij ("net.raphimc:ViaBedrock:0.0.13-SNAPSHOT") { exclude group: "io.jsonwebtoken" exclude group: "com.mojang", module: "brigadier" } diff --git a/gradle.properties b/gradle.properties index 3848281a..a061b25f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,14 +5,14 @@ org.gradle.parallel=true # Project Details maven_group=de.florianmichael maven_name=ViaFabricPlus -maven_version=3.5.3 +maven_version=3.6.0-SNAPSHOT maven_description=Fabric mod to connect to EVERY Minecraft server version (Release, Beta, Alpha, Classic, Snapshots, Bedrock) with QoL fixes to the gameplay # Minecraft/Fabric -minecraft_version=1.21.3 -yarn_version=1.21.3+build.2 +minecraft_version=1.21.4 +yarn_version=1.21.4+build.1 loader_version=0.16.9 -fabric_api_version=0.108.0+1.21.3 +fabric_api_version=0.110.5+1.21.4 # Set to empty to use the Minecraft version above -supported_versions=>=1.21.2 <=1.21.3 +supported_versions= diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/data/ItemRegistryDiff.java b/src/main/java/de/florianmichael/viafabricplus/fixes/data/ItemRegistryDiff.java index 7af1e7ee..c688a8d3 100644 --- a/src/main/java/de/florianmichael/viafabricplus/fixes/data/ItemRegistryDiff.java +++ b/src/main/java/de/florianmichael/viafabricplus/fixes/data/ItemRegistryDiff.java @@ -48,6 +48,17 @@ public class ItemRegistryDiff { public static final List EXTENDED_CLASSIC_ITEMS = new ArrayList<>(); static { + ITEM_DIFF.put(OPEN_EYEBLOSSOM, andNewer(v1_21_4)); + ITEM_DIFF.put(CLOSED_EYEBLOSSOM, andNewer(v1_21_4)); + ITEM_DIFF.put(RESIN_CLUMP, andNewer(v1_21_4)); + ITEM_DIFF.put(RESIN_BLOCK, andNewer(v1_21_4)); + ITEM_DIFF.put(RESIN_BRICKS, andNewer(v1_21_4)); + ITEM_DIFF.put(RESIN_BRICK_STAIRS, andNewer(v1_21_4)); + ITEM_DIFF.put(RESIN_BRICK_SLAB, andNewer(v1_21_4)); + ITEM_DIFF.put(RESIN_BRICK_WALL, andNewer(v1_21_4)); + ITEM_DIFF.put(CHISELED_RESIN_BRICKS, andNewer(v1_21_4)); + ITEM_DIFF.put(RESIN_BRICK, andNewer(v1_21_4)); + ITEM_DIFF.put(PALE_OAK_PLANKS, andNewer(v1_21_2)); ITEM_DIFF.put(PALE_OAK_SAPLING, andNewer(v1_21_2)); ITEM_DIFF.put(PALE_OAK_LOG, andNewer(v1_21_2)); diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/viaversion/ViaFabricPlusProtocol.java b/src/main/java/de/florianmichael/viafabricplus/fixes/viaversion/ViaFabricPlusProtocol.java index 108d0830..195b87b1 100644 --- a/src/main/java/de/florianmichael/viafabricplus/fixes/viaversion/ViaFabricPlusProtocol.java +++ b/src/main/java/de/florianmichael/viafabricplus/fixes/viaversion/ViaFabricPlusProtocol.java @@ -27,6 +27,7 @@ import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType; import com.viaversion.viaversion.api.protocol.packet.State; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import com.viaversion.viaversion.api.type.Types; +import com.viaversion.viaversion.protocols.v1_21_2to1_21_4.packet.ServerboundPackets1_21_4; import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ClientboundPackets1_21_2; import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ServerboundPackets1_21_2; import com.viaversion.viaversion.util.Key; @@ -119,7 +120,7 @@ public class ViaFabricPlusProtocol extends AbstractSimpleProtocol { } public static ServerboundPacketType getSetCreativeModeSlot() { - return ServerboundPackets1_21_2.SET_CREATIVE_MODE_SLOT; + return ServerboundPackets1_21_4.SET_CREATIVE_MODE_SLOT; } public static ClientboundPacketType getCustomPayload() { diff --git a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/ProtocolTranslator.java b/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/ProtocolTranslator.java index d40faec2..a1f65355 100644 --- a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/ProtocolTranslator.java +++ b/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/ProtocolTranslator.java @@ -90,7 +90,7 @@ public class ProtocolTranslator { /** * The native version of the client */ - public static final ProtocolVersion NATIVE_VERSION = ProtocolVersion.v1_21_2; + public static final ProtocolVersion NATIVE_VERSION = ProtocolVersion.v1_21_4; /** * Protocol version that is used to enable protocol auto-detect