project(injector): Remove edge case checks and let the injector handl…

…e it
CyberFlameGO · May 11, 2022 · 8ed22ca · 8ed22ca
1 parent dfddf15
commit 8ed22ca
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/injector/src/main/java/com/openosrs/injector/injectors/MixinInjector.java b/injector/src/main/java/com/openosrs/injector/injectors/MixinInjector.java
@@ -457,17 +457,22 @@ else if (hasInject)
 						}
 					}*/
 
-					Method copy = new Method(targetClass, mixinMethod.getName(), mixinMethod.getDescriptor());
-					moveCode(copy, mixinMethod.getCode());
-					copy.setAccessFlags(mixinMethod.getAccessFlags());
-					copy.setPublic();
-					assert mixinMethod.getExceptions().getExceptions().isEmpty();
+					Method method = targetClass.findMethod(mixinMethod.getName(), mixinMethod.getDescriptor());
 
-					setOwnersToTargetClass(mixinClass, targetClass, copy, copiedMethods);
+					if (method == null)
+					{
+						method = new Method(targetClass, mixinMethod.getName(), mixinMethod.getDescriptor());
+						targetClass.addMethod(method);
+					}
 
-					targetClass.addMethod(copy);
+					moveCode(method, mixinMethod.getCode());
+					method.setAccessFlags(mixinMethod.getAccessFlags());
+					method.setPublic();
+					assert mixinMethod.getExceptions().getExceptions().isEmpty();
 
-					log.debug("[DEBUG] Injected mixin method {} to {}", copy, targetClass);
+					setOwnersToTargetClass(mixinClass, targetClass, method, copiedMethods);
+
+					log.debug("[DEBUG] Injected mixin method {} to {}", method, targetClass);
 					++injected;
 				}
 				else if (mixinMethod.findAnnotation(REPLACE) != null)

diff --git a/injector/src/main/java/com/openosrs/injector/injectors/raw/CopyRuneLiteClasses.java b/injector/src/main/java/com/openosrs/injector/injectors/raw/CopyRuneLiteClasses.java
@@ -93,11 +93,6 @@ public void inject()
 
 				for (Method method : runeLiteDeob.getMethods())
 				{
-					if (className.equals("RuneLiteMenuEntry") && (method.getName().equals("getItemId") || method.getName().equals("getWidget") || method.getName().equals("getItemOp")))
-					{
-						continue;
-					}
-
 					transformMethod(method);
 					runeliteObjectVanilla.addMethod(method);
 				}