fix: incompatible with Carpet Org Addition

fixes #51
RubixDev · Dec 15, 2023 · 58688bc · 58688bc
1 parent 4da1e58
commit 58688bc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/src/main/java/de/rubixdev/rug/RugSettings.java b/src/main/java/de/rubixdev/rug/RugSettings.java
@@ -169,7 +169,8 @@ public String description() {
 
     public static boolean shouldApplyReachDistance() {
         return !FabricLoader.getInstance().isModLoaded("reach-entity-attributes")
-                && !FabricLoader.getInstance().isModLoaded("pehkui");
+                && !FabricLoader.getInstance().isModLoaded("pehkui")
+                && !FabricLoader.getInstance().isModLoaded("carpet-org-addition");
     }
 
     public static class conditionReachDistance implements Condition {

diff --git a/src/main/java/de/rubixdev/rug/mixins/EnderPearlEntityMixin.java b/src/main/java/de/rubixdev/rug/mixins/EnderPearlEntityMixin.java
@@ -1,23 +1,17 @@
 package de.rubixdev.rug.mixins;
 
 import de.rubixdev.rug.RugSettings;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.damage.DamageSource;
 import net.minecraft.entity.projectile.thrown.EnderPearlEntity;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
+import org.spongepowered.asm.mixin.injection.ModifyArg;
 
 @Mixin(EnderPearlEntity.class)
 public class EnderPearlEntityMixin {
-    @Redirect(
+    @ModifyArg(
             method = "onCollision",
-            at =
-                    @At(
-                            value = "INVOKE",
-                            target =
-                                    "Lnet/minecraft/entity/Entity;damage(Lnet/minecraft/entity/damage/DamageSource;F)Z"))
-    private boolean onOnCollision(Entity entity, DamageSource source, float amount) {
-        return entity.damage(source, RugSettings.enderPearlDamage);
+            at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/Entity;damage(Lnet/minecraft/entity/damage/DamageSource;F)Z"))
+    private float setDamageAmount(float original) {
+        return RugSettings.enderPearlDamage;
     }
 }