diff options
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/mixins')
3 files changed, 20 insertions, 49 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/mixins/hooks/RenderGlobalHook.kt b/src/main/java/at/hannibal2/skyhanni/mixins/hooks/RenderGlobalHook.kt deleted file mode 100644 index 459d192f8..000000000 --- a/src/main/java/at/hannibal2/skyhanni/mixins/hooks/RenderGlobalHook.kt +++ /dev/null @@ -1,32 +0,0 @@ -package at.hannibal2.skyhanni.mixins.hooks - -import at.hannibal2.skyhanni.events.RenderParticleEvent -import at.hannibal2.skyhanni.utils.LorenzUtils -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo - -class RenderGlobalHook { - companion object { - fun spawnParticle( - particleId: Int, - x: Double, - y: Double, - z: Double, - ci: CallbackInfo, - ) { - val callerClass = LorenzUtils.getCallerClass( - "at.hannibal2.skyhanni.mixins.hooks.RenderGlobalHook\$Companion", - "at.hannibal2.skyhanni.mixins.hooks.RenderGlobalHook", - "net.minecraft.client.renderer.RenderGlobal", - "net.minecraft.world.World", - "net.minecraft.client.network.NetHandlerPlayClient", - "net.minecraft.network.play.server.S2APacketParticles", - ) ?: "null" - - if (RenderParticleEvent(particleId, callerClass, x, y, z).postAndCatch()) { - ci.cancel() - return - } - - } - } -}
\ No newline at end of file diff --git a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinEntityBlaze.java b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinEntityBlaze.java new file mode 100644 index 000000000..d041a8b69 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinEntityBlaze.java @@ -0,0 +1,20 @@ +package at.hannibal2.skyhanni.mixins.transformers; + +import at.hannibal2.skyhanni.SkyHanniMod; +import net.minecraft.entity.monster.EntityBlaze; +import net.minecraft.util.EnumParticleTypes; +import net.minecraft.world.World; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +@Mixin(EntityBlaze.class) +public class MixinEntityBlaze { + + @Redirect(method = "onLivingUpdate", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/World;spawnParticle(Lnet/minecraft/util/EnumParticleTypes;DDDDDD[I)V")) + private void onLivingUpdate(World instance, EnumParticleTypes particleType, double xCoord, double yCoord, double zCoord, double xOffset, double yOffset, double zOffset, int[] p_175688_14_) { + if (!SkyHanniMod.feature.misc.hideBlazeParticles) { + instance.spawnParticle(particleType, xCoord, yCoord, zCoord, xOffset, yOffset, zOffset, p_175688_14_); + } + } +} diff --git a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinRenderGlobal.java b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinRenderGlobal.java deleted file mode 100644 index 8d5f58127..000000000 --- a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinRenderGlobal.java +++ /dev/null @@ -1,17 +0,0 @@ -package at.hannibal2.skyhanni.mixins.transformers; - -import at.hannibal2.skyhanni.mixins.hooks.RenderGlobalHook; -import net.minecraft.client.renderer.RenderGlobal; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -@Mixin(RenderGlobal.class) -public class MixinRenderGlobal { - - @Inject(method = "spawnParticle(IZDDDDDD[I)V", at = @At("HEAD"), cancellable = true) - private void spawnParticle(int particleId, boolean ignoreRange, double x, double y, double z, double xOffset, double yOffset, double zOffset, int[] p_180442_15_, CallbackInfo ci) { - RenderGlobalHook.Companion.spawnParticle(particleId, x, y, z, ci); - } -} |