custom lava/water for beta 1.1_02

pclewis · Dec 22, 2010 · fdce8f0 · fdce8f0
1 parent 66169b4
commit fdce8f0
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/newcode/src/bc.java b/newcode/src/bc.java
@@ -4,7 +4,7 @@ public class bc extends ae {
 	WaterAnimation w;
 
 	public bc(Minecraft game) {
-		super(of.C.bg);
+		super(og.C.bg);
 		w = new WaterAnimation(game, "lava_still", this.b, this.a);
 	}
 

diff --git a/newcode/src/fi.java → newcode/src/fj.java b/newcode/src/fi.java → newcode/src/fj.java
@@ -1,10 +1,10 @@
 import net.minecraft.client.Minecraft;
 
-public class fi extends ae {
+public class fj extends ae {
 	WaterAnimation w;
 
-	public fi(Minecraft game) {
-		super(of.C.bg + 1);
+	public fj(Minecraft game) {
+		super(og.C.bg + 1);
 		this.e = 2;
 		this.w = new WaterAnimation(game, "lava_flowing", this.b, this.a, 3, 6);
 	}

diff --git a/newcode/src/jm.java → newcode/src/jn.java b/newcode/src/jm.java → newcode/src/jn.java
@@ -1,10 +1,10 @@
 import net.minecraft.client.Minecraft;
 
-public class jm extends ae {
+public class jn extends ae {
 	WaterAnimation w;
 
-	public jm(Minecraft game) {
-		super(of.A.bg + 1);
+	public jn(Minecraft game) {
+		super(og.A.bg + 1);
 		this.e = 2;
 		w = new WaterAnimation(game, "water_flowing", this.b, this.a, 0, 0);
 	}

diff --git a/newcode/src/ot.java → newcode/src/ou.java b/newcode/src/ot.java → newcode/src/ou.java
@@ -1,10 +1,10 @@
 import net.minecraft.client.Minecraft;
 
-public class ot extends ae {
+public class ou extends ae {
 	WaterAnimation w;
 
-	public ot(Minecraft game) {
-		super(of.A.bg);
+	public ou(Minecraft game) {
+		super(og.A.bg);
 		this.w = new WaterAnimation(game, "water_still", this.b, this.a);
 	}
 

diff --git a/src/MCPatcher.java b/src/MCPatcher.java
@@ -267,8 +267,8 @@ private static void getPatches(ArrayList<PatchSet> patches, ArrayList<String> re
 		PatchSet waterPatches = new PatchSet(Patches.water);
 		if (globalParams.getBoolean("useCustomWater")) {
 		    patches.add(new PatchSet("Minecraft", new PatchSet(Patches.customWaterMC)));
-			replaceFiles.add("jm.class");
-			replaceFiles.add("ot.class");
+			replaceFiles.add("jn.class");
+			replaceFiles.add("ou.class");
 		} else {
 			if(!globalParams.getBoolean("useAnimatedWater")) {
 				waterPatches.setParam("tileSize", "0");
@@ -282,7 +282,7 @@ private static void getPatches(ArrayList<PatchSet> patches, ArrayList<String> re
 		if(globalParams.getBoolean("useCustomLava")) {
 			patches.add(new PatchSet("Minecraft", new PatchSet(Patches.customLavaMC)));
 			replaceFiles.add("bc.class");
-			replaceFiles.add("fi.class");
+			replaceFiles.add("fj.class");
 			//lavaPatches.setParam("tileSize", "0");
 			//patches.add(new PatchSet("StillLava", lavaPatches));
 			//patches.add( new PatchSet(Patches.hideStillLava) );

diff --git a/src/Patches.java b/src/Patches.java
@@ -532,15 +532,15 @@ byte[] getToBytes(MethodInfo mi) throws Exception {
 	public static final PatchSet customWaterMC = new PatchSet(
 		"Minecraft",
 		new PatchSpec[] {
-			new PatchSpec(new PassThisPatch("jm", "<init>", "()V", "(Lnet/minecraft/client/Minecraft;)V")),
-			new PatchSpec(new PassThisPatch("ot", "<init>", "()V", "(Lnet/minecraft/client/Minecraft;)V")),
+			new PatchSpec(new PassThisPatch("jn", "<init>", "()V", "(Lnet/minecraft/client/Minecraft;)V")),
+			new PatchSpec(new PassThisPatch("ou", "<init>", "()V", "(Lnet/minecraft/client/Minecraft;)V")),
 		}
 	);
 
 	public static final PatchSet customLavaMC = new PatchSet(
 		"Minecraft",
 		new PatchSpec[] {
-			new PatchSpec(new PassThisPatch("fi", "<init>", "()V", "(Lnet/minecraft/client/Minecraft;)V")),
+			new PatchSpec(new PassThisPatch("fj", "<init>", "()V", "(Lnet/minecraft/client/Minecraft;)V")),
 			new PatchSpec(new PassThisPatch("bc", "<init>", "()V", "(Lnet/minecraft/client/Minecraft;)V")),
 		}
 	);