From 2a34130347692094755f143d304458f29e00498c Mon Sep 17 00:00:00 2001 From: Amnet Date: Tue, 6 Aug 2013 10:57:04 +0200 Subject: [PATCH] Fixed API errors and few warnings. Added config option for Spring Water Regeneration Effect. --- .../assets/biomesoplenty/textures/blocks/rainbowflower.txt | 0 src/minecraft/biomesoplenty/api/Entities.java | 4 ++-- .../biomesoplenty/configuration/BOPConfiguration.java | 2 ++ src/minecraft/biomesoplenty/fluids/BlockFluidSpringWater.java | 3 ++- version.txt | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 src/minecraft/assets/biomesoplenty/textures/blocks/rainbowflower.txt diff --git a/src/minecraft/assets/biomesoplenty/textures/blocks/rainbowflower.txt b/src/minecraft/assets/biomesoplenty/textures/blocks/rainbowflower.txt new file mode 100644 index 000000000..e69de29bb diff --git a/src/minecraft/biomesoplenty/api/Entities.java b/src/minecraft/biomesoplenty/api/Entities.java index cbc9c41e6..dd4eb4910 100644 --- a/src/minecraft/biomesoplenty/api/Entities.java +++ b/src/minecraft/biomesoplenty/api/Entities.java @@ -2,8 +2,8 @@ package biomesoplenty.api; public class Entities { - public static Class Mudball = getClass("biomesoplenty.items.projectiles.EntityMudball"); - public static Class Dart = getClass("biomesoplenty.items.projectiles.EntityDart"); + public static Class Mudball = getClass("biomesoplenty.entities.projectiles.EntityMudball"); + public static Class Dart = getClass("biomesoplenty.entities.projectiles.EntityDart"); public static Class JungleSpider = getClass("biomesoplenty.entities.EntityJungleSpider"); public static Class Rosester = getClass("biomesoplenty.entities.EntityRosester"); public static Class Glob = getClass("biomesoplenty.entities.EntityGlob"); diff --git a/src/minecraft/biomesoplenty/configuration/BOPConfiguration.java b/src/minecraft/biomesoplenty/configuration/BOPConfiguration.java index 3456b976b..d4c1566a3 100644 --- a/src/minecraft/biomesoplenty/configuration/BOPConfiguration.java +++ b/src/minecraft/biomesoplenty/configuration/BOPConfiguration.java @@ -1109,6 +1109,7 @@ public class BOPConfiguration public static boolean enderporterCrafting; public static boolean dartCrafting; public static boolean flowerbandCrafting; + public static boolean hotSpringsRegeneration; public static int promisedLandSkyColor; @@ -1123,6 +1124,7 @@ public class BOPConfiguration achievements = config.get("Miscellanious Settings", "Add Biomes O\' Plenty Achievements", true).getBoolean(false); dungeonLoot = config.get("Miscellanious Settings", "Add Custom Dungeon Loot", true).getBoolean(false); rainCreatesPuddles = config.get("Miscellanious Settings", "Enable Puddles During Rain", true).getBoolean(true); + hotSpringsRegeneration = config.get("Miscellanious Settings", "Enable Spring Water Regeneration Effect", true).getBoolean(true); amethystTools = config.get("Crafting Settings", "Enable Amethyst Tool/Armor Crafting", true).getBoolean(true); mudTools = config.get("Crafting Settings", "Enable Mud Tool/Armor Crafting", true).getBoolean(true); diff --git a/src/minecraft/biomesoplenty/fluids/BlockFluidSpringWater.java b/src/minecraft/biomesoplenty/fluids/BlockFluidSpringWater.java index fa82ab59f..100297338 100644 --- a/src/minecraft/biomesoplenty/fluids/BlockFluidSpringWater.java +++ b/src/minecraft/biomesoplenty/fluids/BlockFluidSpringWater.java @@ -18,6 +18,7 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import biomesoplenty.BiomesOPlenty; import biomesoplenty.api.Fluids; +import biomesoplenty.configuration.BOPConfiguration; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -74,7 +75,7 @@ public class BlockFluidSpringWater extends BlockFluidClassic { int meta = world.getBlockMetadata(x, y, z); - if (!world.isRemote) + if (!world.isRemote && BOPConfiguration.Misc.hotSpringsRegeneration) { if (entity instanceof EntityLivingBase) { diff --git a/version.txt b/version.txt index 45f66f715..358f5f900 100644 --- a/version.txt +++ b/version.txt @@ -1,3 +1,3 @@ -1.5.2:BiomesOPlenty:0.5.5 +1.5.2:BiomesOPlenty:0.5.9.3 1.6.1:BiomesOPlenty:0.5.6 1.6.2:BiomesOPlenty:0.6.0 \ No newline at end of file