fix #23

src/main/java/pl/asie/foamfix/coremod/BlockInfoPatch.java

@@ -22,6 +22,9 @@ public class BlockInfoPatch {
 
 	public void updateLightMatrix() {
 		boolean full = false;
+
+		// FOAMFIX: Instead of generating 27 objects, we can really generate
+		// just one - and we don't save much speed by not doing so either.
 		BlockPos.MutableBlockPos pos = new BlockPos.MutableBlockPos();
 		int xo = blockPos.getX() - 1;
 		int yo = blockPos.getY() - 1;
@@ -70,7 +73,8 @@ public void updateLightMatrix() {
 					skyLight[1][x][y][z] = combine(s[1][y1][1], s[x1][y1][1], s[1][y1][z1], ty ? s[x1][y1][z1] : s[1][y1][1]);
 					blockLight[1][x][y][z] = combine(b[1][y1][1], b[x1][y1][1], b[1][y1][z1], ty ? b[x1][y1][z1] : b[1][y1][1]);
 
-					boolean tz = translucent[x1][1][z1] || translucent[1][y1][z1];
+					// FOAMFIX: typo fix - should be in Forge soon
+					boolean tz = translucent[1][y1][z1] || translucent[x1][1][z1];
 					skyLight[2][x][y][z] = combine(s[1][1][z1], s[1][y1][z1], s[x1][1][z1], tz ? s[x1][y1][z1] : s[1][1][z1]);
 					blockLight[2][x][y][z] = combine(b[1][1][z1], b[1][y1][z1], b[x1][1][z1], tz ? b[x1][y1][z1] : b[1][1][z1]);
 				}

src/main/java/pl/asie/foamfix/coremod/BlockPosPatch.java

@@ -25,6 +25,7 @@
  */
 package pl.asie.foamfix.coremod;
 
+import net.minecraftforge.fml.common.discovery.ASMDataTable;
 import org.objectweb.asm.*;
 import org.objectweb.asm.tree.ClassNode;
 import org.objectweb.asm.tree.FieldNode;
@@ -35,6 +36,7 @@
 public class BlockPosPatch {
 	private static final HashMap<String, String> mutableFieldSwaps = new HashMap<>();
 	private static final HashSet<String> mutableDeletedMethods = new HashSet<>();
+	private static final HashSet<String> mutableOwners = new HashSet<>();
 
 	static {
 		mutableFieldSwaps.put("x", "x");
@@ -52,6 +54,8 @@ public class BlockPosPatch {
 		mutableDeletedMethods.add("func_177958_n");
 		mutableDeletedMethods.add("func_177956_o");
 		mutableDeletedMethods.add("func_177952_p");
+
+		mutableOwners.add("net/minecraft/util/math/BlockPos$MutableBlockPos");
 	}
 
 	private static class BlockPosClassVisitor extends ClassVisitor {
@@ -62,6 +66,15 @@ public BlockPosClassVisitor(int api, ClassVisitor next, boolean isMutable) {
 			this.isMutable = isMutable;
 		}
 
+		@Override
+		public void visit(int version, int access, String name, String signature,
+		                  String superName, String[] interfaces) {
+			if (mutableOwners.contains(superName)) {
+				mutableOwners.add(name);
+			}
+			cv.visit(version, access, name, signature, superName, interfaces);
+		}
+
 		@Override
 		public FieldVisitor visitField(int access, String name, String desc,
 		                               String signature, Object value) {
@@ -91,7 +104,7 @@ public BlockPosMethodVisitor(int api, MethodVisitor mv) {
 		@Override
 		public void visitFieldInsn(int opcode, String owner, String name,
 		                           String desc) {
-			if ("net/minecraft/util/math/BlockPos$MutableBlockPos".equals(owner)) {
+			if (mutableOwners.contains(owner)) {
 				String dst = mutableFieldSwaps.get(name);
 				if (dst != null) {
 					mv.visitFieldInsn(opcode, "net/minecraft/util/math/Vec3i", dst, desc);