Fix Inline Forge dependency, update MixinExtras to 0.3.6

object-Object · Nov 28, 2024 · cdfea9c · cdfea9c
1 parent ab477fc
commit cdfea9c
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 8 deletions.
diff --git a/Common/build.gradle.kts b/Common/build.gradle.kts
@@ -21,7 +21,10 @@ dependencies {
 
     modApi(libs.clothConfig.common)
 
-    implementation(libs.mixinExtras)
+    libs.mixinExtras.common.also {
+        implementation(it)
+        annotationProcessor(it)
+    }
 
     api(libs.bundles.lsp4j)
 

diff --git a/Common/src/main/java/gay/object/hexdebug/mixin/MixinGuiSpellcasting.java b/Common/src/main/java/gay/object/hexdebug/mixin/MixinGuiSpellcasting.java
@@ -7,7 +7,7 @@
 import at.petrak.hexcasting.common.msgs.IMessage;
 import at.petrak.hexcasting.common.msgs.MsgNewSpellPatternC2S;
 import at.petrak.hexcasting.xplat.IClientXplatAbstractions;
-import com.llamalad7.mixinextras.injector.WrapWithCondition;
+import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
 import gay.object.hexdebug.gui.splicing.IMixinGuiSpellcasting;
 import net.minecraft.world.InteractionHand;
 import org.jetbrains.annotations.NotNull;
@@ -47,7 +47,8 @@ public abstract class MixinGuiSpellcasting implements IMixinGuiSpellcasting {
             value = "INVOKE",
             target = "Lat/petrak/hexcasting/xplat/IClientXplatAbstractions;sendPacketToServer(Lat/petrak/hexcasting/common/msgs/IMessage;)V",
             remap = false
-        )
+        ),
+        remap = false
     )
     private boolean redirectSplicingTableStaffPacket$hexdebug(IClientXplatAbstractions instance, IMessage message) {
         if (onDrawSplicingTablePattern$hexdebug != null && message instanceof MsgNewSpellPatternC2S newSpellPatternC2S) {

diff --git a/Fabric/build.gradle.kts b/Fabric/build.gradle.kts
@@ -51,9 +51,10 @@ dependencies {
     modLocalRuntime(libs.trinkets)
     modLocalRuntime(libs.inline.fabric)
 
-    libs.mixinExtras.also {
+    libs.mixinExtras.fabric.also {
         localRuntime(it)
         include(it)
+        annotationProcessor(it)
     }
 
     modApi(libs.clothConfig.fabric) {

diff --git a/Forge/build.gradle.kts b/Forge/build.gradle.kts
@@ -63,11 +63,16 @@ dependencies {
     modImplementation(libs.paucal.forge)
     modLocalRuntime(libs.patchouli.forge)
     modLocalRuntime(libs.caelus)
-    modLocalRuntime(libs.inline.fabric)
+    modLocalRuntime(libs.inline.forge) { isTransitive = false }
 
     modApi(libs.clothConfig.forge)
 
-    libs.mixinExtras.also {
+    libs.mixinExtras.common.also {
+        compileOnly(it)
+        annotationProcessor(it)
+    }
+
+    libs.mixinExtras.forge.also {
         localRuntime(it)
         include(it)
     }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -32,7 +32,7 @@ patchouli-forge = "1.20.1-84-FORGE"
 
 cardinalComponents = "5.2.1"
 serializationHooks = "0.4.99999"
-mixinExtras = "0.1.1"
+mixinExtras = "0.3.6"
 trinkets = "3.7.0"
 clothConfig = "11.1.106"
 modMenu = "7.1.0"
@@ -89,11 +89,14 @@ patchouli-forge  = { module="vazkii.patchouli:Patchouli", version.ref="patchouli
 
 cardinalComponents = { module="dev.onyxstudios.cardinal-components-api:cardinal-components-api", version.ref="cardinalComponents" }
 serializationHooks = { module="libs:serialization-hooks", version.ref="serializationHooks" }
-mixinExtras        = { module="com.github.LlamaLad7:MixinExtras", version.ref="mixinExtras" }
 trinkets           = { module="dev.emi:trinkets", version.ref="trinkets" }
 modMenu            = { module="com.terraformersmc:modmenu", version.ref="modMenu" }
 caelus             = { module="top.theillusivec4.caelus:caelus-forge", version.ref="caelus" }
 
+mixinExtras-common = { module="io.github.llamalad7:mixinextras-common", version.ref="mixinExtras" }
+mixinExtras-fabric = { module="io.github.llamalad7:mixinextras-fabric", version.ref="mixinExtras" }
+mixinExtras-forge  = { module="io.github.llamalad7:mixinextras-forge", version.ref="mixinExtras" }
+
 clothConfig-common = { module="me.shedaniel.cloth:cloth-config", version.ref="clothConfig" }
 clothConfig-fabric = { module="me.shedaniel.cloth:cloth-config-fabric", version.ref="clothConfig" }
 clothConfig-forge  = { module="me.shedaniel.cloth:cloth-config-forge", version.ref="clothConfig" }