Meow

Author: enjarai

gradle.properties

@@ -11,14 +11,14 @@ mod.version=3.8.3
 mod.group=nl.enjarai
 mod.id=do_a_barrel_roll
 mod.name=Do a Barrel Roll
-mod.mc_version=1.21.6
+mod.mc_version=1.21.9-rc1
 
 # Global Dependencies
 deps.mixin_squared=0.1.2-beta.4
 deps.mixin_extras=0.4.1
 deps.cond_mixin=0.6.2
 deps.perm_api=0.4.0
-deps.fabric_loader=0.16.10
+deps.fabric_loader=0.17.0
 
 # Versioned Dependencies
 deps.minecraft=[VERSIONED]
@@ -35,4 +35,6 @@ mod.mc_targets=[VERSIONED]
 publish.modrinth=6FtRfnLg
 publish.curseforge=663658
 publish.github=enjarai/do-a-barrel-roll
-publish.branch=stonecutter/1.21.6
+publish.branch=stonecutter/1.21.9
+
+env.snapshot=true

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.6", "fabric",) //"neoforge")
+        mc("1.21.9", "fabric",) //"neoforge")
     }
     create(rootProject)
 }

src/main/java/nl/enjarai/doabarrelroll/ModKeybindings.java

@@ -14,73 +14,75 @@
 import java.util.List;
 
 public class ModKeybindings {
+    public static final KeyBinding.Category CATEGORY =
+            KeyBinding.Category.create(DoABarrelRoll.id("do_a_barrel_roll"));
 
     public static final KeyBinding TOGGLE_ENABLED = new KeyBinding(
             "key.do_a_barrel_roll.toggle_enabled",
             InputUtil.Type.KEYSYM,
             GLFW.GLFW_KEY_I,
-            "category.do_a_barrel_roll.do_a_barrel_roll"
+            CATEGORY
     );
     public static final KeyBinding TOGGLE_THRUST = new KeyBinding(
             "key.do_a_barrel_roll.toggle_thrust",
             InputUtil.Type.KEYSYM,
             InputUtil.UNKNOWN_KEY.getCode(),
-            "category.do_a_barrel_roll.do_a_barrel_roll"
+            CATEGORY
     );
     public static final KeyBinding OPEN_CONFIG = new KeyBinding(
             "key.do_a_barrel_roll.open_config",
             InputUtil.Type.KEYSYM,
             InputUtil.UNKNOWN_KEY.getCode(),
-            "category.do_a_barrel_roll.do_a_barrel_roll"
+            CATEGORY
     );
 
     public static final KeyBinding PITCH_UP = new KeyBinding(
             "key.do_a_barrel_roll.pitch_up",
             InputUtil.Type.KEYSYM,
             InputUtil.UNKNOWN_KEY.getCode(),
-            "category.do_a_barrel_roll.do_a_barrel_roll.movement"
+            CATEGORY
     );
     public static final KeyBinding PITCH_DOWN = new KeyBinding(
             "key.do_a_barrel_roll.pitch_down",
             InputUtil.Type.KEYSYM,
             InputUtil.UNKNOWN_KEY.getCode(),
-            "category.do_a_barrel_roll.do_a_barrel_roll.movement"
+            CATEGORY
     );
     public static final KeyBinding YAW_LEFT = new KeyBinding(
             "key.do_a_barrel_roll.yaw_left",
             InputUtil.Type.KEYSYM,
             GLFW.GLFW_KEY_A,
-            "category.do_a_barrel_roll.do_a_barrel_roll.movement"
+            CATEGORY
     );
     public static final KeyBinding YAW_RIGHT = new KeyBinding(
             "key.do_a_barrel_roll.yaw_right",
             InputUtil.Type.KEYSYM,
             GLFW.GLFW_KEY_D,
-            "category.do_a_barrel_roll.do_a_barrel_roll.movement"
+            CATEGORY
     );
     public static final KeyBinding ROLL_LEFT = new KeyBinding(
             "key.do_a_barrel_roll.roll_left",
             InputUtil.Type.KEYSYM,
             InputUtil.UNKNOWN_KEY.getCode(),
-            "category.do_a_barrel_roll.do_a_barrel_roll.movement"
+            CATEGORY
     );
     public static final KeyBinding ROLL_RIGHT = new KeyBinding(
             "key.do_a_barrel_roll.roll_right",
             InputUtil.Type.KEYSYM,
             InputUtil.UNKNOWN_KEY.getCode(),
-            "category.do_a_barrel_roll.do_a_barrel_roll.movement"
+            CATEGORY
     );
     public static final KeyBinding THRUST_FORWARD = new KeyBinding(
             "key.do_a_barrel_roll.thrust_forward",
             InputUtil.Type.KEYSYM,
             GLFW.GLFW_KEY_W,
-            "category.do_a_barrel_roll.do_a_barrel_roll.movement"
+            CATEGORY
     );
     public static final KeyBinding THRUST_BACKWARD = new KeyBinding(
             "key.do_a_barrel_roll.thrust_backward",
             InputUtil.Type.KEYSYM,
             InputUtil.UNKNOWN_KEY.getCode(),
-            "category.do_a_barrel_roll.do_a_barrel_roll.movement"
+            CATEGORY
     );
 
     public static final List<KeyBinding> ALL = List.of(
@@ -97,22 +99,6 @@ public class ModKeybindings {
             THRUST_BACKWARD
     );
 
-    public static final InputContext CONTEXT = InputContext.of(
-            DoABarrelRoll.id("fall_flying"),
-            DoABarrelRollClient.FALL_FLYING_GROUP
-    );
-
-    static {
-        CONTEXT.addKeyBinding(PITCH_UP);
-        CONTEXT.addKeyBinding(PITCH_DOWN);
-        CONTEXT.addKeyBinding(YAW_LEFT);
-        CONTEXT.addKeyBinding(YAW_RIGHT);
-        CONTEXT.addKeyBinding(ROLL_LEFT);
-        CONTEXT.addKeyBinding(ROLL_RIGHT);
-        CONTEXT.addKeyBinding(THRUST_FORWARD);
-        CONTEXT.addKeyBinding(THRUST_BACKWARD);
-    }
-
     public static void clientTick(MinecraftClient client) {
         while (TOGGLE_ENABLED.wasPressed()) {
             if (!ClientNetworking.HANDSHAKE_CLIENT.getConfig().map(LimitedModConfigServer::forceEnabled).orElse(false)) {

src/main/java/nl/enjarai/doabarrelroll/mixin/client/LivingEntityMixin.java

@@ -44,9 +44,9 @@ public LivingEntityMixin(EntityType<?> type, World world) {
 
         if (ModConfig.INSTANCE.getThrustParticles()) {
             int particleDensity = (int) MathHelper.clamp(throttleSign * 10, 0, 10);
-            if (throttleSign > 0.1 && getWorld().getTime() % (11 - particleDensity) == 0) {
-                var pPos = getPos().add(velocity.multiply(0.5).negate());
-                getWorld().addParticleClient(
+            if (throttleSign > 0.1 && getEntityWorld().getTime() % (11 - particleDensity) == 0) {
+                var pPos = getEntityPos().add(velocity.multiply(0.5).negate());
+                getEntityWorld().addParticleClient(
                         ParticleTypes.CAMPFIRE_SIGNAL_SMOKE,
                         pPos.getX(), pPos.getY(), pPos.getZ(),
                         0, 0, 0

src/main/java/nl/enjarai/doabarrelroll/net/ServerConfigHolder.java

@@ -121,7 +121,7 @@ public P clientSendsUpdate(ServerPlayerEntity player, ConfigUpdateC2SPacket pack
 
             // Only set our instance if everything else succeeds
             instance = newConfig;
-            updateCallback.accept(player.getServer(), instance);
+            updateCallback.accept(player.getEntityWorld().getServer(), instance);
             save();
             return packetConstructor.construct(HandshakeServer.PROTOCOL_VERSION, true);
         } catch (RuntimeException e) {

src/main/java/nl/enjarai/doabarrelroll/util/StarFoxUtil.java

@@ -94,7 +94,7 @@ public static boolean isFoxMcCloud(PlayerEntity player) {
     }
 
     public static void playBarrelRollSound(PlayerEntity player) {
-        player.getWorld().playSoundFromEntity(
+        player.getEntityWorld().playSoundFromEntity(
                 player, player, barrelRollSound, SoundCategory.PLAYERS,
                 1.0F, (random.nextFloat() - random.nextFloat()) * 0.2F + 1.0F
         );

src/main/resources/do_a_barrel_roll.mixins.json

@@ -17,9 +17,6 @@
     "client.InGameHudMixin",
     "client.LivingEntityMixin",
     "client.PlayerEntityMixin",
-    "client.key.KeyBindingAccessor",
-    "client.key.KeyBindingEntryMixin",
-    "client.key.KeyBindingMixin",
     "client.roll.CameraMixin",
     "client.roll.DebugHudMixin",
     "client.roll.EntityRendererMixin",

stonecutter.gradle.kts

@@ -3,10 +3,10 @@ plugins {
     kotlin("jvm") version "2.0.0" apply false
     kotlin("plugin.serialization") version "2.0.0" apply false
     id("co.uzzu.dotenv.gradle") version "4.0.0"
-    id("dev.architectury.loom") version "1.10-SNAPSHOT" apply false
+    id("dev.architectury.loom") version "1.11-SNAPSHOT" apply false
     id("me.modmuss50.mod-publish-plugin") version "0.5.+" apply false
 }
-stonecutter active "1.21.6-fabric" /* [SC] DO NOT EDIT */
+stonecutter active "1.21.9-fabric" /* [SC] DO NOT EDIT */
 
 stonecutter registerChiseled tasks.register("chiseledBuildAndCollect", stonecutter.chiseled) {
     group = "project"

versions/1.21.6-fabric/gradle.properties

@@ -0,0 +1,18 @@
+loom.platform=fabric
+
+# Global
+deps.yarn_build=1
+deps.compat=\
+    controlify=5q2runiM
+deps.compat_runtime=
+
+# Fabric
+deps.fapi=0.133.13+1.21.9
+deps.modmenu=15.0.0-beta.3
+deps.yacl=3.8.0+1.21.9
+deps.cicada=0.14.2+1.21.6-and-above
+
+# Mod
+mod.mc_dep=>=1.21.8 <=1.21.9
+mod.mc_title=1.21.9
+mod.mc_targets=1.21.9