mirror of
https://github.com/GTNewHorizons/Angelica.git
synced 2026-11-21 21:02:15 +00:00
Mixin-ify RenderGlobal transformer
This commit is contained in:
1 parent
82f2180888
commit
c2c42ffdc9
4 files changed
+108
-371
No files matched your search
+108
-2
@@ -1,17 +1,21 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.renderer;
|
||||
|
||||
import net.minecraft.client.renderer.RenderGlobal;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.client.renderer.culling.ICamera;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.util.MovingObjectPosition;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
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.CallbackInfo;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
||||
|
||||
import com.gtnewhorizon.mixinextras.injector.wrapoperation.Operation;
|
||||
import com.gtnewhorizon.mixinextras.injector.wrapoperation.WrapOperation;
|
||||
import com.gtnewhorizons.angelica.client.Shaders;
|
||||
|
||||
@Mixin(RenderGlobal.class)
|
||||
@@ -124,7 +128,7 @@ public class MixinRenderGlobal {
|
||||
remap = false,
|
||||
ordinal = 3,
|
||||
shift = At.Shift.AFTER))
|
||||
private void angelica$disableFog(CallbackInfoReturnable<Integer> cir) {
|
||||
private void angelica$sortAndRenderDisableFog(CallbackInfoReturnable<Integer> cir) {
|
||||
Shaders.disableFog();
|
||||
}
|
||||
|
||||
@@ -136,8 +140,110 @@ public class MixinRenderGlobal {
|
||||
remap = false,
|
||||
ordinal = 2,
|
||||
shift = At.Shift.AFTER))
|
||||
private void angelica$enableFog(CallbackInfoReturnable<Integer> cir) {
|
||||
private void angelica$sortAndRenderEnableFog(CallbackInfoReturnable<Integer> cir) {
|
||||
Shaders.enableFog();
|
||||
}
|
||||
|
||||
// RenderSky
|
||||
@WrapOperation(
|
||||
method = "renderSky(F)V",
|
||||
at = @At(value = "INVOKE", target = "Lorg/lwjgl/opengl/GL11;glDisable(I)V", remap = false))
|
||||
private void angelica$renderSkyDisable(int cap, Operation<Void> original) {
|
||||
original.call(cap);
|
||||
|
||||
if (cap == GL11.GL_FOG) Shaders.disableFog();
|
||||
else if (cap == GL11.GL_TEXTURE_2D) Shaders.disableTexture2D();
|
||||
}
|
||||
|
||||
@WrapOperation(
|
||||
method = "renderSky(F)V",
|
||||
at = @At(value = "INVOKE", target = "Lorg/lwjgl/opengl/GL11;glEnable(I)V", remap = false))
|
||||
private void angelica$renderSkyEnable(int cap, Operation<Void> original) {
|
||||
original.call(cap);
|
||||
if (cap == GL11.GL_FOG) Shaders.enableFog();
|
||||
else if (cap == GL11.GL_TEXTURE_2D) Shaders.enableTexture2D();
|
||||
}
|
||||
|
||||
@Inject(
|
||||
method = "renderSky(F)V",
|
||||
at = @At(
|
||||
value = "INVOKE",
|
||||
target = "Lorg/lwjgl/opengl/GL11;glCallList(I)V",
|
||||
remap = false,
|
||||
ordinal = 0,
|
||||
shift = At.Shift.BEFORE,
|
||||
by = 2))
|
||||
private void angelica$renderSkyPreSkyList(float p_72714_1_, CallbackInfo ci) {
|
||||
Shaders.preSkyList();
|
||||
}
|
||||
|
||||
@Inject(
|
||||
method = "renderSky(F)V",
|
||||
at = @At(
|
||||
value = "INVOKE",
|
||||
target = "Lnet/minecraft/client/multiplayer/WorldClient;getCelestialAngle(F)F",
|
||||
ordinal = 1,
|
||||
shift = At.Shift.BY,
|
||||
by = -2))
|
||||
private void angelica$renderSkyBeforeCelestialAngle(float p_72714_1_, CallbackInfo ci) {
|
||||
Shaders.preCelestialRotate();
|
||||
}
|
||||
|
||||
@Inject(
|
||||
method = "renderSky(F)V",
|
||||
at = @At(
|
||||
value = "INVOKE",
|
||||
target = "Lorg/lwjgl/opengl/GL11;glRotatef(FFFF)V",
|
||||
remap = false,
|
||||
ordinal = 9,
|
||||
shift = At.Shift.AFTER))
|
||||
private void angelica$renderSkyAfterCelestialAngle(float p_72714_1_, CallbackInfo ci) {
|
||||
Shaders.postCelestialRotate();
|
||||
}
|
||||
|
||||
// drawBlockDamageTexture
|
||||
|
||||
@WrapOperation(
|
||||
method = "Lnet/minecraft/client/renderer/RenderGlobal;drawBlockDamageTexture(Lnet/minecraft/client/renderer/Tessellator;Lnet/minecraft/entity/EntityLivingBase;F)V",
|
||||
remap = false,
|
||||
at = @At(value = "INVOKE", target = "Lorg/lwjgl/opengl/GL11;glDisable(I)V", remap = false))
|
||||
private void angelica$drawBlockDamageTextureDisable(int cap, Operation<Void> original) {
|
||||
original.call(cap);
|
||||
|
||||
if (cap == GL11.GL_TEXTURE_2D) Shaders.disableTexture2D();
|
||||
}
|
||||
|
||||
@WrapOperation(
|
||||
method = "Lnet/minecraft/client/renderer/RenderGlobal;drawBlockDamageTexture(Lnet/minecraft/client/renderer/Tessellator;Lnet/minecraft/entity/EntityLivingBase;F)V",
|
||||
remap = false,
|
||||
at = @At(value = "INVOKE", target = "Lorg/lwjgl/opengl/GL11;glEnable(I)V", remap = false))
|
||||
private void angelica$drawBlockDamageTextureSkyEnable(int cap, Operation<Void> original) {
|
||||
original.call(cap);
|
||||
if (cap == GL11.GL_TEXTURE_2D) Shaders.enableTexture2D();
|
||||
}
|
||||
|
||||
@Inject(
|
||||
method = "Lnet/minecraft/client/renderer/RenderGlobal;drawBlockDamageTexture(Lnet/minecraft/client/renderer/Tessellator;Lnet/minecraft/entity/EntityLivingBase;F)V",
|
||||
at = @At(
|
||||
value = "INVOKE",
|
||||
target = "Lnet/minecraft/client/renderer/Tessellator;startDrawingQuads()V",
|
||||
ordinal = 0,
|
||||
shift = At.Shift.BEFORE))
|
||||
private void angelica$beginBlockDestroyProgress(Tessellator p_72717_1_, EntityLivingBase p_72717_2_,
|
||||
float p_72717_3_, CallbackInfo ci) {
|
||||
Shaders.beginBlockDestroyProgress();
|
||||
}
|
||||
|
||||
@Inject(
|
||||
method = "Lnet/minecraft/client/renderer/RenderGlobal;drawBlockDamageTexture(Lnet/minecraft/client/renderer/Tessellator;Lnet/minecraft/entity/EntityLivingBase;F)V",
|
||||
at = @At(
|
||||
value = "INVOKE",
|
||||
target = "Lnet/minecraft/client/renderer/Tessellator;setTranslation(DDD)V",
|
||||
ordinal = 1,
|
||||
shift = At.Shift.AFTER))
|
||||
private void angelica$endBlockDestroyProgress(Tessellator p_72717_1_, EntityLivingBase p_72717_2_, float p_72717_3_,
|
||||
CallbackInfo ci) {
|
||||
Shaders.endBlockDestroyProgress();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,49 +0,0 @@
|
||||
package com.gtnewhorizons.angelica.transform;
|
||||
|
||||
import static org.objectweb.asm.Opcodes.*;
|
||||
|
||||
import net.minecraft.launchwrapper.IClassTransformer;
|
||||
|
||||
import org.objectweb.asm.ClassReader;
|
||||
import org.objectweb.asm.ClassVisitor;
|
||||
import org.objectweb.asm.ClassWriter;
|
||||
import org.objectweb.asm.FieldVisitor;
|
||||
import org.objectweb.asm.Opcodes;
|
||||
|
||||
public class ACTItemBlock 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 FieldVisitor visitField(int access, String name, String desc, String signature, Object value) {
|
||||
if (Names.itemBlock_block.name.equals(name)) {
|
||||
access = access & ~(ACC_PUBLIC | ACC_PRIVATE | ACC_PROTECTED) | ACC_PUBLIC;
|
||||
}
|
||||
return cv.visitField(access, name, desc, signature, value);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,318 +0,0 @@
|
||||
package com.gtnewhorizons.angelica.transform;
|
||||
|
||||
import static org.objectweb.asm.Opcodes.*;
|
||||
|
||||
import net.minecraft.launchwrapper.IClassTransformer;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import org.objectweb.asm.ClassReader;
|
||||
import org.objectweb.asm.ClassVisitor;
|
||||
import org.objectweb.asm.ClassWriter;
|
||||
import org.objectweb.asm.FieldVisitor;
|
||||
import org.objectweb.asm.MethodVisitor;
|
||||
import org.objectweb.asm.Opcodes;
|
||||
|
||||
public class ACTRenderGlobal 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 FieldVisitor visitField(int access, String name, String desc, String signature, Object value) {
|
||||
if (Names.renderGlobal_worldRenderers.name.equals(name)) {
|
||||
access = access & (~ACC_PRIVATE & ~ACC_PROTECTED) | ACC_PUBLIC;
|
||||
}
|
||||
return cv.visitField(access, name, desc, signature, value);
|
||||
}
|
||||
|
||||
@Override
|
||||
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
|
||||
// String remappedName = SMCRemap.remapper.mapMethodName(classname, name, desc);
|
||||
// ALog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
if (Names.renderGlobal_renderSky.equalsNameDesc(name, desc)) {
|
||||
ALog.finer(" patch method %s.%s%s", classname, name, desc);
|
||||
return new MVrenderSky(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
} else if (Names.renderGlobal_drawBlockDamageTexture.equalsNameDesc(name, desc)
|
||||
|| name.equals("drawBlockDamageTexture")) // Optifine
|
||||
{
|
||||
ALog.finer(" patch method %s.%s%s", classname, name, desc);
|
||||
return new MVdrawBlockDamageTexture(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
}
|
||||
return cv.visitMethod(access, name, desc, signature, exceptions);
|
||||
}
|
||||
}
|
||||
|
||||
/* detect glEnable or glDisable (TEXTURE_2D or FOG) */
|
||||
private static class MVendisTexFog extends MethodVisitor {
|
||||
|
||||
public MVendisTexFog(MethodVisitor mv) {
|
||||
super(Opcodes.ASM4, mv);
|
||||
}
|
||||
|
||||
int lastInt = 0;
|
||||
|
||||
@Override
|
||||
public void visitIntInsn(int opcode, int operand) {
|
||||
mv.visitIntInsn(opcode, operand);
|
||||
if (opcode == SIPUSH && (operand == 3553 /* GL_TEXTURE_2D */ || operand == 2912 /* GL_FOG */ )) {
|
||||
lastInt = operand;
|
||||
} else {
|
||||
lastInt = 0;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void visitMethodInsn(int opcode, String owner, String name, String desc) {
|
||||
mv.visitMethodInsn(opcode, owner, name, desc);
|
||||
if (owner.equals("org/lwjgl/opengl/GL11")) {
|
||||
if (name.equals("glEnable")) {
|
||||
if (lastInt == GL11.GL_TEXTURE_2D) {
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"enableTexture2D",
|
||||
"()V");
|
||||
ALog.finest(" %s", "enableTexture2D");
|
||||
} else if (lastInt == GL11.GL_FOG) {
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"enableFog",
|
||||
"()V");
|
||||
ALog.finest(" %s", "enableFog");
|
||||
}
|
||||
} else if (name.equals("glDisable")) {
|
||||
if (lastInt == GL11.GL_TEXTURE_2D) {
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"disableTexture2D",
|
||||
"()V");
|
||||
ALog.finest(" %s", "disableTexture2D");
|
||||
} else if (lastInt == GL11.GL_FOG) {
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"disableFog",
|
||||
"()V");
|
||||
ALog.finest(" %s", "disableFog");
|
||||
}
|
||||
}
|
||||
}
|
||||
lastInt = 0;
|
||||
}
|
||||
}
|
||||
|
||||
/* extends MVenableTF */
|
||||
private static class MVrenderSky extends MVendisTexFog {
|
||||
|
||||
public MVrenderSky(MethodVisitor mv) {
|
||||
super(mv);
|
||||
}
|
||||
|
||||
int state = 0;
|
||||
boolean detectedOptifine = false;
|
||||
|
||||
int lastInt = 0;
|
||||
int lastVar = 0;
|
||||
|
||||
@Override
|
||||
public void visitIntInsn(int opcode, int operand) {
|
||||
mv.visitIntInsn(opcode, operand);
|
||||
if (opcode == SIPUSH) {
|
||||
lastInt = operand;
|
||||
} else {
|
||||
lastInt = 0;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void visitVarInsn(int opcode, int var) {
|
||||
mv.visitVarInsn(opcode, var);
|
||||
if (opcode == ALOAD) {
|
||||
lastVar = var;
|
||||
} else {
|
||||
lastVar = 0;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void visitFieldInsn(int opcode, String owner, String name, String desc) {
|
||||
switch (state) {
|
||||
case 0:
|
||||
if (Names.vec3_xCoord.equals(owner, name)) {
|
||||
++state;
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"setSkyColor",
|
||||
"(" + Names.vec3_.desc + ")V");
|
||||
mv.visitVarInsn(ALOAD, lastVar);
|
||||
break;
|
||||
}
|
||||
break;
|
||||
case 1:
|
||||
if (Names.renderGlobal_glSkyList.equals(owner, name)) {
|
||||
++state;
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"preSkyList",
|
||||
"()V");
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
mv.visitFieldInsn(opcode, owner, name, desc);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void visitMethodInsn(int opcode, String owner, String name, String desc) {
|
||||
// ALog.info(" %s.%s%s",ownerM,nameM,descM);
|
||||
switch (state) {
|
||||
case 0:
|
||||
if (owner.equals("Config") && name.equals("isSkyEnabled")) {
|
||||
detectedOptifine = true;
|
||||
}
|
||||
break;
|
||||
case 2:
|
||||
if (Names.worldClient_getRainStrength.equals(owner, name, desc)) {
|
||||
++state;
|
||||
}
|
||||
break;
|
||||
}
|
||||
//
|
||||
mv.visitMethodInsn(opcode, owner, name, desc);
|
||||
//
|
||||
if (owner.equals("org/lwjgl/opengl/GL11")) {
|
||||
if (name.equals("glEnable")) {
|
||||
if (lastInt == GL11.GL_TEXTURE_2D) {
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"enableTexture2D",
|
||||
"()V");
|
||||
ALog.finest(" %s", "enableTexture2D");
|
||||
} else if (lastInt == GL11.GL_FOG) {
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"enableFog",
|
||||
"()V");
|
||||
ALog.finest(" %s", "enableFog");
|
||||
}
|
||||
} else if (name.equals("glDisable")) {
|
||||
if (lastInt == GL11.GL_TEXTURE_2D) {
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"disableTexture2D",
|
||||
"()V");
|
||||
ALog.finest(" %s", "disableTexture2D");
|
||||
} else if (lastInt == GL11.GL_FOG) {
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"disableFog",
|
||||
"()V");
|
||||
ALog.finest(" %s", "disableFog");
|
||||
}
|
||||
} else if (name.equals("glRotatef")) {
|
||||
ALog.finest(" *%s %d", "glRotatef", state);
|
||||
if (state == 3) {
|
||||
++state;
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"preCelestialRotate",
|
||||
"()V");
|
||||
ALog.finest(" %s", "preCelestialRotate");
|
||||
} else if (state == 4) {
|
||||
++state;
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"postCelestialRotate",
|
||||
"()V");
|
||||
ALog.finest(" %s", "postCelestialRotate");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static class MVdrawBlockDamageTexture extends MethodVisitor {
|
||||
|
||||
int state = 0;
|
||||
|
||||
public MVdrawBlockDamageTexture(MethodVisitor mv) {
|
||||
super(Opcodes.ASM4, mv);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void visitIntInsn(int opcode, int operand) {
|
||||
switch (state) {
|
||||
case 0:
|
||||
if (opcode == SIPUSH && operand == GL11.GL_ALPHA_TEST) {
|
||||
++state;
|
||||
}
|
||||
break;
|
||||
case 2:
|
||||
if (opcode == SIPUSH && operand == GL11.GL_ALPHA_TEST) {
|
||||
++state;
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"endBlockDestroyProgress",
|
||||
"()V");
|
||||
ALog.finest(" %s", "endBlockDestroyProgress");
|
||||
}
|
||||
break;
|
||||
}
|
||||
mv.visitIntInsn(opcode, operand);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void visitMethodInsn(int opcode, String owner, String name, String desc) {
|
||||
switch (state) {
|
||||
case 1:
|
||||
if (owner.equals("org/lwjgl/opengl/GL11") && name.equals("glEnable")) {
|
||||
++state;
|
||||
mv.visitMethodInsn(opcode, owner, name, desc);
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"beginBlockDestroyProgress",
|
||||
"()V");
|
||||
ALog.finest(" %s", "beginBlockDestroyProgress");
|
||||
return;
|
||||
}
|
||||
break;
|
||||
}
|
||||
mv.visitMethodInsn(opcode, owner, name, desc);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -24,9 +24,7 @@ public class AClassTransformer implements IClassTransformer {
|
||||
names = new Names();
|
||||
InitNames.init();
|
||||
ctMap = new HashMap();
|
||||
put(Names.itemBlock_, new ACTItemBlock()); // TODO - Access Related
|
||||
put(Names.tessellator_, new ACTTessellator());
|
||||
put(Names.renderGlobal_, new ACTRenderGlobal()); // In Progress
|
||||
put(Names.entityRenderer_, new ACTEntityRenderer());
|
||||
put(Names.renderManager_, new ACTRenderManager());
|
||||
put(Names.rendererLivingE_, new ACTRendererLivingEntity());
|
||||
|
||||
Reference in new issue
Block a user