From de0a600163eb830ec7b654b1ebf437db44a9adfb Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Sat, 30 Dec 2023 13:20:59 -0800 Subject: [PATCH] Only enable threaded block transformations when sodium is enabled --- .../angelica/loading/MixinCompatHackTweaker.java | 5 ++++- .../angelica/transform/RedirectorTransformer.java | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/gtnewhorizons/angelica/loading/MixinCompatHackTweaker.java b/src/main/java/com/gtnewhorizons/angelica/loading/MixinCompatHackTweaker.java index 363b90e2f..9bc00f91a 100644 --- a/src/main/java/com/gtnewhorizons/angelica/loading/MixinCompatHackTweaker.java +++ b/src/main/java/com/gtnewhorizons/angelica/loading/MixinCompatHackTweaker.java @@ -1,5 +1,6 @@ package com.gtnewhorizons.angelica.loading; +import com.gtnewhorizons.angelica.config.AngelicaConfig; import com.gtnewhorizons.angelica.transform.BlockTransformer; import com.gtnewhorizons.angelica.transform.RedirectorTransformer; import cpw.mods.fml.common.Loader; @@ -75,7 +76,9 @@ public class MixinCompatHackTweaker implements ITweaker { if (FMLLaunchHandler.side().isClient()) { // Run after Mixins, but before LWJGl3ify Launch.classLoader.registerTransformer(RedirectorTransformer.class.getName()); - Launch.classLoader.registerTransformer(BlockTransformer.class.getName()); + if(AngelicaConfig.enableSodium) { + Launch.classLoader.registerTransformer(BlockTransformer.class.getName()); + } } return new String[0]; diff --git a/src/main/java/com/gtnewhorizons/angelica/transform/RedirectorTransformer.java b/src/main/java/com/gtnewhorizons/angelica/transform/RedirectorTransformer.java index 1f92efd23..e652047f8 100644 --- a/src/main/java/com/gtnewhorizons/angelica/transform/RedirectorTransformer.java +++ b/src/main/java/com/gtnewhorizons/angelica/transform/RedirectorTransformer.java @@ -1,7 +1,7 @@ package com.gtnewhorizons.angelica.transform; -import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; +import com.gtnewhorizons.angelica.config.AngelicaConfig; import com.gtnewhorizons.angelica.loading.AngelicaTweaker; import net.coderbot.iris.IrisLogging; import net.minecraft.launchwrapper.IClassTransformer; @@ -261,7 +261,7 @@ public class RedirectorTransformer implements IClassTransformer { } } else if ((node.getOpcode() == Opcodes.GETFIELD || node.getOpcode() == Opcodes.PUTFIELD) && node instanceof FieldInsnNode fNode) { - if(!blockOwnerExclusions.contains(fNode.owner) && blockSubclasses.contains(fNode.owner)) { + if(!blockOwnerExclusions.contains(fNode.owner) && blockSubclasses.contains(fNode.owner) && AngelicaConfig.enableSodium) { Pair fieldToRedirect = null; for(Pair blockPairs : BlockBoundsFields) { if(fNode.name.equals(blockPairs.getLeft()) || fNode.name.equals(blockPairs.getRight())) {