Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.polyfrost.overflowparticles.mixin.client;

import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.LivingEntity;
Expand All @@ -10,9 +11,7 @@
import org.polyfrost.overflowparticles.client.utils.ParticleSpawner;
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(LivingEntity.class)
Expand All @@ -21,7 +20,7 @@ public Mixin_MultiplyDeathParticles(EntityType<?> arg, Level arg2) {
super(arg, arg2);
}

@ModifyConstant(method = "makePoofParticles", constant = @Constant(intValue = 20))
@ModifyExpressionValue(method = "makePoofParticles", at = @At(value = "CONSTANT", args = "intValue=20"))
private int overflowparticles$applyMultiplier(int constant) {
ParticleConfig config = PerParticleConfigManager.getConfigByType(VanillaParticles.EXPLOSION_NORMAL);
if (config.getMultiplier() == 1) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,19 @@
//?} else {
/*import net.minecraft.world.entity.projectile.AbstractArrow;
*///?}
import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
import org.polyfrost.overflowparticles.client.config.ParticleConfig;
import org.polyfrost.overflowparticles.client.config.PerParticleConfigManager;
import org.polyfrost.overflowparticles.client.particles.VanillaParticles;
import org.polyfrost.overflowparticles.client.utils.ParticleSpawner;
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(AbstractArrow.class)
public class Mixin_ApplyMultiplierToArrows {
@ModifyConstant(method = "tick", constant = @Constant(intValue = 4, ordinal = 0))
@ModifyExpressionValue(method = "tick", at = @At(value = "CONSTANT", args = "intValue=4", ordinal = 0))
private int multiplier(int constant) {
ParticleConfig config = PerParticleConfigManager.getConfigByType(VanillaParticles.CRITICAL);
if (config.getMultiplier() == 1) {
Expand All @@ -28,7 +27,7 @@ private int multiplier(int constant) {
return (int) (constant * config.getMultiplier());
}

@ModifyConstant(method = "tick", constant = @Constant(doubleValue = 4.0D))
@ModifyExpressionValue(method = "tick", at = @At(value = "CONSTANT", args = "doubleValue=4.0D"))
private double multiplier1(double constant) {
ParticleConfig config = PerParticleConfigManager.getConfigByType(VanillaParticles.CRITICAL);
if (config.getMultiplier() == 1) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.polyfrost.overflowparticles.mixin.client.particles;

import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
import net.minecraft.client.particle.TrackingEmitter;
import net.minecraft.core.particles.ParticleOptions;
import org.polyfrost.overflowparticles.client.config.ParticleConfig;
Expand All @@ -11,16 +12,14 @@
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
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(TrackingEmitter.class)
public class Mixin_ApplyMultiplierToEmitters {
@Shadow @Final private ParticleOptions particleType;

@ModifyConstant(method = "tick", constant = @Constant(intValue = 16))
@ModifyExpressionValue(method = "tick", at = @At(value = "CONSTANT", args = "intValue=16"))
private int multiplier(int constant) {
ParticleInfo type = ParticleRegistry.of(this.particleType.getType());
if (type == null) {
Expand Down