From b8500e59a91a68b8ba97ed2f2986eab4f2dda491 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Tue, 15 Jul 2014 14:40:43 +0100 Subject: [PATCH] Added a config option to disable the animation when an item is charging on a mana pool. --- MODSRC/vazkii/botania/common/block/tile/mana/TilePool.java | 3 ++- MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java | 4 ++++ resources/assets/botania/lang/en_US.lang | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/MODSRC/vazkii/botania/common/block/tile/mana/TilePool.java b/MODSRC/vazkii/botania/common/block/tile/mana/TilePool.java index 328299d14..2caf1d7fb 100644 --- a/MODSRC/vazkii/botania/common/block/tile/mana/TilePool.java +++ b/MODSRC/vazkii/botania/common/block/tile/mana/TilePool.java @@ -40,6 +40,7 @@ import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileMod; +import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.handler.ManaNetworkHandler; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; @@ -217,7 +218,7 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked { if(didSomething) { worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); - if(worldObj.isRemote && worldObj.rand.nextInt(5) == 0) { + if(worldObj.isRemote && ConfigHandler.chargingAnimationEnabled && worldObj.rand.nextInt(5) == 0) { Vector3 itemVec = Vector3.fromTileEntity(this).add(0.5, 0.5 + Math.random() * 0.3, 0.5); Vector3 tileVec = Vector3.fromTileEntity(this).add(0.2 + Math.random() * 0.6, 0, 0.2 + Math.random() * 0.6); LightningHandler.spawnLightningBolt(worldObj, outputting ? tileVec : itemVec, outputting ? itemVec : tileVec, 80, worldObj.rand.nextLong(), 0x4400799c, 0x4400C6FF); diff --git a/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java b/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java index 918369421..c7e40b1f8 100644 --- a/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java @@ -35,6 +35,7 @@ public final class ConfigHandler { public static boolean blockBreakParticles = true; public static boolean blockBreakParticlesTool = true; public static boolean elfPortalParticlesEnabled = true; + public static boolean chargingAnimationEnabled = true; public static boolean matrixMode = false; public static boolean referencesEnabled = true; public static boolean baublesInventoryButton = true; @@ -103,6 +104,9 @@ public final class ConfigHandler { desc = "Set to false to disable the particles in the elven portal."; elfPortalParticlesEnabled = loadPropBool("elfPortal.particles.enabled", desc, elfPortalParticlesEnabled); + desc = "Set to false to disable the animation when an item is charging on top of a mana pool."; + chargingAnimationEnabled = loadPropBool("chargeAnimation.enabled", desc, chargingAnimationEnabled); + desc = "Set to true if you are the chosen one. For lovers of glitch art and just general mad people."; matrixMode = loadPropBool("matrixMode.enabled", desc, matrixMode); diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index ec9cc6650..fd725d933 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -89,6 +89,7 @@ lexicon.render.3D=3D Lexicon Render powerSystem.subtle=Use Subtle Power System pylonModel.old=Use Old Pylon Model elfPortal.particles.enabled=Enable Portal Particles +chargeAnimation.enabled=Charging Animation Enabled matrixMode.enabled=Enable Matrix Mode references.enabled=Enable Tooltip References baublesButton.enabled=Baubles Button Enabled