Fix incompatibility with other explosion mixins, closes #24

Ladysnake · Dec 11, 2021 · 54e93cb · 54e93cb
1 parent 8bd7e99
commit 54e93cb
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/build.gradle b/build.gradle
@@ -104,6 +104,7 @@ dependencies {
     modImplementation "net.fabricmc.fabric-api:fabric-api:${fabric_version}"
 
 //    modRuntime "curse.maven:mobz-336554:2826831"
+    modRuntime "curse.maven:carpet-349239:3542018"
 
     compileOnly "com.google.code.findbugs:jsr305:3.0.2"
     compileOnly "org.jetbrains:annotations:19.0.0"

diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,8 @@
+------------------------------------------------------
+Version 1.7.1
+------------------------------------------------------
+- Fixed crash at launch with Carpet and KubeJS
+
 ------------------------------------------------------
 Version 1.7.0
 ------------------------------------------------------

diff --git a/gradle.properties b/gradle.properties
@@ -9,7 +9,7 @@ fabric_version=0.43.1+1.18
 
 # Base properties
 mod_name = Creeper Spores
-mod_version = 1.7.0
+mod_version = 1.7.1
 owners = Ladysnake
 maven_group = io.github.ladysnake
 

diff --git a/src/main/java/io/github/ladysnake/creeperspores/mixin/ExplosionMixin.java b/src/main/java/io/github/ladysnake/creeperspores/mixin/ExplosionMixin.java
@@ -43,7 +43,7 @@ public abstract class ExplosionMixin {
 
 
     // Using ModifyVariable is way easier than an Inject capturing every local
-    @ModifyVariable(method = "collectBlocksAndDamageEntities", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/Entity;damage(Lnet/minecraft/entity/damage/DamageSource;F)Z"))
+    @ModifyVariable(method = "collectBlocksAndDamageEntities", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/Entity;damage(Lnet/minecraft/entity/damage/DamageSource;F)Z", shift = At.Shift.AFTER), ordinal = 0)
     private Entity spreadSpores(Entity affectedEntity) {
         if (this.getCausingEntity() instanceof SporeSpreader) {
             ((SporeSpreader) this.getCausingEntity()).spreadSpores((Explosion) (Object) this, new Vec3d(this.x, this.y, this.z), affectedEntity);