Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix pumplist case confusion

Browse source
This commit is contained in:
CovertJaguar 2013-10-19 04:22:50 -07:00
parent e4af7d00f6
commit 29e5657b0a
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/buildcraft/BuildCraftFactory.java
View file

@ -165,7 +165,7 @@ public class BuildCraftFactory {
pumpList.comment = "Allows admins to whitelist or blacklist pumping of specific fluids in specific dimensions.\n" 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" + "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." + "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()); pumpDimensionList = new PumpDimensionList(pumpList.getString());
int miningWellId = BuildCraftCore.mainConfiguration.getBlock("miningWell.id", DefaultProps.MINING_WELL_ID).getInt(DefaultProps.MINING_WELL_ID); int miningWellId = BuildCraftCore.mainConfiguration.getBlock("miningWell.id", DefaultProps.MINING_WELL_ID).getInt(DefaultProps.MINING_WELL_ID);

3
common/buildcraft/factory/PumpDimensionList.java
View file

@ -3,6 +3,7 @@ package buildcraft.factory;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Locale;
import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.Fluid;
public class PumpDimensionList { public class PumpDimensionList {
@ -34,7 +35,7 @@ public class PumpDimensionList {
else else
e.dimID = Integer.parseInt(dimIDString); e.dimID = Integer.parseInt(dimIDString);
e.fluidName = entryString.substring(i + 1); e.fluidName = entryString.substring(i + 1).toLowerCase(Locale.ENGLISH);
if(e.fluidName.equals("*")) if(e.fluidName.equals("*"))
e.matchAnyFluid = true; e.matchAnyFluid = true;