Stop REI crashing

src/main/java/me/modmuss50/optifabric/patcher/fixes/KeyboardFix.java

@@ -0,0 +1,68 @@
+package me.modmuss50.optifabric.patcher.fixes;
+
+import me.modmuss50.optifabric.util.RemappingUtils;
+import org.apache.commons.lang3.Validate;
+import org.objectweb.asm.Handle;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.tree.AbstractInsnNode;
+import org.objectweb.asm.tree.ClassNode;
+import org.objectweb.asm.tree.InvokeDynamicInsnNode;
+import org.objectweb.asm.tree.MethodNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class KeyboardFix implements ClassFixer {
+	//net/minecraft/client/Keyboard.onKey(JIIII)V
+	private String onKeyName = RemappingUtils.getMethodName("class_309", "method_1466", "(JIIII)V");
+
+	@Override
+	public void fix(ClassNode optifine, ClassNode minecraft) {
+		Validate.notNull(onKeyName, "onKeyName null");
+
+		//Remove the old "broken" method
+		optifine.methods.removeIf(methodNode -> methodNode.name.equals(onKeyName));
+
+		//Find the vanilla method
+		MethodNode methodNode = minecraft.methods.stream().filter(methodNode1 -> methodNode1.name.equals(onKeyName)).findFirst().orElse(null);
+		Validate.notNull(methodNode, "old method null");
+
+		//Add the vanilla method back in
+		optifine.methods.add(methodNode);
+
+		List<String> anonymousMethods = new ArrayList<>();
+
+		//Find all speical anonymous method calls, a more direct and targeted approach to the lambada fixer
+		for (AbstractInsnNode instruction : methodNode.instructions) {
+			if (instruction instanceof InvokeDynamicInsnNode) {
+				InvokeDynamicInsnNode dynamicInsnNode = (InvokeDynamicInsnNode) instruction;
+				for (Object bsmArg : dynamicInsnNode.bsmArgs) {
+					if (bsmArg instanceof Handle) {
+						Handle handle = (Handle) bsmArg;
+						if (handle.getTag() == Opcodes.H_INVOKESPECIAL) {
+							anonymousMethods.add(handle.getName());
+						}
+					}
+				}
+			}
+		}
+
+		//Copy all the synthetic methods back in that we possibly broke by replacing the method
+		for (MethodNode method : minecraft.methods) {
+			if ((method.access & Opcodes.ACC_SYNTHETIC) != 0) {
+				boolean found = false;
+				for (MethodNode node : optifine.methods) {
+					if (node.name.equals(method.name)) {
+						found = true;
+						break;
+					}
+				}
+				//Didnt find the method in optifines classes, we detected it as a possible candidate for being lost, so lets add it back
+				if (!found && anonymousMethods.contains(method.name)) {
+					optifine.methods.add(method);
+				}
+			}
+		}
+
+	}
+}

src/main/java/me/modmuss50/optifabric/patcher/fixes/OptifineFixer.java

@@ -21,6 +21,9 @@ private OptifineFixer() {
 		//net/minecraft/client/render/block/BlockModelRenderer
 		registerFix("class_778", new BlockModelRendererFix());
 
+		//net/minecraft/client/Keyboard
+		registerFix("class_309", new KeyboardFix());
+
 		//net/minecraft/client/particle/ParticleManager
 		skipClass("class_702");
 	}