Skip to content

Fix KeyboardFix for 1.16 and 1.17 #1019

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
XXMA16 wants to merge 1 commit into
base: llama
Choose a base branch
from
Open

Fix KeyboardFix for 1.16 and 1.17 #1019

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/me/modmuss50/optifabric/mod/OptifabricSetup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,7 @@ private static boolean isPresent(String modID) {
return FabricLoader.getInstance().isModLoaded(modID);
}

static boolean isPresent(String modID, String versionRange) {
public static boolean isPresent(String modID, String versionRange) {
return isPresent(modID, modMetadata -> compareVersions(versionRange, modMetadata));
}

Expand Down
25 changes: 17 additions & 8 deletions src/main/java/me/modmuss50/optifabric/patcher/fixes/KeyboardFix.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
package me.modmuss50.optifabric.patcher.fixes;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;

import com.google.common.collect.ImmutableSet;

import me.modmuss50.optifabric.mod.OptifabricSetup;
import org.apache.commons.lang3.Validate;

import org.objectweb.asm.Handle;
Expand All @@ -21,17 +24,23 @@

public class KeyboardFix implements ClassFixer {
private final String screenClass = RemappingUtils.getClassName("class_437");
private final Set<String> revertMethods = ImmutableSet.of(
RemappingUtils.getMethodName("class_309", "method_1466", "(JIIII)V"), //Keyboard, onKey
RemappingUtils.getMethodName("class_309", "method_1454", "(IL" + screenClass + ";[ZIII)V"),
RemappingUtils.getMethodName("class_309", "method_1458", "(L" + screenClass + ";II)V"),
RemappingUtils.getMethodName("class_309", "method_1473", "(L" + screenClass + ";CI)V"),
RemappingUtils.getMethodName("class_309", "method_1463", "(Lnet/minecraft/class_2561)V"),
RemappingUtils.getMethodName("class_309", "method_1464", "(Lnet/minecraft/class_2561)V")
);
private Set<String> revertMethods;

@Override
public void fix(ClassNode optifine, ClassNode minecraft) {
List<String> revert = new ArrayList<>(Arrays.asList(
RemappingUtils.getMethodName("class_309", "method_1466", "(JIIII)V"), //Keyboard, onKey
RemappingUtils.getMethodName("class_309", "method_1454", "(IL" + screenClass + ";[ZIII)V"),
RemappingUtils.getMethodName("class_309", "method_1463", "(Lnet/minecraft/class_2561)V"),
RemappingUtils.getMethodName("class_309", "method_1464", "(Lnet/minecraft/class_2561)V")
));

if (OptifabricSetup.isPresent("minecraft", ">=1.18.2")) {
revert.add(RemappingUtils.getMethodName("class_309", "method_1458", "(L" + screenClass + ";II)V"));
revert.add(RemappingUtils.getMethodName("class_309", "method_1473", "(L" + screenClass + ";CI)V"));
}
revertMethods = ImmutableSet.copyOf(revert);

Validate.noNullElements(revertMethods, "Failed to remap Keyboard method name %d"); //ImmutableSet iteration order is stable

//Remove the "broken" OptiFine methods
Expand Down