diff options
| author | Kevin <92656833+kevinthegreat1@users.noreply.github.com> | 2023-11-10 15:24:52 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-10 15:24:52 -0500 |
| commit | e3942c04a53755faa1048978b74bdfbb39501d2e (patch) | |
| tree | a804222063d75c58a3faa6ddaa363b25c111fd3d /src/main/java/de/hysky/skyblocker/compatibility | |
| parent | 8731707bedea9ec7c59f9910214aec99cb4eab52 (diff) | |
| parent | 96e81b922393a3830b64e0ddca92e7c822787303 (diff) | |
| download | Skyblocker-e3942c04a53755faa1048978b74bdfbb39501d2e.tar.gz Skyblocker-e3942c04a53755faa1048978b74bdfbb39501d2e.tar.bz2 Skyblocker-e3942c04a53755faa1048978b74bdfbb39501d2e.zip | |
Merge pull request #410 from kevinthegreat1/yacl-update
Update yacl to 3.3.0-beta.1
Diffstat (limited to 'src/main/java/de/hysky/skyblocker/compatibility')
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/compatibility/MixinPlugin.java | 28 |
1 files changed, 5 insertions, 23 deletions
diff --git a/src/main/java/de/hysky/skyblocker/compatibility/MixinPlugin.java b/src/main/java/de/hysky/skyblocker/compatibility/MixinPlugin.java index 2475d0d3..7820dfa4 100644 --- a/src/main/java/de/hysky/skyblocker/compatibility/MixinPlugin.java +++ b/src/main/java/de/hysky/skyblocker/compatibility/MixinPlugin.java @@ -1,20 +1,15 @@ package de.hysky.skyblocker.compatibility; -import java.util.List; -import java.util.Set; - +import net.fabricmc.loader.api.FabricLoader; import org.objectweb.asm.tree.ClassNode; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin; import org.spongepowered.asm.mixin.extensibility.IMixinInfo; -import net.fabricmc.loader.api.FabricLoader; +import java.util.List; +import java.util.Set; public class MixinPlugin implements IMixinConfigPlugin { - private static final Logger LOGGER = LoggerFactory.getLogger(MixinPlugin.class); private static final boolean OPTIFABRIC_LOADED = FabricLoader.getInstance().isModLoaded("optifabric"); - private static final String YACL_VERSION = FabricLoader.getInstance().getModContainer("yet_another_config_lib_v3").get().getMetadata().getVersion().getFriendlyString(); @Override public void onLoad(String mixinPackage) { @@ -29,21 +24,8 @@ public class MixinPlugin implements IMixinConfigPlugin { @Override public boolean shouldApplyMixin(String targetClassName, String mixinClassName) { //OptiFabric Compatibility - if (mixinClassName.endsWith("WorldRendererMixin") && OPTIFABRIC_LOADED) return false; - - //YACL#103 Patch - if (mixinClassName.endsWith("DoubleFieldControllerMixin") || mixinClassName.endsWith("FloatFieldControllerMixin") || mixinClassName.endsWith("IntegerFieldControllerMixin") || mixinClassName.endsWith("LongFieldControllerMixin") || mixinClassName.endsWith("NumberFieldControllerMixin")) { - if (YACL_VERSION.equals("3.2.1+1.20.2")) { - LOGGER.info("[Skyblocker] Applying patch for " + targetClassName + " from " + mixinClassName); - } else { - LOGGER.info("[Skyblocker] Skipping patch on " + targetClassName + " due to an Unknown YACL version being found! Version: {}", YACL_VERSION); - - return false; - } - } - - return true; - } + return !mixinClassName.endsWith("WorldRendererMixin") || !OPTIFABRIC_LOADED; + } @Override public void acceptTargets(Set<String> myTargets, Set<String> otherTargets) { |