diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java b/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java index 5dcfbb1b4..ed8d667c2 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java @@ -35,7 +35,9 @@ public enum Mixins { "renderer.MixinEntityRender", "renderer.MixinRenderBlocks", "renderer.MixinRenderGlobal", - "renderer.MixinModelRenderer") + "renderer.MixinModelRenderer", + "renderer.MixinTextureClock", + "renderer.MixinTextureCompass") .setApplyIf(() -> true)) ; diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/renderer/MixinTextureClock.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/renderer/MixinTextureClock.java new file mode 100644 index 000000000..52ae168d2 --- /dev/null +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/early/renderer/MixinTextureClock.java @@ -0,0 +1,25 @@ +package com.gtnewhorizons.angelica.mixins.early.renderer; + +import net.minecraft.client.renderer.texture.TextureClock; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +import com.gtnewhorizons.angelica.client.ShadersTex; + +@Mixin(value = TextureClock.class) +public class MixinTextureClock { + + @Redirect( + method = "updateAnimation()V", + at = @At( + value = "INVOKE", + target = "Lnet/minecraft/client/renderer/texture/TextureUtil;uploadTextureMipmap([[IIIIIZZ)V", + remap = false)) + private void angelica$updateAnimation(int[][] data, int width, int height, int xoffset, int yoffset, boolean linear, + boolean clamp) { + ShadersTex.uploadTexSub(data, width, height, xoffset, yoffset, linear, clamp); + } + +} diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/renderer/MixinTextureCompass.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/renderer/MixinTextureCompass.java new file mode 100644 index 000000000..390d9c1bc --- /dev/null +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/early/renderer/MixinTextureCompass.java @@ -0,0 +1,25 @@ +package com.gtnewhorizons.angelica.mixins.early.renderer; + +import net.minecraft.client.renderer.texture.TextureCompass; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +import com.gtnewhorizons.angelica.client.ShadersTex; + +@Mixin(value = TextureCompass.class) +public class MixinTextureCompass { + + @Redirect( + method = "updateCompass(Lnet/minecraft/world/World;DDDZZ)V", + at = @At( + value = "INVOKE", + target = "Lnet/minecraft/client/renderer/texture/TextureUtil;uploadTextureMipmap([[IIIIIZZ)V", + remap = false)) + private void angelica$updateCompass(int[][] data, int width, int height, int xoffset, int yoffset, boolean linear, + boolean clamp) { + ShadersTex.uploadTexSub(data, width, height, xoffset, yoffset, linear, clamp); + } + +} diff --git a/src/main/java/com/gtnewhorizons/angelica/transform/ACTTextureClock.java b/src/main/java/com/gtnewhorizons/angelica/transform/ACTTextureClock.java deleted file mode 100644 index b9c031b69..000000000 --- a/src/main/java/com/gtnewhorizons/angelica/transform/ACTTextureClock.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.gtnewhorizons.angelica.transform; - -import net.minecraft.launchwrapper.IClassTransformer; - -import org.objectweb.asm.ClassReader; -import org.objectweb.asm.ClassVisitor; -import org.objectweb.asm.ClassWriter; -import org.objectweb.asm.MethodVisitor; -import org.objectweb.asm.Opcodes; - -public class ACTTextureClock implements IClassTransformer { - - @Override - public byte[] transform(String par1, String par2, byte[] par3) { - ALog.fine("transforming %s %s", par1, par2); - ClassReader cr = new ClassReader(par3); - ClassWriter cw = new ClassWriter(cr, ClassWriter.COMPUTE_MAXS); - CVTransform cv = new CVTransform(cw); - cr.accept(cv, 0); - return cw.toByteArray(); - } - - private static class CVTransform extends ClassVisitor { - - String classname; - - public CVTransform(ClassVisitor cv) { - super(Opcodes.ASM4, cv); - } - - @Override - public void visit(int version, int access, String name, String signature, String superName, - String[] interfaces) { - classname = name; - // ALog.info(" class %s",name); - cv.visit(version, access, name, signature, superName, interfaces); - } - - @Override - public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) { - // ALog.info(" method %s.%s%s = %s",classname,name,desc,remappedName); - if (Names.textureAtlasSpri_updateAnimation.equalsNameDesc(name, desc)) { - // ALog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM); - return new ACTTextureAtlasSprite.MVanimation(cv.visitMethod(access, name, desc, signature, exceptions)); - } - return cv.visitMethod(access, name, desc, signature, exceptions); - } - } -} diff --git a/src/main/java/com/gtnewhorizons/angelica/transform/ACTTextureCompass.java b/src/main/java/com/gtnewhorizons/angelica/transform/ACTTextureCompass.java deleted file mode 100644 index 74f0dcf85..000000000 --- a/src/main/java/com/gtnewhorizons/angelica/transform/ACTTextureCompass.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.gtnewhorizons.angelica.transform; - -import net.minecraft.launchwrapper.IClassTransformer; - -import org.objectweb.asm.ClassReader; -import org.objectweb.asm.ClassVisitor; -import org.objectweb.asm.ClassWriter; -import org.objectweb.asm.MethodVisitor; -import org.objectweb.asm.Opcodes; - -public class ACTTextureCompass implements IClassTransformer { - - @Override - public byte[] transform(String par1, String par2, byte[] par3) { - ALog.fine("transforming %s %s", par1, par2); - ClassReader cr = new ClassReader(par3); - ClassWriter cw = new ClassWriter(cr, ClassWriter.COMPUTE_MAXS); - CVTransform cv = new CVTransform(cw); - cr.accept(cv, 0); - return cw.toByteArray(); - } - - private static class CVTransform extends ClassVisitor { - - String classname; - - public CVTransform(ClassVisitor cv) { - super(Opcodes.ASM4, cv); - } - - @Override - public void visit(int version, int access, String name, String signature, String superName, - String[] interfaces) { - classname = name; - // ALog.info(" class %s",name); - cv.visit(version, access, name, signature, superName, interfaces); - } - - @Override - public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) { - // ALog.info(" method %s.%s%s = %s",classname,name,desc,remappedName); - if (Names.textureCompass_updateCompass.equalsNameDesc(name, desc)) { - // ALog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM); - return new ACTTextureAtlasSprite.MVanimation(cv.visitMethod(access, name, desc, signature, exceptions)); - } - return cv.visitMethod(access, name, desc, signature, exceptions); - } - } -} diff --git a/src/main/java/com/gtnewhorizons/angelica/transform/AClassTransformer.java b/src/main/java/com/gtnewhorizons/angelica/transform/AClassTransformer.java index 0c25b16c2..12eb01ef7 100644 --- a/src/main/java/com/gtnewhorizons/angelica/transform/AClassTransformer.java +++ b/src/main/java/com/gtnewhorizons/angelica/transform/AClassTransformer.java @@ -40,8 +40,6 @@ public class AClassTransformer implements IClassTransformer { put(Names.dynamicTexture_, new ACTTextureDynamic()); put(Names.textureMap_, new ACTTextureMap()); put(Names.textureAtlasSpri_, new ACTTextureAtlasSprite()); - put(Names.textureClock_, new ACTTextureClock()); - put(Names.textureCompass_, new ACTTextureCompass()); put(Names.textureManager_, new ACTTextureManager()); ctMap.put("mrtjp.projectred.illumination.RenderHalo$", new ACTPrjRedIlluRenderHalo()); ctMap.put("net.smart.render.ModelRotationRenderer", new ACTSmartMoveModelRotationRenderer());