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

add option to use facade blacklist as whitelist, happens to close #1914

Browse source
This commit is contained in:
Adrian Siekierka 2014-11-11 09:59:04 +01:00
parent 051036848a
commit 983931e627
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
common/buildcraft/BuildCraftTransport.java
View file

@ -150,7 +150,8 @@ public class BuildCraftTransport extends BuildCraftMod {
public static BuildCraftTransport instance; public static BuildCraftTransport instance;
public static float pipeDurability; public static float pipeDurability;
public static int pipeFluidsBaseFlowRate; public static int pipeFluidsBaseFlowRate;
public static boolean facadeTreatBlacklistAsWhitelist;
public static BlockGenericPipe genericPipeBlock; public static BlockGenericPipe genericPipeBlock;
public static BlockFilteredBuffer filteredBufferBlock; public static BlockFilteredBuffer filteredBufferBlock;
@ -352,6 +353,9 @@ public class BuildCraftTransport extends BuildCraftMod {
facadeBlacklistProp.comment = "Blocks listed here will not have facades created. The format is modid:blockname.\nFor mods with a | character, the value needs to be surrounded with quotes."; facadeBlacklistProp.comment = "Blocks listed here will not have facades created. The format is modid:blockname.\nFor mods with a | character, the value needs to be surrounded with quotes.";
facadeBlacklist = facadeBlacklistProp.getStringList(); facadeBlacklist = facadeBlacklistProp.getStringList();
Property facadeAsWhitelist = BuildCraftCore.mainConfiguration.get(Configuration.CATEGORY_GENERAL, "facade.treatBlacklistAsWhitelist", false);
facadeTreatBlacklistAsWhitelist = facadeAsWhitelist.getBoolean();
pipeWaterproof = new ItemBuildCraft(); pipeWaterproof = new ItemBuildCraft();
pipeWaterproof.setUnlocalizedName("pipeWaterproof"); pipeWaterproof.setUnlocalizedName("pipeWaterproof");

16
common/buildcraft/transport/ItemFacade.java
View file

@ -288,19 +288,21 @@ public class ItemFacade extends ItemBuildCraft implements IFacadeItem {
return true; return true;
} }
for (String blacklistedBlock : BuildCraftTransport.facadeBlacklist) { // Blocks blacklisted by mods should always be treated as blacklisted
if (blockName.equals(JavaTools.stripSurroundingQuotes(blacklistedBlock))) {
return true;
}
}
for (String blacklistedBlock : blacklistedFacades) { for (String blacklistedBlock : blacklistedFacades) {
if (blockName.equals(blacklistedBlock)) { if (blockName.equals(blacklistedBlock)) {
return true; return true;
} }
} }
return false; // Blocks blacklisted by config should depend on the config settings
for (String blacklistedBlock : BuildCraftTransport.facadeBlacklist) {
if (blockName.equals(JavaTools.stripSurroundingQuotes(blacklistedBlock))) {
return true ^ BuildCraftTransport.facadeTreatBlacklistAsWhitelist;
}
}
return false ^ BuildCraftTransport.facadeTreatBlacklistAsWhitelist;
} }
private static boolean isBlockValidForFacade(Block block) { private static boolean isBlockValidForFacade(Block block) {