better arrow particle multiplier

Polyfrost · Jul 17, 2024 · 07bd765 · 07bd765
1 parent 1702504
commit 07bd765
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 2 deletions.
diff --git a/src/main/java/org/polyfrost/overflowparticles/mixin/EntityLivingBaseMixin.java b/src/main/java/org/polyfrost/overflowparticles/mixin/EntityLivingBaseMixin.java
@@ -51,7 +51,7 @@ private Material fall(Block instance) {
     @ModifyConstant(method = "onDeathUpdate", constant = @Constant(intValue = 20, ordinal = 1))
     private int multiplier(int constant) {
         ParticleConfig config = OverflowParticles.INSTANCE.getConfigs().get(0);
-        if (config == null || config.getEntry().getMultiplier() == 1 || config.getId() == 28) return constant;
+        if (config == null || config.getEntry().getMultiplier() == 1) return constant;
         return (int) (constant * config.getEntry().getMultiplier());
     }
 

diff --git a/src/main/java/org/polyfrost/overflowparticles/mixin/particles/EntityArrowMixin.java b/src/main/java/org/polyfrost/overflowparticles/mixin/particles/EntityArrowMixin.java
@@ -0,0 +1,36 @@
+package org.polyfrost.overflowparticles.mixin.particles;
+
+import net.minecraft.entity.projectile.EntityArrow;
+import net.minecraft.util.EnumParticleTypes;
+import org.polyfrost.overflowparticles.OverflowParticles;
+import org.polyfrost.overflowparticles.config.ParticleConfig;
+import org.polyfrost.overflowparticles.utils.UtilKt;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Constant;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.ModifyConstant;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(EntityArrow.class)
+public class EntityArrowMixin {
+
+    @ModifyConstant(method = "onUpdate", constant = @Constant(intValue = 4, ordinal = 0))
+    private int multiplier(int constant) {
+        ParticleConfig config = OverflowParticles.INSTANCE.getConfigs().get(EnumParticleTypes.CRIT.getParticleID());
+        if (config == null || config.getEntry().getMultiplier() == 1) return constant;
+        return (int) (constant * config.getEntry().getMultiplier());
+    }
+
+    @ModifyConstant(method = "onUpdate", constant = @Constant(doubleValue = 4.0D))
+    private double multiplier1(double constant) {
+        ParticleConfig config = OverflowParticles.INSTANCE.getConfigs().get(EnumParticleTypes.CRIT.getParticleID());
+        if (config == null || config.getEntry().getMultiplier() == 1) return constant;
+        return (int) (constant * config.getEntry().getMultiplier());
+    }
+
+    @Inject(method = "onUpdate", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/World;spawnParticle(Lnet/minecraft/util/EnumParticleTypes;DDDDDD[I)V", ordinal = 0))
+    private void cancel(CallbackInfo ci) {
+        UtilKt.setMultiplied(true);
+    }
+}
diff --git a/...main/java/org/polyfrost/overflowparticles/mixin/particles/EntityParticleEmitterMixin.java b/...main/java/org/polyfrost/overflowparticles/mixin/particles/EntityParticleEmitterMixin.java
@@ -21,7 +21,7 @@ public class EntityParticleEmitterMixin {
     @ModifyConstant(method = "onUpdate", constant = @Constant(intValue = 16))
     private int multiplier(int constant) {
         ParticleConfig config = OverflowParticles.INSTANCE.getConfigs().get(particleTypes.getParticleID());
-        if (config == null || config.getEntry().getMultiplier() == 1 || config.getId() == 28) return constant;
+        if (config == null || config.getEntry().getMultiplier() == 1) return constant;
         return (int) (constant * config.getEntry().getMultiplier());
     }
 

diff --git a/src/main/resources/mixins.overflowparticles.json b/src/main/resources/mixins.overflowparticles.json
@@ -20,6 +20,7 @@
     "oneconfig.ConfigSliderMixin",
     "oneconfig.ModCardMixin",
     "particles.BarrierMixin",
+    "particles.EntityArrowMixin",
     "particles.EntityBreakingFXMixin",
     "particles.EntityDiggingFXMixin",
     "particles.EntityFootStepFXMixin",