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 007ec7689..0115b9f4e 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java @@ -58,6 +58,7 @@ public final class ConfigHandler { public static boolean enchanterEnabled = true; public static boolean fluxfieldEnabled = true; public static boolean relicsEnabled = true; + public static boolean ringOfOdinFireResist = true; public static int flowerQuantity = 2; public static int flowerDensity = 16; @@ -171,6 +172,9 @@ public final class ConfigHandler { desc = "Set this to false to disable the Relic System. This only disables the entries, drops and achievements. Old ones that are already in the world will stay."; relicsEnabled = loadPropBool("relics.enabled", desc, relicsEnabled); + desc = "Set this to false to make the Ring of Odin not apply fire resistance. Mostly for people who use Witchery transformations."; + ringOfOdinFireResist = loadPropBool("ringOfOdin.fireResist", desc, ringOfOdinFireResist); + desc = "The quantity of Botania flower patches to generate in the world, defaults to 2, the lower the number the less patches generate."; flowerQuantity = loadPropInt("worldgen.flower.quantity", desc, flowerQuantity); diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java index 701e6d2ce..bf8ebf628 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java @@ -22,9 +22,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingAttackEvent; +import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; import baubles.api.BaubleType; +import baubles.common.Config; import baubles.common.container.InventoryBaubles; import baubles.common.lib.PlayerHandler; @@ -37,21 +39,22 @@ public class ItemOdinRing extends ItemRelicBauble { public static List damageNegations = new ArrayList(); - static { - damageNegations.add(DamageSource.drown.damageType); - damageNegations.add(DamageSource.fall.damageType); - damageNegations.add(DamageSource.lava.damageType); - damageNegations.add(DamageSource.inFire.damageType); - damageNegations.add(DamageSource.onFire.damageType); - damageNegations.add(DamageSource.inWall.damageType); - damageNegations.add(DamageSource.starve.damageType); - } - Multimap attributes = HashMultimap.create(); public ItemOdinRing() { super(LibItemNames.ODIN_RING); MinecraftForge.EVENT_BUS.register(this); + + damageNegations.add(DamageSource.drown.damageType); + damageNegations.add(DamageSource.fall.damageType); + damageNegations.add(DamageSource.lava.damageType); + if(ConfigHandler.ringOfOdinFireResist) { + damageNegations.add(DamageSource.inFire.damageType); + damageNegations.add(DamageSource.onFire.damageType); + } + + damageNegations.add(DamageSource.inWall.damageType); + damageNegations.add(DamageSource.starve.damageType); } @Override diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index eb3dad92f..c9c4aefe2 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -246,6 +246,7 @@ fallenKanade.enabled=Enable Fallen Kanade manaEnchanter.enabled=Enable Mana Enchanter manaFluxfield.enabled=Enable Mana Fluxfield relics.enabled=Enable Relics +ringOfOdin.fireResist=Enable Ring of Odin Fire Resist flower.forceCheck=Flower Force Checking enderPickpocket.enabled=Enable Ender Pickpocketting thermalily.obsidian=Thermalily Needs Obsidian