aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/de/hysky/skyblocker/compatibility
diff options
context:
space:
mode:
authorKevinthegreat <92656833+kevinthegreat1@users.noreply.github.com>2023-11-07 22:08:55 -0500
committerKevinthegreat <92656833+kevinthegreat1@users.noreply.github.com>2023-11-07 22:08:55 -0500
commit92b3214ff78a40ff92c3d44baa435ddfda29779b (patch)
treed26b1a3fd36a7bfa077afef82f98f2273836a677 /src/main/java/de/hysky/skyblocker/compatibility
parent8731707bedea9ec7c59f9910214aec99cb4eab52 (diff)
downloadSkyblocker-92b3214ff78a40ff92c3d44baa435ddfda29779b.tar.gz
Skyblocker-92b3214ff78a40ff92c3d44baa435ddfda29779b.tar.bz2
Skyblocker-92b3214ff78a40ff92c3d44baa435ddfda29779b.zip
Remove yacl patches
Diffstat (limited to 'src/main/java/de/hysky/skyblocker/compatibility')
-rw-r--r--src/main/java/de/hysky/skyblocker/compatibility/MixinPlugin.java28
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) {