Fix some mis-spellings which shouldn't be there, and add some which s…

…hould. Signed-off-by: Ross Allan <rallanpcl@gmail.com>
MinimallyCorrect · Jul 11, 2013 · afb05fc · afb05fc
1 parent 84746a1
commit afb05fc
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/resources/patches-deobfuscated.xml b/resources/patches-deobfuscated.xml
@@ -1651,10 +1651,10 @@
 			appeng.me.tile.TileTerminal
 			appeng.me.tile.TileStorageMonitor
 			appeng.me.tile.TileStorageBus
-			appeng.me.tile.TileProgrammableInterface
+			appeng.me.tile.TileProgramableInterface
 			appeng.me.tile.TileP2PTunnel
 			appeng.me.tile.TileOutputCable
-			appeng.me.tile.TileLEvelEmitter
+			appeng.me.tile.TileLevelEmitter
 			appeng.me.tile.TileIOPort
 			appeng.me.tile.TileInterfaceBase
 			appeng.me.tile.TileInputCable
@@ -1665,7 +1665,7 @@
 			appeng.me.tile.TileAssemblerMB
 			appeng.me.tile.TileAssembler
 		">
-			<newMethod code="public void ^method:TileEntity/updateEntity^() { }" new=""/>
+			<newMethod code="public void ^method:TileEntity/updateEntity^() { }" ignoreDuplicate=""/>
 			<renameInterfaceMethod name="tickNetwork" interface="appeng.api.me.tiles.IGridMachine" allowMissing="">^method:TileEntity/updateEntity^</renameInterfaceMethod>
 		</class>
 	</appliedEnergistics>

diff --git a/src/common/nallar/tickthreading/patcher/PatchManager.java b/src/common/nallar/tickthreading/patcher/PatchManager.java
@@ -336,7 +336,9 @@ public Object run(Element patchElement, CtClass ctClass) {
 					try {
 						ctMethod = methodDescription.inClass(ctClass);
 					} catch (Throwable t) {
-						Log.warning("", t);
+						if (!attributes.containsKey("allowMissing")) {
+							Log.warning("", t);
+						}
 						continue;
 					}
 					run(ctMethod, attributes);

diff --git a/src/common/nallar/tickthreading/patcher/Patches.java b/src/common/nallar/tickthreading/patcher/Patches.java
@@ -32,6 +32,7 @@
 import javassist.bytecode.CodeIterator;
 import javassist.bytecode.ConstPool;
 import javassist.bytecode.Descriptor;
+import javassist.bytecode.DuplicateMemberException;
 import javassist.bytecode.MethodInfo;
 import javassist.bytecode.Mnemonic;
 import javassist.bytecode.Opcode;
@@ -78,7 +79,13 @@ public void remove(CtMethod ctMethod) {
 			requiredAttributes = "code"
 	)
 	public void newMethod(CtClass ctClass, Map<String, String> attributes) throws CannotCompileException {
-		ctClass.addMethod(CtNewMethod.make(attributes.get("code"), ctClass));
+		try {
+			ctClass.addMethod(CtNewMethod.make(attributes.get("code"), ctClass));
+		} catch (DuplicateMemberException e) {
+			if (!attributes.containsKey("ignoreDuplicate")) {
+				throw e;
+			}
+		}
 	}
 
 	@Patch (