From 0fcb96c50d88f63e7d47748fb2d7a1626c55b821 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Sun, 18 Jan 2015 16:31:03 +0000 Subject: [PATCH] Added a config option to disable bauble rendering. Closes #482 --- .../botania/client/core/handler/BaubleRenderHandler.java | 4 ++++ .../botania/common/core/handler/ConfigHandler.java | 4 ++++ src/main/resources/assets/botania/lang/en_US.lang | 9 +-------- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java index 9654aa62b..92d31b043 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java @@ -28,6 +28,7 @@ import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.api.item.IBaubleRender.RenderType; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.lib.LibResources; +import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara; import baubles.common.container.InventoryBaubles; import baubles.common.lib.PlayerHandler; @@ -37,6 +38,9 @@ public final class BaubleRenderHandler { @SubscribeEvent public void onPlayerRender(RenderPlayerEvent.Specials.Post event) { + if(!ConfigHandler.renderBaubles) + return; + EntityPlayer player = event.entityPlayer; InventoryBaubles inv = PlayerHandler.getPlayerBaubles(player); diff --git a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java index 6c6290137..3f7d2b767 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java @@ -38,6 +38,7 @@ public final class ConfigHandler { public static boolean chargingAnimationEnabled = true; public static boolean useVanillaParticleLimiter = true; public static boolean silentSpreaders = false; + public static boolean renderBaubles = true; public static boolean altFlowerTextures = false; public static boolean matrixMode = false; @@ -111,6 +112,9 @@ public final class ConfigHandler { desc = "Set to true to disable the mana spreader shooting sound."; silentSpreaders = loadPropBool("manaSpreaders.silent", desc, silentSpreaders); + desc = "Set to false to disable rendering of baubles in the player."; + renderBaubles = loadPropBool("baubleRender.enabled", desc, renderBaubles); + desc = "Set to true to use alternate flower textures by Futureazoo, not all flowers are textured. http://redd.it/2b3o3f"; altFlowerTextures = loadPropBool("flowerTextures.alt", desc, altFlowerTextures); diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 8d371752c..7034f4579 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -186,19 +186,12 @@ flowerTextures.alt=Alternate Flower Textures matrixMode.enabled=Enable Matrix Mode references.enabled=Enable Tooltip References shaders.enabled=Enable Shader Usage +baubleRender.enabled=Enable Bauble Rendering spreader.posShift=Spreader Pos Shift versionChecking.enabled=Enable Version Checking wandBeam.static=Enable Static Wand Beam worldgen.flower.density=Worldgen Flower Density worldgen.flower.quantity=Worldgen Flower Quantity -shedRate.chicken=Shed Rate: Chicken -shedRate.squid=Shed Rate: Squid -shedRate.villager=Shed Rate: Villager -shedRate.spider=Shed Rate: Spider -shedRate.blaze=Shed Rate: Blaze -shedRate.ghast=Shed Rate: Ghast -shedRate.skeleton=Shed Rate: Skeleton -shedRate.slime=Shed Rate: Slime # VERSION CHECKING botania.versioning.flavour0=NANI SORE!? BOTANIA IS OUTDATED!?