From 29e5657b0a1141165e0b265ddefaf6861ca25778 Mon Sep 17 00:00:00 2001 From: CovertJaguar Date: Sat, 19 Oct 2013 04:22:50 -0700 Subject: [PATCH] Fix pumplist case confusion --- common/buildcraft/BuildCraftFactory.java | 2 +- common/buildcraft/factory/PumpDimensionList.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/common/buildcraft/BuildCraftFactory.java b/common/buildcraft/BuildCraftFactory.java index f79138aa..4ed83863 100644 --- a/common/buildcraft/BuildCraftFactory.java +++ b/common/buildcraft/BuildCraftFactory.java @@ -165,7 +165,7 @@ public class BuildCraftFactory { pumpList.comment = "Allows admins to whitelist or blacklist pumping of specific fluids in specific dimensions.\n" + "Eg. \"-/-1/Lava\" will disable lava in the nether. \"-/*/Lava\" will disable lava in any dimension. \"+/0/*\" will enable any fluid in the overworld.\n" + "Entries are comma seperated, banned fluids have precedence over allowed ones." - + "Default is \"+/*/*,+/-1/Lava\" - the second redundant entry (\"+/-1/Lava\") is there to show the format."; + + "Default is \"+/*/*,+/-1/Lava\" - the second redundant entry (\"+/-1/lava\") is there to show the format."; pumpDimensionList = new PumpDimensionList(pumpList.getString()); int miningWellId = BuildCraftCore.mainConfiguration.getBlock("miningWell.id", DefaultProps.MINING_WELL_ID).getInt(DefaultProps.MINING_WELL_ID); diff --git a/common/buildcraft/factory/PumpDimensionList.java b/common/buildcraft/factory/PumpDimensionList.java index eca15387..d8e5da4d 100644 --- a/common/buildcraft/factory/PumpDimensionList.java +++ b/common/buildcraft/factory/PumpDimensionList.java @@ -3,6 +3,7 @@ package buildcraft.factory; import java.util.ArrayList; import java.util.LinkedList; import java.util.List; +import java.util.Locale; import net.minecraftforge.fluids.Fluid; public class PumpDimensionList { @@ -34,7 +35,7 @@ public class PumpDimensionList { else e.dimID = Integer.parseInt(dimIDString); - e.fluidName = entryString.substring(i + 1); + e.fluidName = entryString.substring(i + 1).toLowerCase(Locale.ENGLISH); if(e.fluidName.equals("*")) e.matchAnyFluid = true;