Skip to content

Fix Language Reload >=1.5.0 #1023

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 Language Reload >=1.5.0 #1023

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
51 changes: 51 additions & 0 deletions src/main/java/me/modmuss50/optifabric/patcher/fixes/GameOptionsFix.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
package me.modmuss50.optifabric.patcher.fixes;

import com.google.common.collect.MoreCollectors;
import me.modmuss50.optifabric.util.RemappingUtils;
import org.apache.commons.lang3.Validate;
import org.objectweb.asm.Opcodes;
import org.objectweb.asm.tree.*;

public class GameOptionsFix implements ClassFixer {

private final String gameOptionsName = RemappingUtils.getClassName("class_315");
private final String loadName = RemappingUtils.getMethodName("class_315", "method_1636", "()V");

@Override
public void fix(ClassNode optifine, ClassNode minecraft) {
optifine.methods.removeIf(method -> loadName.equals(method.name));
optifine.methods.removeIf(method -> "load".equals(method.name));
//lambda$load(NbtCompound,String)void
optifine.methods.removeIf(method -> (method.access | Opcodes.ACC_STATIC | Opcodes.ACC_SYNTHETIC) == method.access
&& method.name.startsWith("lambda$load$")
&& method.desc.equals(RemappingUtils.mapMethodDescriptor("(Lnet/minecraft/class_2487;Ljava/lang/String;)V")));

MethodNode method = minecraft.methods.stream().filter(node -> loadName.equals(node.name)).collect(MoreCollectors.onlyElement());
Validate.notNull(method, "old method null");

MethodNode lambda = minecraft.methods.stream().filter(node -> "method_24230".equals(node.name)).collect(MoreCollectors.onlyElement());
Validate.notNull(method, "old method lambda null");

//re-add the Optifine stuff
InsnList head = new InsnList();
head.add(new VarInsnNode(Opcodes.ALOAD, 0));
head.add(new InsnNode(Opcodes.ICONST_1));
head.add(new FieldInsnNode(Opcodes.PUTFIELD, gameOptionsName, "loadOptions", "Z"));

InsnList tail = new InsnList();
tail.add(new VarInsnNode(Opcodes.ALOAD, 0));
tail.add(new InsnNode(Opcodes.ICONST_0));
tail.add(new FieldInsnNode(Opcodes.PUTFIELD, gameOptionsName, "loadOptions", "Z"));
tail.add(new VarInsnNode(Opcodes.ALOAD, 0));
tail.add(new MethodInsnNode(Opcodes.INVOKEVIRTUAL, gameOptionsName, "loadOfOptions", "()V", false));

method.instructions.insertBefore(method.instructions.getFirst(), head);
method.instructions.insertBefore(method.instructions.getLast().getPrevious(), tail);

optifine.methods.add(method);
//failsafe for 1.18.2
if (optifine.methods.stream().noneMatch(node -> node.name.equals(lambda.name) && node.desc.equals(lambda.desc))) {
optifine.methods.add(lambda);
}
}
}
6 changes: 6 additions & 0 deletions src/main/java/me/modmuss50/optifabric/patcher/fixes/OptifineFixer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import java.util.Map;
import java.util.Set;

import me.modmuss50.optifabric.mod.OptifabricSetup;
import net.fabricmc.loader.api.FabricLoader;

import me.modmuss50.optifabric.compat.fabricrenderingfluids.FluidRendererFix;
Expand Down Expand Up @@ -43,6 +44,11 @@ private OptifineFixer() {
//net/minecraft/client/render/model/json/ModelOverrideList
registerFix("class_806", new ModelOverrideListFix());

if (OptifabricSetup.isPresent("minecraft", ">=1.18.2")) {
//net/minecraft/client/option/GameOptions
registerFix("class_315", new GameOptionsFix());
}

if (FabricLoader.getInstance().isModLoaded("fabric-rendering-fluids-v1")) {
//net/minecraft/client/render/block/FluidRenderer
registerFix("class_775", new FluidRendererFix());
Expand Down