DisguiseLib 1.2.1 compatibility

common/build.gradle

@@ -10,7 +10,7 @@ dependencies {
     modImplementation "net.fabricmc:fabric-loader:${rootProject.loader_version}"
 
     modCompileOnly "xyz.nucleoid:disguiselib-fabric:${rootProject.disguiselib_version}"
-    modCompileOnly "com.github.samolego.Config2Brigadier:config2brigadier:${rootProject.c2b_version}"
+    modCompileOnly "com.github.samolego.Config2Brigadier:config2brigadier-common:${rootProject.c2b_version}"
 
     // Built using vanillagradle, no need for remapping
     //compileOnly("com.github.samolego:Config2Brigadier:55370d49b3")

common/src/main/java/org/samo_lego/taterzens/compatibility/DisguiseLibCompatibility.java

@@ -3,7 +3,7 @@
 import com.mojang.authlib.GameProfile;
 import net.minecraft.world.entity.Entity;
 import org.samo_lego.taterzens.npc.TaterzenNPC;
-import xyz.nucleoid.disguiselib.casts.EntityDisguise;
+import xyz.nucleoid.disguiselib.api.EntityDisguise;
 
 /**
  * Just DisguiseLib methods in their own
@@ -23,4 +23,8 @@ public static void setGameProfile(TaterzenNPC taterzen, GameProfile gameProfile)
     public static void clearDisguise(TaterzenNPC taterzen) {
         ((EntityDisguise) taterzen).removeDisguise();
     }
+
+    public static boolean isDisguised(Entity entity) {
+        return ((EntityDisguise) entity).isDisguised();
+    }
 }

common/src/main/java/org/samo_lego/taterzens/mixin/network/ServerGamePacketListenerImplMixin_PacketFaker.java

@@ -19,6 +19,7 @@
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.GameType;
 import net.minecraft.world.level.Level;
+import org.samo_lego.taterzens.compatibility.DisguiseLibCompatibility;
 import org.samo_lego.taterzens.interfaces.ITaterzenEditor;
 import org.samo_lego.taterzens.mixin.accessors.ClientboundAddPlayerPacketAccessor;
 import org.samo_lego.taterzens.mixin.accessors.ClientboundPlayerInfoPacketAccessor;
@@ -41,6 +42,7 @@
 import static net.minecraft.network.protocol.game.ClientboundPlayerInfoPacket.Action.ADD_PLAYER;
 import static net.minecraft.network.protocol.game.ClientboundPlayerInfoPacket.Action.REMOVE_PLAYER;
 import static org.samo_lego.taterzens.Taterzens.config;
+import static org.samo_lego.taterzens.compatibility.ModDiscovery.DISGUISELIB_LOADED;
 
 /**
  * Used to "fake" the TaterzenNPC entity type.
@@ -82,11 +84,10 @@ private void changeEntityType(Packet<?> packet, GenericFutureListener<? extends
         if(packet instanceof ClientboundAddPlayerPacket && !this.taterzens$skipCheck) {
             Entity entity = world.getEntity(((ClientboundAddPlayerPacketAccessor) packet).getId());
 
-            if(!(entity instanceof TaterzenNPC npc))
+            if(!(entity instanceof TaterzenNPC npc) || (DISGUISELIB_LOADED && DisguiseLibCompatibility.isDisguised(entity)))
                 return;
 
             GameProfile profile = npc.getGameProfile();
-
             ClientboundPlayerInfoPacket playerAddPacket = new ClientboundPlayerInfoPacket(ADD_PLAYER);
             //noinspection ConstantConditions
             ((ClientboundPlayerInfoPacketAccessor) playerAddPacket).setEntries(

fabric/src/main/resources/fabric.mod.json

@@ -35,6 +35,9 @@
     "fabric": ">=0.45.1"
   },
   "recommends": {
-    "disguiselib": ">=1.0.0"
+    "disguiselib": ">=1.2.1"
+  },
+  "breaks": {
+    "disguiselib": "<1.2.1"
   }
 }

gradle.properties

@@ -18,6 +18,6 @@ maven_group = org.samo_lego
 archives_base_name = taterzens
 
 # Dependencies
-disguiselib_version = 1.0.8
-c2b_version = 1.0.2
+disguiselib_version = 1.2.1
+c2b_version = 1.1.1
 sgui_version = 1.0.0-rc5+1.18+pre5