diff --git a/gradle.properties b/gradle.properties index 2f36a9b..2abe714 100644 --- a/gradle.properties +++ b/gradle.properties @@ -66,7 +66,7 @@ usesMixinDebug = true # Specify the location of your implementation of IMixinConfigPlugin. Leave it empty otherwise. mixinPlugin = # Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail! -mixinsPackage = mixin +mixinsPackage = mixin.impl # Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin! # This parameter is for legacy compatibility only # Example value: coreModClass = asm.FMLPlugin + modGroup = com.myname.mymodid -> com.myname.mymodid.asm.FMLPlugin diff --git a/src/main/java/com/goodbird/cnpcgeckoaddon/mixin/IDataDisplay.java b/src/main/java/com/goodbird/cnpcgeckoaddon/mixin/IDataDisplay.java new file mode 100644 index 0000000..456952b --- /dev/null +++ b/src/main/java/com/goodbird/cnpcgeckoaddon/mixin/IDataDisplay.java @@ -0,0 +1,9 @@ +package com.goodbird.cnpcgeckoaddon.mixin; + +import com.goodbird.cnpcgeckoaddon.data.CustomModelData; + +public interface IDataDisplay { + CustomModelData getCustomModelData(); + + boolean hasCustomModel(); +} diff --git a/src/main/java/com/goodbird/cnpcgeckoaddon/mixin/MixinDataDisplay.java b/src/main/java/com/goodbird/cnpcgeckoaddon/mixin/impl/MixinDataDisplay.java similarity index 71% rename from src/main/java/com/goodbird/cnpcgeckoaddon/mixin/MixinDataDisplay.java rename to src/main/java/com/goodbird/cnpcgeckoaddon/mixin/impl/MixinDataDisplay.java index 43e75f4..d4cedb7 100644 --- a/src/main/java/com/goodbird/cnpcgeckoaddon/mixin/MixinDataDisplay.java +++ b/src/main/java/com/goodbird/cnpcgeckoaddon/mixin/impl/MixinDataDisplay.java @@ -1,7 +1,8 @@ -package com.goodbird.cnpcgeckoaddon.mixin; +package com.goodbird.cnpcgeckoaddon.mixin.impl; import com.goodbird.cnpcgeckoaddon.data.CustomModelData; import com.goodbird.cnpcgeckoaddon.entity.EntityCustomModel; +import com.goodbird.cnpcgeckoaddon.mixin.IDataDisplay; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.DataDisplay; import noppes.npcs.entity.EntityCustomNpc; @@ -15,25 +16,30 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @Mixin(DataDisplay.class) -public class MixinDataDisplay { +public class MixinDataDisplay implements IDataDisplay { - @Shadow public EntityNPCInterface npc; + @Shadow(remap = false) public EntityNPCInterface npc; @Unique private final CustomModelData customNPC_Gecko_Addon$customModelData = new CustomModelData(); - @Inject(method = "writeToNBT", at = @At("HEAD")) + @Inject(method = "writeToNBT", at = @At("HEAD"), remap = false) public void writeToNBT(NBTTagCompound nbttagcompound, CallbackInfoReturnable cir) { - if(customNPC_Gecko_Addon$hasCustomModel()) + if(hasCustomModel()) customNPC_Gecko_Addon$customModelData.writeToNBT(nbttagcompound); } - @Inject(method = "readToNBT", at = @At("HEAD")) + @Inject(method = "readToNBT", at = @At("HEAD"), remap = false) public void readFromNBT(NBTTagCompound nbttagcompound, CallbackInfo ci){ customNPC_Gecko_Addon$customModelData.readFromNBT(nbttagcompound); } @Unique - public boolean customNPC_Gecko_Addon$hasCustomModel() { + public CustomModelData getCustomModelData(){ + return customNPC_Gecko_Addon$customModelData; + } + + @Unique + public boolean hasCustomModel() { return (npc instanceof EntityCustomNpc) && ((EntityCustomNpc) npc).modelData.getEntity(npc) != null && ((EntityCustomNpc) npc).modelData.getEntity(npc) instanceof EntityCustomModel; } diff --git a/src/main/java/com/goodbird/cnpcgeckoaddon/mixin/MixinRenderNPCInterface.java b/src/main/java/com/goodbird/cnpcgeckoaddon/mixin/impl/MixinRenderNPCInterface.java similarity index 98% rename from src/main/java/com/goodbird/cnpcgeckoaddon/mixin/MixinRenderNPCInterface.java rename to src/main/java/com/goodbird/cnpcgeckoaddon/mixin/impl/MixinRenderNPCInterface.java index 7938b30..5a7c39c 100644 --- a/src/main/java/com/goodbird/cnpcgeckoaddon/mixin/MixinRenderNPCInterface.java +++ b/src/main/java/com/goodbird/cnpcgeckoaddon/mixin/impl/MixinRenderNPCInterface.java @@ -1,4 +1,4 @@ -package com.goodbird.cnpcgeckoaddon.mixin; +package com.goodbird.cnpcgeckoaddon.mixin.impl; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.RenderManager; diff --git a/src/main/resources/mixins.cnpcgeckoaddon.json b/src/main/resources/mixins.cnpcgeckoaddon.json index ebe5a18..e6405a0 100644 --- a/src/main/resources/mixins.cnpcgeckoaddon.json +++ b/src/main/resources/mixins.cnpcgeckoaddon.json @@ -1,14 +1,17 @@ { "required": true, "minVersion": "0.8.5-GTNH", - "package": "com.goodbird.cnpcgeckoaddon.mixin", + "package": "com.goodbird.cnpcgeckoaddon.mixin.impl", "refmap": "mixins.cnpcgeckoaddon.refmap.json", "target": "@env(DEFAULT)", "compatibilityLevel": "JAVA_8", "mixins": [ - "MixinDataDisplay" + "MixinDataDisplay", + "MixinEntityUtil" ], "client": [ + "MixinGuiCreationScreen", + "MixinGuiNpcDisplay", "MixinRenderNPCInterface" ], "server": []