From e7b2709a89866bd9fc898ac55b65c353c339c794 Mon Sep 17 00:00:00 2001
From: o7Moon <0167moon@gmail.com>
Date: Fri, 29 Dec 2023 13:13:38 -0600
Subject: [PATCH 1/2] dedicated server fix

---
 .../java/dev/o7moon/openboatutils/Modes.java  | 32 +++++++++----------
 .../o7moon/openboatutils/OpenBoatUtils.java   |  2 +-
 .../mixin/ServerPlayNetworkHandlerMixin2.java | 10 ++++--
 src/main/resources/fabric.mod.json            |  4 +--
 4 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/src/main/java/dev/o7moon/openboatutils/Modes.java b/src/main/java/dev/o7moon/openboatutils/Modes.java
index 8f81946..a756b93 100644
--- a/src/main/java/dev/o7moon/openboatutils/Modes.java
+++ b/src/main/java/dev/o7moon/openboatutils/Modes.java
@@ -1,22 +1,22 @@
 package dev.o7moon.openboatutils;
 
 public enum Modes {
-    BROKEN_SLIME_RALLY,
-    BROKEN_SLIME_RALLY_BLUE,
-    BROKEN_SLIME_BA_NOFD,
-    BROKEN_SLIME_PARKOUR,
-    BROKEN_SLIME_BA_BLUE_NOFD,
-    BROKEN_SLIME_PARKOUR_BLUE,
-    BROKEN_SLIME_BA,
-    BROKEN_SLIME_BA_BLUE,
-    RALLY,
-    RALLY_BLUE,
-    BA_NOFD,
-    PARKOUR,
-    BA_BLUE_NOFD,
-    PARKOUR_BLUE,
-    BA,
-    BA_BLUE;
+    BROKEN_SLIME_RALLY,//0
+    BROKEN_SLIME_RALLY_BLUE,//1
+    BROKEN_SLIME_BA_NOFD,//2
+    BROKEN_SLIME_PARKOUR,//3
+    BROKEN_SLIME_BA_BLUE_NOFD,//4
+    BROKEN_SLIME_PARKOUR_BLUE,//5
+    BROKEN_SLIME_BA,//6
+    BROKEN_SLIME_BA_BLUE,//7
+    RALLY,//8
+    RALLY_BLUE,//9
+    BA_NOFD,//10
+    PARKOUR,//11
+    BA_BLUE_NOFD,//12
+    PARKOUR_BLUE,//13
+    BA,//14
+    BA_BLUE;//15
 
     public static void setMode(Modes mode) {
         switch (mode){
diff --git a/src/main/java/dev/o7moon/openboatutils/OpenBoatUtils.java b/src/main/java/dev/o7moon/openboatutils/OpenBoatUtils.java
index 8eac2be..45fa9f8 100644
--- a/src/main/java/dev/o7moon/openboatutils/OpenBoatUtils.java
+++ b/src/main/java/dev/o7moon/openboatutils/OpenBoatUtils.java
@@ -30,7 +30,7 @@ public void onInitialize() {
 
     public static final Logger LOG = LoggerFactory.getLogger("OpenBoatUtils");
 
-    public static final int VERSION = 5;
+    public static final int VERSION = 6;
 
     public static final Identifier settingsChannel = new Identifier("openboatutils","settings");
 
diff --git a/src/main/java/dev/o7moon/openboatutils/mixin/ServerPlayNetworkHandlerMixin2.java b/src/main/java/dev/o7moon/openboatutils/mixin/ServerPlayNetworkHandlerMixin2.java
index a4311cc..3de224a 100644
--- a/src/main/java/dev/o7moon/openboatutils/mixin/ServerPlayNetworkHandlerMixin2.java
+++ b/src/main/java/dev/o7moon/openboatutils/mixin/ServerPlayNetworkHandlerMixin2.java
@@ -1,15 +1,21 @@
 package dev.o7moon.openboatutils.mixin;
 
 import net.minecraft.server.network.ServerPlayNetworkHandler;
+import org.spongepowered.asm.mixin.Debug;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.ModifyVariable;
 
 // only for dedicated servers
+@Debug(export = true)
 @Mixin(ServerPlayNetworkHandler.class)
 public class ServerPlayNetworkHandlerMixin2 {
-    @ModifyVariable(method = "onVehicleMove", at = @At("STORE"), name = {"bl3","bl4"})
-    private boolean movedWronglyHook(boolean bl3){
+    @ModifyVariable(method = "onVehicleMove", at = @At(value = "STORE", ordinal = 1), ordinal = 2)
+    private boolean movedWronglyHook(boolean b){
         return false;
     }
+    @ModifyVariable(method = "onVehicleMove", at = @At(value = "STORE"), ordinal = 3)
+    private boolean movedWronglyHook2(boolean b){
+        return true;
+    }
 }
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 7bbbc03..588631e 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -1,7 +1,7 @@
 {
   "schemaVersion": 1,
   "id": "openboatutils",
-  "version": "0.3",
+  "version": "0.4",
   "name": "OpenBoatUtils",
   "description": "Configurable boat physics, from the serverside. Check the wiki (website button) for more information.",
   "authors": [
@@ -28,6 +28,6 @@
   "depends": {
     "fabricloader": ">=${loader_version}",
     "fabric": "*",
-    "minecraft": "${minecraft_version}"
+    "minecraft": "1.20.1"
   }
 }

From 779387baa4bd66f3c733da532638ae4981ec0228 Mon Sep 17 00:00:00 2001
From: o7Moon <0167moon@gmail.com>
Date: Fri, 29 Dec 2023 13:15:29 -0600
Subject: [PATCH 2/2] remove debug annotation

---
 .../openboatutils/mixin/ServerPlayNetworkHandlerMixin2.java     | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/main/java/dev/o7moon/openboatutils/mixin/ServerPlayNetworkHandlerMixin2.java b/src/main/java/dev/o7moon/openboatutils/mixin/ServerPlayNetworkHandlerMixin2.java
index 3de224a..b5d8218 100644
--- a/src/main/java/dev/o7moon/openboatutils/mixin/ServerPlayNetworkHandlerMixin2.java
+++ b/src/main/java/dev/o7moon/openboatutils/mixin/ServerPlayNetworkHandlerMixin2.java
@@ -1,13 +1,11 @@
 package dev.o7moon.openboatutils.mixin;
 
 import net.minecraft.server.network.ServerPlayNetworkHandler;
-import org.spongepowered.asm.mixin.Debug;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.ModifyVariable;
 
 // only for dedicated servers
-@Debug(export = true)
 @Mixin(ServerPlayNetworkHandler.class)
 public class ServerPlayNetworkHandlerMixin2 {
     @ModifyVariable(method = "onVehicleMove", at = @At(value = "STORE", ordinal = 1), ordinal = 2)