fix AM2 particles

huihiuhuai · Nov 14, 2024 · d76cb65 · d76cb65
1 parent 0f1afdf
commit d76cb65
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 1 deletion.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -71,12 +71,13 @@ repositories {
             includeGroup("optifine")
         }
     }
+    exclusive(ivy("https://mvn.falsepattern.com/releases/mirror/", "[orgPath]/[artifact]-[revision].[ext]"), "mirror")
 }
 
 dependencies {
     apiSplit("com.falsepattern:lumi-mc1.7.10:1.0.1")
     implementationSplit("com.falsepattern:falsepatternlib-mc1.7.10:1.4.4")
-    implementationSplit("com.falsepattern:falsetweaks-mc1.7.10:3.3.3-2-g28ce36e")
+    implementationSplit("com.falsepattern:falsetweaks-mc1.7.10:3.3.3-4-g4f3e9ce")
 
     compileOnly("makamys:neodymium-mc1.7.10:0.3.3-unofficial:dev")
 
@@ -104,4 +105,8 @@ dependencies {
     compileOnly(deobfCurse("appliedenergistics2-223794:2296430"))
     // The Lord of the Rings Mod: Legacy v36.15
     compileOnly(deobfCurse("the-lord-of-the-rings-mod-legacy-423748:4091561"))
+
+    compileOnly("mirror:AM2.5:LTS-1.6.7-dev")
+
+    runtimeOnlyNonPublishable(deobfCurse("animationapi-77191:2221721"))
 }
diff --git a/src/main/java/com/falsepattern/rple/internal/mixin/mixins/client/am25/AMParticleMixin.java b/src/main/java/com/falsepattern/rple/internal/mixin/mixins/client/am25/AMParticleMixin.java
@@ -0,0 +1,17 @@
+package com.falsepattern.rple.internal.mixin.mixins.client.am25;
+
+import am2.particles.AMParticle;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.Constant;
+import org.spongepowered.asm.mixin.injection.ModifyConstant;
+
+@Mixin(value = AMParticle.class)
+public abstract class AMParticleMixin {
+    @ModifyConstant(method = "renderParticle",
+                    constant = @Constant(intValue = 0x0F00_00F0),
+                    require = 0,
+                    expect = 0)
+    private int fixInt(int constant) {
+        return 0x00F0_00F0;
+    }
+}
diff --git a/src/main/java/com/falsepattern/rple/internal/mixin/plugin/Mixin.java b/src/main/java/com/falsepattern/rple/internal/mixin/plugin/Mixin.java
@@ -151,6 +151,10 @@ public enum Mixin implements IMixin {
     client_computronics_TileColorfulLampMixin(COMMON, require(COMPUTRONICS), "computronics.TileColorfulLampMixin"),
     // endregion
 
+    // region Ars Magica 2.5 Compatibility
+    client_am25_AMParticleMixin(CLIENT, require(AM25), "am25.AMParticleMixin"),
+    // endregion
+
     // TODO proper category
     RenderManagerMixin(CLIENT, always(), "RenderManagerMixin")
     ;

diff --git a/src/main/java/com/falsepattern/rple/internal/mixin/plugin/TargetedMod.java b/src/main/java/com/falsepattern/rple/internal/mixin/plugin/TargetedMod.java
@@ -56,6 +56,7 @@ public enum TargetedMod implements ITargetedMod {
     NOT_ENOUGH_ITEMS("NotEnoughItems", false, contains("NotEnoughItems-")),
     FORGE_MULTI_PART("Forge Multi Part", false, contains("forgemultipart-")),
     COMPUTRONICS("Computronics", false, contains("Computronics-")),
+    AM25("Ars Magica 2.5", false, contains("am2.5")),
     ;
 
     @Getter