Fix issue with OpenPeripheral ASM

Fixes #67
SquidDev-CC · Sep 12, 2015 · 04d97fe · 04d97fe
1 parent e01f823
commit 04d97fe
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/src/main/java/org/squiddev/cctweaks/core/asm/PatchOpenModule.java b/src/main/java/org/squiddev/cctweaks/core/asm/PatchOpenModule.java
@@ -41,6 +41,7 @@ public ClassVisitor patch(String className, final ClassVisitor delegate) throws
 		) {
 			@Override
 			public void handle(InsnList nodes, MethodVisitor visitor) {
+				nodes.accept(visitor);
 				visitor.visitLdcInsn(IPeripheralEnvironments.ARG_NETWORK);
 				visitor.visitLdcInsn(Type.getType("Lorg/squiddev/cctweaks/api/network/INetworkAccess;"));
 				visitor.visitMethodInsn(INVOKEVIRTUAL,
@@ -50,6 +51,6 @@ public void handle(InsnList nodes, MethodVisitor visitor) {
 					false
 				);
 			}
-		}.onMethod("<clinit>").once().mustFind();
+		}.onMethod("<clinit>").onMethod("init").once().mustFind();
 	}
 }
diff --git a/src/main/java/org/squiddev/cctweaks/core/asm/PatchOpenPeripheralAdapter.java b/src/main/java/org/squiddev/cctweaks/core/asm/PatchOpenPeripheralAdapter.java
@@ -39,7 +39,7 @@ public ClassVisitor patch(final String className, ClassVisitor delegate) throws
 				CLASS_NAME,
 				"org.squiddev.cctweaks.core.patch.op.AdapterPeripheral_Patch"
 			).patch(className, delegate),
-			new VarInsnNode(ALOAD, 0),
+			new VarInsnNode(ALOAD, -1),
 			new MethodInsnNode(
 				INVOKEINTERFACE,
 				"openperipheral/adapter/IMethodCall",
@@ -52,7 +52,7 @@ public ClassVisitor patch(final String className, ClassVisitor delegate) throws
 			public void handle(InsnList nodes, MethodVisitor visitor) {
 				visitor.visitLdcInsn(IPeripheralEnvironments.ARG_NETWORK);
 				visitor.visitVarInsn(ALOAD, 0);
-				visitor.visitFieldInsn(GETFIELD, CLASS_TYPE, "network", "Lorg/squiddev/cctweaks/core/network/NetworkAccessDelegate;");
+				visitor.visitFieldInsn(INVOKEVIRTUAL, CLASS_TYPE, "getNetworkAccess", "()Lorg/squiddev/cctweaks/core/network/NetworkAccessDelegate;");
 				visitor.visitMethodInsn(
 					INVOKEINTERFACE,
 					"openperipheral/adapter/IMethodCall",
@@ -61,6 +61,8 @@ public void handle(InsnList nodes, MethodVisitor visitor) {
 					true
 				);
 
+				nodes.accept(visitor);
+
 				DebugLogger.debug("Added additional environments into " + CLASS_NAME);
 			}
 		}.once().onMethod("call").mustFind();

diff --git a/...main/java/org/squiddev/cctweaks/integration/openperipheral/AdapterNetworkedInventory.java b/...main/java/org/squiddev/cctweaks/integration/openperipheral/AdapterNetworkedInventory.java
@@ -32,7 +32,7 @@ private static void checkSlotId(IInventory inventory, int slot, String name) {
 		if (slot != ANY_SLOT) Preconditions.checkElementIndex(slot, inventory.getSizeInventory(), name + " slot id");
 	}
 
-	public static IInventory getInventory(INetworkAccess network, String name) {
+	private static IInventory getInventory(INetworkAccess network, String name) {
 		Object object = CCTweaksAPI.instance().peripheralHelpers().getTarget(network.getPeripheralsOnNetwork().get(name));
 		if (object != null && object instanceof IInventory) return InventoryUtils.getInventory((IInventory) object);
 		return null;