mirror of
https://github.com/GTNewHorizons/Angelica.git
synced 2026-11-19 11:59:40 +00:00
[ci skip] spotlessApply with the new settings
This commit is contained in:
1 parent
c47661b619
commit
f64f7f366a
56 files changed
+1803
-1559
No files matched your search
@@ -4,13 +4,16 @@ import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.net.URI;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.GuiButton;
|
||||
import net.minecraft.client.gui.GuiScreen;
|
||||
import net.minecraft.client.settings.GameSettings;
|
||||
|
||||
import org.lwjgl.Sys;
|
||||
|
||||
public class GuiShaders extends GuiScreen {
|
||||
|
||||
/** This GUI's parent GUI. */
|
||||
protected GuiScreen parentGui;
|
||||
|
||||
@@ -18,33 +21,15 @@ public class GuiShaders extends GuiScreen {
|
||||
public boolean needReinit;
|
||||
|
||||
/*
|
||||
private class GuiListShaderpacks {
|
||||
int posX,posY,sizeX,sizeY;
|
||||
int viewPosY;
|
||||
int itemHeight = 20;
|
||||
int selection;
|
||||
ArrayList<String> listShaderpacks;
|
||||
public void draw() {
|
||||
Tessellator tess = Tessellator.instance;
|
||||
int listSize = listShaderpacks.size();
|
||||
int i,j;
|
||||
for (i=viewPosY/itemHeight, j=Math.min((viewPosY+sizeY)/itemHeight,listSize); i<j; ++i)
|
||||
{
|
||||
int itemY = posY-viewPosY+itemHeight*i;
|
||||
boolean selected = i==selection;
|
||||
tess.startDrawingQuads();
|
||||
tess.setColorRGBA(0,0,selected?128:0,128);
|
||||
tess.addVertex(posX,itemY,0);
|
||||
tess.addVertex(posX,itemY+itemHeight,0);
|
||||
tess.addVertex(posX+sizeX,itemY+itemHeight,0);
|
||||
tess.addVertex(posX+sizeX,itemY,0);
|
||||
tess.draw();
|
||||
field_146289_q.drawString(listShaderpacks.get(i), posX, itemY, 0xFFFFFFFF, true);
|
||||
}
|
||||
}
|
||||
}
|
||||
private GuiListShaderpacks guiListShaderpacks;
|
||||
*/
|
||||
* private class GuiListShaderpacks { int posX,posY,sizeX,sizeY; int viewPosY; int itemHeight = 20; int selection;
|
||||
* ArrayList<String> listShaderpacks; public void draw() { Tessellator tess = Tessellator.instance; int listSize =
|
||||
* listShaderpacks.size(); int i,j; for (i=viewPosY/itemHeight, j=Math.min((viewPosY+sizeY)/itemHeight,listSize);
|
||||
* i<j; ++i) { int itemY = posY-viewPosY+itemHeight*i; boolean selected = i==selection; tess.startDrawingQuads();
|
||||
* tess.setColorRGBA(0,0,selected?128:0,128); tess.addVertex(posX,itemY,0); tess.addVertex(posX,itemY+itemHeight,0);
|
||||
* tess.addVertex(posX+sizeX,itemY+itemHeight,0); tess.addVertex(posX+sizeX,itemY,0); tess.draw();
|
||||
* field_146289_q.drawString(listShaderpacks.get(i), posX, itemY, 0xFFFFFFFF, true); } } } private
|
||||
* GuiListShaderpacks guiListShaderpacks;
|
||||
*/
|
||||
|
||||
private GuiSlotShaders shaderList;
|
||||
|
||||
@@ -68,44 +53,72 @@ public class GuiShaders extends GuiScreen {
|
||||
List buttonList = this.buttonList;
|
||||
int width = this.width;
|
||||
int height = this.height;
|
||||
buttonList.add(new GuiButton(
|
||||
17, width * 3 / 4 - 60, 30, 160, 18, "NormapMap: " + toStringOnOff(Shaders.configNormalMap)));
|
||||
buttonList.add(new GuiButton(
|
||||
18, width * 3 / 4 - 60, 50, 160, 18, "SpecularMap: " + toStringOnOff(Shaders.configSpecularMap)));
|
||||
buttonList.add(new GuiButton(
|
||||
15,
|
||||
width * 3 / 4 - 60,
|
||||
70,
|
||||
160,
|
||||
18,
|
||||
"RenderResMul: " + String.format("%.04f", Shaders.configRenderResMul)));
|
||||
buttonList.add(new GuiButton(
|
||||
16,
|
||||
width * 3 / 4 - 60,
|
||||
90,
|
||||
160,
|
||||
18,
|
||||
"ShadowResMul: " + String.format("%.04f", Shaders.configShadowResMul)));
|
||||
buttonList.add(new GuiButton(
|
||||
10,
|
||||
width * 3 / 4 - 60,
|
||||
110,
|
||||
160,
|
||||
18,
|
||||
"HandDepth: " + String.format("%.04f", Shaders.configHandDepthMul)));
|
||||
buttonList.add(new GuiButton(
|
||||
9, width * 3 / 4 - 60, 130, 160, 18, "CloudShadow: " + toStringOnOff(Shaders.configCloudShadow)));
|
||||
buttonList.add(
|
||||
new GuiButton(
|
||||
17,
|
||||
width * 3 / 4 - 60,
|
||||
30,
|
||||
160,
|
||||
18,
|
||||
"NormapMap: " + toStringOnOff(Shaders.configNormalMap)));
|
||||
buttonList.add(
|
||||
new GuiButton(
|
||||
18,
|
||||
width * 3 / 4 - 60,
|
||||
50,
|
||||
160,
|
||||
18,
|
||||
"SpecularMap: " + toStringOnOff(Shaders.configSpecularMap)));
|
||||
buttonList.add(
|
||||
new GuiButton(
|
||||
15,
|
||||
width * 3 / 4 - 60,
|
||||
70,
|
||||
160,
|
||||
18,
|
||||
"RenderResMul: " + String.format("%.04f", Shaders.configRenderResMul)));
|
||||
buttonList.add(
|
||||
new GuiButton(
|
||||
16,
|
||||
width * 3 / 4 - 60,
|
||||
90,
|
||||
160,
|
||||
18,
|
||||
"ShadowResMul: " + String.format("%.04f", Shaders.configShadowResMul)));
|
||||
buttonList.add(
|
||||
new GuiButton(
|
||||
10,
|
||||
width * 3 / 4 - 60,
|
||||
110,
|
||||
160,
|
||||
18,
|
||||
"HandDepth: " + String.format("%.04f", Shaders.configHandDepthMul)));
|
||||
buttonList.add(
|
||||
new GuiButton(
|
||||
9,
|
||||
width * 3 / 4 - 60,
|
||||
130,
|
||||
160,
|
||||
18,
|
||||
"CloudShadow: " + toStringOnOff(Shaders.configCloudShadow)));
|
||||
// buttonList.add(new GuiButton(14, width *3 /4 -60, 150, 160, 18, "ShadowClipFrustrum: "
|
||||
// +toStringOnOff(Shaders.configShadowClipFrustrum)));
|
||||
buttonList.add(new GuiButton(
|
||||
4,
|
||||
width * 3 / 4 - 60,
|
||||
170,
|
||||
160,
|
||||
18,
|
||||
"tweakBlockDamage: " + toStringOnOff(Shaders.configTweakBlockDamage)));
|
||||
buttonList.add(new GuiButton(
|
||||
19, width * 3 / 4 - 60, 190, 160, 18, "OldLighting: " + toStringOnOff(Shaders.configOldLighting)));
|
||||
buttonList.add(
|
||||
new GuiButton(
|
||||
4,
|
||||
width * 3 / 4 - 60,
|
||||
170,
|
||||
160,
|
||||
18,
|
||||
"tweakBlockDamage: " + toStringOnOff(Shaders.configTweakBlockDamage)));
|
||||
buttonList.add(
|
||||
new GuiButton(
|
||||
19,
|
||||
width * 3 / 4 - 60,
|
||||
190,
|
||||
160,
|
||||
18,
|
||||
"OldLighting: " + toStringOnOff(Shaders.configOldLighting)));
|
||||
// buttonList.add(new GuiButton(11, width *3 /4 -60, 210, 160, 18, "Tex Min: "
|
||||
// +Shaders.texMinFilDesc[Shaders.configTexMinFilB]));
|
||||
// buttonList.add(new GuiButton(12, width *3 /4 -60, 230, 160, 18, "Tex_n Mag: "
|
||||
@@ -120,8 +133,9 @@ public class GuiShaders extends GuiScreen {
|
||||
}
|
||||
|
||||
@Override
|
||||
/** actionPerformed
|
||||
* Fired when a control is clicked. This is the equivalent of ActionListener.actionPerformed(ActionEvent e).
|
||||
/**
|
||||
* actionPerformed Fired when a control is clicked. This is the equivalent of
|
||||
* ActionListener.actionPerformed(ActionEvent e).
|
||||
*/
|
||||
protected void actionPerformed(GuiButton par1GuiButton) {
|
||||
if (par1GuiButton.enabled) // enabled
|
||||
@@ -141,7 +155,7 @@ public class GuiShaders extends GuiScreen {
|
||||
|
||||
case 10: /* Hand Depth */ {
|
||||
float val = Shaders.configHandDepthMul;
|
||||
float[] choices = {0.0625f, 0.125f, 0.25f, 0.5f, 1.0f};
|
||||
float[] choices = { 0.0625f, 0.125f, 0.25f, 0.5f, 1.0f };
|
||||
int i;
|
||||
if (!isShiftKeyDown()) { // isShiftKeyDown
|
||||
for (i = 0; i < choices.length && choices[i] <= val; ++i) {}
|
||||
@@ -157,7 +171,7 @@ public class GuiShaders extends GuiScreen {
|
||||
|
||||
case 15: /* Render Resolution Multiplier */ {
|
||||
float val = Shaders.configRenderResMul;
|
||||
float[] choices = {0.25f, 0.3333333333f, 0.5f, 0.7071067812f, 1.0f, 1.414213562f, 2.0f};
|
||||
float[] choices = { 0.25f, 0.3333333333f, 0.5f, 0.7071067812f, 1.0f, 1.414213562f, 2.0f };
|
||||
int i;
|
||||
if (!isShiftKeyDown()) {
|
||||
for (i = 0; i < choices.length && choices[i] <= val; ++i) {}
|
||||
@@ -174,7 +188,8 @@ public class GuiShaders extends GuiScreen {
|
||||
|
||||
case 16: /* Shadow Resolution Multiplier */ {
|
||||
float val = Shaders.configShadowResMul;
|
||||
float[] choices = {0.25f, 0.3333333333f, 0.5f, 0.7071067812f, 1.0f, 1.414213562f, 2.0f, 3.0f, 4.0f};
|
||||
float[] choices = { 0.25f, 0.3333333333f, 0.5f, 0.7071067812f, 1.0f, 1.414213562f, 2.0f, 3.0f,
|
||||
4.0f };
|
||||
int i;
|
||||
if (!isShiftKeyDown()) {
|
||||
for (i = 0; i < choices.length && choices[i] <= val; ++i) {}
|
||||
@@ -238,39 +253,36 @@ public class GuiShaders extends GuiScreen {
|
||||
|
||||
case 14: /* shadow frustum clipping */ {
|
||||
Shaders.configShadowClipFrustrum = !Shaders.configShadowClipFrustrum;
|
||||
par1GuiButton.displayString =
|
||||
"ShadowClipFrustrum: " + toStringOnOff(Shaders.configShadowClipFrustrum);
|
||||
par1GuiButton.displayString = "ShadowClipFrustrum: "
|
||||
+ toStringOnOff(Shaders.configShadowClipFrustrum);
|
||||
ShadersTex.updateTextureMinMagFilter();
|
||||
break;
|
||||
}
|
||||
|
||||
case 5: /* Open shaderpacks folder */
|
||||
switch (net.minecraft.util.Util.getOSType()) {
|
||||
case OSX:
|
||||
{
|
||||
try {
|
||||
Runtime.getRuntime().exec(new String[] {
|
||||
"/usr/bin/open", Shaders.shaderpacksdir.getAbsolutePath()
|
||||
});
|
||||
return;
|
||||
} catch (IOException var7) {
|
||||
var7.printStackTrace();
|
||||
}
|
||||
case OSX: {
|
||||
try {
|
||||
Runtime.getRuntime().exec(
|
||||
new String[] { "/usr/bin/open", Shaders.shaderpacksdir.getAbsolutePath() });
|
||||
return;
|
||||
} catch (IOException var7) {
|
||||
var7.printStackTrace();
|
||||
}
|
||||
}
|
||||
break;
|
||||
case WINDOWS:
|
||||
{
|
||||
String var2 = String.format(
|
||||
"cmd.exe /C start \"Open file\" \"%s\"",
|
||||
new Object[] {Shaders.shaderpacksdir.getAbsolutePath()});
|
||||
case WINDOWS: {
|
||||
String var2 = String.format(
|
||||
"cmd.exe /C start \"Open file\" \"%s\"",
|
||||
new Object[] { Shaders.shaderpacksdir.getAbsolutePath() });
|
||||
|
||||
try {
|
||||
Runtime.getRuntime().exec(var2);
|
||||
return;
|
||||
} catch (IOException var6) {
|
||||
var6.printStackTrace();
|
||||
}
|
||||
try {
|
||||
Runtime.getRuntime().exec(var2);
|
||||
return;
|
||||
} catch (IOException var6) {
|
||||
var6.printStackTrace();
|
||||
}
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
@@ -280,9 +292,9 @@ public class GuiShaders extends GuiScreen {
|
||||
try {
|
||||
Class var3 = Class.forName("java.awt.Desktop");
|
||||
Object var4 = var3.getMethod("getDesktop", new Class[0]).invoke((Object) null, new Object[0]);
|
||||
var3.getMethod("browse", new Class[] {URI.class})
|
||||
.invoke(var4, new Object[] {(new File(mc.mcDataDir, Shaders.shaderpacksdirname)).toURI()
|
||||
});
|
||||
var3.getMethod("browse", new Class[] { URI.class }).invoke(
|
||||
var4,
|
||||
new Object[] { (new File(mc.mcDataDir, Shaders.shaderpacksdirname)).toURI() });
|
||||
} catch (Throwable var5) {
|
||||
var5.printStackTrace();
|
||||
var8 = true;
|
||||
@@ -298,8 +310,7 @@ public class GuiShaders extends GuiScreen {
|
||||
File confshader = new File(Shaders.shadersdir, "current.cfg");
|
||||
try {
|
||||
Shaders.storeConfig();
|
||||
} catch (Exception ex) {
|
||||
}
|
||||
} catch (Exception ex) {}
|
||||
if (needReinit) {
|
||||
needReinit = false;
|
||||
Shaders.loadShaderPack();
|
||||
|
||||
@@ -1,10 +1,12 @@
|
||||
package com.gtnewhorizons.angelica.client;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
import net.minecraft.client.gui.GuiSlot;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
|
||||
class GuiSlotShaders extends GuiSlot {
|
||||
|
||||
private ArrayList shaderslist;
|
||||
|
||||
final GuiShaders shadersGui;
|
||||
@@ -70,6 +72,9 @@ class GuiSlotShaders extends GuiSlot {
|
||||
/** drawSlot */
|
||||
protected void drawSlot(int par1, int par2, int par3, int par4, Tessellator par5, int par6, int par7) {
|
||||
this.shadersGui.drawCenteredString(
|
||||
(String) this.shaderslist.get(par1), this.shadersGui.width / 4 + 10, par3 + 1, 0xffffff);
|
||||
(String) this.shaderslist.get(par1),
|
||||
this.shadersGui.width / 4 + 10,
|
||||
par3 + 1,
|
||||
0xffffff);
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,7 @@
|
||||
package com.gtnewhorizons.angelica.client;
|
||||
|
||||
import java.nio.ByteBuffer;
|
||||
|
||||
import org.lwjgl.BufferUtils;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
@@ -9,6 +10,7 @@ import org.lwjgl.opengl.GL11;
|
||||
* @author Nathanael Lane
|
||||
*/
|
||||
public class HFNoiseTexture {
|
||||
|
||||
public int texID;
|
||||
public int textureUnit;
|
||||
|
||||
@@ -24,7 +26,15 @@ public class HFNoiseTexture {
|
||||
// GL13.glActiveTexture(GL13.GL_TEXTURE0 + this.textureUnit);
|
||||
GL11.glBindTexture(GL11.GL_TEXTURE_2D, texID);
|
||||
GL11.glTexImage2D(
|
||||
GL11.GL_TEXTURE_2D, 0, GL11.GL_RGB, width, height, 0, GL11.GL_RGB, GL11.GL_UNSIGNED_BYTE, data);
|
||||
GL11.GL_TEXTURE_2D,
|
||||
0,
|
||||
GL11.GL_RGB,
|
||||
width,
|
||||
height,
|
||||
0,
|
||||
GL11.GL_RGB,
|
||||
GL11.GL_UNSIGNED_BYTE,
|
||||
data);
|
||||
GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_S, GL11.GL_REPEAT);
|
||||
GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_T, GL11.GL_REPEAT);
|
||||
GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, GL11.GL_LINEAR);
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package com.gtnewhorizons.angelica.client;
|
||||
|
||||
public class MultiTexID {
|
||||
|
||||
public int base;
|
||||
public int norm;
|
||||
public int spec;
|
||||
|
||||
@@ -23,8 +23,7 @@ public class ShaderPackFolder implements IShaderPack {
|
||||
if (resFile != null) {
|
||||
return new BufferedInputStream(new FileInputStream(resFile));
|
||||
}
|
||||
} catch (Exception excp) {
|
||||
}
|
||||
} catch (Exception excp) {}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@@ -20,8 +20,7 @@ public class ShaderPackZip implements IShaderPack {
|
||||
if (packZipFile != null) {
|
||||
try {
|
||||
packZipFile.close();
|
||||
} catch (Exception excp) {
|
||||
}
|
||||
} catch (Exception excp) {}
|
||||
packZipFile = null;
|
||||
}
|
||||
}
|
||||
@@ -31,8 +30,7 @@ public class ShaderPackZip implements IShaderPack {
|
||||
if (packZipFile == null) {
|
||||
try {
|
||||
packZipFile = new ZipFile(packFile);
|
||||
} catch (Exception excp) {
|
||||
}
|
||||
} catch (Exception excp) {}
|
||||
}
|
||||
if (packZipFile != null) {
|
||||
try {
|
||||
@@ -40,8 +38,7 @@ public class ShaderPackZip implements IShaderPack {
|
||||
if (entry != null) {
|
||||
return packZipFile.getInputStream(entry);
|
||||
}
|
||||
} catch (Exception excp) {
|
||||
}
|
||||
} catch (Exception excp) {}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large.
Load diff
@@ -1,6 +1,7 @@
|
||||
package com.gtnewhorizons.angelica.client;
|
||||
|
||||
import java.nio.IntBuffer;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockIce;
|
||||
import net.minecraft.client.renderer.EntityRenderer;
|
||||
@@ -10,6 +11,7 @@ import net.minecraft.client.renderer.WorldRenderer;
|
||||
import net.minecraft.client.renderer.culling.Frustrum;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemBlock;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
public class ShadersRender {
|
||||
|
||||
@@ -4,15 +4,18 @@ import static org.lwjgl.opengl.ARBVertexShader.glDisableVertexAttribArrayARB;
|
||||
import static org.lwjgl.opengl.ARBVertexShader.glEnableVertexAttribArrayARB;
|
||||
import static org.lwjgl.opengl.ARBVertexShader.glVertexAttribPointerARB;
|
||||
|
||||
import com.gtnewhorizons.angelica.transform.ALog;
|
||||
import java.nio.FloatBuffer;
|
||||
import java.nio.ShortBuffer;
|
||||
import java.util.Arrays;
|
||||
|
||||
import net.minecraft.client.renderer.OpenGlHelper;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import org.lwjgl.opengl.GL13;
|
||||
|
||||
import com.gtnewhorizons.angelica.transform.ALog;
|
||||
|
||||
public class ShadersTess {
|
||||
|
||||
public static final int vertexStride = 16;
|
||||
@@ -103,12 +106,21 @@ public class ShadersTess {
|
||||
}
|
||||
if (Shaders.useMidTexCoordAttrib && tess.hasTexture) {
|
||||
glVertexAttribPointerARB(
|
||||
Shaders.midTexCoordAttrib, 2, false, vertexStride * 4, (FloatBuffer) tess.floatBuffer.position(12));
|
||||
Shaders.midTexCoordAttrib,
|
||||
2,
|
||||
false,
|
||||
vertexStride * 4,
|
||||
(FloatBuffer) tess.floatBuffer.position(12));
|
||||
glEnableVertexAttribArrayARB(Shaders.midTexCoordAttrib);
|
||||
}
|
||||
if (Shaders.useEntityAttrib) {
|
||||
glVertexAttribPointerARB(Shaders.entityAttrib, 3, false, false, vertexStride * 4, (ShortBuffer)
|
||||
tess.shortBuffer.position(7 * 2));
|
||||
glVertexAttribPointerARB(
|
||||
Shaders.entityAttrib,
|
||||
3,
|
||||
false,
|
||||
false,
|
||||
vertexStride * 4,
|
||||
(ShortBuffer) tess.shortBuffer.position(7 * 2));
|
||||
glEnableVertexAttribArrayARB(Shaders.entityAttrib);
|
||||
}
|
||||
// Shaders.checkGLError("preDrawArray");
|
||||
@@ -158,7 +170,7 @@ public class ShadersTess {
|
||||
// Check if buffer is nearly full
|
||||
if (rbi >= tess.bufferSize - vertexStride * 4) {
|
||||
if (tess.bufferSize >= 0x1000000) {
|
||||
// Max size reached. Just draw.
|
||||
// Max size reached. Just draw.
|
||||
if (tess.addedVertices % 4 == 0) {
|
||||
tess.draw();
|
||||
tess.isDrawing = true;
|
||||
@@ -195,28 +207,26 @@ public class ShadersTess {
|
||||
float vnz = x1 * y2 - x2 * y1;
|
||||
float lensq = vnx * vnx + vny * vny + vnz * vnz;
|
||||
float mult = (lensq != 0.0) ? (float) (1f / Math.sqrt(lensq)) : 1f;
|
||||
rawBuffer[rbi + (9 - vertexStride * 3)] = rawBuffer[rbi + (9 - vertexStride * 2)] =
|
||||
rawBuffer[rbi + (9 - vertexStride * 1)] = Float.floatToRawIntBits(tess.normalX = vnx * mult);
|
||||
rawBuffer[rbi + (10 - vertexStride * 3)] = rawBuffer[rbi + (10 - vertexStride * 2)] =
|
||||
rawBuffer[rbi + (10 - vertexStride * 1)] = Float.floatToRawIntBits(tess.normalY = vny * mult);
|
||||
rawBuffer[rbi + (11 - vertexStride * 3)] = rawBuffer[rbi + (11 - vertexStride * 2)] =
|
||||
rawBuffer[rbi + (11 - vertexStride * 1)] = Float.floatToRawIntBits(tess.normalZ = vnz * mult);
|
||||
rawBuffer[rbi + (9 - vertexStride * 3)] = rawBuffer[rbi + (9 - vertexStride * 2)] = rawBuffer[rbi
|
||||
+ (9 - vertexStride * 1)] = Float.floatToRawIntBits(tess.normalX = vnx * mult);
|
||||
rawBuffer[rbi + (10 - vertexStride * 3)] = rawBuffer[rbi + (10 - vertexStride * 2)] = rawBuffer[rbi
|
||||
+ (10 - vertexStride * 1)] = Float.floatToRawIntBits(tess.normalY = vny * mult);
|
||||
rawBuffer[rbi + (11 - vertexStride * 3)] = rawBuffer[rbi + (11 - vertexStride * 2)] = rawBuffer[rbi
|
||||
+ (11 - vertexStride * 1)] = Float.floatToRawIntBits(tess.normalZ = vnz * mult);
|
||||
tess.hasNormals = true;
|
||||
// mid UV
|
||||
tess.midTextureU = (Float.intBitsToFloat(rawBuffer[rbi + (3 - vertexStride * 3)])
|
||||
+ Float.intBitsToFloat(rawBuffer[rbi + (3 - vertexStride * 2)])
|
||||
+ Float.intBitsToFloat(rawBuffer[rbi + (3 - vertexStride * 1)])
|
||||
+ (float) tess.textureU)
|
||||
/ 4;
|
||||
+ Float.intBitsToFloat(rawBuffer[rbi + (3 - vertexStride * 2)])
|
||||
+ Float.intBitsToFloat(rawBuffer[rbi + (3 - vertexStride * 1)])
|
||||
+ (float) tess.textureU) / 4;
|
||||
tess.midTextureV = (Float.intBitsToFloat(rawBuffer[rbi + (4 - vertexStride * 3)])
|
||||
+ Float.intBitsToFloat(rawBuffer[rbi + (4 - vertexStride * 2)])
|
||||
+ Float.intBitsToFloat(rawBuffer[rbi + (4 - vertexStride * 1)])
|
||||
+ (float) tess.textureV)
|
||||
/ 4;
|
||||
rawBuffer[rbi + (12 - vertexStride * 3)] = rawBuffer[rbi + (12 - vertexStride * 2)] =
|
||||
rawBuffer[rbi + (12 - vertexStride * 1)] = Float.floatToRawIntBits(tess.midTextureU);
|
||||
rawBuffer[rbi + (13 - vertexStride * 3)] = rawBuffer[rbi + (13 - vertexStride * 2)] =
|
||||
rawBuffer[rbi + (13 - vertexStride * 1)] = Float.floatToRawIntBits(tess.midTextureV);
|
||||
+ Float.intBitsToFloat(rawBuffer[rbi + (4 - vertexStride * 2)])
|
||||
+ Float.intBitsToFloat(rawBuffer[rbi + (4 - vertexStride * 1)])
|
||||
+ (float) tess.textureV) / 4;
|
||||
rawBuffer[rbi + (12 - vertexStride * 3)] = rawBuffer[rbi + (12 - vertexStride * 2)] = rawBuffer[rbi
|
||||
+ (12 - vertexStride * 1)] = Float.floatToRawIntBits(tess.midTextureU);
|
||||
rawBuffer[rbi + (13 - vertexStride * 3)] = rawBuffer[rbi + (13 - vertexStride * 2)] = rawBuffer[rbi
|
||||
+ (13 - vertexStride * 1)] = Float.floatToRawIntBits(tess.midTextureV);
|
||||
}
|
||||
}
|
||||
// end normal and mid UV calculation
|
||||
|
||||
@@ -10,7 +10,9 @@ import java.util.HashMap;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.imageio.ImageIO;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.texture.AbstractTexture;
|
||||
import net.minecraft.client.renderer.texture.DynamicTexture;
|
||||
@@ -24,6 +26,7 @@ import net.minecraft.client.renderer.texture.TextureUtil;
|
||||
import net.minecraft.client.resources.IResource;
|
||||
import net.minecraft.client.resources.IResourceManager;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
import org.lwjgl.BufferUtils;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import org.lwjgl.opengl.GL12;
|
||||
@@ -31,6 +34,7 @@ import org.lwjgl.opengl.GL13;
|
||||
import org.lwjgl.opengl.GL30.*;
|
||||
|
||||
public class ShadersTex {
|
||||
|
||||
public static final int initialBufferSize = 1048576;
|
||||
public static ByteBuffer byteBuffer = BufferUtils.createByteBuffer(initialBufferSize * 4);
|
||||
public static IntBuffer intBuffer = byteBuffer.asIntBuffer();
|
||||
@@ -205,7 +209,7 @@ public class ShadersTex {
|
||||
public static void allocTexStorage(int width, int height, int maxLevel) {
|
||||
Shaders.checkGLError("pre allocTexStorage");
|
||||
int level;
|
||||
for (level = 0; (width >> level) > 0 && (height >> level) > 0 /*&& level<=maxLevel*/; ++level) {
|
||||
for (level = 0; (width >> level) > 0 && (height >> level) > 0 /* && level<=maxLevel */; ++level) {
|
||||
GL11.glTexImage2D(
|
||||
GL11.GL_TEXTURE_2D,
|
||||
level,
|
||||
@@ -221,7 +225,7 @@ public class ShadersTex {
|
||||
Shaders.checkGLError("allocTexStorage");
|
||||
// clear unused level otherwise glTexSubImage2D will crash on AMD when reallocation texture of different size.
|
||||
// for ( ; level < 16 ; ++level) {
|
||||
// GL11.glTexImage2D(GL11.GL_TEXTURE_2D, level, GL11.GL_RGBA, 0, 0, 0, GL12.GL_BGRA,
|
||||
// GL11.glTexImage2D(GL11.GL_TEXTURE_2D, level, GL11.GL_RGBA, 0, 0, 0, GL12.GL_BGRA,
|
||||
// GL12.GL_UNSIGNED_INT_8_8_8_8_REV, (IntBuffer)null);
|
||||
// }
|
||||
GL11.glGetError(); // It usually returns error 0x0501 Invalid value for width 0 height 0. Ignore it.
|
||||
@@ -273,10 +277,11 @@ public class ShadersTex {
|
||||
}
|
||||
|
||||
// for TextureMap
|
||||
public static void allocateTextureMap(
|
||||
int texID, int mipmapLevels, int width, int height, float anisotropy, Stitcher stitcher, TextureMap tex) {
|
||||
System.out.println("allocateTextureMap " + tex.getTextureType() + " " + mipmapLevels + " " + width + " "
|
||||
+ height + " " + anisotropy + " ");
|
||||
public static void allocateTextureMap(int texID, int mipmapLevels, int width, int height, float anisotropy,
|
||||
Stitcher stitcher, TextureMap tex) {
|
||||
System.out.println(
|
||||
"allocateTextureMap " + tex
|
||||
.getTextureType() + " " + mipmapLevels + " " + width + " " + height + " " + anisotropy + " ");
|
||||
updatingTextureMap = tex;
|
||||
tex.atlasWidth = width;
|
||||
tex.atlasHeight = height;
|
||||
@@ -298,8 +303,8 @@ public class ShadersTex {
|
||||
return iconName = name;
|
||||
}
|
||||
|
||||
public static void uploadTexSubForLoadAtlas(
|
||||
int[][] data, int width, int height, int xoffset, int yoffset, boolean linear, boolean clamp) {
|
||||
public static void uploadTexSubForLoadAtlas(int[][] data, int width, int height, int xoffset, int yoffset,
|
||||
boolean linear, boolean clamp) {
|
||||
TextureUtil.uploadTextureMipmap(data, width, height, xoffset, yoffset, linear, clamp);
|
||||
boolean border = updatingSprite.useAnisotropicFiltering;
|
||||
int[][] aaint;
|
||||
@@ -319,8 +324,8 @@ public class ShadersTex {
|
||||
GL11.glBindTexture(GL11.GL_TEXTURE_2D, updatingTex.base);
|
||||
}
|
||||
|
||||
public static int[][] readImageAndMipmaps(
|
||||
String name, int width, int height, int numLevels, boolean border, int defColor) {
|
||||
public static int[][] readImageAndMipmaps(String name, int width, int height, int numLevels, boolean border,
|
||||
int defColor) {
|
||||
int[][] aaint = new int[numLevels][];
|
||||
int[] aint;
|
||||
aaint[0] = aint = new int[width * height];
|
||||
@@ -350,13 +355,11 @@ public class ShadersTex {
|
||||
try {
|
||||
istr = resManager.getResource(resLoc).getInputStream();
|
||||
image = ImageIO.read(istr);
|
||||
} catch (IOException e) {
|
||||
}
|
||||
} catch (IOException e) {}
|
||||
if (istr != null) {
|
||||
try {
|
||||
istr.close();
|
||||
} catch (IOException e) {
|
||||
}
|
||||
} catch (IOException e) {}
|
||||
istr = null;
|
||||
}
|
||||
}
|
||||
@@ -375,8 +378,11 @@ public class ShadersTex {
|
||||
for (y = 0; y < cw; ++y) {
|
||||
for (x = 0; x < cw; ++x) {
|
||||
int ppos = y * 2 * pw + x * 2;
|
||||
aintc[y * cw + x] =
|
||||
blend4Simple(aintp[ppos], aintp[ppos + 1], aintp[ppos + pw], aintp[ppos + pw + 1]);
|
||||
aintc[y * cw + x] = blend4Simple(
|
||||
aintp[ppos],
|
||||
aintp[ppos + 1],
|
||||
aintp[ppos + pw],
|
||||
aintp[ppos + pw + 1]);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -384,8 +390,8 @@ public class ShadersTex {
|
||||
return data;
|
||||
}
|
||||
|
||||
public static void uploadTexSub(
|
||||
int[][] data, int width, int height, int xoffset, int yoffset, boolean linear, boolean clamp) {
|
||||
public static void uploadTexSub(int[][] data, int width, int height, int xoffset, int yoffset, boolean linear,
|
||||
boolean clamp) {
|
||||
TextureUtil.uploadTextureMipmap(data, width, height, xoffset, yoffset, linear, clamp);
|
||||
}
|
||||
|
||||
@@ -405,35 +411,26 @@ public class ShadersTex {
|
||||
a3 = a2 = a1 = a0 = 1;
|
||||
}
|
||||
int frac = (dv + 1) / 2;
|
||||
// return (((Math.min(Math.min(Math.min(a0,a1),a2),a3)/ 4) << 24) |
|
||||
// return (((Math.min(Math.min(Math.min(a0,a1),a2),a3)/ 4) << 24) |
|
||||
int color = (an << 24)
|
||||
| (((((c0 >>> 16) & 255) * a0
|
||||
+ ((c1 >>> 16) & 255) * a1
|
||||
+ ((c2 >>> 16) & 255) * a2
|
||||
+ ((c3 >>> 16) & 255) * a3
|
||||
+ frac)
|
||||
/ dv)
|
||||
<< 16)
|
||||
| (((((c0 >>> 8) & 255) * a0
|
||||
+ ((c1 >>> 8) & 255) * a1
|
||||
+ ((c2 >>> 8) & 255) * a2
|
||||
+ ((c3 >>> 8) & 255) * a3
|
||||
+ frac)
|
||||
/ dv)
|
||||
<< 8)
|
||||
| (((((c0 >>> 0) & 255) * a0
|
||||
+ ((c1 >>> 0) & 255) * a1
|
||||
+ ((c2 >>> 0) & 255) * a2
|
||||
+ ((c3 >>> 0) & 255) * a3
|
||||
+ frac)
|
||||
/ dv)
|
||||
<< 0);
|
||||
| (((((c0 >>> 16) & 255) * a0 + ((c1 >>> 16) & 255) * a1
|
||||
+ ((c2 >>> 16) & 255) * a2
|
||||
+ ((c3 >>> 16) & 255) * a3
|
||||
+ frac) / dv) << 16)
|
||||
| (((((c0 >>> 8) & 255) * a0 + ((c1 >>> 8) & 255) * a1
|
||||
+ ((c2 >>> 8) & 255) * a2
|
||||
+ ((c3 >>> 8) & 255) * a3
|
||||
+ frac) / dv) << 8)
|
||||
| (((((c0 >>> 0) & 255) * a0 + ((c1 >>> 0) & 255) * a1
|
||||
+ ((c2 >>> 0) & 255) * a2
|
||||
+ ((c3 >>> 0) & 255) * a3
|
||||
+ frac) / dv) << 0);
|
||||
return color;
|
||||
}
|
||||
|
||||
public static int blend4Simple(int c0, int c1, int c2, int c3) {
|
||||
int color = (((((c0 >>> 24) & 255) + ((c1 >>> 24) & 255) + ((c2 >>> 24) & 255) + ((c3 >>> 24) & 255) + 2) / 4)
|
||||
<< 24)
|
||||
<< 24)
|
||||
| (((((c0 >>> 16) & 255) + ((c1 >>> 16) & 255) + ((c2 >>> 16) & 255) + ((c3 >>> 16) & 255) + 2) / 4)
|
||||
<< 16)
|
||||
| (((((c0 >>> 8) & 255) + ((c1 >>> 8) & 255) + ((c2 >>> 8) & 255) + ((c3 >>> 8) & 255) + 2) / 4) << 8)
|
||||
@@ -566,17 +563,25 @@ public class ShadersTex {
|
||||
Arrays.fill(aint, color);
|
||||
}
|
||||
//
|
||||
// if (page == 0)
|
||||
// if (page == 0)
|
||||
genMipmapAlpha(aint, 0, width, height);
|
||||
// else
|
||||
// genMipmapSimple(aint,0,width,height);
|
||||
// else
|
||||
// genMipmapSimple(aint,0,width,height);
|
||||
//
|
||||
for (int level = 0, offset = 0, lw = width, lh = height, px = posX, py = posY; lw > 0 && lh > 0; ++level) {
|
||||
int lsize = lw * lh;
|
||||
intBuf.clear();
|
||||
intBuf.put(aint, offset, lsize).position(0).limit(lsize);
|
||||
GL11.glTexSubImage2D(
|
||||
GL11.GL_TEXTURE_2D, level, px, py, lw, lh, GL12.GL_BGRA, GL12.GL_UNSIGNED_INT_8_8_8_8_REV, intBuf);
|
||||
GL11.GL_TEXTURE_2D,
|
||||
level,
|
||||
px,
|
||||
py,
|
||||
lw,
|
||||
lh,
|
||||
GL12.GL_BGRA,
|
||||
GL12.GL_UNSIGNED_INT_8_8_8_8_REV,
|
||||
intBuf);
|
||||
offset += lsize;
|
||||
lw /= 2;
|
||||
lh /= 2;
|
||||
@@ -592,9 +597,8 @@ public class ShadersTex {
|
||||
int ch;
|
||||
int cx;
|
||||
int cy;
|
||||
for (level = 0, cw = width, ch = height, cx = posX, cy = posY;
|
||||
cw > 0 && ch > 0;
|
||||
++level, cw /= 2, ch /= 2, cx /= 2, cy /= 2) {
|
||||
for (level = 0, cw = width, ch = height, cx = posX, cy = posY; cw > 0
|
||||
&& ch > 0; ++level, cw /= 2, ch /= 2, cx /= 2, cy /= 2) {
|
||||
GL11.glCopyTexSubImage2D(GL11.GL_TEXTURE_2D, level, cx, cy, 0, 0, cw, ch);
|
||||
}
|
||||
}
|
||||
@@ -605,17 +609,20 @@ public class ShadersTex {
|
||||
IntBuffer intBuf = getIntBuffer(size);
|
||||
int numLevel = src.length;
|
||||
for (int level = 0, // offset=0,
|
||||
lw = width,
|
||||
lh = height,
|
||||
px = posX,
|
||||
py = posY;
|
||||
lw > 0 && lh > 0 && level < numLevel;
|
||||
++level) {
|
||||
lw = width, lh = height, px = posX, py = posY; lw > 0 && lh > 0 && level < numLevel; ++level) {
|
||||
int lsize = lw * lh;
|
||||
intBuf.clear();
|
||||
intBuf.put(src[level], 0 /*offset*/, lsize).position(0).limit(lsize);
|
||||
intBuf.put(src[level], 0 /* offset */, lsize).position(0).limit(lsize);
|
||||
GL11.glTexSubImage2D(
|
||||
GL11.GL_TEXTURE_2D, level, px, py, lw, lh, GL12.GL_BGRA, GL12.GL_UNSIGNED_INT_8_8_8_8_REV, intBuf);
|
||||
GL11.GL_TEXTURE_2D,
|
||||
level,
|
||||
px,
|
||||
py,
|
||||
lw,
|
||||
lh,
|
||||
GL12.GL_BGRA,
|
||||
GL12.GL_UNSIGNED_INT_8_8_8_8_REV,
|
||||
intBuf);
|
||||
// offset += lsize;
|
||||
lw /= 2;
|
||||
lh /= 2;
|
||||
@@ -627,14 +634,11 @@ public class ShadersTex {
|
||||
|
||||
public static void setupTextureMipmap(TextureMap tex) {
|
||||
/*
|
||||
MultiTexID multiTex = tex.getMultiTexID();
|
||||
GL11.glBindTexture(GL11.GL_TEXTURE_2D, multiTex.norm);
|
||||
GL30.glGenerateMipmap(GL11.GL_TEXTURE_2D);
|
||||
GL11.glBindTexture(GL11.GL_TEXTURE_2D, multiTex.spec);
|
||||
GL30.glGenerateMipmap(GL11.GL_TEXTURE_2D);
|
||||
GL11.glBindTexture(GL11.GL_TEXTURE_2D, multiTex.base);
|
||||
GL30.glGenerateMipmap(GL11.GL_TEXTURE_2D);
|
||||
*/
|
||||
* MultiTexID multiTex = tex.getMultiTexID(); GL11.glBindTexture(GL11.GL_TEXTURE_2D, multiTex.norm);
|
||||
* GL30.glGenerateMipmap(GL11.GL_TEXTURE_2D); GL11.glBindTexture(GL11.GL_TEXTURE_2D, multiTex.spec);
|
||||
* GL30.glGenerateMipmap(GL11.GL_TEXTURE_2D); GL11.glBindTexture(GL11.GL_TEXTURE_2D, multiTex.base);
|
||||
* GL30.glGenerateMipmap(GL11.GL_TEXTURE_2D);
|
||||
*/
|
||||
}
|
||||
|
||||
public static void updateDynamicTexture(int texID, int[] src, int width, int height, DynamicTexture tex) {
|
||||
@@ -647,8 +651,8 @@ public class ShadersTex {
|
||||
updateSubImage1(src, width, height, 0, 0, 0, defBaseTexColor);
|
||||
}
|
||||
|
||||
public static void updateSubImage(
|
||||
int[] src, int width, int height, int posX, int posY, boolean linear, boolean clamp) {
|
||||
public static void updateSubImage(int[] src, int width, int height, int posX, int posY, boolean linear,
|
||||
boolean clamp) {
|
||||
if (updatingTex != null) {
|
||||
GL11.glBindTexture(GL11.GL_TEXTURE_2D, updatingTex.norm);
|
||||
updateSubImage1(src, width, height, posX, posY, 1, defNormTexColor);
|
||||
@@ -664,24 +668,24 @@ public class ShadersTex {
|
||||
Iterator<TextureAtlasSprite> iterator;
|
||||
MultiTexID multiTex = tex.getMultiTexID();
|
||||
GL11.glBindTexture(GL11.GL_TEXTURE_2D, multiTex.norm);
|
||||
for (iterator = tasList.iterator(); iterator.hasNext(); ) {
|
||||
for (iterator = tasList.iterator(); iterator.hasNext();) {
|
||||
TextureAtlasSprite tas = iterator.next();
|
||||
tas.updateAnimation();
|
||||
}
|
||||
GL11.glBindTexture(GL11.GL_TEXTURE_2D, multiTex.norm);
|
||||
for (iterator = tasList.iterator(); iterator.hasNext(); ) {
|
||||
for (iterator = tasList.iterator(); iterator.hasNext();) {
|
||||
TextureAtlasSprite tas = iterator.next();
|
||||
tas.updateAnimation();
|
||||
}
|
||||
GL11.glBindTexture(GL11.GL_TEXTURE_2D, multiTex.norm);
|
||||
for (iterator = tasList.iterator(); iterator.hasNext(); ) {
|
||||
for (iterator = tasList.iterator(); iterator.hasNext();) {
|
||||
TextureAtlasSprite tas = iterator.next();
|
||||
tas.updateAnimation();
|
||||
}
|
||||
}
|
||||
|
||||
public static void setupTexture(
|
||||
MultiTexID multiTex, int[] src, int width, int height, boolean linear, boolean clamp) {
|
||||
public static void setupTexture(MultiTexID multiTex, int[] src, int width, int height, boolean linear,
|
||||
boolean clamp) {
|
||||
int mmfilter = linear ? GL11.GL_LINEAR : GL11.GL_NEAREST;
|
||||
int wraptype = clamp ? GL11.GL_CLAMP : GL11.GL_REPEAT;
|
||||
int size = width * height;
|
||||
@@ -743,8 +747,8 @@ public class ShadersTex {
|
||||
}
|
||||
|
||||
/* currently not used */
|
||||
public static void updateSubImage(
|
||||
MultiTexID multiTex, int[] src, int width, int height, int posX, int posY, boolean linear, boolean clamp) {
|
||||
public static void updateSubImage(MultiTexID multiTex, int[] src, int width, int height, int posX, int posY,
|
||||
boolean linear, boolean clamp) {
|
||||
int size = width * height;
|
||||
IntBuffer intBuf = getIntBuffer(size);
|
||||
//
|
||||
@@ -816,24 +820,28 @@ public class ShadersTex {
|
||||
return new ResourceLocation(location.getResourceDomain(), basenameNoFileType + "_" + mapName + ".png");
|
||||
}
|
||||
|
||||
public static void loadNSMap(
|
||||
IResourceManager manager, ResourceLocation location, int width, int height, int[] aint) {
|
||||
if (Shaders.configNormalMap)
|
||||
ShadersTex.loadNSMap1(
|
||||
manager, getNSMapLocation(location, "n"), width, height, aint, width * height, defNormTexColor);
|
||||
if (Shaders.configSpecularMap)
|
||||
ShadersTex.loadNSMap1(
|
||||
manager, getNSMapLocation(location, "s"), width, height, aint, width * height * 2, defSpecTexColor);
|
||||
public static void loadNSMap(IResourceManager manager, ResourceLocation location, int width, int height,
|
||||
int[] aint) {
|
||||
if (Shaders.configNormalMap) ShadersTex.loadNSMap1(
|
||||
manager,
|
||||
getNSMapLocation(location, "n"),
|
||||
width,
|
||||
height,
|
||||
aint,
|
||||
width * height,
|
||||
defNormTexColor);
|
||||
if (Shaders.configSpecularMap) ShadersTex.loadNSMap1(
|
||||
manager,
|
||||
getNSMapLocation(location, "s"),
|
||||
width,
|
||||
height,
|
||||
aint,
|
||||
width * height * 2,
|
||||
defSpecTexColor);
|
||||
}
|
||||
|
||||
public static void loadNSMap1(
|
||||
IResourceManager manager,
|
||||
ResourceLocation location,
|
||||
int width,
|
||||
int height,
|
||||
int[] aint,
|
||||
int offset,
|
||||
int defaultColor) {
|
||||
public static void loadNSMap1(IResourceManager manager, ResourceLocation location, int width, int height,
|
||||
int[] aint, int offset, int defaultColor) {
|
||||
boolean good = false;
|
||||
try {
|
||||
IResource res = manager.getResource(location);
|
||||
@@ -842,25 +850,19 @@ public class ShadersTex {
|
||||
bufferedimage.getRGB(0, 0, width, height, aint, offset, width);
|
||||
good = true;
|
||||
}
|
||||
} catch (IOException ex) {
|
||||
}
|
||||
} catch (IOException ex) {}
|
||||
if (!good) {
|
||||
java.util.Arrays.fill(aint, offset, offset + width * height, defaultColor);
|
||||
}
|
||||
}
|
||||
|
||||
/** init and upload from BufferedImage */
|
||||
/* Replacement for TextureUtil.func_110989_a call in SimpleTexture.func_110551_a.
|
||||
Keep par0...par5 the same as func_110989_a for easy patching.
|
||||
More parameters added for reading N-S-Map. */
|
||||
public static int loadSimpleTexture(
|
||||
int textureID,
|
||||
BufferedImage bufferedimage,
|
||||
boolean linear,
|
||||
boolean clamp,
|
||||
IResourceManager resourceManager,
|
||||
ResourceLocation location,
|
||||
MultiTexID multiTex) {
|
||||
/*
|
||||
* Replacement for TextureUtil.func_110989_a call in SimpleTexture.func_110551_a. Keep par0...par5 the same as
|
||||
* func_110989_a for easy patching. More parameters added for reading N-S-Map.
|
||||
*/
|
||||
public static int loadSimpleTexture(int textureID, BufferedImage bufferedimage, boolean linear, boolean clamp,
|
||||
IResourceManager resourceManager, ResourceLocation location, MultiTexID multiTex) {
|
||||
int width = bufferedimage.getWidth();
|
||||
int height = bufferedimage.getHeight();
|
||||
int size = width * height;
|
||||
@@ -887,7 +889,7 @@ public class ShadersTex {
|
||||
int size = 0;
|
||||
int[] image = null;
|
||||
Iterator<String> iterator;
|
||||
for (iterator = list.iterator(); iterator.hasNext(); ) {
|
||||
for (iterator = list.iterator(); iterator.hasNext();) {
|
||||
String s = iterator.next();
|
||||
if (s != null) {
|
||||
try {
|
||||
@@ -929,22 +931,34 @@ public class ShadersTex {
|
||||
// base texture
|
||||
GL11.glBindTexture(GL11.GL_TEXTURE_2D, multiTex.base);
|
||||
GL11.glTexParameteri(
|
||||
GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, Shaders.texMinFilValue[Shaders.configTexMinFilB]);
|
||||
GL11.GL_TEXTURE_2D,
|
||||
GL11.GL_TEXTURE_MIN_FILTER,
|
||||
Shaders.texMinFilValue[Shaders.configTexMinFilB]);
|
||||
GL11.glTexParameteri(
|
||||
GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, Shaders.texMagFilValue[Shaders.configTexMagFilB]);
|
||||
GL11.GL_TEXTURE_2D,
|
||||
GL11.GL_TEXTURE_MAG_FILTER,
|
||||
Shaders.texMagFilValue[Shaders.configTexMagFilB]);
|
||||
// norm texture
|
||||
GL11.glBindTexture(GL11.GL_TEXTURE_2D, multiTex.norm);
|
||||
GL11.glTexParameteri(
|
||||
GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, Shaders.texMinFilValue[Shaders.configTexMinFilN]);
|
||||
GL11.GL_TEXTURE_2D,
|
||||
GL11.GL_TEXTURE_MIN_FILTER,
|
||||
Shaders.texMinFilValue[Shaders.configTexMinFilN]);
|
||||
GL11.glTexParameteri(
|
||||
GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, Shaders.texMagFilValue[Shaders.configTexMagFilN]);
|
||||
GL11.GL_TEXTURE_2D,
|
||||
GL11.GL_TEXTURE_MAG_FILTER,
|
||||
Shaders.texMagFilValue[Shaders.configTexMagFilN]);
|
||||
|
||||
// spec texture
|
||||
GL11.glBindTexture(GL11.GL_TEXTURE_2D, multiTex.spec);
|
||||
GL11.glTexParameteri(
|
||||
GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, Shaders.texMinFilValue[Shaders.configTexMinFilS]);
|
||||
GL11.GL_TEXTURE_2D,
|
||||
GL11.GL_TEXTURE_MIN_FILTER,
|
||||
Shaders.texMinFilValue[Shaders.configTexMinFilS]);
|
||||
GL11.glTexParameteri(
|
||||
GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, Shaders.texMagFilValue[Shaders.configTexMagFilS]);
|
||||
GL11.GL_TEXTURE_2D,
|
||||
GL11.GL_TEXTURE_MAG_FILTER,
|
||||
Shaders.texMagFilValue[Shaders.configTexMagFilS]);
|
||||
|
||||
GL11.glBindTexture(GL11.GL_TEXTURE_2D, 0);
|
||||
}
|
||||
@@ -960,8 +974,8 @@ public class ShadersTex {
|
||||
return manager.getResource(location);
|
||||
}
|
||||
|
||||
public static int[] loadAtlasSprite(
|
||||
BufferedImage bufferedimage, int startX, int startY, int w, int h, int[] aint, int offset, int scansize) {
|
||||
public static int[] loadAtlasSprite(BufferedImage bufferedimage, int startX, int startY, int w, int h, int[] aint,
|
||||
int offset, int scansize) {
|
||||
imageSize = w * h;
|
||||
bufferedimage.getRGB(startX, startY, w, h, aint, offset, scansize);
|
||||
loadNSMap(resManager, resLocation, w, h, aint);
|
||||
|
||||
@@ -3,11 +3,13 @@ package com.gtnewhorizons.angelica.loading;
|
||||
import java.io.File;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.launchwrapper.ITweaker;
|
||||
import net.minecraft.launchwrapper.Launch;
|
||||
import net.minecraft.launchwrapper.LaunchClassLoader;
|
||||
|
||||
public class ATweaker implements ITweaker {
|
||||
|
||||
public List<String> args;
|
||||
public File gameDir;
|
||||
public File assetsDir;
|
||||
|
||||
@@ -3,6 +3,7 @@ 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;
|
||||
@@ -22,6 +23,7 @@ public class ACTBlock implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class CVTransform extends ClassVisitor {
|
||||
|
||||
String classname;
|
||||
|
||||
public CVTransform(ClassVisitor cv) {
|
||||
@@ -29,8 +31,8 @@ public class ACTBlock implements IClassTransformer {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void visit(
|
||||
int version, int access, String name, String signature, String superName, String[] interfaces) {
|
||||
public void visit(int version, int access, String name, String signature, String superName,
|
||||
String[] interfaces) {
|
||||
this.classname = name;
|
||||
// SMCLog.info(" class %s",name);
|
||||
super.visit(version, access, name, signature, superName, interfaces);
|
||||
@@ -39,7 +41,7 @@ public class ACTBlock implements IClassTransformer {
|
||||
@Override
|
||||
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
|
||||
if (Names.block_getAoLight.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.info(" patching");
|
||||
// SMCLog.info(" patching");
|
||||
return new MVgetAoLight(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
}
|
||||
return cv.visitMethod(access, name, desc, signature, exceptions);
|
||||
@@ -47,6 +49,7 @@ public class ACTBlock implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class MVgetAoLight extends MethodVisitor {
|
||||
|
||||
public MVgetAoLight(MethodVisitor mv) {
|
||||
super(Opcodes.ASM4, mv);
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@ 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;
|
||||
@@ -24,6 +25,7 @@ public class ACTEntityRenderer implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class CVTransform extends ClassVisitor {
|
||||
|
||||
String classname;
|
||||
|
||||
public CVTransform(ClassVisitor cv) {
|
||||
@@ -31,8 +33,8 @@ public class ACTEntityRenderer implements IClassTransformer {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void visit(
|
||||
int version, int access, String name, String signature, String superName, String[] interfaces) {
|
||||
public void visit(int version, int access, String name, String signature, String superName,
|
||||
String[] interfaces) {
|
||||
classname = name;
|
||||
// SMCLog.info(" class %s",name);
|
||||
cv.visit(version, access, name, signature, superName, interfaces);
|
||||
@@ -71,6 +73,7 @@ public class ACTEntityRenderer implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class MVdisableLightmap extends MethodVisitor {
|
||||
|
||||
public MVdisableLightmap(MethodVisitor mv) {
|
||||
super(Opcodes.ASM4, mv);
|
||||
}
|
||||
@@ -85,6 +88,7 @@ public class ACTEntityRenderer implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class MVenableLightmap extends MethodVisitor {
|
||||
|
||||
public MVenableLightmap(MethodVisitor mv) {
|
||||
super(Opcodes.ASM4, mv);
|
||||
}
|
||||
@@ -99,6 +103,7 @@ public class ACTEntityRenderer implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class MVupdateFogColor extends MethodVisitor {
|
||||
|
||||
public MVupdateFogColor(MethodVisitor mv) {
|
||||
super(Opcodes.ASM4, mv);
|
||||
}
|
||||
@@ -107,7 +112,10 @@ public class ACTEntityRenderer implements IClassTransformer {
|
||||
public void visitMethodInsn(int opcode, String owner, String name, String desc) {
|
||||
if (Names.equals("org/lwjgl/opengl/GL11", "glClearColor", "(FFFF)V", owner, name, desc)) {
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "setClearColor", "(FFFF)V");
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"setClearColor",
|
||||
"(FFFF)V");
|
||||
return;
|
||||
}
|
||||
mv.visitMethodInsn(opcode, owner, name, desc);
|
||||
@@ -115,6 +123,7 @@ public class ACTEntityRenderer implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class MVsetFogColorBuffer extends MethodVisitor {
|
||||
|
||||
public MVsetFogColorBuffer(MethodVisitor mv) {
|
||||
super(Opcodes.ASM4, mv);
|
||||
}
|
||||
@@ -130,6 +139,7 @@ public class ACTEntityRenderer implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class MVsetupFog extends MethodVisitor {
|
||||
|
||||
public MVsetupFog(MethodVisitor mv) {
|
||||
super(Opcodes.ASM4, mv);
|
||||
}
|
||||
@@ -145,6 +155,7 @@ public class ACTEntityRenderer implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class MVrenderCloudsCheck extends MethodVisitor {
|
||||
|
||||
public MVrenderCloudsCheck(MethodVisitor mv) {
|
||||
super(Opcodes.ASM4, mv);
|
||||
}
|
||||
@@ -169,6 +180,7 @@ public class ACTEntityRenderer implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class MVrenderHand extends MethodVisitor {
|
||||
|
||||
Label la1, la2;
|
||||
|
||||
public MVrenderHand(MethodVisitor mv) {
|
||||
@@ -219,6 +231,7 @@ public class ACTEntityRenderer implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class MVrenderWorld extends MethodVisitor {
|
||||
|
||||
public MVrenderWorld(MethodVisitor mv) {
|
||||
super(Opcodes.ASM4, mv);
|
||||
}
|
||||
@@ -235,7 +248,10 @@ public class ACTEntityRenderer implements IClassTransformer {
|
||||
mv.visitCode();
|
||||
mv.visitVarInsn(ALOAD, 0);
|
||||
mv.visitFieldInsn(
|
||||
GETFIELD, Names.entityRenderer_mc.clas, Names.entityRenderer_mc.name, Names.entityRenderer_mc.desc);
|
||||
GETFIELD,
|
||||
Names.entityRenderer_mc.clas,
|
||||
Names.entityRenderer_mc.name,
|
||||
Names.entityRenderer_mc.desc);
|
||||
mv.visitVarInsn(FLOAD, 1);
|
||||
mv.visitVarInsn(LLOAD, 2);
|
||||
mv.visitMethodInsn(
|
||||
@@ -249,7 +265,7 @@ public class ACTEntityRenderer implements IClassTransformer {
|
||||
public void visitLdcInsn(Object cst) {
|
||||
if (cst instanceof String) {
|
||||
String scst = (String) cst;
|
||||
// SMCLog.finest(" %d Ldc %s", state, scst);
|
||||
// SMCLog.finest(" %d Ldc %s", state, scst);
|
||||
section = scst;
|
||||
}
|
||||
mv.visitLdcInsn(cst);
|
||||
@@ -257,23 +273,23 @@ public class ACTEntityRenderer implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public void visitIntInsn(int opcode, int operand) {
|
||||
// SMCLog.finest(" %d Int %d %d", state ,opcode, operand);
|
||||
// SMCLog.finest(" %d Int %d %d", state ,opcode, operand);
|
||||
// switch (state) {
|
||||
// case 23:
|
||||
// case 25:
|
||||
// if (opcode == SIPUSH && operand == 256) {
|
||||
// state = 26;
|
||||
// mv.visitInsn(ICONST_0);
|
||||
// return;
|
||||
// }
|
||||
// break;
|
||||
// if (opcode == SIPUSH && operand == 256) {
|
||||
// state = 26;
|
||||
// mv.visitInsn(ICONST_0);
|
||||
// return;
|
||||
// }
|
||||
// break;
|
||||
// }
|
||||
mv.visitIntInsn(opcode, operand);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void visitJumpInsn(int opcode, Label label) {
|
||||
// SMCLog.finest(" %d, Jump %d", state, opcode);
|
||||
// SMCLog.finest(" %d, Jump %d", state, opcode);
|
||||
switch (state) {
|
||||
case 4:
|
||||
if (opcode == IF_ICMPLT) {
|
||||
@@ -291,7 +307,10 @@ public class ACTEntityRenderer implements IClassTransformer {
|
||||
labelEndUpdate = new Label();
|
||||
mv.visitJumpInsn(opcode, label);
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "beginUpdateChunks", "()V");
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"beginUpdateChunks",
|
||||
"()V");
|
||||
return;
|
||||
}
|
||||
break;
|
||||
@@ -307,17 +326,17 @@ public class ACTEntityRenderer implements IClassTransformer {
|
||||
mv.visitJumpInsn(opcode, label);
|
||||
mv.visitFieldInsn(GETSTATIC, "com/gtnewhorizons/angelica/client/Shaders", "isShadowPass", "Z");
|
||||
mv.visitJumpInsn(IFNE, label);
|
||||
// mv.visitMethodInsn(INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders",
|
||||
// mv.visitMethodInsn(INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders",
|
||||
// "readCenterDepth",
|
||||
// "()V");
|
||||
// mv.visitMethodInsn(INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders",
|
||||
// mv.visitMethodInsn(INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders",
|
||||
// "beginHand", "()V");
|
||||
// mv.visitVarInsn(ALOAD, 0);
|
||||
// mv.visitVarInsn(FLOAD, 1);
|
||||
// mv.visitVarInsn(ILOAD, 13);
|
||||
// mv.visitMethodInsn(INVOKESPECIAL, Names.EntityRenderer_, Names.EntityRenderer_renderHand,
|
||||
// mv.visitVarInsn(ALOAD, 0);
|
||||
// mv.visitVarInsn(FLOAD, 1);
|
||||
// mv.visitVarInsn(ILOAD, 13);
|
||||
// mv.visitMethodInsn(INVOKESPECIAL, Names.EntityRenderer_, Names.EntityRenderer_renderHand,
|
||||
// Names.EntityRenderer_renderHand_desc);
|
||||
// mv.visitMethodInsn(INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "endHand",
|
||||
// mv.visitMethodInsn(INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "endHand",
|
||||
// "()V");
|
||||
mv.visitVarInsn(ALOAD, 0);
|
||||
mv.visitVarInsn(FLOAD, 1);
|
||||
@@ -347,7 +366,10 @@ public class ACTEntityRenderer implements IClassTransformer {
|
||||
++state;
|
||||
mv.visitLabel(labelEndUpdate);
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "endUpdateChunks", "()V");
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"endUpdateChunks",
|
||||
"()V");
|
||||
mv.visitLabel(label);
|
||||
labelAfterUpdate = labelEndUpdate = null;
|
||||
return;
|
||||
@@ -358,7 +380,7 @@ public class ACTEntityRenderer implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public void visitFrame(int type, int nLocal, Object[] local, int nStack, Object[] stack) {
|
||||
// SMCLog.finest(" %d, Frame",state);
|
||||
// SMCLog.finest(" %d, Frame",state);
|
||||
switch (state) {
|
||||
case 7: {
|
||||
state = 8;
|
||||
@@ -380,7 +402,7 @@ public class ACTEntityRenderer implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public void visitFieldInsn(int opcode, String owner, String name, String desc) {
|
||||
// SMCLog.finest(" %d F %d %s.%s %s", state, opcode, ownerM, nameM, descM);
|
||||
// SMCLog.finest(" %d F %d %s.%s %s", state, opcode, ownerM, nameM, descM);
|
||||
switch (state) {
|
||||
case 3:
|
||||
if (Names.gameSettings_renderDistance.equals(owner, name)) {
|
||||
@@ -415,13 +437,16 @@ public class ACTEntityRenderer implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public void visitMethodInsn(int opcode, String owner, String name, String desc) {
|
||||
// SMCLog.finest(" %d M %d %s.%s%s", state, opcode, ownerM, nameM, descM);
|
||||
// SMCLog.finest(" %d M %d %s.%s%s", state, opcode, ownerM, nameM, descM);
|
||||
switch (state) {
|
||||
case 0:
|
||||
if (Names.equals("org/lwjgl/opengl/GL11", "glViewport", "(IIII)V", owner, name, desc)) {
|
||||
++state;
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "setViewport", "(IIII)V");
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"setViewport",
|
||||
"(IIII)V");
|
||||
return;
|
||||
}
|
||||
break;
|
||||
@@ -430,7 +455,10 @@ public class ACTEntityRenderer implements IClassTransformer {
|
||||
++state;
|
||||
mv.visitMethodInsn(opcode, owner, name, desc);
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "clearRenderBuffer", "()V");
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"clearRenderBuffer",
|
||||
"()V");
|
||||
return;
|
||||
}
|
||||
break;
|
||||
@@ -440,7 +468,10 @@ public class ACTEntityRenderer implements IClassTransformer {
|
||||
mv.visitMethodInsn(opcode, owner, name, desc);
|
||||
mv.visitVarInsn(FLOAD, 1);
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "setCamera", "(F)V");
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"setCamera",
|
||||
"(F)V");
|
||||
return;
|
||||
}
|
||||
break;
|
||||
@@ -458,7 +489,10 @@ public class ACTEntityRenderer implements IClassTransformer {
|
||||
if (Names.renderGlobal_renderSky.equals(owner, name, desc)) {
|
||||
state = 8;
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "beginSky", "()V");
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"beginSky",
|
||||
"()V");
|
||||
mv.visitMethodInsn(opcode, owner, name, desc);
|
||||
mv.visitMethodInsn(INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "endSky", "()V");
|
||||
return;
|
||||
@@ -468,7 +502,10 @@ public class ACTEntityRenderer implements IClassTransformer {
|
||||
if (Names.renderGlobal_renderSky.equals(owner, name, desc)) {
|
||||
++state;
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "beginSky", "()V");
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"beginSky",
|
||||
"()V");
|
||||
mv.visitMethodInsn(opcode, owner, name, desc);
|
||||
mv.visitMethodInsn(INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "endSky", "()V");
|
||||
return;
|
||||
@@ -501,10 +538,16 @@ public class ACTEntityRenderer implements IClassTransformer {
|
||||
if (Names.renderGlobal_sortAndRender.equals(owner, name, desc)) {
|
||||
++state;
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "beginTerrain", "()V");
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"beginTerrain",
|
||||
"()V");
|
||||
mv.visitMethodInsn(opcode, owner, name, desc);
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "endTerrain", "()V");
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"endTerrain",
|
||||
"()V");
|
||||
return;
|
||||
}
|
||||
break;
|
||||
@@ -513,7 +556,10 @@ public class ACTEntityRenderer implements IClassTransformer {
|
||||
// vanilla or forge. not optfine
|
||||
++state;
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "beginLitParticles", "()V");
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"beginLitParticles",
|
||||
"()V");
|
||||
mv.visitMethodInsn(opcode, owner, name, desc);
|
||||
return;
|
||||
} else if (Names.equals("org/lwjgl/opengl/GL11", "glDisable", "(I)V", owner, name, desc)) {
|
||||
@@ -526,10 +572,16 @@ public class ACTEntityRenderer implements IClassTransformer {
|
||||
if (Names.effectRenderer_renderParticles.equals(owner, name, desc)) {
|
||||
++state;
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "beginParticles", "()V");
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"beginParticles",
|
||||
"()V");
|
||||
mv.visitMethodInsn(opcode, owner, name, desc);
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "endParticles", "()V");
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"endParticles",
|
||||
"()V");
|
||||
return;
|
||||
}
|
||||
break;
|
||||
@@ -543,10 +595,16 @@ public class ACTEntityRenderer implements IClassTransformer {
|
||||
if (Names.entityRenderer_renderRainSnow.equals(owner, name, desc)) {
|
||||
++state;
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "beginWeather", "()V");
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"beginWeather",
|
||||
"()V");
|
||||
mv.visitMethodInsn(opcode, owner, name, desc);
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "endWeather", "()V");
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"endWeather",
|
||||
"()V");
|
||||
return;
|
||||
}
|
||||
break;
|
||||
@@ -563,7 +621,10 @@ public class ACTEntityRenderer implements IClassTransformer {
|
||||
"renderHand0",
|
||||
"(" + Names.entityRenderer_.desc + "FI)V");
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "preWater", "()V");
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"preWater",
|
||||
"()V");
|
||||
return;
|
||||
}
|
||||
case 18:
|
||||
@@ -572,21 +633,33 @@ public class ACTEntityRenderer implements IClassTransformer {
|
||||
if (Names.renderGlobal_sortAndRender.equals(owner, name, desc)) {
|
||||
++state;
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "beginWater", "()V");
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"beginWater",
|
||||
"()V");
|
||||
mv.visitMethodInsn(opcode, owner, name, desc);
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "endWater", "()V");
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"endWater",
|
||||
"()V");
|
||||
return;
|
||||
} else if (Names.equals(
|
||||
Names.renderGlobal_.clas, "renderAllSortedRenderers", "(ID)I", owner, name, desc)) {
|
||||
++state;
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "beginWater", "()V");
|
||||
mv.visitMethodInsn(opcode, owner, name, desc);
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "endWater", "()V");
|
||||
return;
|
||||
}
|
||||
} else if (Names
|
||||
.equals(Names.renderGlobal_.clas, "renderAllSortedRenderers", "(ID)I", owner, name, desc)) {
|
||||
++state;
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"beginWater",
|
||||
"()V");
|
||||
mv.visitMethodInsn(opcode, owner, name, desc);
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"endWater",
|
||||
"()V");
|
||||
return;
|
||||
}
|
||||
break;
|
||||
case 21:
|
||||
if (Names.equals("org/lwjgl/opengl/GL11", "glDepthMask", "(Z)V", owner, name, desc)) {
|
||||
@@ -607,7 +680,10 @@ public class ACTEntityRenderer implements IClassTransformer {
|
||||
++state;
|
||||
mv.visitMethodInsn(opcode, owner, name, desc);
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "disableFog", "()V");
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"disableFog",
|
||||
"()V");
|
||||
return;
|
||||
}
|
||||
break;
|
||||
@@ -615,7 +691,10 @@ public class ACTEntityRenderer implements IClassTransformer {
|
||||
if (Names.effectRenderer_renderLitParticles.equals(owner, name, desc)) {
|
||||
++state;
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "beginLitParticles", "()V");
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"beginLitParticles",
|
||||
"()V");
|
||||
mv.visitMethodInsn(opcode, owner, name, desc);
|
||||
return;
|
||||
}
|
||||
@@ -624,10 +703,16 @@ public class ACTEntityRenderer implements IClassTransformer {
|
||||
if (Names.effectRenderer_renderParticles.equals(owner, name, desc)) {
|
||||
++state;
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "beginParticles", "()V");
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"beginParticles",
|
||||
"()V");
|
||||
mv.visitMethodInsn(opcode, owner, name, desc);
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "endParticles", "()V");
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"endParticles",
|
||||
"()V");
|
||||
return;
|
||||
}
|
||||
break;
|
||||
@@ -644,21 +729,11 @@ public class ACTEntityRenderer implements IClassTransformer {
|
||||
break;
|
||||
}
|
||||
/*
|
||||
case :
|
||||
if (Namer.equals(SMCNames.,SMCNames.,SMCNames._desc,owner,name,desc)) {
|
||||
++state;
|
||||
mv.visitMethodInsn(opcode, owner, name, desc);
|
||||
return;
|
||||
}
|
||||
break;
|
||||
case :
|
||||
if (Namer.equals("","","",owner,name,desc)) {
|
||||
++state;
|
||||
mv.visitMethodInsn(opcode, owner, name, desc);
|
||||
return;
|
||||
}
|
||||
break;
|
||||
*/
|
||||
* case : if (Namer.equals(SMCNames.,SMCNames.,SMCNames._desc,owner,name,desc)) { ++state;
|
||||
* mv.visitMethodInsn(opcode, owner, name, desc); return; } break; case : if
|
||||
* (Namer.equals("","","",owner,name,desc)) { ++state; mv.visitMethodInsn(opcode, owner, name, desc);
|
||||
* return; } break;
|
||||
*/
|
||||
mv.visitMethodInsn(opcode, owner, name, desc);
|
||||
}
|
||||
|
||||
|
||||
@@ -3,6 +3,7 @@ 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;
|
||||
@@ -23,6 +24,7 @@ public class ACTGuiOptions implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class CVTransform extends ClassVisitor {
|
||||
|
||||
String classname;
|
||||
|
||||
public CVTransform(ClassVisitor cv) {
|
||||
@@ -30,8 +32,8 @@ public class ACTGuiOptions implements IClassTransformer {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void visit(
|
||||
int version, int access, String name, String signature, String superName, String[] interfaces) {
|
||||
public void visit(int version, int access, String name, String signature, String superName,
|
||||
String[] interfaces) {
|
||||
this.classname = name;
|
||||
// SMCLog.info(" class %s",name);
|
||||
cv.visit(version, access, name, signature, superName, interfaces);
|
||||
@@ -39,13 +41,13 @@ public class ACTGuiOptions implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
|
||||
// SMCLog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
// SMCLog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
if (Names.guiOptions_initGui.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.info(" patching");
|
||||
// SMCLog.info(" patching");
|
||||
return new MVinitGui(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
}
|
||||
if (Names.guiOptions_actionPerformed.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.info(" patching");
|
||||
// SMCLog.info(" patching");
|
||||
return new MVactionPerformed(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
}
|
||||
return cv.visitMethod(access, name, desc, signature, exceptions);
|
||||
@@ -53,6 +55,7 @@ public class ACTGuiOptions implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class MVinitGui extends MethodVisitor {
|
||||
|
||||
int state = 0;
|
||||
|
||||
public MVinitGui(MethodVisitor mv) {
|
||||
@@ -128,6 +131,7 @@ public class ACTGuiOptions implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class MVactionPerformed extends MethodVisitor {
|
||||
|
||||
public MVactionPerformed(MethodVisitor mv) {
|
||||
super(Opcodes.ASM4, mv);
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@ 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;
|
||||
@@ -22,6 +23,7 @@ public class ACTItemBlock implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class CVTransform extends ClassVisitor {
|
||||
|
||||
String classname;
|
||||
|
||||
public CVTransform(ClassVisitor cv) {
|
||||
@@ -29,8 +31,8 @@ public class ACTItemBlock implements IClassTransformer {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void visit(
|
||||
int version, int access, String name, String signature, String superName, String[] interfaces) {
|
||||
public void visit(int version, int access, String name, String signature, String superName,
|
||||
String[] interfaces) {
|
||||
classname = name;
|
||||
// SMCLog.info(" class %s",name);
|
||||
cv.visit(version, access, name, signature, superName, interfaces);
|
||||
|
||||
@@ -3,6 +3,7 @@ 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;
|
||||
@@ -23,6 +24,7 @@ public class ACTItemRenderer implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class CVTransform extends ClassVisitor {
|
||||
|
||||
String classname;
|
||||
|
||||
public CVTransform(ClassVisitor cv) {
|
||||
@@ -32,12 +34,13 @@ public class ACTItemRenderer implements IClassTransformer {
|
||||
Names.Meth renderItemIrt = new Names.Meth(
|
||||
Names.itemRenderer_,
|
||||
"renderItem",
|
||||
"(" + Names.entityLivingBase_.desc + Names.itemStack_.desc
|
||||
"(" + Names.entityLivingBase_.desc
|
||||
+ Names.itemStack_.desc
|
||||
+ "ILnet/minecraftforge/client/IItemRenderer$ItemRenderType;)V");
|
||||
|
||||
@Override
|
||||
public void visit(
|
||||
int version, int access, String name, String signature, String superName, String[] interfaces) {
|
||||
public void visit(int version, int access, String name, String signature, String superName,
|
||||
String[] interfaces) {
|
||||
classname = name;
|
||||
// SMCLog.info(" class %s",name);
|
||||
cv.visit(version, access, name, signature, superName, interfaces);
|
||||
@@ -45,7 +48,7 @@ public class ACTItemRenderer implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
|
||||
// SMCLog.info(" method %s.%s%s",classname,name,desc);
|
||||
// SMCLog.info(" method %s.%s%s",classname,name,desc);
|
||||
if (Names.itemRenderer_updateEquipped.equalsNameDesc(name, desc)) {
|
||||
ALog.finer(" patch method %s.%s%s", classname, name, desc);
|
||||
return new MVupdate(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
@@ -61,6 +64,7 @@ public class ACTItemRenderer implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class MVupdate extends MethodVisitor {
|
||||
|
||||
public MVupdate(MethodVisitor mv) {
|
||||
super(Opcodes.ASM4, mv);
|
||||
}
|
||||
@@ -70,13 +74,17 @@ public class ACTItemRenderer implements IClassTransformer {
|
||||
if (opcode == PUTFIELD && Names.itemRenderer_itemToRender.equals(owner, name, desc)) {
|
||||
mv.visitInsn(DUP);
|
||||
mv.visitFieldInsn(
|
||||
PUTSTATIC, "com/gtnewhorizons/angelica/client/Shaders", "itemToRender", Names.itemStack_.desc);
|
||||
PUTSTATIC,
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"itemToRender",
|
||||
Names.itemStack_.desc);
|
||||
}
|
||||
mv.visitFieldInsn(opcode, owner, name, desc);
|
||||
}
|
||||
}
|
||||
|
||||
private static class MVrenderItem extends MethodVisitor {
|
||||
|
||||
public MVrenderItem(MethodVisitor mv) {
|
||||
super(Opcodes.ASM4, mv);
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@ 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;
|
||||
@@ -22,6 +23,7 @@ public class ACTMinecraft implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class CVTransform extends ClassVisitor {
|
||||
|
||||
String classname;
|
||||
|
||||
public CVTransform(ClassVisitor cv) {
|
||||
@@ -29,8 +31,8 @@ public class ACTMinecraft implements IClassTransformer {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void visit(
|
||||
int version, int access, String name, String signature, String superName, String[] interfaces) {
|
||||
public void visit(int version, int access, String name, String signature, String superName,
|
||||
String[] interfaces) {
|
||||
this.classname = name;
|
||||
// SMCLog.info(" class %s",name);
|
||||
super.visit(version, access, name, signature, superName, interfaces);
|
||||
@@ -38,9 +40,9 @@ public class ACTMinecraft implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
|
||||
// SMCLog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
// SMCLog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
if (Names.minecraft_startGame.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.info(" patching");
|
||||
// SMCLog.info(" patching");
|
||||
return new MVstartGame(super.visitMethod(access, name, desc, signature, exceptions));
|
||||
}
|
||||
return super.visitMethod(access, name, desc, signature, exceptions);
|
||||
@@ -48,6 +50,7 @@ public class ACTMinecraft implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class MVstartGame extends MethodVisitor {
|
||||
|
||||
int state = 0;
|
||||
|
||||
public MVstartGame(MethodVisitor mv) {
|
||||
@@ -78,7 +81,7 @@ public class ACTMinecraft implements IClassTransformer {
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"startup",
|
||||
"(" + Names.minecraft_.desc + ")V");
|
||||
// SMCLog.finest(" startup");
|
||||
// SMCLog.finest(" startup");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@ 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;
|
||||
@@ -23,6 +24,7 @@ public class ACTModelRenderer implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class CVTransform extends ClassVisitor {
|
||||
|
||||
String classname;
|
||||
|
||||
public CVTransform(ClassVisitor cv) {
|
||||
@@ -30,40 +32,40 @@ public class ACTModelRenderer implements IClassTransformer {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void visit(
|
||||
int version, int access, String name, String signature, String superName, String[] interfaces) {
|
||||
public void visit(int version, int access, String name, String signature, String superName,
|
||||
String[] interfaces) {
|
||||
classname = name;
|
||||
// SMCLog.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.modelRenderer_compiled.name.equals(name) ||
|
||||
// Names.modelRenderer_displayList.name.equals(name)) {
|
||||
// access = access & ~(ACC_PUBLIC|ACC_PRIVATE|ACC_PROTECTED) | ACC_PUBLIC;
|
||||
// }
|
||||
// return cv.visitField(access, name, desc, signature, value);
|
||||
// }
|
||||
// @Override
|
||||
// public FieldVisitor visitField(int access, String name, String desc,
|
||||
// String signature, Object value) {
|
||||
// if (Names.modelRenderer_compiled.name.equals(name) ||
|
||||
// Names.modelRenderer_displayList.name.equals(name)) {
|
||||
// access = access & ~(ACC_PUBLIC|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) {
|
||||
// SMCLog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
// if (Names.modelRenderer_render.equalsNameDesc(name, desc))
|
||||
// {
|
||||
// //SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
// return new MVrender(
|
||||
// cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
// }
|
||||
// else
|
||||
// if (Names.modelRenderer_renderWithRotation.equalsNameDesc(name, desc))
|
||||
// {
|
||||
// //SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
// return new MVrender(
|
||||
// cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
// }
|
||||
// else
|
||||
// SMCLog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
// if (Names.modelRenderer_render.equalsNameDesc(name, desc))
|
||||
// {
|
||||
// //SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
// return new MVrender(
|
||||
// cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
// }
|
||||
// else
|
||||
// if (Names.modelRenderer_renderWithRotation.equalsNameDesc(name, desc))
|
||||
// {
|
||||
// //SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
// return new MVrender(
|
||||
// cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
// }
|
||||
// else
|
||||
if ("resetDisplayList".equals(name) && "()V".equals(desc)
|
||||
|| "getCompiled".equals(name) && "()Z".equals(desc)
|
||||
|| "getDisplayList".equals(name) && "()I".equals(desc)) {
|
||||
|
||||
@@ -3,6 +3,7 @@ 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;
|
||||
@@ -22,6 +23,7 @@ public class ACTOpenGlHelper implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class CVTransform extends ClassVisitor {
|
||||
|
||||
String classname;
|
||||
|
||||
public CVTransform(ClassVisitor cv) {
|
||||
@@ -29,8 +31,8 @@ public class ACTOpenGlHelper implements IClassTransformer {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void visit(
|
||||
int version, int access, String name, String signature, String superName, String[] interfaces) {
|
||||
public void visit(int version, int access, String name, String signature, String superName,
|
||||
String[] interfaces) {
|
||||
classname = name;
|
||||
// SMCLog.info(" class %s",name);
|
||||
cv.visit(version, access, name, signature, superName, interfaces);
|
||||
@@ -38,27 +40,27 @@ public class ACTOpenGlHelper implements IClassTransformer {
|
||||
|
||||
// boolean has_activeTexUnit = false;
|
||||
|
||||
// @Override
|
||||
// public FieldVisitor visitField(int access, String name, String desc,
|
||||
// String signature, Object value) {
|
||||
// //if (name.equals("activeTexUnit")) {
|
||||
// // has_activeTexUnit = true;
|
||||
// //}
|
||||
// return cv.visitField(access, name, desc, signature, value);
|
||||
// }
|
||||
// @Override
|
||||
// public FieldVisitor visitField(int access, String name, String desc,
|
||||
// String signature, Object value) {
|
||||
// //if (name.equals("activeTexUnit")) {
|
||||
// // has_activeTexUnit = true;
|
||||
// //}
|
||||
// return cv.visitField(access, name, desc, signature, value);
|
||||
// }
|
||||
|
||||
@Override
|
||||
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
|
||||
// if (!has_activeTexUnit) {
|
||||
// has_activeTexUnit = true;
|
||||
// FieldVisitor fv = cv.visitField(ACC_PUBLIC + ACC_STATIC, "activeTexUnit", "I", null, null);
|
||||
// fv.visitEnd();
|
||||
// SMCLog.finest(" add field activeTexUnit");
|
||||
// has_activeTexUnit = true;
|
||||
// FieldVisitor fv = cv.visitField(ACC_PUBLIC + ACC_STATIC, "activeTexUnit", "I", null, null);
|
||||
// fv.visitEnd();
|
||||
// SMCLog.finest(" add field activeTexUnit");
|
||||
// }
|
||||
|
||||
// SMCLog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
// SMCLog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
if (Names.openGlHelper_setActiveTexture.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.info(" patching");
|
||||
// SMCLog.info(" patching");
|
||||
return new MVsetActiveTexture(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
}
|
||||
return cv.visitMethod(access, name, desc, signature, exceptions);
|
||||
@@ -66,6 +68,7 @@ public class ACTOpenGlHelper implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class MVsetActiveTexture extends MethodVisitor {
|
||||
|
||||
public MVsetActiveTexture(MethodVisitor mv) {
|
||||
super(Opcodes.ASM4, mv);
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@ package com.gtnewhorizons.angelica.transform;
|
||||
import static org.objectweb.asm.Opcodes.INVOKESTATIC;
|
||||
|
||||
import net.minecraft.launchwrapper.IClassTransformer;
|
||||
|
||||
import org.objectweb.asm.ClassReader;
|
||||
import org.objectweb.asm.ClassVisitor;
|
||||
import org.objectweb.asm.ClassWriter;
|
||||
@@ -22,6 +23,7 @@ public class ACTPrjRedIlluRenderHalo implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class CVTransform extends ClassVisitor {
|
||||
|
||||
String classname;
|
||||
|
||||
public CVTransform(ClassVisitor cv) {
|
||||
@@ -29,8 +31,8 @@ public class ACTPrjRedIlluRenderHalo implements IClassTransformer {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void visit(
|
||||
int version, int access, String name, String signature, String superName, String[] interfaces) {
|
||||
public void visit(int version, int access, String name, String signature, String superName,
|
||||
String[] interfaces) {
|
||||
this.classname = name;
|
||||
// SMCLog.info(" class %s",name);
|
||||
super.visit(version, access, name, signature, superName, interfaces);
|
||||
@@ -38,7 +40,7 @@ public class ACTPrjRedIlluRenderHalo implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
|
||||
// SMCLog.info(" %s%s",name,desc);
|
||||
// SMCLog.info(" %s%s",name,desc);
|
||||
if ("prepareRenderState".equals(name) && "()V".equals(desc)) {
|
||||
ALog.finer(" patch method %s.%s%s", classname, name, desc);
|
||||
return new MVprepare(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
@@ -52,6 +54,7 @@ public class ACTPrjRedIlluRenderHalo implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class MVprepare extends MethodVisitor {
|
||||
|
||||
public MVprepare(MethodVisitor mv) {
|
||||
super(Opcodes.ASM4, mv);
|
||||
}
|
||||
@@ -61,7 +64,10 @@ public class ACTPrjRedIlluRenderHalo implements IClassTransformer {
|
||||
if (Names.equals("codechicken/lib/render/CCRenderState", "reset", "()V", owner, name, desc)) {
|
||||
ALog.info(" beginHalo");
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "beginProjectRedHalo", "()V");
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"beginProjectRedHalo",
|
||||
"()V");
|
||||
}
|
||||
super.visitMethodInsn(opcode, owner, name, desc);
|
||||
}
|
||||
@@ -73,6 +79,7 @@ public class ACTPrjRedIlluRenderHalo implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class MVrestore extends MethodVisitor {
|
||||
|
||||
public MVrestore(MethodVisitor mv) {
|
||||
super(Opcodes.ASM4, mv);
|
||||
}
|
||||
@@ -83,7 +90,10 @@ public class ACTPrjRedIlluRenderHalo implements IClassTransformer {
|
||||
if (Names.equals("org/lwjgl/opengl/GL11", "glDisable", "(I)V", owner, name, desc)) {
|
||||
ALog.info(" endHalo");
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "endProjectRedHalo", "()V");
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"endProjectRedHalo",
|
||||
"()V");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@ 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;
|
||||
@@ -23,6 +24,7 @@ public class ACTRender implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class CVTransform extends ClassVisitor {
|
||||
|
||||
String classname;
|
||||
|
||||
public CVTransform(ClassVisitor cv) {
|
||||
@@ -30,8 +32,8 @@ public class ACTRender implements IClassTransformer {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void visit(
|
||||
int version, int access, String name, String signature, String superName, String[] interfaces) {
|
||||
public void visit(int version, int access, String name, String signature, String superName,
|
||||
String[] interfaces) {
|
||||
classname = name;
|
||||
// SMCLog.info(" class %s",name);
|
||||
cv.visit(version, access, name, signature, superName, interfaces);
|
||||
@@ -39,9 +41,9 @@ public class ACTRender implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
|
||||
// SMCLog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
// SMCLog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
if (Names.render_renderShadow.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
return new MVrenderShadow(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
}
|
||||
return cv.visitMethod(access, name, desc, signature, exceptions);
|
||||
@@ -49,6 +51,7 @@ public class ACTRender implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class MVrenderShadow extends MethodVisitor {
|
||||
|
||||
// protected MethodVisitor mv;
|
||||
public MVrenderShadow(MethodVisitor mv) {
|
||||
super(Opcodes.ASM4, mv);
|
||||
|
||||
@@ -3,6 +3,7 @@ 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;
|
||||
@@ -26,6 +27,7 @@ public class ACTRenderBlocks implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class CVTransform extends ClassVisitor {
|
||||
|
||||
String classname;
|
||||
|
||||
public CVTransform(ClassVisitor cv) {
|
||||
@@ -33,8 +35,8 @@ public class ACTRenderBlocks implements IClassTransformer {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void visit(
|
||||
int version, int access, String name, String signature, String superName, String[] interfaces) {
|
||||
public void visit(int version, int access, String name, String signature, String superName,
|
||||
String[] interfaces) {
|
||||
classname = name;
|
||||
// SMCLog.info(" class %s",name);
|
||||
cv.visit(version, access, name, signature, superName, interfaces);
|
||||
@@ -42,40 +44,43 @@ public class ACTRenderBlocks implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
|
||||
// SMCLog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
// SMCLog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
if (Names.renderBlocks_renderBlockByRenderType.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
return new MVrenBlkByRenType(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
} else if (Names.renderBlocks_renderBlockFlowerPot.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
return new MVrenBlkFlowerPot(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
} else if (Names.renderBlocks_renderStdBlockWithAOP.equalsNameDesc(name, desc)
|
||||
|| Names.renderBlocks_renderStdBlockWithAO.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
return new MVrenBlkWithAO(
|
||||
access,
|
||||
name,
|
||||
desc,
|
||||
signature,
|
||||
exceptions,
|
||||
cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
} else if (Names.renderBlocks_renderStdBlockWithCM.equalsNameDesc(name, desc)
|
||||
|| Names.renderBlocks_renderBlockCactusImpl.equalsNameDesc(name, desc)
|
||||
|| Names.renderBlocks_renderBlockBed.equalsNameDesc(name, desc)
|
||||
|| Names.renderBlocks_renderBlockFluids.equalsNameDesc(name, desc)
|
||||
|| Names.renderBlocks_renderBlockDoor.equalsNameDesc(name, desc)
|
||||
|| Names.renderBlocks_renderBlockSandFalling.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
return new MVrenBlkFVar(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
} else if (Names.renderBlocks_renderPistonExtension.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
return new MVrenBlkPistonExt(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
}
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
return new MVrenBlkWithAO(
|
||||
access,
|
||||
name,
|
||||
desc,
|
||||
signature,
|
||||
exceptions,
|
||||
cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
} else
|
||||
if (Names.renderBlocks_renderStdBlockWithCM.equalsNameDesc(name, desc)
|
||||
|| Names.renderBlocks_renderBlockCactusImpl.equalsNameDesc(name, desc)
|
||||
|| Names.renderBlocks_renderBlockBed.equalsNameDesc(name, desc)
|
||||
|| Names.renderBlocks_renderBlockFluids.equalsNameDesc(name, desc)
|
||||
|| Names.renderBlocks_renderBlockDoor.equalsNameDesc(name, desc)
|
||||
|| Names.renderBlocks_renderBlockSandFalling.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
return new MVrenBlkFVar(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
} else
|
||||
if (Names.renderBlocks_renderPistonExtension.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
return new MVrenBlkPistonExt(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
}
|
||||
return cv.visitMethod(access, name, desc, signature, exceptions);
|
||||
}
|
||||
}
|
||||
|
||||
private static class MVrenBlkByRenType extends MethodVisitor {
|
||||
|
||||
public MVrenBlkByRenType(MethodVisitor mv) {
|
||||
super(Opcodes.ASM4, mv);
|
||||
}
|
||||
@@ -95,7 +100,7 @@ public class ACTRenderBlocks implements IClassTransformer {
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"pushEntity",
|
||||
"(" + Names.renderBlocks_.desc + Names.block_.desc + "III)V");
|
||||
// SMCLog.info(" pushEntity");
|
||||
// SMCLog.info(" pushEntity");
|
||||
++nPatch;
|
||||
}
|
||||
|
||||
@@ -103,7 +108,7 @@ public class ACTRenderBlocks implements IClassTransformer {
|
||||
public void visitInsn(int opcode) {
|
||||
if (opcode == Opcodes.IRETURN) {
|
||||
mv.visitMethodInsn(INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "popEntity", "()V");
|
||||
// SMCLog.info(" popEntity");
|
||||
// SMCLog.info(" popEntity");
|
||||
++nPatch;
|
||||
}
|
||||
mv.visitInsn(opcode);
|
||||
@@ -112,11 +117,12 @@ public class ACTRenderBlocks implements IClassTransformer {
|
||||
@Override
|
||||
public void visitEnd() {
|
||||
mv.visitEnd();
|
||||
// SMCLog.info(" %d", nPatch);
|
||||
// SMCLog.info(" %d", nPatch);
|
||||
}
|
||||
}
|
||||
|
||||
private static class MVrenBlkFlowerPot extends MethodVisitor {
|
||||
|
||||
public MVrenBlkFlowerPot(MethodVisitor mv) {
|
||||
super(Opcodes.ASM4, mv);
|
||||
}
|
||||
@@ -156,7 +162,10 @@ public class ACTRenderBlocks implements IClassTransformer {
|
||||
if (Names.tessellator_addTranslation.equals(owner, name, desc)) {
|
||||
++state;
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "popEntity", "()V");
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"popEntity",
|
||||
"()V");
|
||||
}
|
||||
break;
|
||||
}
|
||||
@@ -175,7 +184,7 @@ public class ACTRenderBlocks implements IClassTransformer {
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"pushEntity",
|
||||
"(" + Names.renderBlocks_.desc + Names.block_.desc + "III)V");
|
||||
// SMCLog.info(" pushEntity");
|
||||
// SMCLog.info(" pushEntity");
|
||||
++nPatch;
|
||||
}
|
||||
|
||||
@@ -183,7 +192,7 @@ public class ACTRenderBlocks implements IClassTransformer {
|
||||
public void visitInsn(int opcode) {
|
||||
if (opcode == Opcodes.IRETURN) {
|
||||
mv.visitMethodInsn(INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "popEntity", "()V");
|
||||
// SMCLog.info(" popEntity");
|
||||
// SMCLog.info(" popEntity");
|
||||
++nPatch;
|
||||
}
|
||||
mv.visitInsn(opcode);
|
||||
@@ -192,24 +201,21 @@ public class ACTRenderBlocks implements IClassTransformer {
|
||||
@Override
|
||||
public void visitEnd() {
|
||||
mv.visitEnd();
|
||||
// SMCLog.info(" %d", nPatch);
|
||||
// SMCLog.info(" %d", nPatch);
|
||||
}
|
||||
}
|
||||
|
||||
static final String[] fieldsBlockLightLevel = {null, "blockLightLevel05", "blockLightLevel06", "blockLightLevel08"};
|
||||
static final String[] fieldsBlockLightLevel = { null, "blockLightLevel05", "blockLightLevel06",
|
||||
"blockLightLevel08" };
|
||||
|
||||
private static class MVrenBlkWithAO extends MethodVisitor {
|
||||
|
||||
MethodVisitor mv1;
|
||||
MethodNode mn;
|
||||
int nPatch = 0;
|
||||
|
||||
public MVrenBlkWithAO(
|
||||
final int access,
|
||||
final String name,
|
||||
final String desc,
|
||||
final String signature,
|
||||
final String[] exceptions,
|
||||
MethodVisitor mv) {
|
||||
public MVrenBlkWithAO(final int access, final String name, final String desc, final String signature,
|
||||
final String[] exceptions, MethodVisitor mv) {
|
||||
super(Opcodes.ASM4);
|
||||
super.mv = this.mn = new MethodNode(access, name, desc, signature, exceptions);
|
||||
this.mv1 = mv;
|
||||
@@ -219,7 +225,7 @@ public class ACTRenderBlocks implements IClassTransformer {
|
||||
public void visitEnd() {
|
||||
mn.visitEnd();
|
||||
mn.accept(mv1);
|
||||
// SMCLog.info(" %d", nPatch);
|
||||
// SMCLog.info(" %d", nPatch);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -265,7 +271,7 @@ public class ACTRenderBlocks implements IClassTransformer {
|
||||
if (match2 != 0) {
|
||||
String fieldName = fieldsBlockLightLevel[match2];
|
||||
mn.visitFieldInsn(GETSTATIC, "com/gtnewhorizons/angelica/client/Shaders", fieldName, "F");
|
||||
// SMCLog.info(" %s", fieldName);
|
||||
// SMCLog.info(" %s", fieldName);
|
||||
++nPatch;
|
||||
return;
|
||||
}
|
||||
@@ -275,6 +281,7 @@ public class ACTRenderBlocks implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class MVrenBlkFVar extends MethodVisitor {
|
||||
|
||||
int nPatch = 0;
|
||||
|
||||
public MVrenBlkFVar(MethodVisitor mv) {
|
||||
@@ -296,7 +303,7 @@ public class ACTRenderBlocks implements IClassTransformer {
|
||||
++state;
|
||||
String fieldName = fieldsBlockLightLevel[match1];
|
||||
mv.visitFieldInsn(GETSTATIC, "com/gtnewhorizons/angelica/client/Shaders", fieldName, "F");
|
||||
// SMCLog.info(" %s", fieldName);
|
||||
// SMCLog.info(" %s", fieldName);
|
||||
++nPatch;
|
||||
return;
|
||||
}
|
||||
@@ -306,11 +313,12 @@ public class ACTRenderBlocks implements IClassTransformer {
|
||||
@Override
|
||||
public void visitEnd() {
|
||||
mv.visitEnd();
|
||||
// SMCLog.info(" %d", nPatch);
|
||||
// SMCLog.info(" %d", nPatch);
|
||||
}
|
||||
}
|
||||
|
||||
private static class MVrenBlkPistonExt extends MethodVisitor {
|
||||
|
||||
int nPatch = 0;
|
||||
|
||||
public MVrenBlkPistonExt(MethodVisitor mv) {
|
||||
@@ -337,7 +345,7 @@ public class ACTRenderBlocks implements IClassTransformer {
|
||||
if (match1 != 0 && state == 1) {
|
||||
String fieldName = fieldsBlockLightLevel[match1];
|
||||
mv.visitFieldInsn(GETSTATIC, "com/gtnewhorizons/angelica/client/Shaders", fieldName, "F");
|
||||
// SMCLog.info(" %s", fieldName);
|
||||
// SMCLog.info(" %s", fieldName);
|
||||
++nPatch;
|
||||
return;
|
||||
}
|
||||
@@ -347,32 +355,32 @@ public class ACTRenderBlocks implements IClassTransformer {
|
||||
@Override
|
||||
public void visitEnd() {
|
||||
mv.visitEnd();
|
||||
// SMCLog.info(" %d", nPatch);
|
||||
// SMCLog.info(" %d", nPatch);
|
||||
}
|
||||
}
|
||||
|
||||
// private static class MVNTransform extends MethodVisitor
|
||||
// {
|
||||
// protected MethodVisitor mv;
|
||||
// protected MethodNode mn;
|
||||
// public MVNTransform(MethodNode mn, MethodVisitor mv) {
|
||||
// super(Opcodes.ASM4);
|
||||
// super.mv = this.mn = mn;
|
||||
// this.mv = mv;
|
||||
// }
|
||||
// private static class MVNTransform extends MethodVisitor
|
||||
// {
|
||||
// protected MethodVisitor mv;
|
||||
// protected MethodNode mn;
|
||||
// public MVNTransform(MethodNode mn, MethodVisitor mv) {
|
||||
// super(Opcodes.ASM4);
|
||||
// super.mv = this.mn = mn;
|
||||
// this.mv = mv;
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void visitEnd() {
|
||||
// super.visitEnd();
|
||||
// Iterator<AbstractInsnNode> it = mn.instructions.iterator();
|
||||
// while (it.hasNext())
|
||||
// {
|
||||
// AbstractInsnNode node = it.next();
|
||||
// System.out.println(node.toString());
|
||||
// }
|
||||
// // send to target
|
||||
// mn.accept(mv);
|
||||
// }
|
||||
// }
|
||||
// @Override
|
||||
// public void visitEnd() {
|
||||
// super.visitEnd();
|
||||
// Iterator<AbstractInsnNode> it = mn.instructions.iterator();
|
||||
// while (it.hasNext())
|
||||
// {
|
||||
// AbstractInsnNode node = it.next();
|
||||
// System.out.println(node.toString());
|
||||
// }
|
||||
// // send to target
|
||||
// mn.accept(mv);
|
||||
// }
|
||||
// }
|
||||
|
||||
}
|
||||
@@ -3,6 +3,7 @@ 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;
|
||||
@@ -24,6 +25,7 @@ public class ACTRenderGlobal implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class CVTransform extends ClassVisitor {
|
||||
|
||||
String classname;
|
||||
|
||||
public CVTransform(ClassVisitor cv) {
|
||||
@@ -31,8 +33,8 @@ public class ACTRenderGlobal implements IClassTransformer {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void visit(
|
||||
int version, int access, String name, String signature, String superName, String[] interfaces) {
|
||||
public void visit(int version, int access, String name, String signature, String superName,
|
||||
String[] interfaces) {
|
||||
classname = name;
|
||||
// SMCLog.info(" class %s",name);
|
||||
cv.visit(version, access, name, signature, superName, interfaces);
|
||||
@@ -49,7 +51,7 @@ public class ACTRenderGlobal implements IClassTransformer {
|
||||
@Override
|
||||
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
|
||||
// String remappedName = SMCRemap.remapper.mapMethodName(classname, name, desc);
|
||||
// SMCLog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
// SMCLog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
if (Names.renderGlobal_renderEntities.equalsNameDesc(name, desc)) {
|
||||
ALog.finer(" patch method %s.%s%s", classname, name, desc);
|
||||
return new MVrenderEntities(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
@@ -73,6 +75,7 @@ public class ACTRenderGlobal implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class MVrenderEntities extends MethodVisitor {
|
||||
|
||||
public MVrenderEntities(MethodVisitor mv) {
|
||||
super(Opcodes.ASM4, mv);
|
||||
}
|
||||
@@ -115,13 +118,19 @@ public class ACTRenderGlobal implements IClassTransformer {
|
||||
mv.visitMethodInsn(INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "endEntities", "()V");
|
||||
ALog.finest(" %s", "endEntities");
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "beginBlockEntities", "()V");
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"beginBlockEntities",
|
||||
"()V");
|
||||
ALog.finest(" %s", "beginTileEntities");
|
||||
} else if (state == 5) {
|
||||
if (Names.entityRenderer_disableLightmap.equals(owner, name, desc)) {
|
||||
state = 6;
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "endBlockEntities", "()V");
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"endBlockEntities",
|
||||
"()V");
|
||||
ALog.finest(" %s", "endTileEntities");
|
||||
}
|
||||
}
|
||||
@@ -130,6 +139,7 @@ public class ACTRenderGlobal implements IClassTransformer {
|
||||
|
||||
/* detect glEnable or glDisable (TEXTURE_2D or FOG) */
|
||||
private static class MVendisTexFog extends MethodVisitor {
|
||||
|
||||
public MVendisTexFog(MethodVisitor mv) {
|
||||
super(Opcodes.ASM4, mv);
|
||||
}
|
||||
@@ -153,21 +163,33 @@ public class ACTRenderGlobal implements IClassTransformer {
|
||||
if (name.equals("glEnable")) {
|
||||
if (lastInt == GL11.GL_TEXTURE_2D) {
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "enableTexture2D", "()V");
|
||||
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");
|
||||
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");
|
||||
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");
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"disableFog",
|
||||
"()V");
|
||||
ALog.finest(" %s", "disableFog");
|
||||
}
|
||||
}
|
||||
@@ -178,6 +200,7 @@ public class ACTRenderGlobal implements IClassTransformer {
|
||||
|
||||
/* extends MVenableTF */
|
||||
private static class MVrenderSky extends MVendisTexFog {
|
||||
|
||||
public MVrenderSky(MethodVisitor mv) {
|
||||
super(mv);
|
||||
}
|
||||
@@ -227,7 +250,10 @@ public class ACTRenderGlobal implements IClassTransformer {
|
||||
if (Names.renderGlobal_glSkyList.equals(owner, name)) {
|
||||
++state;
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "preSkyList", "()V");
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"preSkyList",
|
||||
"()V");
|
||||
break;
|
||||
}
|
||||
break;
|
||||
@@ -237,7 +263,7 @@ public class ACTRenderGlobal implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public void visitMethodInsn(int opcode, String owner, String name, String desc) {
|
||||
// SMCLog.info(" %s.%s%s",ownerM,nameM,descM);
|
||||
// SMCLog.info(" %s.%s%s",ownerM,nameM,descM);
|
||||
switch (state) {
|
||||
case 0:
|
||||
if (owner.equals("Config") && name.equals("isSkyEnabled")) {
|
||||
@@ -257,21 +283,33 @@ public class ACTRenderGlobal implements IClassTransformer {
|
||||
if (name.equals("glEnable")) {
|
||||
if (lastInt == GL11.GL_TEXTURE_2D) {
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "enableTexture2D", "()V");
|
||||
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");
|
||||
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");
|
||||
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");
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"disableFog",
|
||||
"()V");
|
||||
ALog.finest(" %s", "disableFog");
|
||||
}
|
||||
} else if (name.equals("glRotatef")) {
|
||||
@@ -279,7 +317,10 @@ public class ACTRenderGlobal implements IClassTransformer {
|
||||
if (state == 3) {
|
||||
++state;
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "preCelestialRotate", "()V");
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"preCelestialRotate",
|
||||
"()V");
|
||||
ALog.finest(" %s", "preCelestialRotate");
|
||||
} else if (state == 4) {
|
||||
++state;
|
||||
@@ -296,6 +337,7 @@ public class ACTRenderGlobal implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class MVdrawBlockDamageTexture extends MethodVisitor {
|
||||
|
||||
int state = 0;
|
||||
|
||||
public MVdrawBlockDamageTexture(MethodVisitor mv) {
|
||||
|
||||
@@ -3,6 +3,7 @@ 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;
|
||||
@@ -23,6 +24,7 @@ public class ACTRenderManager implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class CVTransform extends ClassVisitor {
|
||||
|
||||
String classname;
|
||||
boolean endFields = false;
|
||||
|
||||
@@ -31,8 +33,8 @@ public class ACTRenderManager implements IClassTransformer {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void visit(
|
||||
int version, int access, String name, String signature, String superName, String[] interfaces) {
|
||||
public void visit(int version, int access, String name, String signature, String superName,
|
||||
String[] interfaces) {
|
||||
classname = name;
|
||||
// SMCLog.info(" class %s",name);
|
||||
cv.visit(version, access, name, signature, superName, interfaces);
|
||||
|
||||
@@ -3,6 +3,7 @@ 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;
|
||||
@@ -22,6 +23,7 @@ public class ACTRenderSpider implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class CVTransform extends ClassVisitor {
|
||||
|
||||
String classname;
|
||||
|
||||
public CVTransform(ClassVisitor cv) {
|
||||
@@ -29,8 +31,8 @@ public class ACTRenderSpider implements IClassTransformer {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void visit(
|
||||
int version, int access, String name, String signature, String superName, String[] interfaces) {
|
||||
public void visit(int version, int access, String name, String signature, String superName,
|
||||
String[] interfaces) {
|
||||
classname = name;
|
||||
// SMCLog.info(" class %s",name);
|
||||
cv.visit(version, access, name, signature, superName, interfaces);
|
||||
@@ -38,17 +40,17 @@ public class ACTRenderSpider implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
|
||||
// SMCLog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
// SMCLog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
if (Names.renderDragon_shouldRenderPass.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
return new MVshouldRenderPass(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
}
|
||||
if (Names.renderEnderman_shouldRenderPass.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
return new MVshouldRenderPass(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
}
|
||||
if (Names.renderSpider_shouldRenderPass.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
return new MVshouldRenderPass(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
}
|
||||
return cv.visitMethod(access, name, desc, signature, exceptions);
|
||||
@@ -56,6 +58,7 @@ public class ACTRenderSpider implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class MVshouldRenderPass extends MethodVisitor {
|
||||
|
||||
public MVshouldRenderPass(MethodVisitor mv) {
|
||||
super(Opcodes.ASM4, mv);
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@ package com.gtnewhorizons.angelica.transform;
|
||||
import static org.objectweb.asm.Opcodes.*;
|
||||
|
||||
import net.minecraft.launchwrapper.IClassTransformer;
|
||||
|
||||
import org.lwjgl.opengl.GL12;
|
||||
import org.objectweb.asm.ClassReader;
|
||||
import org.objectweb.asm.ClassVisitor;
|
||||
@@ -25,6 +26,7 @@ public class ACTRendererLivingEntity implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class CVTransform extends ClassVisitor {
|
||||
|
||||
String classname;
|
||||
|
||||
public CVTransform(ClassVisitor cv) {
|
||||
@@ -32,8 +34,8 @@ public class ACTRendererLivingEntity implements IClassTransformer {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void visit(
|
||||
int version, int access, String name, String signature, String superName, String[] interfaces) {
|
||||
public void visit(int version, int access, String name, String signature, String superName,
|
||||
String[] interfaces) {
|
||||
classname = name;
|
||||
// SMCLog.info(" class %s",name);
|
||||
cv.visit(version, access, name, signature, superName, interfaces);
|
||||
@@ -50,12 +52,12 @@ public class ACTRendererLivingEntity implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
|
||||
// SMCLog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
// SMCLog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
if (Names.rendererLivingE_doRender.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
return new MVdoRenderLiving(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
} else if (Names.rendererLivingE_renderLabel.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
return new MVrenderLivingLabel(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
}
|
||||
return cv.visitMethod(access, name, desc, signature, exceptions);
|
||||
@@ -63,13 +65,14 @@ public class ACTRendererLivingEntity implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class MVdoRenderLiving extends MethodVisitor {
|
||||
|
||||
public MVdoRenderLiving(MethodVisitor mv) {
|
||||
super(Opcodes.ASM4, mv);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void visitCode() {
|
||||
// SMCLog.info(" insert code");
|
||||
// SMCLog.info(" insert code");
|
||||
mv.visitCode();
|
||||
mv.visitFieldInsn(GETSTATIC, "com/gtnewhorizons/angelica/client/Shaders", "useEntityHurtFlash", "Z");
|
||||
Label label1 = new Label();
|
||||
@@ -99,7 +102,7 @@ public class ACTRendererLivingEntity implements IClassTransformer {
|
||||
mv.visitFrame(Opcodes.F_SAME, 0, null, 0, null);
|
||||
mv.visitInsn(ICONST_0);
|
||||
mv.visitLabel(label4);
|
||||
mv.visitFrame(Opcodes.F_SAME1, 0, null, 1, new Object[] {Opcodes.INTEGER});
|
||||
mv.visitFrame(Opcodes.F_SAME1, 0, null, 1, new Object[] { Opcodes.INTEGER });
|
||||
mv.visitVarInsn(ALOAD, 0);
|
||||
mv.visitVarInsn(ALOAD, 1);
|
||||
mv.visitVarInsn(ALOAD, 1);
|
||||
@@ -116,10 +119,13 @@ public class ACTRendererLivingEntity implements IClassTransformer {
|
||||
Names.rendererLivingE_getColorMultiplier.name,
|
||||
Names.rendererLivingE_getColorMultiplier.desc);
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "setEntityHurtFlash", "(II)V");
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"setEntityHurtFlash",
|
||||
"(II)V");
|
||||
mv.visitLabel(label1);
|
||||
mv.visitFrame(Opcodes.F_SAME, 0, null, 0, null);
|
||||
// SMCLog.info(" end insert");
|
||||
// SMCLog.info(" end insert");
|
||||
}
|
||||
|
||||
/** last SIPUSH operand */
|
||||
@@ -144,9 +150,9 @@ public class ACTRendererLivingEntity implements IClassTransformer {
|
||||
if (cst instanceof Integer) {
|
||||
int icst = ((Integer) cst).intValue();
|
||||
if (icst == GL12.GL_RESCALE_NORMAL) {
|
||||
// SMCLog.info(" rescale_normal");
|
||||
// SMCLog.info(" rescale_normal");
|
||||
if (labelEndVH != null) {
|
||||
// SMCLog.info(" jump target");
|
||||
// SMCLog.info(" jump target");
|
||||
mv.visitLabel(labelEndVH);
|
||||
labelEndVH = null;
|
||||
}
|
||||
@@ -157,15 +163,21 @@ public class ACTRendererLivingEntity implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public void visitMethodInsn(int opcode, String owner, String name, String desc) {
|
||||
// SMCLog.info(" %s.%s%s",ownerM,nameM,descM);
|
||||
// SMCLog.info(" %s.%s%s",ownerM,nameM,descM);
|
||||
if (opcode == INVOKEVIRTUAL) {
|
||||
if (Names.rendererLivingE_renderEquippedItems.equals(owner, name, desc)) {
|
||||
// SMCLog.info(" renderEquippedItems");
|
||||
// SMCLog.info(" renderEquippedItems");
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "resetEntityHurtFlash", "()V");
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"resetEntityHurtFlash",
|
||||
"()V");
|
||||
mv.visitMethodInsn(opcode, owner, name, desc);
|
||||
mv.visitFieldInsn(
|
||||
GETSTATIC, "com/gtnewhorizons/angelica/client/Shaders", "useEntityHurtFlash", "Z");
|
||||
GETSTATIC,
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"useEntityHurtFlash",
|
||||
"Z");
|
||||
labelEndVH = new Label();
|
||||
mv.visitJumpInsn(IFNE, labelEndVH);
|
||||
state = 1;
|
||||
@@ -177,29 +189,41 @@ public class ACTRendererLivingEntity implements IClassTransformer {
|
||||
//
|
||||
if (opcode == INVOKESTATIC) {
|
||||
if (Names.equals("org/lwjgl/opengl/GL11", "glDepthFunc", "(I)V", owner, name, desc)) {
|
||||
// SMCLog.info(" glDepthFunc");
|
||||
// SMCLog.info(" glDepthFunc");
|
||||
if (state == 3) {
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "beginLivingDamage", "()V");
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"beginLivingDamage",
|
||||
"()V");
|
||||
++state;
|
||||
} else if (state == 4) {
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "endLivingDamage", "()V");
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"endLivingDamage",
|
||||
"()V");
|
||||
++state;
|
||||
}
|
||||
} else if (Names.openGlHelper_setActiveTexture.equals(owner, name, desc)) {
|
||||
// SMCLog.info(" setActiveTexture");
|
||||
// SMCLog.info(" setActiveTexture");
|
||||
if (state == 1) {
|
||||
++state;
|
||||
} else if (state == 2) {
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "disableLightmap", "()V");
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"disableLightmap",
|
||||
"()V");
|
||||
++state;
|
||||
} else if (state == 5) {
|
||||
++state;
|
||||
} else if (state == 6) {
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC, "com/gtnewhorizons/angelica/client/Shaders", "enableLightmap", "()V");
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/Shaders",
|
||||
"enableLightmap",
|
||||
"()V");
|
||||
++state;
|
||||
}
|
||||
}
|
||||
@@ -216,6 +240,7 @@ public class ACTRendererLivingEntity implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class MVrenderLivingLabel extends MethodVisitor {
|
||||
|
||||
public MVrenderLivingLabel(MethodVisitor mv) {
|
||||
super(Opcodes.ASM4, mv);
|
||||
}
|
||||
@@ -246,28 +271,28 @@ public class ACTRendererLivingEntity implements IClassTransformer {
|
||||
}
|
||||
}
|
||||
|
||||
// private static class MVNTransform extends MethodVisitor
|
||||
// {
|
||||
// protected MethodVisitor mv;
|
||||
// protected MethodNode mn;
|
||||
// public MVNTransform(MethodNode mn, MethodVisitor mv) {
|
||||
// super(Opcodes.ASM4);
|
||||
// super.mv = this.mn = mn;
|
||||
// this.mv = mv;
|
||||
// }
|
||||
// private static class MVNTransform extends MethodVisitor
|
||||
// {
|
||||
// protected MethodVisitor mv;
|
||||
// protected MethodNode mn;
|
||||
// public MVNTransform(MethodNode mn, MethodVisitor mv) {
|
||||
// super(Opcodes.ASM4);
|
||||
// super.mv = this.mn = mn;
|
||||
// this.mv = mv;
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void visitEnd() {
|
||||
// super.visitEnd();
|
||||
// Iterator<AbstractInsnNode> it = mn.instructions.iterator();
|
||||
// while (it.hasNext())
|
||||
// {
|
||||
// AbstractInsnNode node = it.next();
|
||||
// System.out.println(node.toString());
|
||||
// }
|
||||
// // send to target
|
||||
// mn.accept(mv);
|
||||
// }
|
||||
// }
|
||||
// @Override
|
||||
// public void visitEnd() {
|
||||
// super.visitEnd();
|
||||
// Iterator<AbstractInsnNode> it = mn.instructions.iterator();
|
||||
// while (it.hasNext())
|
||||
// {
|
||||
// AbstractInsnNode node = it.next();
|
||||
// System.out.println(node.toString());
|
||||
// }
|
||||
// // send to target
|
||||
// mn.accept(mv);
|
||||
// }
|
||||
// }
|
||||
|
||||
}
|
||||
+13
-5
@@ -3,6 +3,7 @@ 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;
|
||||
@@ -22,6 +23,7 @@ public class ACTSmartMoveModelRotationRenderer implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class CVTransform extends ClassVisitor {
|
||||
|
||||
String classname;
|
||||
|
||||
public CVTransform(ClassVisitor cv) {
|
||||
@@ -29,8 +31,8 @@ public class ACTSmartMoveModelRotationRenderer implements IClassTransformer {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void visit(
|
||||
int version, int access, String name, String signature, String superName, String[] interfaces) {
|
||||
public void visit(int version, int access, String name, String signature, String superName,
|
||||
String[] interfaces) {
|
||||
classname = name;
|
||||
// SMCLog.info(" class %s",name);
|
||||
cv.visit(version, access, name, signature, superName, interfaces);
|
||||
@@ -38,7 +40,7 @@ public class ACTSmartMoveModelRotationRenderer implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
|
||||
// SMCLog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
// SMCLog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
if ("resetDisplayList".equals(name) && "()V".equals(desc)) {
|
||||
return null;
|
||||
}
|
||||
@@ -57,12 +59,18 @@ public class ACTSmartMoveModelRotationRenderer implements IClassTransformer {
|
||||
mv.visitInsn(ICONST_0);
|
||||
// mv.visitFieldInsn(PUTFIELD, "net/smart/render/ModelRotationRenderer", "compiled", "Z");
|
||||
mv.visitFieldInsn(
|
||||
PUTFIELD, "net/smart/render/ModelRotationRenderer", Names.modelRenderer_compiled.name, "Z");
|
||||
PUTFIELD,
|
||||
"net/smart/render/ModelRotationRenderer",
|
||||
Names.modelRenderer_compiled.name,
|
||||
"Z");
|
||||
mv.visitVarInsn(ALOAD, 0);
|
||||
mv.visitInsn(ICONST_0);
|
||||
// mv.visitFieldInsn(PUTFIELD, "net/smart/render/ModelRotationRenderer", "displayList", "I");
|
||||
mv.visitFieldInsn(
|
||||
PUTFIELD, "net/smart/render/ModelRotationRenderer", Names.modelRenderer_displayList.name, "I");
|
||||
PUTFIELD,
|
||||
"net/smart/render/ModelRotationRenderer",
|
||||
Names.modelRenderer_displayList.name,
|
||||
"I");
|
||||
mv.visitInsn(RETURN);
|
||||
mv.visitMaxs(2, 1);
|
||||
mv.visitEnd();
|
||||
|
||||
@@ -3,6 +3,7 @@ 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;
|
||||
@@ -27,6 +28,7 @@ public class ACTTessellator implements IClassTransformer {
|
||||
private static boolean inputHasStaticBuffer = false;
|
||||
|
||||
private static class CVTransform extends ClassVisitor {
|
||||
|
||||
String classname;
|
||||
boolean endFields = false;
|
||||
|
||||
@@ -35,8 +37,8 @@ public class ACTTessellator implements IClassTransformer {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void visit(
|
||||
int version, int access, String name, String signature, String superName, String[] interfaces) {
|
||||
public void visit(int version, int access, String name, String signature, String superName,
|
||||
String[] interfaces) {
|
||||
classname = name;
|
||||
// SMCLog.info(" class %s",name);
|
||||
cv.visit(version, access, name, signature, superName, interfaces);
|
||||
@@ -45,28 +47,26 @@ public class ACTTessellator implements IClassTransformer {
|
||||
@Override
|
||||
public FieldVisitor visitField(int access, String name, String desc, String signature, Object value) {
|
||||
// SMCLog.fine("%x %s %s %s",access,desc,name,nameM);
|
||||
if (name.equals("vertexPos")
|
||||
|| name.equals("normalX")
|
||||
if (name.equals("vertexPos") || name.equals("normalX")
|
||||
|| name.equals("normalY")
|
||||
|| name.equals("normalZ")
|
||||
|| name.equals("midTextureU")
|
||||
|| name.equals("midTextureV")) {
|
||||
return null;
|
||||
} else if (((access & ACC_STATIC) != 0)
|
||||
&& (Names.tessellator_byteBuffer.name.equals(name)
|
||||
|| Names.tessellator_intBuffer.name.equals(name)
|
||||
&& (Names.tessellator_byteBuffer.name.equals(name) || Names.tessellator_intBuffer.name.equals(name)
|
||||
|| Names.tessellator_floatBuffer.name.equals(name)
|
||||
|| Names.tessellator_shortBuffer.name.equals(name)
|
||||
|| Names.tessellator_vertexCount.name.equals(name)
|
||||
// nameM.equals(Names.Tessellator_useVBO) ||
|
||||
// nameM.equals(Names.Tessellator_vertexBuffers)
|
||||
)) {
|
||||
inputHasStaticBuffer = true;
|
||||
// SMCLog.finest(" input has static buffer");
|
||||
access = access & (~ACC_STATIC & ~ACC_PRIVATE & ~ACC_PROTECTED) | ACC_PUBLIC;
|
||||
} else {
|
||||
access = access & (~ACC_PRIVATE & ~ACC_PROTECTED) | ACC_PUBLIC;
|
||||
}
|
||||
inputHasStaticBuffer = true;
|
||||
// SMCLog.finest(" input has static buffer");
|
||||
access = access & (~ACC_STATIC & ~ACC_PRIVATE & ~ACC_PROTECTED) | ACC_PUBLIC;
|
||||
} else {
|
||||
access = access & (~ACC_PRIVATE & ~ACC_PROTECTED) | ACC_PUBLIC;
|
||||
}
|
||||
return cv.visitField(access, name, desc, signature, value);
|
||||
}
|
||||
|
||||
@@ -88,31 +88,31 @@ public class ACTTessellator implements IClassTransformer {
|
||||
fv = cv.visitField(ACC_PUBLIC, "midTextureV", "F", null, null);
|
||||
fv.visitEnd();
|
||||
}
|
||||
// SMCLog.fine(" method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
// SMCLog.fine(" method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
if (name.equals("<clinit>")) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
return new MVclinit(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
} else if (name.equals("<init>") && desc.equals("()V")) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
return new MVinit(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
} else if (name.equals("<init>") && desc.equals("(I)V")) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
return new MVinitI(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
} else if (Names.tessellator_draw.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
return new MVdraw(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
} else if (Names.tessellator_reset.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
access = access & ~(ACC_PRIVATE | ACC_PROTECTED) | ACC_PUBLIC;
|
||||
return new MVreset(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
} else if (Names.tessellator_addVertex.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
return new MVaddVertex(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
} else if (Names.tessellator_setNormal.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
return new MVsetNormal(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
} else if (Names.tessellator_sortQuad.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
return new MVsortQuad(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
} else {
|
||||
access = access & ~(ACC_PRIVATE | ACC_PROTECTED) | ACC_PUBLIC;
|
||||
@@ -121,70 +121,53 @@ public class ACTTessellator implements IClassTransformer {
|
||||
}
|
||||
}
|
||||
|
||||
/*private static class MVclinit extends MethodVisitor
|
||||
{
|
||||
public MVclinit(MethodVisitor mv) {
|
||||
super(Opcodes.ASM4, mv);
|
||||
}
|
||||
}
|
||||
|
||||
private static class MVinit extends MethodVisitor
|
||||
{
|
||||
public MVinit(MethodVisitor mv) {
|
||||
super(Opcodes.ASM4, mv);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void visitInsn(int opcode) {
|
||||
if (opcode == RETURN) {
|
||||
mv.visitVarInsn(ALOAD, 0);
|
||||
mv.visitIntInsn(BIPUSH, 16);
|
||||
mv.visitIntInsn(NEWARRAY, T_FLOAT);
|
||||
mv.visitFieldInsn(PUTFIELD, SMCNames.Tessellator_, "vertexPos", "[F");
|
||||
}
|
||||
mv.visitInsn(opcode);
|
||||
}
|
||||
}*/
|
||||
/*
|
||||
* private static class MVclinit extends MethodVisitor { public MVclinit(MethodVisitor mv) { super(Opcodes.ASM4,
|
||||
* mv); } } private static class MVinit extends MethodVisitor { public MVinit(MethodVisitor mv) {
|
||||
* super(Opcodes.ASM4, mv); }
|
||||
* @Override public void visitInsn(int opcode) { if (opcode == RETURN) { mv.visitVarInsn(ALOAD, 0);
|
||||
* mv.visitIntInsn(BIPUSH, 16); mv.visitIntInsn(NEWARRAY, T_FLOAT); mv.visitFieldInsn(PUTFIELD,
|
||||
* SMCNames.Tessellator_, "vertexPos", "[F"); } mv.visitInsn(opcode); } }
|
||||
*/
|
||||
|
||||
private static class MVclinit extends MethodVisitor {
|
||||
|
||||
public MVclinit(MethodVisitor mv) {
|
||||
super(Opcodes.ASM4, mv);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void visitFieldInsn(int opcode, String owner, String name, String desc) {
|
||||
// SMCLog.finest(" F %d %s.%s %s", opcode, ownerM, nameM, descM);
|
||||
if (opcode == PUTSTATIC
|
||||
&& (Names.tessellator_byteBuffer.equals(owner, name)
|
||||
|| Names.tessellator_intBuffer.equals(owner, name)
|
||||
|| Names.tessellator_floatBuffer.equals(owner, name)
|
||||
|| Names.tessellator_shortBuffer.equals(owner, name)
|
||||
|| Names.tessellator_vertexCount.equals(owner, name)
|
||||
// nameM.equals(Names.Tessellator_useVBO)||
|
||||
// nameM.equals(Names.Tessellator_vertexBuffers)
|
||||
)) {
|
||||
// SMCLog.finest(" F %d %s.%s %s", opcode, ownerM, nameM, descM);
|
||||
if (opcode == PUTSTATIC && (Names.tessellator_byteBuffer.equals(owner, name)
|
||||
|| Names.tessellator_intBuffer.equals(owner, name)
|
||||
|| Names.tessellator_floatBuffer.equals(owner, name)
|
||||
|| Names.tessellator_shortBuffer.equals(owner, name)
|
||||
|| Names.tessellator_vertexCount.equals(owner, name)
|
||||
// nameM.equals(Names.Tessellator_useVBO)||
|
||||
// nameM.equals(Names.Tessellator_vertexBuffers)
|
||||
)) {
|
||||
mv.visitInsn(POP);
|
||||
return;
|
||||
} else if (opcode == GETSTATIC
|
||||
&& (Names.tessellator_byteBuffer.equals(owner, name)
|
||||
// nameM.equals(Names.Tessellator_vertexBuffers)
|
||||
)) {
|
||||
} else if (opcode == GETSTATIC && (Names.tessellator_byteBuffer.equals(owner, name)
|
||||
// nameM.equals(Names.Tessellator_vertexBuffers)
|
||||
)) {
|
||||
mv.visitInsn(ACONST_NULL);
|
||||
return;
|
||||
// } else
|
||||
// if (opcode==GETSTATIC && (
|
||||
// nameM.equals(Names.Tessellator_useVBO)
|
||||
// ))
|
||||
// nameM.equals(Names.Tessellator_useVBO)
|
||||
// ))
|
||||
// {
|
||||
// mv.visitInsn(ICONST_0);
|
||||
// return;
|
||||
// mv.visitInsn(ICONST_0);
|
||||
// return;
|
||||
}
|
||||
mv.visitFieldInsn(opcode, owner, name, desc);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void visitMethodInsn(int opcode, String owner, String name, String desc) {
|
||||
// SMCLog.finest(" M %d %s.%s %s", opcode, ownerM, nameM, descM);
|
||||
// SMCLog.finest(" M %d %s.%s %s", opcode, ownerM, nameM, descM);
|
||||
if (Names.glAllocation_createDirectByteBuffer.equals(owner, name, desc)) {
|
||||
mv.visitInsn(POP);
|
||||
mv.visitInsn(ACONST_NULL);
|
||||
@@ -193,27 +176,39 @@ public class ACTTessellator implements IClassTransformer {
|
||||
mv.visitInsn(POP);
|
||||
mv.visitInsn(ACONST_NULL);
|
||||
return;
|
||||
} else if (Names.equals(
|
||||
"java/nio/ByteBuffer", "asIntBuffer", "()Ljava/nio/IntBuffer;", owner, name, desc)) {
|
||||
mv.visitInsn(POP);
|
||||
mv.visitInsn(ACONST_NULL);
|
||||
return;
|
||||
} else if (Names.equals(
|
||||
"java/nio/ByteBuffer", "asFloatBuffer", "()Ljava/nio/FloatBuffer;", owner, name, desc)) {
|
||||
mv.visitInsn(POP);
|
||||
mv.visitInsn(ACONST_NULL);
|
||||
return;
|
||||
} else if (Names.equals(
|
||||
"java/nio/ByteBuffer", "asShortBuffer", "()Ljava/nio/ShortBuffer;", owner, name, desc)) {
|
||||
mv.visitInsn(POP);
|
||||
mv.visitInsn(ACONST_NULL);
|
||||
return;
|
||||
}
|
||||
} else
|
||||
if (Names.equals("java/nio/ByteBuffer", "asIntBuffer", "()Ljava/nio/IntBuffer;", owner, name, desc)) {
|
||||
mv.visitInsn(POP);
|
||||
mv.visitInsn(ACONST_NULL);
|
||||
return;
|
||||
} else if (Names.equals(
|
||||
"java/nio/ByteBuffer",
|
||||
"asFloatBuffer",
|
||||
"()Ljava/nio/FloatBuffer;",
|
||||
owner,
|
||||
name,
|
||||
desc)) {
|
||||
mv.visitInsn(POP);
|
||||
mv.visitInsn(ACONST_NULL);
|
||||
return;
|
||||
} else
|
||||
if (Names.equals(
|
||||
"java/nio/ByteBuffer",
|
||||
"asShortBuffer",
|
||||
"()Ljava/nio/ShortBuffer;",
|
||||
owner,
|
||||
name,
|
||||
desc)) {
|
||||
mv.visitInsn(POP);
|
||||
mv.visitInsn(ACONST_NULL);
|
||||
return;
|
||||
}
|
||||
mv.visitMethodInsn(opcode, owner, name, desc);
|
||||
}
|
||||
}
|
||||
|
||||
private static class MVinit extends MethodVisitor {
|
||||
|
||||
public MVinit(MethodVisitor mv) {
|
||||
super(Opcodes.ASM4, mv);
|
||||
}
|
||||
@@ -230,6 +225,7 @@ public class ACTTessellator implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class MVinitI extends MethodVisitor {
|
||||
|
||||
public MVinitI(MethodVisitor mv) {
|
||||
super(Opcodes.ASM4, mv);
|
||||
}
|
||||
@@ -273,7 +269,10 @@ public class ACTTessellator implements IClassTransformer {
|
||||
Names.tessellator_byteBuffer.name,
|
||||
Names.tessellator_byteBuffer.desc);
|
||||
mv.visitMethodInsn(
|
||||
INVOKEVIRTUAL, "java/nio/ByteBuffer", "asFloatBuffer", "()Ljava/nio/FloatBuffer;");
|
||||
INVOKEVIRTUAL,
|
||||
"java/nio/ByteBuffer",
|
||||
"asFloatBuffer",
|
||||
"()Ljava/nio/FloatBuffer;");
|
||||
mv.visitFieldInsn(
|
||||
PUTFIELD,
|
||||
Names.tessellator_floatBuffer.clas,
|
||||
@@ -287,7 +286,10 @@ public class ACTTessellator implements IClassTransformer {
|
||||
Names.tessellator_byteBuffer.name,
|
||||
Names.tessellator_byteBuffer.desc);
|
||||
mv.visitMethodInsn(
|
||||
INVOKEVIRTUAL, "java/nio/ByteBuffer", "asShortBuffer", "()Ljava/nio/ShortBuffer;");
|
||||
INVOKEVIRTUAL,
|
||||
"java/nio/ByteBuffer",
|
||||
"asShortBuffer",
|
||||
"()Ljava/nio/ShortBuffer;");
|
||||
mv.visitFieldInsn(
|
||||
PUTFIELD,
|
||||
Names.tessellator_shortBuffer.clas,
|
||||
@@ -357,6 +359,7 @@ public class ACTTessellator implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class MVdraw extends MethodVisitor {
|
||||
|
||||
public MVdraw(MethodVisitor mv) {
|
||||
super(Opcodes.ASM4, null);
|
||||
mv.visitCode();
|
||||
@@ -379,13 +382,14 @@ public class ACTTessellator implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class MVreset extends MethodVisitor {
|
||||
|
||||
public MVreset(MethodVisitor mv) {
|
||||
super(Opcodes.ASM4, mv);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void visitFieldInsn(int opcode, String owner, String name, String desc) {
|
||||
// SMCLog.finest(" F %d %s.%s %s", opcode, ownerM, nameM, descM);
|
||||
// SMCLog.finest(" F %d %s.%s %s", opcode, ownerM, nameM, descM);
|
||||
if (opcode == GETSTATIC && Names.tessellator_byteBuffer.equals(owner, name)) {
|
||||
mv.visitVarInsn(ALOAD, 0);
|
||||
mv.visitFieldInsn(GETFIELD, owner, name, desc);
|
||||
@@ -396,6 +400,7 @@ public class ACTTessellator implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class MVaddVertex extends MethodVisitor {
|
||||
|
||||
public MVaddVertex(MethodVisitor mv) {
|
||||
super(Opcodes.ASM4, null);
|
||||
mv.visitCode();
|
||||
@@ -427,6 +432,7 @@ public class ACTTessellator implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class MVsetNormal extends MethodVisitor {
|
||||
|
||||
public MVsetNormal(MethodVisitor mv) {
|
||||
super(Opcodes.ASM4, null);
|
||||
mv.visitCode();
|
||||
@@ -461,6 +467,7 @@ public class ACTTessellator implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class MVsortQuad extends MethodVisitor {
|
||||
|
||||
public MVsortQuad(MethodVisitor mv) {
|
||||
super(Opcodes.ASM4, mv);
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@ 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;
|
||||
@@ -24,6 +25,7 @@ public class ACTTextureAbstract implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class CVTransform extends ClassVisitor {
|
||||
|
||||
String classname;
|
||||
boolean endFields = false;
|
||||
|
||||
@@ -32,8 +34,8 @@ public class ACTTextureAbstract implements IClassTransformer {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void visit(
|
||||
int version, int access, String name, String signature, String superName, String[] interfaces) {
|
||||
public void visit(int version, int access, String name, String signature, String superName,
|
||||
String[] interfaces) {
|
||||
classname = name;
|
||||
// SMCLog.info(" class %s",name);
|
||||
cv.visit(version, access, name, signature, superName, interfaces);
|
||||
@@ -56,17 +58,21 @@ public class ACTTextureAbstract implements IClassTransformer {
|
||||
FieldVisitor fv;
|
||||
// multiTex
|
||||
fv = cv.visitField(
|
||||
ACC_PUBLIC, "multiTex", "Lcom/gtnewhorizons/angelica/client/MultiTexID;", null, null);
|
||||
ACC_PUBLIC,
|
||||
"multiTex",
|
||||
"Lcom/gtnewhorizons/angelica/client/MultiTexID;",
|
||||
null,
|
||||
null);
|
||||
fv.visitEnd();
|
||||
}
|
||||
// SMCLog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
// SMCLog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
if (Names.abstractTexture_deleteGlTexture.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s%s",classname,name,desc,nameM,descM);
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s%s",classname,name,desc,nameM,descM);
|
||||
return new MVdeleteGlTexture(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
} else if (name.equals("getMultiTexID")
|
||||
&& desc.equals("()Lcom/gtnewhorizons/angelica/client/MultiTexID;")) {
|
||||
return null;
|
||||
}
|
||||
} else
|
||||
if (name.equals("getMultiTexID") && desc.equals("()Lcom/gtnewhorizons/angelica/client/MultiTexID;")) {
|
||||
return null;
|
||||
}
|
||||
return cv.visitMethod(access, name, desc, signature, exceptions);
|
||||
}
|
||||
|
||||
@@ -75,7 +81,11 @@ public class ACTTextureAbstract implements IClassTransformer {
|
||||
MethodVisitor mv;
|
||||
// getMultiTexID
|
||||
mv = cv.visitMethod(
|
||||
ACC_PUBLIC, "getMultiTexID", "()Lcom/gtnewhorizons/angelica/client/MultiTexID;", null, null);
|
||||
ACC_PUBLIC,
|
||||
"getMultiTexID",
|
||||
"()Lcom/gtnewhorizons/angelica/client/MultiTexID;",
|
||||
null,
|
||||
null);
|
||||
mv.visitCode();
|
||||
mv.visitVarInsn(ALOAD, 0);
|
||||
mv.visitMethodInsn(
|
||||
@@ -92,6 +102,7 @@ public class ACTTextureAbstract implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class MVdeleteGlTexture extends MethodVisitor {
|
||||
|
||||
public MVdeleteGlTexture(MethodVisitor mv) {
|
||||
super(Opcodes.ASM4, mv);
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@ 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;
|
||||
@@ -25,6 +26,7 @@ public class ACTTextureAtlasSprite implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class CVTransform extends ClassVisitor {
|
||||
|
||||
String classname;
|
||||
|
||||
public CVTransform(ClassVisitor cv) {
|
||||
@@ -32,8 +34,8 @@ public class ACTTextureAtlasSprite implements IClassTransformer {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void visit(
|
||||
int version, int access, String name, String signature, String superName, String[] interfaces) {
|
||||
public void visit(int version, int access, String name, String signature, String superName,
|
||||
String[] interfaces) {
|
||||
classname = name;
|
||||
cv.visit(version, access, name, signature, superName, interfaces);
|
||||
}
|
||||
@@ -47,28 +49,30 @@ public class ACTTextureAtlasSprite implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
|
||||
// SMCLog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
// SMCLog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
access = access & ~(ACC_PRIVATE | ACC_PROTECTED) | ACC_PUBLIC;
|
||||
if (Names.textureAtlasSpri_updateAnimation.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
return new MVanimation(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
} else if (name.equals("load")
|
||||
&& desc.equals("(" + Names.iResourceManager_.desc + Names.resourceLocation_.desc + ")Z")) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
return new MVload(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
} else if (Names.textureAtlasSpri_loadSprite.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
return new MVloadSprite(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
} else if (name.equals("uploadFrameTexture") && desc.equals("(III)V")) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
return new MVuploadFrameTexture(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
}
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
return new MVload(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
} else
|
||||
if (Names.textureAtlasSpri_loadSprite.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
return new MVloadSprite(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
} else if (name.equals("uploadFrameTexture") && desc.equals("(III)V")) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
return new MVuploadFrameTexture(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
}
|
||||
return cv.visitMethod(access, name, desc, signature, exceptions);
|
||||
}
|
||||
}
|
||||
|
||||
// also used by clock and compass
|
||||
protected static class MVanimation extends MethodVisitor {
|
||||
|
||||
// protected MethodVisitor mv;
|
||||
public MVanimation(MethodVisitor mv) {
|
||||
super(Opcodes.ASM4, mv);
|
||||
@@ -79,7 +83,10 @@ public class ACTTextureAtlasSprite implements IClassTransformer {
|
||||
public void visitMethodInsn(int opcode, String owner, String name, String desc) {
|
||||
if (Names.textureUtil_uploadTexSub.equals(owner, name, desc)) {
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC, "com/gtnewhorizons/angelica/client/ShadersTex", "uploadTexSub", "([[IIIIIZZ)V");
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/ShadersTex",
|
||||
"uploadTexSub",
|
||||
"([[IIIIIZZ)V");
|
||||
return;
|
||||
}
|
||||
mv.visitMethodInsn(opcode, owner, name, desc);
|
||||
@@ -87,6 +94,7 @@ public class ACTTextureAtlasSprite implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class MVload extends MethodVisitor {
|
||||
|
||||
// protected MethodVisitor mv;
|
||||
public MVload(MethodVisitor mv) {
|
||||
super(Opcodes.ASM4, mv);
|
||||
@@ -100,7 +108,9 @@ public class ACTTextureAtlasSprite implements IClassTransformer {
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/ShadersTex",
|
||||
"loadResource",
|
||||
"(" + Names.iResourceManager_.desc + Names.resourceLocation_.desc + ")"
|
||||
"(" + Names.iResourceManager_.desc
|
||||
+ Names.resourceLocation_.desc
|
||||
+ ")"
|
||||
+ Names.iResource_.desc);
|
||||
return;
|
||||
}
|
||||
@@ -109,6 +119,7 @@ public class ACTTextureAtlasSprite implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class MVloadSprite extends MethodVisitor {
|
||||
|
||||
// protected MethodVisitor mv;
|
||||
public MVloadSprite(MethodVisitor mv) {
|
||||
super(Opcodes.ASM4, mv);
|
||||
@@ -135,7 +146,10 @@ public class ACTTextureAtlasSprite implements IClassTransformer {
|
||||
return;
|
||||
} else if (Names.textureAtlasSpri_getFrameTextureData.equals(owner, name, desc)) {
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC, "com/gtnewhorizons/angelica/client/ShadersTex", "extractFrame", "([IIII)[I");
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/ShadersTex",
|
||||
"extractFrame",
|
||||
"([IIII)[I");
|
||||
return;
|
||||
} else if (Names.equals(Names.textureAtlasSpri_.clas, "fixTransparentColor", "([I)V", owner, name, desc)) {
|
||||
mv.visitMethodInsn(
|
||||
@@ -150,6 +164,7 @@ public class ACTTextureAtlasSprite implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class MVuploadFrameTexture extends MethodVisitor {
|
||||
|
||||
public MVuploadFrameTexture(MethodVisitor mv) {
|
||||
super(Opcodes.ASM4, null);
|
||||
mv.visitCode();
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
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;
|
||||
@@ -20,6 +21,7 @@ public class ACTTextureClock implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class CVTransform extends ClassVisitor {
|
||||
|
||||
String classname;
|
||||
|
||||
public CVTransform(ClassVisitor cv) {
|
||||
@@ -27,8 +29,8 @@ public class ACTTextureClock implements IClassTransformer {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void visit(
|
||||
int version, int access, String name, String signature, String superName, String[] interfaces) {
|
||||
public void visit(int version, int access, String name, String signature, String superName,
|
||||
String[] interfaces) {
|
||||
classname = name;
|
||||
// SMCLog.info(" class %s",name);
|
||||
cv.visit(version, access, name, signature, superName, interfaces);
|
||||
@@ -36,9 +38,9 @@ public class ACTTextureClock implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
|
||||
// SMCLog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
// SMCLog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
if (Names.textureAtlasSpri_updateAnimation.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
// SMCLog.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);
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
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;
|
||||
@@ -20,6 +21,7 @@ public class ACTTextureCompass implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class CVTransform extends ClassVisitor {
|
||||
|
||||
String classname;
|
||||
|
||||
public CVTransform(ClassVisitor cv) {
|
||||
@@ -27,8 +29,8 @@ public class ACTTextureCompass implements IClassTransformer {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void visit(
|
||||
int version, int access, String name, String signature, String superName, String[] interfaces) {
|
||||
public void visit(int version, int access, String name, String signature, String superName,
|
||||
String[] interfaces) {
|
||||
classname = name;
|
||||
// SMCLog.info(" class %s",name);
|
||||
cv.visit(version, access, name, signature, superName, interfaces);
|
||||
@@ -36,9 +38,9 @@ public class ACTTextureCompass implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
|
||||
// SMCLog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
// SMCLog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
if (Names.textureCompass_updateCompass.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
// SMCLog.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);
|
||||
|
||||
@@ -3,6 +3,7 @@ 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;
|
||||
@@ -24,6 +25,7 @@ public class ACTTextureDownload implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class CVTransform extends ClassVisitor {
|
||||
|
||||
String classname;
|
||||
|
||||
public CVTransform(ClassVisitor cv) {
|
||||
@@ -31,8 +33,8 @@ public class ACTTextureDownload implements IClassTransformer {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void visit(
|
||||
int version, int access, String name, String signature, String superName, String[] interfaces) {
|
||||
public void visit(int version, int access, String name, String signature, String superName,
|
||||
String[] interfaces) {
|
||||
classname = name;
|
||||
// SMCLog.info(" class %s",name);
|
||||
cv.visit(version, access, name, signature, superName, interfaces);
|
||||
@@ -40,14 +42,14 @@ public class ACTTextureDownload implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public FieldVisitor visitField(int access, String name, String desc, String signature, Object value) {
|
||||
// SMCLog.finest(" field %s %s %s %d", classname, name, desc, access);
|
||||
// SMCLog.finest(" field %s %s %s %d", classname, name, desc, access);
|
||||
return super.visitField(access, name, desc, signature, value);
|
||||
}
|
||||
|
||||
@Override
|
||||
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
|
||||
// String nameM = SMCRemap.remapper.mapMethodName(classname, name, desc);
|
||||
// SMCLog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
// SMCLog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
if (name.equals("getMultiTexID")) {
|
||||
return null;
|
||||
}
|
||||
@@ -59,7 +61,11 @@ public class ACTTextureDownload implements IClassTransformer {
|
||||
MethodVisitor mv;
|
||||
// getMultiTexID
|
||||
mv = cv.visitMethod(
|
||||
ACC_PUBLIC, "getMultiTexID", "()Lcom/gtnewhorizons/angelica/client/MultiTexID;", null, null);
|
||||
ACC_PUBLIC,
|
||||
"getMultiTexID",
|
||||
"()Lcom/gtnewhorizons/angelica/client/MultiTexID;",
|
||||
null,
|
||||
null);
|
||||
mv.visitCode();
|
||||
Label l0 = new Label();
|
||||
mv.visitLabel(l0);
|
||||
|
||||
@@ -3,6 +3,7 @@ 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;
|
||||
@@ -22,6 +23,7 @@ public class ACTTextureDynamic implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class CVTransform extends ClassVisitor {
|
||||
|
||||
String classname;
|
||||
|
||||
public CVTransform(ClassVisitor cv) {
|
||||
@@ -29,8 +31,8 @@ public class ACTTextureDynamic implements IClassTransformer {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void visit(
|
||||
int version, int access, String name, String signature, String superName, String[] interfaces) {
|
||||
public void visit(int version, int access, String name, String signature, String superName,
|
||||
String[] interfaces) {
|
||||
classname = name;
|
||||
// SMCLog.info(" class %s",name);
|
||||
cv.visit(version, access, name, signature, superName, interfaces);
|
||||
@@ -38,12 +40,12 @@ public class ACTTextureDynamic implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
|
||||
// SMCLog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
// SMCLog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
if (name.equals("<init>") && desc.equals("(II)V")) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
return new MVinit(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
} else if (Names.dynamicTexture_updateDynamicTexture.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
return new MVupdate(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
}
|
||||
return cv.visitMethod(access, name, desc, signature, exceptions);
|
||||
@@ -51,6 +53,7 @@ public class ACTTextureDynamic implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class MVinit extends MethodVisitor {
|
||||
|
||||
// protected MethodVisitor mv;
|
||||
public MVinit(MethodVisitor mv) {
|
||||
super(Opcodes.ASM4, mv);
|
||||
@@ -82,6 +85,7 @@ public class ACTTextureDynamic implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class MVupdate extends MethodVisitor {
|
||||
|
||||
// protected MethodVisitor mv;
|
||||
public MVupdate(MethodVisitor mv) {
|
||||
super(Opcodes.ASM4, mv);
|
||||
|
||||
@@ -3,6 +3,7 @@ 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;
|
||||
@@ -23,6 +24,7 @@ public class ACTTextureLayered implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class CVTransform extends ClassVisitor {
|
||||
|
||||
String classname;
|
||||
|
||||
public CVTransform(ClassVisitor cv) {
|
||||
@@ -30,8 +32,8 @@ public class ACTTextureLayered implements IClassTransformer {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void visit(
|
||||
int version, int access, String name, String signature, String superName, String[] interfaces) {
|
||||
public void visit(int version, int access, String name, String signature, String superName,
|
||||
String[] interfaces) {
|
||||
classname = name;
|
||||
// SMCLog.info(" class %s",name);
|
||||
cv.visit(version, access, name, signature, superName, interfaces);
|
||||
@@ -40,9 +42,9 @@ public class ACTTextureLayered implements IClassTransformer {
|
||||
@Override
|
||||
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
|
||||
// String descM = SMCNames.remapper.mapMethodDesc(desc);
|
||||
// SMCLog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
// SMCLog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
if (Names.iTextureObject_loadTexture.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
return new MVloadTexture(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
}
|
||||
return cv.visitMethod(access, name, desc, signature, exceptions);
|
||||
@@ -50,6 +52,7 @@ public class ACTTextureLayered implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class MVloadTexture extends MethodVisitor {
|
||||
|
||||
// protected MethodVisitor mv;
|
||||
public MVloadTexture(MethodVisitor mv) {
|
||||
super(Opcodes.ASM4);
|
||||
|
||||
@@ -3,6 +3,7 @@ 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;
|
||||
@@ -22,6 +23,7 @@ public class ACTTextureManager implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class CVTransform extends ClassVisitor {
|
||||
|
||||
String classname;
|
||||
|
||||
public CVTransform(ClassVisitor cv) {
|
||||
@@ -29,8 +31,8 @@ public class ACTTextureManager implements IClassTransformer {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void visit(
|
||||
int version, int access, String name, String signature, String superName, String[] interfaces) {
|
||||
public void visit(int version, int access, String name, String signature, String superName,
|
||||
String[] interfaces) {
|
||||
classname = name;
|
||||
// SMCLog.info(" class %s",name);
|
||||
cv.visit(version, access, name, signature, superName, interfaces);
|
||||
@@ -38,12 +40,12 @@ public class ACTTextureManager implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
|
||||
// SMCLog.info(" method %s.%s%s = %s%s",classname,name,desc,nameM,descM);
|
||||
// SMCLog.info(" method %s.%s%s = %s%s",classname,name,desc,nameM,descM);
|
||||
if (Names.textureManager_bindTexture.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s%s",classname,name,desc,nameM,descM);
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s%s",classname,name,desc,nameM,descM);
|
||||
return new MVbindTexture(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
} else if (Names.textureManager_onResourceManagerReload.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s%s",classname,name,desc,nameM,descM);
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s%s",classname,name,desc,nameM,descM);
|
||||
return new MVonReload(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
}
|
||||
return cv.visitMethod(access, name, desc, signature, exceptions);
|
||||
@@ -51,6 +53,7 @@ public class ACTTextureManager implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class MVbindTexture extends MethodVisitor {
|
||||
|
||||
public MVbindTexture(MethodVisitor mv) {
|
||||
super(Opcodes.ASM4, mv);
|
||||
}
|
||||
@@ -72,6 +75,7 @@ public class ACTTextureManager implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class MVonReload extends MethodVisitor {
|
||||
|
||||
public MVonReload(MethodVisitor mv) {
|
||||
super(Opcodes.ASM4, mv);
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@ 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;
|
||||
@@ -23,6 +24,7 @@ public class ACTTextureMap implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class CVTransform extends ClassVisitor {
|
||||
|
||||
String classname;
|
||||
boolean endFields = false;
|
||||
|
||||
@@ -31,8 +33,8 @@ public class ACTTextureMap implements IClassTransformer {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void visit(
|
||||
int version, int access, String name, String signature, String superName, String[] interfaces) {
|
||||
public void visit(int version, int access, String name, String signature, String superName,
|
||||
String[] interfaces) {
|
||||
classname = name;
|
||||
// SMCLog.info(" class %s",name);
|
||||
cv.visit(version, access, name, signature, superName, interfaces);
|
||||
@@ -60,14 +62,14 @@ public class ACTTextureMap implements IClassTransformer {
|
||||
fv = cv.visitField(ACC_PUBLIC, "atlasHeight", "I", null, null);
|
||||
fv.visitEnd();
|
||||
}
|
||||
// SMCLog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
// SMCLog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
if (Names.textureMap_getIconResLoc.equalsNameDesc(name, desc)) {
|
||||
access = access & (~ACC_PRIVATE & ~ACC_PROTECTED) | ACC_PUBLIC;
|
||||
} else if (Names.textureMap_loadTextureAtlas.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
return new MVloadAtlas(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
} else if (Names.textureMap_updateAnimations.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s",classname,name,desc,nameM);
|
||||
return new MVanimation(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
}
|
||||
return cv.visitMethod(access, name, desc, signature, exceptions);
|
||||
@@ -75,6 +77,7 @@ public class ACTTextureMap implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class MVloadAtlas extends MethodVisitor {
|
||||
|
||||
// protected MethodVisitor mv;
|
||||
public MVloadAtlas(MethodVisitor mv) {
|
||||
super(Opcodes.ASM4, mv);
|
||||
@@ -107,59 +110,63 @@ public class ACTTextureMap implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public void visitMethodInsn(int opcode, String owner, String name, String desc) {
|
||||
// SMCLog.finest(" %s.%s%s",ownerM,nameM,descM);
|
||||
// SMCLog.finest(" %s.%s%s",ownerM,nameM,descM);
|
||||
if (Names.iResourceManager_getResource.equals(owner, name, desc)) {
|
||||
ALog.finest(" %s", "loadRes");
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/ShadersTex",
|
||||
"loadResource",
|
||||
"(" + Names.iResourceManager_.desc + Names.resourceLocation_.desc + ")"
|
||||
"(" + Names.iResourceManager_.desc
|
||||
+ Names.resourceLocation_.desc
|
||||
+ ")"
|
||||
+ Names.iResource_.desc);
|
||||
return;
|
||||
} else if (opcode == INVOKESPECIAL
|
||||
&& Names.equals(Names.stitcher_.clas, "<init>", "(IIZII)V", owner, name, desc)) {
|
||||
isStitcher = true;
|
||||
} else if (Names.textureUtil_allocateTextureMipmapAniso.equals(owner, name, desc)) {
|
||||
ALog.finest(" %s", "allocateTextureMap");
|
||||
mv.visitVarInsn(ALOAD, varStitcher);
|
||||
mv.visitVarInsn(ALOAD, 0);
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/ShadersTex",
|
||||
"allocateTextureMap",
|
||||
"(IIIIF" + Names.stitcher_.desc + Names.textureMap_.desc + ")V");
|
||||
state = 1;
|
||||
return;
|
||||
} else if (state == 1 && Names.textureAtlasSpri_getIconName.equals(owner, name, desc)) {
|
||||
ALog.finest(" %s", "setSprite setIconName");
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/ShadersTex",
|
||||
"setSprite",
|
||||
"(" + Names.textureAtlasSpri_.desc + ")" + Names.textureAtlasSpri_.desc);
|
||||
mv.visitMethodInsn(opcode, owner, name, desc);
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/ShadersTex",
|
||||
"setIconName",
|
||||
"(Ljava/lang/String;)Ljava/lang/String;");
|
||||
state = 0;
|
||||
return;
|
||||
} else if (Names.textureUtil_uploadTexSub.equals(owner, name, desc)) {
|
||||
ALog.finest(" %s", "uploadTexSubForLoadAtlas");
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/ShadersTex",
|
||||
"uploadTexSubForLoadAtlas",
|
||||
"([[IIIIIZZ)V");
|
||||
return;
|
||||
}
|
||||
isStitcher = true;
|
||||
} else
|
||||
if (Names.textureUtil_allocateTextureMipmapAniso.equals(owner, name, desc)) {
|
||||
ALog.finest(" %s", "allocateTextureMap");
|
||||
mv.visitVarInsn(ALOAD, varStitcher);
|
||||
mv.visitVarInsn(ALOAD, 0);
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/ShadersTex",
|
||||
"allocateTextureMap",
|
||||
"(IIIIF" + Names.stitcher_.desc + Names.textureMap_.desc + ")V");
|
||||
state = 1;
|
||||
return;
|
||||
} else if (state == 1 && Names.textureAtlasSpri_getIconName.equals(owner, name, desc)) {
|
||||
ALog.finest(" %s", "setSprite setIconName");
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/ShadersTex",
|
||||
"setSprite",
|
||||
"(" + Names.textureAtlasSpri_.desc + ")" + Names.textureAtlasSpri_.desc);
|
||||
mv.visitMethodInsn(opcode, owner, name, desc);
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/ShadersTex",
|
||||
"setIconName",
|
||||
"(Ljava/lang/String;)Ljava/lang/String;");
|
||||
state = 0;
|
||||
return;
|
||||
} else if (Names.textureUtil_uploadTexSub.equals(owner, name, desc)) {
|
||||
ALog.finest(" %s", "uploadTexSubForLoadAtlas");
|
||||
mv.visitMethodInsn(
|
||||
INVOKESTATIC,
|
||||
"com/gtnewhorizons/angelica/client/ShadersTex",
|
||||
"uploadTexSubForLoadAtlas",
|
||||
"([[IIIIIZZ)V");
|
||||
return;
|
||||
}
|
||||
mv.visitMethodInsn(opcode, owner, name, desc);
|
||||
}
|
||||
}
|
||||
|
||||
private static class MVanimation extends MethodVisitor {
|
||||
|
||||
public MVanimation(MethodVisitor mv) {
|
||||
super(Opcodes.ASM4, mv);
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@ 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;
|
||||
@@ -22,6 +23,7 @@ public class ACTTextureObject implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class CVTransform extends ClassVisitor {
|
||||
|
||||
String classname;
|
||||
|
||||
public CVTransform(ClassVisitor cv) {
|
||||
@@ -29,8 +31,8 @@ public class ACTTextureObject implements IClassTransformer {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void visit(
|
||||
int version, int access, String name, String signature, String superName, String[] interfaces) {
|
||||
public void visit(int version, int access, String name, String signature, String superName,
|
||||
String[] interfaces) {
|
||||
classname = name;
|
||||
// SMCLog.info(" class %s",name);
|
||||
cv.visit(version, access, name, signature, superName, interfaces);
|
||||
@@ -38,7 +40,7 @@ public class ACTTextureObject implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
|
||||
// SMCLog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
// SMCLog.info(" method %s.%s%s = %s",classname,name,desc,remappedName);
|
||||
if (name.equals("getMultiTexID") && desc.equals("()Lcom/gtnewhorizons/angelica/client/MultiTexID;")) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@ 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;
|
||||
@@ -24,6 +25,7 @@ public class ACTTextureSimple implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class CVTransform extends ClassVisitor {
|
||||
|
||||
String classname;
|
||||
|
||||
public CVTransform(ClassVisitor cv) {
|
||||
@@ -31,8 +33,8 @@ public class ACTTextureSimple implements IClassTransformer {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void visit(
|
||||
int version, int access, String name, String signature, String superName, String[] interfaces) {
|
||||
public void visit(int version, int access, String name, String signature, String superName,
|
||||
String[] interfaces) {
|
||||
classname = name;
|
||||
// SMCLog.info(" class %s",name);
|
||||
cv.visit(version, access, name, signature, superName, interfaces);
|
||||
@@ -40,9 +42,9 @@ public class ACTTextureSimple implements IClassTransformer {
|
||||
|
||||
@Override
|
||||
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
|
||||
// SMCLog.info(" method %s.%s%s = %s%s",classname,name,desc,nameM,descM);
|
||||
// SMCLog.info(" method %s.%s%s = %s%s",classname,name,desc,nameM,descM);
|
||||
if (Names.iTextureObject_loadTexture.equalsNameDesc(name, desc)) {
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s%s",classname,name,desc,nameM,descM);
|
||||
// SMCLog.finer(" patching method %s.%s%s = %s%s",classname,name,desc,nameM,descM);
|
||||
return new MVloadTexture(cv.visitMethod(access, name, desc, signature, exceptions));
|
||||
}
|
||||
return cv.visitMethod(access, name, desc, signature, exceptions);
|
||||
@@ -50,6 +52,7 @@ public class ACTTextureSimple implements IClassTransformer {
|
||||
}
|
||||
|
||||
private static class MVloadTexture extends MethodVisitor {
|
||||
|
||||
public MVloadTexture(MethodVisitor mv) {
|
||||
super(Opcodes.ASM4, mv);
|
||||
}
|
||||
@@ -76,7 +79,8 @@ public class ACTTextureSimple implements IClassTransformer {
|
||||
"com/gtnewhorizons/angelica/client/ShadersTex",
|
||||
"loadSimpleTexture",
|
||||
"(ILjava/awt/image/BufferedImage;ZZ" + Names.iResourceManager_.desc
|
||||
+ Names.resourceLocation_.desc + "Lcom/gtnewhorizons/angelica/client/MultiTexID;)I");
|
||||
+ Names.resourceLocation_.desc
|
||||
+ "Lcom/gtnewhorizons/angelica/client/MultiTexID;)I");
|
||||
ALog.finer(" loadSimpleTexture");
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@ package com.gtnewhorizons.angelica.transform;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import net.minecraft.launchwrapper.IClassTransformer;
|
||||
|
||||
public class AClassTransformer implements IClassTransformer {
|
||||
|
||||
@@ -15,6 +15,7 @@ import java.util.logging.Logger;
|
||||
public abstract class ALog {
|
||||
|
||||
private static class SMCFormatter extends Formatter {
|
||||
|
||||
int tzOffset;
|
||||
|
||||
SMCFormatter() {
|
||||
@@ -30,17 +31,14 @@ public abstract class ALog {
|
||||
// .append(time/600000%6).append(time/60000%10)//.append(":")
|
||||
// .append(time/10000%6).append(time/10000%10).append(".")
|
||||
// .append(time/100%10).append(time/10%10).append(time%10).append(" ")
|
||||
.append(record.getLoggerName())
|
||||
.append(" ")
|
||||
.append(record.getLevel())
|
||||
.append("]")
|
||||
.append(record.getMessage())
|
||||
.append("\n");
|
||||
.append(record.getLoggerName()).append(" ").append(record.getLevel()).append("]")
|
||||
.append(record.getMessage()).append("\n");
|
||||
return sb.toString();
|
||||
}
|
||||
}
|
||||
|
||||
private static class SMCLogger extends Logger {
|
||||
|
||||
SMCLogger(String name) {
|
||||
super(name, null);
|
||||
setUseParentHandlers(false);
|
||||
@@ -60,6 +58,7 @@ public abstract class ALog {
|
||||
}
|
||||
|
||||
private static class SMCLevel extends Level {
|
||||
|
||||
private SMCLevel(String name, int value) {
|
||||
super(name, value);
|
||||
}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package com.gtnewhorizons.angelica.transform;
|
||||
|
||||
public class InitNames {
|
||||
|
||||
public static void init() {
|
||||
new NamerSrg().setNames();
|
||||
}
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
package com.gtnewhorizons.angelica.transform;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
import com.gtnewhorizons.angelica.transform.Names.Clas;
|
||||
import com.gtnewhorizons.angelica.transform.Names.Fiel;
|
||||
import com.gtnewhorizons.angelica.transform.Names.Meth;
|
||||
import java.util.ArrayList;
|
||||
|
||||
public class Namer {
|
||||
|
||||
|
||||
@@ -158,17 +158,23 @@ public class Namer1_7_10 extends Namer {
|
||||
rendererLivingE_doRender = m(rendererLivingE_, "a", "(" + entityLivingBase_.desc + "DDDFF)V");
|
||||
rendererLivingE_renderEquippedItems = m(rendererLivingE_, "c", "(" + entityLivingBase_.desc + "F)V");
|
||||
rendererLivingE_getColorMultiplier = m(rendererLivingE_, "a", "(" + entityLivingBase_.desc + "FF)I");
|
||||
rendererLivingE_renderLabel =
|
||||
m(rendererLivingE_, "a", "(" + entityLivingBase_.desc + "DDDLjava/lang/String;FD)V");
|
||||
rendererLivingE_renderLabel = m(
|
||||
rendererLivingE_,
|
||||
"a",
|
||||
"(" + entityLivingBase_.desc + "DDDLjava/lang/String;FD)V");
|
||||
renderGlobal_renderEntities = m(renderGlobal_, "a", "(" + entityLivingBase_.desc + iCamera_.desc + "F)V");
|
||||
renderGlobal_renderSky = m(renderGlobal_, "a", "(F)V");
|
||||
renderGlobal_drawBlockDamageTexture =
|
||||
m(renderGlobal_, "a", "(" + tessellator_.desc + entityPlayer_.desc + "F)V");
|
||||
renderGlobal_drawBlockDamageTexture = m(
|
||||
renderGlobal_,
|
||||
"a",
|
||||
"(" + tessellator_.desc + entityPlayer_.desc + "F)V");
|
||||
renderGlobal_renderClouds = m(renderGlobal_, "b", "(F)V");
|
||||
renderGlobal_sortAndRender = m(renderGlobal_, "a", "(" + entityLivingBase_.desc + "ID)I");
|
||||
renderGlobal_clipRenderersByFrustum = m(renderGlobal_, "a", "(" + iCamera_.desc + "F)V");
|
||||
renderGlobal_drawSelectionBox =
|
||||
m(renderGlobal_, "a", "(" + entityPlayer_.desc + movingObjectPos_.desc + "IF)V");
|
||||
renderGlobal_drawSelectionBox = m(
|
||||
renderGlobal_,
|
||||
"a",
|
||||
"(" + entityPlayer_.desc + movingObjectPos_.desc + "IF)V");
|
||||
renderGlobal_renderAllRenderLists = m(renderGlobal_, "a", "(ID)V");
|
||||
stitcher_getCurrentWidth = m(stitcher_, "a", "()I");
|
||||
tessellator_sortQuad = m(tessellator_, "a", "(FFF)" + tessVertexState_.desc);
|
||||
|
||||
@@ -1,8 +1,5 @@
|
||||
package com.gtnewhorizons.angelica.transform;
|
||||
|
||||
import com.gtnewhorizons.angelica.transform.Names.Clas;
|
||||
import com.gtnewhorizons.angelica.transform.Names.Fiel;
|
||||
import com.gtnewhorizons.angelica.transform.Names.Meth;
|
||||
import java.io.BufferedReader;
|
||||
import java.io.FileNotFoundException;
|
||||
import java.io.FileReader;
|
||||
@@ -10,6 +7,10 @@ import java.io.IOException;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import com.gtnewhorizons.angelica.transform.Names.Clas;
|
||||
import com.gtnewhorizons.angelica.transform.Names.Fiel;
|
||||
import com.gtnewhorizons.angelica.transform.Names.Meth;
|
||||
|
||||
public class NamerMcp extends NamerSrg {
|
||||
|
||||
public void setNames() {
|
||||
|
||||
@@ -130,10 +130,14 @@ public class NamerSrg extends Namer {
|
||||
guiOptions_actionPerformed = m(guiOptions_, "func_146284_a", "(" + guiButton_.desc + ")V");
|
||||
guiOptions_initGui = m(guiOptions_, "func_73866_w_", "()V");
|
||||
iCamera_setPosition = m(iCamera_, "func_78547_a", "(DDD)V");
|
||||
iResourceManager_getResource =
|
||||
m(iResourceManager_, "func_110536_a", "(" + resourceLocation_.desc + ")" + iResource_.desc);
|
||||
itemRenderer_renderItem =
|
||||
m(itemRenderer_, "func_78443_a", "(" + entityLivingBase_.desc + itemStack_.desc + "I)V");
|
||||
iResourceManager_getResource = m(
|
||||
iResourceManager_,
|
||||
"func_110536_a",
|
||||
"(" + resourceLocation_.desc + ")" + iResource_.desc);
|
||||
itemRenderer_renderItem = m(
|
||||
itemRenderer_,
|
||||
"func_78443_a",
|
||||
"(" + entityLivingBase_.desc + itemStack_.desc + "I)V");
|
||||
itemRenderer_renderItemInFirstPerson = m(itemRenderer_, "func_78440_a", "(F)V");
|
||||
itemRenderer_renderOverlays = m(itemRenderer_, "func_78447_b", "(F)V");
|
||||
itemRenderer_updateEquipped = m(itemRenderer_, "func_78441_a", "()V");
|
||||
@@ -145,8 +149,10 @@ public class NamerSrg extends Namer {
|
||||
render_renderShadow = m(render_, "func_76975_c", "(" + entity_.desc + "DDDFF)V");
|
||||
renderBlocks_renderBlockFluids = m(renderBlocks_, "func_147721_p", "(" + block_.desc + "III)Z");
|
||||
renderBlocks_renderStdBlockWithCM = m(renderBlocks_, "func_147736_d", "(" + block_.desc + "IIIFFF)Z");
|
||||
renderBlocks_renderBlockSandFalling =
|
||||
m(renderBlocks_, "func_147749_a", "(" + block_.desc + world_.desc + "IIII)V");
|
||||
renderBlocks_renderBlockSandFalling = m(
|
||||
renderBlocks_,
|
||||
"func_147749_a",
|
||||
"(" + block_.desc + world_.desc + "IIII)V");
|
||||
renderBlocks_renderStdBlockWithAO = m(renderBlocks_, "func_147751_a", "(" + block_.desc + "IIIFFF)Z");
|
||||
renderBlocks_renderBlockCactusImpl = m(renderBlocks_, "func_147754_e", "(" + block_.desc + "IIIFFF)Z");
|
||||
renderBlocks_renderBlockDoor = m(renderBlocks_, "func_147760_u", "(" + block_.desc + "III)Z");
|
||||
@@ -161,18 +167,26 @@ public class NamerSrg extends Namer {
|
||||
rendererLivingE_doRender = m(rendererLivingE_, "func_76986_a", "(" + entityLivingBase_.desc + "DDDFF)V");
|
||||
rendererLivingE_renderEquippedItems = m(rendererLivingE_, "func_77029_c", "(" + entityLivingBase_.desc + "F)V");
|
||||
rendererLivingE_getColorMultiplier = m(rendererLivingE_, "func_77030_a", "(" + entityLivingBase_.desc + "FF)I");
|
||||
rendererLivingE_renderLabel =
|
||||
m(rendererLivingE_, "func_96449_a", "(" + entityLivingBase_.desc + "DDDLjava/lang/String;FD)V");
|
||||
renderGlobal_renderEntities =
|
||||
m(renderGlobal_, "func_147589_a", "(" + entityLivingBase_.desc + iCamera_.desc + "F)V");
|
||||
rendererLivingE_renderLabel = m(
|
||||
rendererLivingE_,
|
||||
"func_96449_a",
|
||||
"(" + entityLivingBase_.desc + "DDDLjava/lang/String;FD)V");
|
||||
renderGlobal_renderEntities = m(
|
||||
renderGlobal_,
|
||||
"func_147589_a",
|
||||
"(" + entityLivingBase_.desc + iCamera_.desc + "F)V");
|
||||
renderGlobal_renderSky = m(renderGlobal_, "func_72714_a", "(F)V");
|
||||
renderGlobal_drawBlockDamageTexture =
|
||||
m(renderGlobal_, "func_72717_a", "(" + tessellator_.desc + entityPlayer_.desc + "F)V");
|
||||
renderGlobal_drawBlockDamageTexture = m(
|
||||
renderGlobal_,
|
||||
"func_72717_a",
|
||||
"(" + tessellator_.desc + entityPlayer_.desc + "F)V");
|
||||
renderGlobal_renderClouds = m(renderGlobal_, "func_72718_b", "(F)V");
|
||||
renderGlobal_sortAndRender = m(renderGlobal_, "func_72719_a", "(" + entityLivingBase_.desc + "ID)I");
|
||||
renderGlobal_clipRenderersByFrustum = m(renderGlobal_, "func_72729_a", "(" + iCamera_.desc + "F)V");
|
||||
renderGlobal_drawSelectionBox =
|
||||
m(renderGlobal_, "func_72731_b", "(" + entityPlayer_.desc + movingObjectPos_.desc + "IF)V");
|
||||
renderGlobal_drawSelectionBox = m(
|
||||
renderGlobal_,
|
||||
"func_72731_b",
|
||||
"(" + entityPlayer_.desc + movingObjectPos_.desc + "IF)V");
|
||||
renderGlobal_renderAllRenderLists = m(renderGlobal_, "func_72733_a", "(ID)V");
|
||||
stitcher_getCurrentWidth = m(stitcher_, "func_110935_a", "()I");
|
||||
tessellator_sortQuad = m(tessellator_, "func_147564_a", "(FFF)" + tessVertexState_.desc);
|
||||
@@ -186,16 +200,22 @@ public class NamerSrg extends Namer {
|
||||
textureAtlasSpri_getIconName = m(textureAtlasSpri_, "func_94215_i", "()Ljava/lang/String;");
|
||||
textureAtlasSpri_updateAnimation = m(textureAtlasSpri_, "func_94219_l", "()V");
|
||||
textureCompass_updateCompass = m(textureCompass_, "func_94241_a", "(" + world_.desc + "DDDZZ)V");
|
||||
textureManager_onResourceManagerReload =
|
||||
m(textureManager_, "func_110549_a", "(" + iResourceManager_.desc + ")V");
|
||||
textureManager_onResourceManagerReload = m(
|
||||
textureManager_,
|
||||
"func_110549_a",
|
||||
"(" + iResourceManager_.desc + ")V");
|
||||
textureManager_bindTexture = m(textureManager_, "func_110577_a", "(" + resourceLocation_.desc + ")V");
|
||||
textureMap_loadTextureAtlas = m(textureMap_, "func_110571_b", "(" + iResourceManager_.desc + ")V");
|
||||
textureMap_getIconResLoc =
|
||||
m(textureMap_, "func_147634_a", "(" + resourceLocation_.desc + "I)" + resourceLocation_.desc);
|
||||
textureMap_getIconResLoc = m(
|
||||
textureMap_,
|
||||
"func_147634_a",
|
||||
"(" + resourceLocation_.desc + "I)" + resourceLocation_.desc);
|
||||
textureMap_updateAnimations = m(textureMap_, "func_94248_c", "()V");
|
||||
textureUtil_uploadTexture = m(textureUtil_, "func_110988_a", "(I[III)V");
|
||||
textureUtil_uploadTextureImageAllocate =
|
||||
m(textureUtil_, "func_110989_a", "(ILjava/awt/image/BufferedImage;ZZ)I");
|
||||
textureUtil_uploadTextureImageAllocate = m(
|
||||
textureUtil_,
|
||||
"func_110989_a",
|
||||
"(ILjava/awt/image/BufferedImage;ZZ)I");
|
||||
textureUtil_allocateTexture = m(textureUtil_, "func_110991_a", "(III)V");
|
||||
textureUtil_allocateTextureMipmapAniso = m(textureUtil_, "func_147946_a", "(IIIIF)V");
|
||||
textureUtil_uploadTexSub = m(textureUtil_, "func_147955_a", "([[IIIIIZZ)V");
|
||||
|
||||
@@ -3,6 +3,7 @@ package com.gtnewhorizons.angelica.transform;
|
||||
public class Names {
|
||||
|
||||
public static class Name {
|
||||
|
||||
String clas;
|
||||
String name;
|
||||
String desc;
|
||||
@@ -26,6 +27,7 @@ public class Names {
|
||||
}
|
||||
|
||||
public static class Type extends Name {
|
||||
|
||||
public Type(String desc) {
|
||||
super("", "", desc);
|
||||
}
|
||||
@@ -36,6 +38,7 @@ public class Names {
|
||||
}
|
||||
|
||||
public static class Clas extends Type {
|
||||
|
||||
public Clas(String name) {
|
||||
super(name, "L" + name + ";");
|
||||
}
|
||||
@@ -46,6 +49,7 @@ public class Names {
|
||||
}
|
||||
|
||||
public static class Fiel extends Name {
|
||||
|
||||
public Fiel(Clas clas, String name, String desc) {
|
||||
super(clas.clas, name, desc);
|
||||
}
|
||||
@@ -56,6 +60,7 @@ public class Names {
|
||||
}
|
||||
|
||||
public static class Meth extends Name {
|
||||
|
||||
public Meth(Clas clas, String name, String desc) {
|
||||
super(clas.clas, name, desc);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user