Merge pull request #13 from RappyLabyAddons/bug/headRotation

Bug: Yaw and pitch are switched on `>= 1.16.5`
RappyLabyAddons · Sep 27, 2023 · 7071425 · 7071425
2 parents 34eedfb + 3d9cb0a
commit 7071425
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 21 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -21,7 +21,7 @@ labyMod {
         author = "RappyTV"
         description = "This addon saves your last death point, so you can find your items again."
         minecraftVersion = "1.8<1.20.2"
-        version = System.getenv().getOrDefault("VERSION", "1.0.3")
+        version = System.getenv().getOrDefault("VERSION", "1.0.4")
     }
 
     minecraft {

diff --git a/game-runner/src/v1_16_5/java/com/rappytv/deathfinder/v1_16_5/mixins/DeathScreenMixin.java b/game-runner/src/v1_16_5/java/com/rappytv/deathfinder/v1_16_5/mixins/DeathScreenMixin.java
@@ -28,8 +28,8 @@ public void onDeathScreen(CallbackInfo ci) {
         Location deathLocation = new Location(player.getX(), player.getY(), player.getZ());
 
         if(DeathFinderAddon.get().configuration().saveRotation().get()) {
-            deathLocation.setYaw(player.xRot);
-            deathLocation.setPitch(player.yRot);
+            deathLocation.setYaw(player.yRot);
+            deathLocation.setPitch(player.xRot);
         }
         if(deathLocation.equals(DeathFinderAddon.getDeathLocation())) return;
 

diff --git a/game-runner/src/v1_17_1/java/com/rappytv/deathfinder/v1_17_1/mixins/DeathScreenMixin.java b/game-runner/src/v1_17_1/java/com/rappytv/deathfinder/v1_17_1/mixins/DeathScreenMixin.java
@@ -28,8 +28,8 @@ public void onDeathScreen(CallbackInfo ci) {
         Location deathLocation = new Location(player.getX(), player.getY(), player.getZ());
 
         if(DeathFinderAddon.get().configuration().saveRotation().get()) {
-            deathLocation.setYaw(player.getXRot());
-            deathLocation.setPitch(player.getYRot());
+            deathLocation.setYaw(player.getYRot());
+            deathLocation.setPitch(player.getXRot());
         }
         if(deathLocation.equals(DeathFinderAddon.getDeathLocation())) return;
 

diff --git a/game-runner/src/v1_18_2/java/com/rappytv/deathfinder/v1_18_2/mixins/DeathScreenMixin.java b/game-runner/src/v1_18_2/java/com/rappytv/deathfinder/v1_18_2/mixins/DeathScreenMixin.java
@@ -28,8 +28,8 @@ public void onDeathScreen(CallbackInfo ci) {
         Location deathLocation = new Location(player.getX(), player.getY(), player.getZ());
 
         if(DeathFinderAddon.get().configuration().saveRotation().get()) {
-            deathLocation.setYaw(player.getXRot());
-            deathLocation.setPitch(player.getYRot());
+            deathLocation.setYaw(player.getYRot());
+            deathLocation.setPitch(player.getXRot());
         }
         if(deathLocation.equals(DeathFinderAddon.getDeathLocation())) return;
 

diff --git a/game-runner/src/v1_19_2/java/com/rappytv/deathfinder/v1_19_2/mixins/DeathScreenMixin.java b/game-runner/src/v1_19_2/java/com/rappytv/deathfinder/v1_19_2/mixins/DeathScreenMixin.java
@@ -28,8 +28,8 @@ public void onDeathScreen(CallbackInfo ci) {
         Location deathLocation = new Location(player.getX(), player.getY(), player.getZ());
 
         if(DeathFinderAddon.get().configuration().saveRotation().get()) {
-            deathLocation.setYaw(player.getXRot());
-            deathLocation.setPitch(player.getYRot());
+            deathLocation.setYaw(player.getYRot());
+            deathLocation.setPitch(player.getXRot());
         }
         if(deathLocation.equals(DeathFinderAddon.getDeathLocation())) return;
 

diff --git a/game-runner/src/v1_19_3/java/com/rappytv/deathfinder/v1_19_3/mixins/DeathScreenMixin.java b/game-runner/src/v1_19_3/java/com/rappytv/deathfinder/v1_19_3/mixins/DeathScreenMixin.java
@@ -28,8 +28,8 @@ public void onDeathScreen(CallbackInfo ci) {
         Location deathLocation = new Location(player.getX(), player.getY(), player.getZ());
 
         if(DeathFinderAddon.get().configuration().saveRotation().get()) {
-            deathLocation.setYaw(player.getXRot());
-            deathLocation.setPitch(player.getYRot());
+            deathLocation.setYaw(player.getYRot());
+            deathLocation.setPitch(player.getXRot());
         }
         if(deathLocation.equals(DeathFinderAddon.getDeathLocation())) return;
 

diff --git a/game-runner/src/v1_19_4/java/com/rappytv/deathfinder/v1_19_4/mixins/DeathScreenMixin.java b/game-runner/src/v1_19_4/java/com/rappytv/deathfinder/v1_19_4/mixins/DeathScreenMixin.java
@@ -28,8 +28,8 @@ public void onDeathScreen(CallbackInfo ci) {
         Location deathLocation = new Location(player.getX(), player.getY(), player.getZ());
 
         if(DeathFinderAddon.get().configuration().saveRotation().get()) {
-            deathLocation.setYaw(player.getXRot());
-            deathLocation.setPitch(player.getYRot());
+            deathLocation.setYaw(player.getYRot());
+            deathLocation.setPitch(player.getXRot());
         }
         if(deathLocation.equals(DeathFinderAddon.getDeathLocation())) return;
 

diff --git a/game-runner/src/v1_20_1/java/com/rappytv/deathfinder/v1_20_1/mixins/DeathScreenMixin.java b/game-runner/src/v1_20_1/java/com/rappytv/deathfinder/v1_20_1/mixins/DeathScreenMixin.java
@@ -28,8 +28,8 @@ public void onDeathScreen(CallbackInfo ci) {
         Location deathLocation = new Location(player.getX(), player.getY(), player.getZ());
 
         if(DeathFinderAddon.get().configuration().saveRotation().get()) {
-            deathLocation.setYaw(player.getXRot());
-            deathLocation.setPitch(player.getYRot());
+            deathLocation.setYaw(player.getYRot());
+            deathLocation.setPitch(player.getXRot());
         }
         if(deathLocation.equals(DeathFinderAddon.getDeathLocation())) return;
 

diff --git a/game-runner/src/v1_20_2/java/com/rappytv/deathfinder/v1_20_2/mixins/DeathScreenMixin.java b/game-runner/src/v1_20_2/java/com/rappytv/deathfinder/v1_20_2/mixins/DeathScreenMixin.java
@@ -22,20 +22,16 @@ protected DeathScreenMixin(Component title) {
 
     @Inject(method = "init", at = @At("TAIL"))
     public void onDeathScreen(CallbackInfo ci) {
-        System.out.println("\n\n1\n\n");
         if(this.minecraft == null || this.minecraft.player == null) return;
-        System.out.println("\n\n2\n\n");
 
         LocalPlayer player = this.minecraft.player;
         Location deathLocation = new Location(player.getX(), player.getY(), player.getZ());
 
         if(DeathFinderAddon.get().configuration().saveRotation().get()) {
-            deathLocation.setYaw(player.getXRot());
-            deathLocation.setPitch(player.getYRot());
-            System.out.println("\n\n3\n\n");
+            deathLocation.setYaw(player.getYRot());
+            deathLocation.setPitch(player.getXRot());
         }
         if(deathLocation.equals(DeathFinderAddon.getDeathLocation())) return;
-        System.out.println("\n\n4\n\n");
 
         Laby.fireEvent(new DeathEvent(deathLocation));
     }