Fix mixin incompatibility with architectury, closes #18

Ladysnake · Jul 24, 2021 · ec77f6b · ec77f6b
1 parent 86e022e
commit ec77f6b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,9 @@
+------------------------------------------------------
+Version 1.6.2
+------------------------------------------------------
+**Fixes**
+- Fixed mixin error with Architectury
+
 ------------------------------------------------------
 Version 1.6.1
 ------------------------------------------------------

diff --git a/gradle.properties b/gradle.properties
@@ -11,7 +11,7 @@ loader_version=0.11.6
 fabric_version=0.36.0+1.17
 
 # Mod Properties
-mod_version = 1.6.1
+mod_version = 1.6.2
 owners = Ladysnake
 maven_group = io.github.ladysnake
 archives_base_name = satin

diff --git a/src/main/java/ladysnake/satin/mixin/SatinMixinPlugin.java b/src/main/java/ladysnake/satin/mixin/SatinMixinPlugin.java
@@ -28,6 +28,7 @@
 
 public final class SatinMixinPlugin implements IMixinConfigPlugin {
     private static final boolean ALLOW_RENDER_LAYER_MIXINS;
+    private static final boolean ENABLE_SHADER_EFFECT_LOCATION_MIXIN;
 
     static {
         FabricLoader loader = FabricLoader.getInstance();
@@ -40,6 +41,8 @@ public final class SatinMixinPlugin implements IMixinConfigPlugin {
             }
             ALLOW_RENDER_LAYER_MIXINS = true;
         }
+        // Architectury actually does the same change, and they can't exactly depend on Satin so...
+        ENABLE_SHADER_EFFECT_LOCATION_MIXIN = !loader.isModLoaded("architectury");
     }
 
     @Override
@@ -54,8 +57,10 @@ public String getRefMapperConfig() {
 
     @Override
     public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
-        if (targetClassName.startsWith("blockrenderlayer")) {
+        if (mixinClassName.contains("blockrenderlayer")) {
             return ALLOW_RENDER_LAYER_MIXINS;
+        } else if (mixinClassName.endsWith("gl.JsonEffectGlShaderMixin")) {
+            return ENABLE_SHADER_EFFECT_LOCATION_MIXIN;
         }
         return true;
     }