From e219b505897edcebdce328c7819ea887d4077c6b Mon Sep 17 00:00:00 2001 From: Nick Date: Wed, 3 Feb 2016 20:41:41 -0800 Subject: [PATCH] Config option for Goggles upgrade --- .../java/WayofTime/bloodmagic/ConfigHandler.java | 2 ++ .../bloodmagic/util/handler/EventHandler.java | 15 +++++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/ConfigHandler.java b/src/main/java/WayofTime/bloodmagic/ConfigHandler.java index 51354092..380cfde7 100644 --- a/src/main/java/WayofTime/bloodmagic/ConfigHandler.java +++ b/src/main/java/WayofTime/bloodmagic/ConfigHandler.java @@ -123,6 +123,7 @@ public class ConfigHandler // Compat public static int wailaAltarDisplayMode; + public static boolean thaumcraftGogglesUpgrade; public static void init(File file) { @@ -248,6 +249,7 @@ public class ConfigHandler category = "Compatibility"; config.addCustomCategoryComment(category, "Compatibility settings"); wailaAltarDisplayMode = config.getInt("wailaAltarDisplayMode", category + ".waila", 1, 0, 2, "The mode for the Waila display on Blood Altars.\n0 - Always display information\n1 - Only display when Divination/Seer sigil is in hand.\n2 - Only display when Divination/Seer sigil is in inventory"); + thaumcraftGogglesUpgrade = config.getBoolean("thaumcraftGogglesUpgrade", category + ".thaumcraft", true, "Allows the Living Helmet to be upgraded with Goggles of Revealing in an Anvil."); config.save(); } diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java index 9dd9515a..666f316f 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java @@ -95,14 +95,17 @@ public class EventHandler @SubscribeEvent public void onAnvil(AnvilUpdateEvent event) { - if (event.left.getItem() == ModItems.livingArmourHelmet && event.right.getItem() == Constants.Compat.THAUMCRAFT_GOGGLES && !event.right.isItemDamaged()) + if (ConfigHandler.thaumcraftGogglesUpgrade) { - ItemStack output = event.left.copy(); - output = NBTHelper.checkNBT(output); - output.getTagCompound().setBoolean(Constants.Compat.THAUMCRAFT_HAS_GOGGLES, true); - event.cost = 1; + if (event.left.getItem() == ModItems.livingArmourHelmet && event.right.getItem() == Constants.Compat.THAUMCRAFT_GOGGLES && !event.right.isItemDamaged()) + { + ItemStack output = event.left.copy(); + output = NBTHelper.checkNBT(output); + output.getTagCompound().setBoolean(Constants.Compat.THAUMCRAFT_HAS_GOGGLES, true); + event.cost = 1; - event.output = output; + event.output = output; + } } }