That was easy...

enjarai · Dec 7, 2024 · 350f343 · 350f343
1 parent 308e4d5
commit 350f343
Show file tree

Hide file tree

Showing 12 changed files with 32 additions and 32 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -11,7 +11,7 @@ mod.version=3.8.1
 mod.group=nl.enjarai
 mod.id=do_a_barrel_roll
 mod.name=Do a Barrel Roll
-mod.mc_version=1.21.2
+mod.mc_version=1.21.4
 
 # Global Dependencies
 deps.mixin_squared=0.1.2-beta.4
@@ -35,4 +35,4 @@ mod.mc_targets=[VERSIONED]
 publish.modrinth=6FtRfnLg
 publish.curseforge=663658
 publish.github=enjarai/do-a-barrel-roll
-publish.branch=stonecutter/1.21.2
+publish.branch=stonecutter/1.21.4
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -28,7 +28,7 @@ extensions.configure<StonecutterSettings> {
         //mc("1.20.2", "fabric", "forge")
         //mc("1.20.4", "fabric", "neoforge")
         //mc("1.20.6", "fabric", "neoforge")
-        mc("1.21.2", "fabric",) //"neoforge")
+        mc("1.21.4", "fabric",) //"neoforge")
     }
     create(rootProject)
 }

diff --git a/src/main/java/nl/enjarai/doabarrelroll/config/LimitedModConfigServer.java b/src/main/java/nl/enjarai/doabarrelroll/config/LimitedModConfigServer.java
@@ -18,8 +18,8 @@ static Codec<LimitedModConfigServer> getCodec() {
 
     static PacketCodec<PacketByteBuf, LimitedModConfigServer> getPacketCodec() {
         return PacketCodec.tuple(
-                PacketCodecs.BOOL, LimitedModConfigServer::allowThrusting,
-                PacketCodecs.BOOL, LimitedModConfigServer::forceEnabled,
+                PacketCodecs.BOOLEAN, LimitedModConfigServer::allowThrusting,
+                PacketCodecs.BOOLEAN, LimitedModConfigServer::forceEnabled,
                 Impl::new
         );
     }

diff --git a/src/main/java/nl/enjarai/doabarrelroll/config/ModConfigServer.java b/src/main/java/nl/enjarai/doabarrelroll/config/ModConfigServer.java
@@ -27,9 +27,9 @@ public record ModConfigServer(boolean allowThrusting,
             KineticDamage.CODEC.optionalFieldOf("kineticDamage", DEFAULT.kineticDamage()).forGetter(ModConfigServer::kineticDamage)
     ).apply(instance, ModConfigServer::new));
     public static final PacketCodec<ByteBuf, ModConfigServer> PACKET_CODEC = PacketCodec.tuple(
-            PacketCodecs.BOOL, ModConfigServer::allowThrusting,
-            PacketCodecs.BOOL, ModConfigServer::forceEnabled,
-            PacketCodecs.BOOL, ModConfigServer::forceInstalled,
+            PacketCodecs.BOOLEAN, ModConfigServer::allowThrusting,
+            PacketCodecs.BOOLEAN, ModConfigServer::forceEnabled,
+            PacketCodecs.BOOLEAN, ModConfigServer::forceInstalled,
             PacketCodecs.INTEGER, ModConfigServer::installedTimeout,
             KineticDamage.PACKET_CODEC, ModConfigServer::kineticDamage,
             ModConfigServer::new

diff --git a/src/main/java/nl/enjarai/doabarrelroll/net/packet/ConfigResponseC2SPacket.java b/src/main/java/nl/enjarai/doabarrelroll/net/packet/ConfigResponseC2SPacket.java
@@ -10,7 +10,7 @@ public record ConfigResponseC2SPacket(int protocolVersion, boolean success) impl
     public static final Id<ConfigResponseC2SPacket> PACKET_ID = new Id<>(DoABarrelRoll.id("config_response"));
     public static final PacketCodec<ByteBuf, ConfigResponseC2SPacket> PACKET_CODEC = PacketCodec.tuple(
             PacketCodecs.INTEGER, ConfigResponseC2SPacket::protocolVersion,
-            PacketCodecs.BOOL, ConfigResponseC2SPacket::success,
+            PacketCodecs.BOOLEAN, ConfigResponseC2SPacket::success,
             ConfigResponseC2SPacket::new
     );
 

diff --git a/src/main/java/nl/enjarai/doabarrelroll/net/packet/ConfigSyncS2CPacket.java b/src/main/java/nl/enjarai/doabarrelroll/net/packet/ConfigSyncS2CPacket.java
@@ -13,7 +13,7 @@ public record ConfigSyncS2CPacket(int protocolVersion, LimitedModConfigServer ap
     public static final PacketCodec<PacketByteBuf, ConfigSyncS2CPacket> PACKET_CODEC = PacketCodec.tuple(
             PacketCodecs.INTEGER, ConfigSyncS2CPacket::protocolVersion,
             LimitedModConfigServer.getPacketCodec(), ConfigSyncS2CPacket::applicableConfig,
-            PacketCodecs.BOOL, ConfigSyncS2CPacket::isLimited,
+            PacketCodecs.BOOLEAN, ConfigSyncS2CPacket::isLimited,
             ModConfigServer.PACKET_CODEC, ConfigSyncS2CPacket::fullConfig,
             ConfigSyncS2CPacket::new
     );

diff --git a/src/main/java/nl/enjarai/doabarrelroll/net/packet/ConfigUpdateAckS2CPacket.java b/src/main/java/nl/enjarai/doabarrelroll/net/packet/ConfigUpdateAckS2CPacket.java
@@ -10,7 +10,7 @@ public record ConfigUpdateAckS2CPacket(int protocolVersion, boolean success) imp
     public static final Id<ConfigUpdateAckS2CPacket> PACKET_ID = new Id<>(DoABarrelRoll.id("config_update_ack"));
     public static final PacketCodec<ByteBuf, ConfigUpdateAckS2CPacket> PACKET_CODEC = PacketCodec.tuple(
             PacketCodecs.INTEGER, ConfigUpdateAckS2CPacket::protocolVersion,
-            PacketCodecs.BOOL, ConfigUpdateAckS2CPacket::success,
+            PacketCodecs.BOOLEAN, ConfigUpdateAckS2CPacket::success,
             ConfigUpdateAckS2CPacket::new
     );
 

diff --git a/src/main/java/nl/enjarai/doabarrelroll/net/packet/RollSyncC2SPacket.java b/src/main/java/nl/enjarai/doabarrelroll/net/packet/RollSyncC2SPacket.java
@@ -9,7 +9,7 @@
 public record RollSyncC2SPacket(boolean rolling, float roll) implements CustomPayload {
     public static final Id<RollSyncC2SPacket> PACKET_ID = new Id<>(DoABarrelRoll.id("roll_sync"));
     public static final PacketCodec<ByteBuf, RollSyncC2SPacket> PACKET_CODEC = PacketCodec.tuple(
-            PacketCodecs.BOOL, RollSyncC2SPacket::rolling,
+            PacketCodecs.BOOLEAN, RollSyncC2SPacket::rolling,
             PacketCodecs.FLOAT, RollSyncC2SPacket::roll,
             RollSyncC2SPacket::new
     );

diff --git a/src/main/java/nl/enjarai/doabarrelroll/net/packet/RollSyncS2CPacket.java b/src/main/java/nl/enjarai/doabarrelroll/net/packet/RollSyncS2CPacket.java
@@ -10,7 +10,7 @@ public record RollSyncS2CPacket(int entityId, boolean rolling, float roll) imple
     public static final Id<RollSyncS2CPacket> PACKET_ID = new Id<>(DoABarrelRoll.id("roll_sync"));
     public static final PacketCodec<ByteBuf, RollSyncS2CPacket> PACKET_CODEC = PacketCodec.tuple(
             PacketCodecs.INTEGER, RollSyncS2CPacket::entityId,
-            PacketCodecs.BOOL, RollSyncS2CPacket::rolling,
+            PacketCodecs.BOOLEAN, RollSyncS2CPacket::rolling,
             PacketCodecs.FLOAT, RollSyncS2CPacket::roll,
             RollSyncS2CPacket::new
     );

diff --git a/stonecutter.gradle.kts b/stonecutter.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     id("dev.architectury.loom") version "1.7-SNAPSHOT" apply false
     id("me.modmuss50.mod-publish-plugin") version "0.5.+" apply false
 }
-stonecutter active "1.21.2-fabric" /* [SC] DO NOT EDIT */
+stonecutter active "1.21.4-fabric" /* [SC] DO NOT EDIT */
 
 stonecutter registerChiseled tasks.register("chiseledBuildAndCollect", stonecutter.chiseled) {
     group = "project"

diff --git a/versions/1.21.2-fabric/gradle.properties b/versions/1.21.2-fabric/gradle.properties
diff --git a/versions/1.21.4-fabric/gradle.properties b/versions/1.21.4-fabric/gradle.properties
@@ -0,0 +1,18 @@
+loom.platform=fabric
+
+# Global
+deps.yarn_build=1
+deps.compat=\
+    controlify=2.0.0-beta.14+1.21-fabric
+deps.compat_runtime=
+
+# Fabric
+deps.fapi=0.111.0+1.21.4
+deps.modmenu=13.0.0-beta.1
+deps.yacl=3.6.2+1.21.4
+deps.cicada=0.9.2+1.21.2-and-above
+
+# Mod
+mod.mc_dep=>=1.21.4 <=1.21.4
+mod.mc_title=1.21.4
+mod.mc_targets=1.21.4