Merge branch 'dev' into syntax-highlighter-unified

src/main/java/kamkeel/npcs/network/packets/data/RequestProperSpawnData.java

@@ -25,17 +25,12 @@ public class RequestProperSpawnData extends AbstractPacket {
     public static final String packetName = "Player|SpawnData";
     private static final int BATCH_LIMIT = 5;
 
-    @SideOnly(Side.CLIENT)
     private static final Set<Integer> entitiesToFix = new HashSet<>();
-
-    @SideOnly(Side.CLIENT)
     private static long lastBatchAttemptMillis = 0L;
-
     private int entityId;
 
     public RequestProperSpawnData() {}
 
-    @SideOnly(Side.CLIENT)
     public RequestProperSpawnData(int entityId) {
         this.entityId = entityId;
     }

src/main/java/noppes/npcs/CustomNpcs.java

@@ -122,7 +122,7 @@ import java.util.HashSet;
 import java.util.Set;
 import java.util.function.Consumer;
 
-@Mod(modid = "customnpcs", name = "CustomNPC+", version = "1.11-beta8")
+@Mod(modid = "customnpcs", name = "CustomNPC+", version = "1.11-beta8.1")
 public class CustomNpcs {
 
     @SidedProxy(clientSide = "noppes.npcs.client.ClientProxy", serverSide = "noppes.npcs.CommonProxy")

src/main/java/noppes/npcs/mixin/MixinModelRenderer.java

@@ -86,9 +86,6 @@ public abstract class MixinModelRenderer {
                 float prevAngleX = this.rotateAngleX;
                 float prevAngleY = this.rotateAngleY;
                 float prevAngleZ = this.rotateAngleZ;
-                float prevOffsetX = this.offsetX;
-                float prevOffsetY = this.offsetY;
-                float prevOffsetZ = this.offsetZ;
 
                 boolean changedAngles = false;
                 try {
@@ -152,11 +149,6 @@ public abstract class MixinModelRenderer {
                     GL11.glPopMatrix();
                 }
 
-                // Mirror vanilla ModelRenderer behavior: always undo offset translation.
-                // Without this, models that animate via offsetX/Y/Z (e.g. witch nose while drinking)
-                // leak transforms into subsequent renders.
-                GL11.glTranslatef(-this.offsetX, -this.offsetY, -this.offsetZ);
-
                 if (changedAngles) {
                     this.rotationPointX = prevPointX;
                     this.rotationPointY = prevPointY;
@@ -164,9 +156,6 @@ public abstract class MixinModelRenderer {
                     this.rotateAngleX = prevAngleX;
                     this.rotateAngleY = prevAngleY;
                     this.rotateAngleZ = prevAngleZ;
-                    this.offsetX = prevOffsetX;
-                    this.offsetY = prevOffsetY;
-                    this.offsetZ = prevOffsetZ;
                 }
             }
         }