Merge pull request #369 from jchung01/desync-fix-compat

Blacklist irregular entities from desync fix

Author: ACGaming

src/main/java/mod/acgaming/universaltweaks/bugfixes/entities/desync/IPrevMotion.java

@@ -14,4 +14,10 @@ public interface IPrevMotion
     double getPrevMotionZ();
 
     void setPrevMotionZ(double prevMotionZ);
+
+    /**
+     * Checks if this entity has ever called super.onUpdate(). This should adequately determine if it should be ignored by the desync fix.
+     * @return true if the implementing class calls super.onUpdate()
+     */
+    boolean hasSuperUpdate();
 }

src/main/java/mod/acgaming/universaltweaks/bugfixes/entities/desync/UTEntityDesync.java

@@ -36,6 +36,6 @@ public static void initBlacklistedEntityEntries()
 
     public static boolean isBlacklisted(Entity entity)
     {
-        return blacklistedEntityEntries.contains(EntityRegistry.getEntry(entity.getClass()));
+        return blacklistedEntityEntries.contains(EntityRegistry.getEntry(entity.getClass())) || !(((IPrevMotion) entity).hasSuperUpdate());
     }
 }

src/main/java/mod/acgaming/universaltweaks/bugfixes/entities/desync/mixin/UTEntityMixin.java

@@ -27,11 +27,14 @@ public class UTEntityMixin implements IPrevMotion
     private double prevMotionY;
     @Unique
     private double prevMotionZ;
+    @Unique
+    private boolean universalTweaks$superUpdate = false;
 
     @Inject(method = "onUpdate", at = @At("HEAD"))
     public void utOnUpdate(CallbackInfo info)
     {
         if (UTEntityDesync.isBlacklisted(((Entity) (Object) this))) return;
+        if (!universalTweaks$superUpdate) universalTweaks$superUpdate = true;
         prevMotionX = motionX;
         prevMotionY = motionY;
         prevMotionZ = motionZ;
@@ -72,4 +75,10 @@ public void setPrevMotionZ(double prevMotionZ)
     {
         this.prevMotionZ = prevMotionZ;
     }
+
+    @Override
+    public boolean hasSuperUpdate()
+    {
+        return universalTweaks$superUpdate;
+    }
 }