Move mod mixins to subpackages, Gaia guardian fix

Signed-off-by: roadhog360 <[email protected]>

Author: Roadhog360

README.md

@@ -17,16 +17,16 @@ Current Features:
 - Hat layers on head blocks
 - New default skins alongside just Steve
 - Patch for Twilight Forest giants
+- Patch for Botania's Gaia Guardian
 
 Todo:
 - Config
+  - Fix regular heads not working without a UUID when worn as a helmet
   - Toggle head block inventory icon render
-  - Toggle new default skins (Either Steve/Alex or JUST Steve)
 
 Current incompatibility todo:
-- Twilight Forest heads
+- Twilight Forest heads are not 3D
 - Smart Moving (it's like 90% working slim models are just slightly wrong)
-- Botania Gaia Guardian
 
 Current wontfix incompatibilities: (Might change my mind later, PRs welcome)
 - OptiFine

dependencies.gradle

@@ -37,4 +37,5 @@ dependencies {
     runtimeOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:2.5.4-GTNH:dev")
     compileOnly('com.github.GTNewHorizons:twilightforest:2.6.33:dev')
     compileOnly deobfCurse("headcrumbs-222838:2279949")
+    compileOnly deobfCurse("botania-225643:2283837")
 }

src/main/java/roadhog360/simpleskinbackport/core/Utils.java

@@ -6,6 +6,7 @@
 import com.mojang.authlib.GameProfile;
 import com.mojang.authlib.minecraft.MinecraftProfileTexture;
 import com.mojang.authlib.properties.Property;
+import cpw.mods.fml.client.FMLClientHandler;
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelBox;
 import net.minecraft.client.model.ModelRenderer;
@@ -178,6 +179,13 @@ public static void changeTextureSize(ModelBase base, int width, int height) {
         base.boxList.forEach(Utils::remakeBoxes);
     }
 
+    public static boolean isClientPlayerSlim() {
+        if(FMLClientHandler.instance().getClientPlayerEntity() instanceof IArmsState player) {
+            return player.simpleSkinBackport$isSlim();
+        }
+        return false;
+    }
+
     /**
      * I got sick of constantly updating the util funcs whenever I needed to pass in a new setting lol
      */

src/main/java/roadhog360/simpleskinbackport/mixinplugin/SimpleSkinBackportLateMixins.java

@@ -22,9 +22,14 @@ public String getMixinConfig() {
     @Override
     public List<String> getMixins(Set<String> loadedMods) {
         List<String> mixins = new ArrayList<>();
-        if(loadedMods.contains("TwilightForest")) {
-            if(SIDE == MixinEnvironment.Side.CLIENT) {
-                mixins.add("MixinRenderTFGiant");
+        if(SIDE == MixinEnvironment.Side.CLIENT) {
+            if(loadedMods.contains("TwilightForest")) {
+                mixins.add("twilightforest.MixinRenderTFGiant");
+            }
+            if(loadedMods.contains("Botania")) {
+                mixins.add("botania.MixinClientProxy");
+                mixins.add("botania.MixinRenderTileSkullOverride");
+                mixins.add("botania.MixinRenderDoppelganger");
             }
         }
         return mixins;

src/main/java/roadhog360/simpleskinbackport/mixins/early/MixinModelBiped.java

@@ -56,17 +56,19 @@ private void checkPlayerModelAndSetDim(ModelBiped instance, int value, Operation
 
         if(!simpleSkinBackport$isPlayerModel()) {
             boolean isPlayerRenderer;
+            boolean isGaia;
             //Do all this OUTSIDE of the if bracket, so we can find and add cases for classes that use size > 0
             try {
                 Class<?> caller = Class.forName(Utils.getCallerClassName());
-                isPlayerRenderer = caller.isAssignableFrom(RenderPlayer.class)
+                isGaia = caller.getName().equals("vazkii.botania.client.render.entity.RenderDoppleganger");
+                isPlayerRenderer = caller.isAssignableFrom(RenderPlayer.class) || isGaia
                     || caller.getName().equals("net.smart.render.ModelPlayer") || caller.getName().contains("RenderTFGiant");
                 //We need a way to check if it's a player model, without modifying the RenderPlayer.
             } catch (ClassNotFoundException e) {
                 throw new RuntimeException(e);
             }
 
-            if (size == 0 || size == 0.0625F) {
+            if (size == 0 || size == 0.0625F || isGaia) {
                 //TODO: Might have to add special exceptions for big models, I think this is model size so I named it as such.
                 // Mods that add giant (or small) players will need special treatment.
                 if (isPlayerRenderer) {

src/main/java/roadhog360/simpleskinbackport/mixins/late/botania/MixinClientProxy.java

@@ -0,0 +1,20 @@
+package roadhog360.simpleskinbackport.mixins.late.botania;
+
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.tileentity.TileEntitySkull;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+
+@Mixin(vazkii.botania.client.core.proxy.ClientProxy.class)
+public class MixinClientProxy extends  vazkii.botania.common.core.proxy.CommonProxy {
+    @WrapOperation(method = "initRenderers", remap = false, at = @At(value = "INVOKE", target = "Lcpw/mods/fml/client/registry/ClientRegistry;bindTileEntitySpecialRenderer(Ljava/lang/Class;Lnet/minecraft/client/renderer/tileentity/TileEntitySpecialRenderer;)V"))
+    private void disarmSkullRenderReplacer(Class<? extends TileEntity> tileEntityClass, TileEntitySpecialRenderer specialRenderer, Operation<Void> original) {
+        if(tileEntityClass != TileEntitySkull.class) {
+            //We provide our own hat layer directly on the skull, so Botania doesn't need to do this.
+            original.call(tileEntityClass, specialRenderer);
+        }
+    }
+}

src/main/java/roadhog360/simpleskinbackport/mixins/late/botania/MixinRenderDoppelganger.java

@@ -0,0 +1,27 @@
+package roadhog360.simpleskinbackport.mixins.late.botania;
+
+import net.minecraft.client.model.ModelBiped;
+import net.minecraft.client.renderer.entity.RenderBiped;
+import net.minecraft.entity.Entity;
+import net.minecraft.util.ResourceLocation;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+import roadhog360.simpleskinbackport.core.Utils;
+import roadhog360.simpleskinbackport.ducks.INewBipedModel;
+import vazkii.botania.client.render.entity.RenderDoppleganger;
+
+@Mixin(RenderDoppleganger.class)
+public class MixinRenderDoppelganger extends RenderBiped {
+    public MixinRenderDoppelganger(ModelBiped p_i1257_1_, float p_i1257_2_) {
+        super(p_i1257_1_, p_i1257_2_);
+    }
+
+    @Inject(method = "getEntityTexture", at = @At(value = "HEAD"))
+    private void overrideSkinAndSetResourceLocation(Entity par1Entity, CallbackInfoReturnable<ResourceLocation> cir) {
+        if(this.modelBipedMain instanceof INewBipedModel model) {
+            model.simpleSkinBackport$setSlim(Utils.isClientPlayerSlim());
+        }
+    }
+}

src/main/java/roadhog360/simpleskinbackport/mixins/late/botania/MixinRenderTileSkullOverride.java

@@ -0,0 +1,36 @@
+package roadhog360.simpleskinbackport.mixins.late.botania;
+
+import net.minecraft.client.model.ModelSkeletonHead;
+import net.minecraft.client.renderer.tileentity.TileEntitySkullRenderer;
+import net.minecraft.entity.Entity;
+import net.minecraft.util.ResourceLocation;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+import roadhog360.simpleskinbackport.core.DefaultPlayerSkin;
+import vazkii.botania.client.model.ModelSkullOverride;
+import vazkii.botania.client.render.tile.RenderTileSkullOverride;
+
+@Mixin(RenderTileSkullOverride.class)
+public class MixinRenderTileSkullOverride extends TileEntitySkullRenderer {
+
+    private ModelSkeletonHead skull = new ModelSkeletonHead(0, 0, 64, 64);
+    //The new one isn't needed
+
+    /**
+     * 64x64 model needs new Steve textures
+     */
+    @Redirect(method = "render", at = @At(value = "FIELD", target = "Lnet/minecraft/client/entity/AbstractClientPlayer;locationStevePng:Lnet/minecraft/util/ResourceLocation;"))
+    private ResourceLocation fixDefaultTexture() {
+        return DefaultPlayerSkin.STEVE.getResource();
+    }
+
+    /**
+     * Botania's model override isn't necessary; it's easier to provide the vanilla one to set the 64x64 textures.
+     * We need the 64x64 texture head since Gaia Guardians copy the player's texture, which uses 64x64 textures.
+     */
+    @Redirect(method = "render", at = @At(value = "INVOKE", target = "Lvazkii/botania/client/model/ModelSkullOverride;render(Lnet/minecraft/entity/Entity;FFFFFF)V"))
+    private void changeModel(ModelSkullOverride instance, Entity par1Entity, float par2, float par3, float par4, float par5, float par6, float par7) {
+        skull.render(par1Entity, par2, par3, par4, par5, par6, par7);
+    }
+}

src/main/java/roadhog360/simpleskinbackport/mixins/late/MixinRenderTFGiant.java renamed to src/main/java/roadhog360/simpleskinbackport/mixins/late/twilightforest/MixinRenderTFGiant.java

@@ -1,17 +1,15 @@
-package roadhog360.simpleskinbackport.mixins.late;
+package roadhog360.simpleskinbackport.mixins.late.twilightforest;
 
-import cpw.mods.fml.client.FMLClientHandler;
 import net.minecraft.client.model.ModelBiped;
 import net.minecraft.client.renderer.entity.RenderBiped;
 import net.minecraft.entity.Entity;
 import net.minecraft.util.ResourceLocation;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import roadhog360.simpleskinbackport.configuration.configs.ConfigModCompat;
-import roadhog360.simpleskinbackport.ducks.IArmsState;
+import roadhog360.simpleskinbackport.core.Utils;
 import roadhog360.simpleskinbackport.ducks.INewBipedModel;
 import twilightforest.client.renderer.entity.RenderTFGiant;
 
@@ -24,20 +22,12 @@ public MixinRenderTFGiant(ModelBiped p_i1257_1_, float p_i1257_2_) {
     @Inject(method = "getEntityTexture", at = @At(value = "HEAD"), cancellable = true)
     private void overrideSkinAndSetResourceLocation(Entity par1Entity, CallbackInfoReturnable<ResourceLocation> cir) {
         boolean usePlayerModel = ConfigModCompat.TFgiantSkinSet == null;
-        boolean slim = usePlayerModel ? simpleSkinBackport$isClientPlayerSlim() : ConfigModCompat.TFgiantSkinSet.getDefaultSkin(par1Entity.getPersistentID()).isSlim();
+        boolean slim = usePlayerModel ? Utils.isClientPlayerSlim() : ConfigModCompat.TFgiantSkinSet.getDefaultSkin(par1Entity.getPersistentID()).isSlim();
         if(this.modelBipedMain instanceof INewBipedModel model) {
             model.simpleSkinBackport$setSlim(slim);
         }
         if(!usePlayerModel) {
             cir.setReturnValue(ConfigModCompat.TFgiantSkinSet.getDefaultSkin(par1Entity.getPersistentID()).getResource());
         }
     }
-
-    @Unique
-    private boolean simpleSkinBackport$isClientPlayerSlim() {
-        if(FMLClientHandler.instance().getClientPlayerEntity() instanceof IArmsState player) {
-            return player.simpleSkinBackport$isSlim();
-        }
-        return false;
-    }
 }