Default allow to entity head pitching.

CitizensDev · Apr 25, 2023 · 0b82ee2 · 0b82ee2
1 parent 283a2a3
commit 0b82ee2
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 44 deletions.
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/PitchableLookControl.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/PitchableLookControl.java
@@ -8,25 +8,20 @@
 import net.minecraft.server.v1_14_R1.EntityInsentient;
 
 public class PitchableLookControl extends ControllerLook {
-    private boolean explicit = true;
     private final Supplier<Boolean> resetOnTick;
 
     public PitchableLookControl(EntityInsentient var0) {
         super(var0);
         if (var0 instanceof NPCHolder) {
             NPC npc = ((NPCHolder) var0).getNPC();
-            resetOnTick = () -> npc.data().get(NPC.Metadata.RESET_PITCH_ON_TICK, explicit);
+            resetOnTick = () -> npc.data().get(NPC.Metadata.RESET_PITCH_ON_TICK, false);
         } else {
-            resetOnTick = () -> explicit;
+            resetOnTick = () -> true;
         }
     }
 
     @Override
     public boolean b() {
         return resetOnTick.get();
     }
-
-    public void setResetXRotOnTick(boolean val) {
-        explicit = val;
-    }
 }
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/PitchableLookControl.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/PitchableLookControl.java
@@ -8,25 +8,20 @@
 import net.minecraft.server.v1_15_R1.EntityInsentient;
 
 public class PitchableLookControl extends ControllerLook {
-    private boolean explicit = true;
     private final Supplier<Boolean> resetOnTick;
 
     public PitchableLookControl(EntityInsentient var0) {
         super(var0);
         if (var0 instanceof NPCHolder) {
             NPC npc = ((NPCHolder) var0).getNPC();
-            resetOnTick = () -> npc.data().get(NPC.Metadata.RESET_PITCH_ON_TICK, explicit);
+            resetOnTick = () -> npc.data().get(NPC.Metadata.RESET_PITCH_ON_TICK, false);
         } else {
-            resetOnTick = () -> explicit;
+            resetOnTick = () -> true;
         }
     }
 
     @Override
     public boolean b() {
         return resetOnTick.get();
     }
-
-    public void setResetXRotOnTick(boolean val) {
-        explicit = val;
-    }
 }
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PitchableLookControl.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PitchableLookControl.java
@@ -8,25 +8,20 @@
 import net.minecraft.server.v1_16_R3.EntityInsentient;
 
 public class PitchableLookControl extends ControllerLook {
-    private boolean explicit = true;
     private final Supplier<Boolean> resetOnTick;
 
     public PitchableLookControl(EntityInsentient var0) {
         super(var0);
         if (var0 instanceof NPCHolder) {
             NPC npc = ((NPCHolder) var0).getNPC();
-            resetOnTick = () -> npc.data().get(NPC.Metadata.RESET_PITCH_ON_TICK, explicit);
+            resetOnTick = () -> npc.data().get(NPC.Metadata.RESET_PITCH_ON_TICK, false);
         } else {
-            resetOnTick = () -> explicit;
+            resetOnTick = () -> true;
         }
     }
 
     @Override
     public boolean b() {
         return resetOnTick.get();
     }
-
-    public void setResetXRotOnTick(boolean val) {
-        explicit = val;
-    }
 }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/PitchableLookControl.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/PitchableLookControl.java
@@ -8,25 +8,20 @@
 import net.minecraft.world.entity.ai.control.LookControl;
 
 public class PitchableLookControl extends LookControl {
-    private boolean explicit = true;
     private final Supplier<Boolean> resetOnTick;
 
     public PitchableLookControl(Mob var0) {
         super(var0);
         if (var0 instanceof NPCHolder) {
             NPC npc = ((NPCHolder) var0).getNPC();
-            resetOnTick = () -> npc.data().get(NPC.Metadata.RESET_PITCH_ON_TICK, explicit);
+            resetOnTick = () -> npc.data().get(NPC.Metadata.RESET_PITCH_ON_TICK, false);
         } else {
-            resetOnTick = () -> explicit;
+            resetOnTick = () -> true;
         }
     }
 
     @Override
     public boolean resetXRotOnTick() {
         return resetOnTick.get();
     }
-
-    public void setResetXRotOnTick(boolean val) {
-        explicit = val;
-    }
 }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/PitchableLookControl.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/PitchableLookControl.java
@@ -8,25 +8,20 @@
 import net.minecraft.world.entity.ai.control.LookControl;
 
 public class PitchableLookControl extends LookControl {
-    private boolean explicit = true;
     private final Supplier<Boolean> resetOnTick;
 
     public PitchableLookControl(Mob var0) {
         super(var0);
         if (var0 instanceof NPCHolder) {
             NPC npc = ((NPCHolder) var0).getNPC();
-            resetOnTick = () -> npc.data().get(NPC.Metadata.RESET_PITCH_ON_TICK, explicit);
+            resetOnTick = () -> npc.data().get(NPC.Metadata.RESET_PITCH_ON_TICK, false);
         } else {
-            resetOnTick = () -> explicit;
+            resetOnTick = () -> true;
         }
     }
 
     @Override
     public boolean resetXRotOnTick() {
         return resetOnTick.get();
     }
-
-    public void setResetXRotOnTick(boolean val) {
-        explicit = val;
-    }
 }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/AllayController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/AllayController.java
@@ -59,7 +59,6 @@ public AllayNPC(EntityAllayNPC entity) {
 
     public static class EntityAllayNPC extends Allay implements NPCHolder {
         private final CitizensNPC npc;
-
         private int taskId = -1;
 
         public EntityAllayNPC(EntityType<? extends Allay> types, Level level) {

diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/NMSImpl.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/NMSImpl.java
@@ -1197,8 +1197,9 @@ public void onPlayerInfoAdd(Player player, Object raw) {
                 changed = true;
             }
             MirrorTrait trait = npc.getTraitNullable(MirrorTrait.class);
-            if (trait == null || !trait.isMirroring(player))
+            if (trait == null || !trait.isMirroring(player)) {
                 continue;
+            }
             GameProfile profile = NMS.getProfile(player);
             if (trait.mirrorName()) {
                 list.set(i,

diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/PitchableLookControl.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/PitchableLookControl.java
@@ -8,25 +8,20 @@
 import net.minecraft.world.entity.ai.control.LookControl;
 
 public class PitchableLookControl extends LookControl {
-    private boolean explicit = true;
     private final Supplier<Boolean> resetOnTick;
 
     public PitchableLookControl(Mob var0) {
         super(var0);
         if (var0 instanceof NPCHolder) {
             NPC npc = ((NPCHolder) var0).getNPC();
-            resetOnTick = () -> npc.data().get(NPC.Metadata.RESET_PITCH_ON_TICK, explicit);
+            resetOnTick = () -> npc.data().get(NPC.Metadata.RESET_PITCH_ON_TICK, false);
         } else {
-            resetOnTick = () -> explicit;
+            resetOnTick = () -> true;
         }
     }
 
     @Override
     public boolean resetXRotOnTick() {
         return resetOnTick.get();
     }
-
-    public void setResetXRotOnTick(boolean val) {
-        explicit = val;
-    }
 }