From fd8e81cbdc8f29f11d82a51c3a32afd8b1e2fe5c Mon Sep 17 00:00:00 2001 From: Nick Date: Thu, 17 Mar 2016 14:57:29 -0700 Subject: [PATCH] Family friendly debuff config --- src/main/java/WayofTime/bloodmagic/ConfigHandler.java | 7 +++++++ .../java/WayofTime/bloodmagic/api/network/SoulNetwork.java | 4 +++- .../WayofTime/bloodmagic/api/util/helper/PlayerHelper.java | 4 +++- .../WayofTime/bloodmagic/client/gui/config/ConfigGui.java | 1 + .../java/WayofTime/bloodmagic/item/ItemLavaCrystal.java | 4 +++- 5 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/ConfigHandler.java b/src/main/java/WayofTime/bloodmagic/ConfigHandler.java index 53ee7d31..2a39c5c4 100644 --- a/src/main/java/WayofTime/bloodmagic/ConfigHandler.java +++ b/src/main/java/WayofTime/bloodmagic/ConfigHandler.java @@ -142,6 +142,9 @@ public class ConfigHandler public static int wailaAltarDisplayMode; public static boolean thaumcraftGogglesUpgrade; + // IDontLikeFun + public static boolean antiHitler; + public static void init(File file) { config = new Configuration(file); @@ -286,6 +289,10 @@ public class ConfigHandler 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."); + category = "IDontLikeFun"; + config.addCustomCategoryComment(category, "My name is Scrooge."); + antiHitler = config.get(category, "replaceNauseaWithWeakness", false).getBoolean(); + config.save(); } diff --git a/src/main/java/WayofTime/bloodmagic/api/network/SoulNetwork.java b/src/main/java/WayofTime/bloodmagic/api/network/SoulNetwork.java index 2dcf3be3..05d98b69 100644 --- a/src/main/java/WayofTime/bloodmagic/api/network/SoulNetwork.java +++ b/src/main/java/WayofTime/bloodmagic/api/network/SoulNetwork.java @@ -2,6 +2,7 @@ package WayofTime.bloodmagic.api.network; import javax.annotation.Nullable; +import WayofTime.bloodmagic.ConfigHandler; import lombok.Getter; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; @@ -177,7 +178,8 @@ public class SoulNetwork extends WorldSavedData { if (getPlayer() != null) { - getPlayer().addPotionEffect(new PotionEffect(Potion.confusion.getId(), 99)); + PotionEffect effect = ConfigHandler.antiHitler ? new PotionEffect(Potion.weakness.getId(), 99, 127) : new PotionEffect(Potion.confusion.getId(), 99); + getPlayer().addPotionEffect(effect); } } diff --git a/src/main/java/WayofTime/bloodmagic/api/util/helper/PlayerHelper.java b/src/main/java/WayofTime/bloodmagic/api/util/helper/PlayerHelper.java index e1c3d588..46edc784 100644 --- a/src/main/java/WayofTime/bloodmagic/api/util/helper/PlayerHelper.java +++ b/src/main/java/WayofTime/bloodmagic/api/util/helper/PlayerHelper.java @@ -3,6 +3,7 @@ package WayofTime.bloodmagic.api.util.helper; import java.util.ArrayList; import java.util.UUID; +import WayofTime.bloodmagic.ConfigHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; @@ -94,6 +95,7 @@ public class PlayerHelper if (player == null) return; - player.addPotionEffect(new PotionEffect(Potion.confusion.id, 80)); + PotionEffect effect = ConfigHandler.antiHitler ? new PotionEffect(Potion.weakness.getId(), 99, 127) : new PotionEffect(Potion.confusion.getId(), 99); + player.addPotionEffect(effect); } } diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/config/ConfigGui.java b/src/main/java/WayofTime/bloodmagic/client/gui/config/ConfigGui.java index c433999b..15d7b49e 100644 --- a/src/main/java/WayofTime/bloodmagic/client/gui/config/ConfigGui.java +++ b/src/main/java/WayofTime/bloodmagic/client/gui/config/ConfigGui.java @@ -34,6 +34,7 @@ public class ConfigGui extends GuiConfig list.add(new ConfigElement(ConfigHandler.getConfig().getCategory("General".toLowerCase()))); list.add(new ConfigElement(ConfigHandler.getConfig().getCategory("Rituals".toLowerCase()))); list.add(new ConfigElement(ConfigHandler.getConfig().getCategory("Blood Altar Sacrificial Values".toLowerCase()))); + list.add(new ConfigElement(ConfigHandler.getConfig().getCategory("IDontLikeFun".toLowerCase()))); return list; } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java b/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java index 08bc84b9..60c3bedc 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java @@ -1,5 +1,6 @@ package WayofTime.bloodmagic.item; +import WayofTime.bloodmagic.ConfigHandler; import WayofTime.bloodmagic.client.IVariantProvider; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -71,7 +72,8 @@ public class ItemLavaCrystal extends ItemBindable implements IFuelHandler, IVari EntityPlayer player = PlayerHelper.getPlayerFromUUID(getBindableOwner(fuel)); if (player != null) { - player.addPotionEffect(new PotionEffect(Potion.confusion.getId(), 99)); + PotionEffect effect = ConfigHandler.antiHitler ? new PotionEffect(Potion.weakness.getId(), 99, 127) : new PotionEffect(Potion.confusion.getId(), 99); + player.addPotionEffect(effect); } }