diff --git a/src/main/java/dev/zenfyr/andromeda/modules/gui/gui_particles/GuiParticles.java b/src/main/java/dev/zenfyr/andromeda/modules/gui/gui_particles/GuiParticles.java index 64c34871..143a05d2 100644 --- a/src/main/java/dev/zenfyr/andromeda/modules/gui/gui_particles/GuiParticles.java +++ b/src/main/java/dev/zenfyr/andromeda/modules/gui/gui_particles/GuiParticles.java @@ -38,5 +38,7 @@ public final class GuiParticles extends Module implements PostBootstrapEvent { public boolean gameModeSwitcherParticles = true; public boolean bundleInputParticles = true; + + public boolean magnetParticles = true; } } diff --git a/src/main/java/dev/zenfyr/andromeda/modules/items/magnet/client/MagnetClient.java b/src/main/java/dev/zenfyr/andromeda/modules/items/magnet/client/MagnetClient.java index 99a012c7..8a840aaf 100644 --- a/src/main/java/dev/zenfyr/andromeda/modules/items/magnet/client/MagnetClient.java +++ b/src/main/java/dev/zenfyr/andromeda/modules/items/magnet/client/MagnetClient.java @@ -1,5 +1,8 @@ package dev.zenfyr.andromeda.modules.items.magnet.client; +import dev.zenfyr.andromeda.bootstrap.ModuleManager; +import dev.zenfyr.andromeda.common.client.AndromedaClient; +import dev.zenfyr.andromeda.modules.gui.gui_particles.GuiParticles; import dev.zenfyr.pulsar.api.client.particles.ScreenParticles; import dev.zenfyr.pulsar.api.client.particles.VanillaParticles; import net.minecraft.client.Minecraft; @@ -11,7 +14,16 @@ import net.minecraft.world.item.ItemStackTemplate; public class MagnetClient { + public static boolean hideParticles() { + return ModuleManager.get() + .get(GuiParticles.class) + .map(_ -> !AndromedaClient.CLIENT.get(GuiParticles.CONFIG).magnetParticles) + .orElse(true); + } + public static void upgradeParticles(Player player) { + if (hideParticles()) return; + var client = Minecraft.getInstance(); int x = (int) (client.mouseHandler.xpos() * (double) client.getWindow().getGuiScaledWidth() @@ -25,6 +37,8 @@ public class MagnetClient { } public static void itemParticles(ItemStack stack, Player player) { + if (hideParticles()) return; + var client = Minecraft.getInstance(); int x = (int) (client.mouseHandler.xpos() * (double) client.getWindow().getGuiScaledWidth() diff --git a/src/main/resources/assets/andromeda/lang/en_us.json b/src/main/resources/assets/andromeda/lang/en_us.json index 1ce82b88..0330213a 100644 --- a/src/main/resources/assets/andromeda/lang/en_us.json +++ b/src/main/resources/assets/andromeda/lang/en_us.json @@ -379,7 +379,9 @@ "config.andromeda.gui.gui_particles.option.creativeScreenParticles": "Creative Screen Particles", "config.andromeda.gui.gui_particles.option.creativeScreenParticlesVelX": "X velocity of Creative Screen Particles", "config.andromeda.gui.gui_particles.option.gameModeSwitcherParticles": "Gamemode Switcher Particles", - "config.andromeda.gui.gui_particles.option.bundleInputParticles": "Bundle Input Particles", + "config.andromeda.gui.gui_particles.option.bundleInputParticles": "Bundle Particles", + "config.andromeda.gui.gui_particles.option.magnetParticles": "Magnet Particles", + "config.andromeda.gui.gui_particles.option.magnetParticles.@Tooltip": "Requires the magnet module!", "config.andromeda.gui.item_frame_tooltips": "Item Frame Tooltips", "config.andromeda.gui.item_frame_tooltips.@Tooltip": "Enable in-world tooltips for item frames.",