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

remove redundant redundancy check, fix #2388

Browse source
This commit is contained in:
asiekierka 2015-01-18 11:11:03 +01:00
parent 3be7ce1189
commit 24c084b598
1 changed files with 2 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
common/buildcraft/core/InterModComms.java
View file

@ -192,22 +192,12 @@ public final class InterModComms {
BCLog.logger.info(String.format("Received an invalid add-facade request %s from mod %s", m.getStringValue(), m.getSender())); BCLog.logger.info(String.format("Received an invalid add-facade request %s from mod %s", m.getStringValue(), m.getSender()));
} else { } else {
Block block = (Block) Block.blockRegistry.getObject(blockName); Block block = (Block) Block.blockRegistry.getObject(blockName);
if (block.getRenderType() != 0 && block.getRenderType() != 31) { BuildCraftTransport.facadeItem.addFacade(new ItemStack(block, 1, metaId));
BuildCraftTransport.facadeItem.addFacade(new ItemStack(block, 1, metaId));
} else {
logRedundantAddFacadeMessage(m, block.toString());
}
} }
} }
} else if (m.isItemStackMessage()) { } else if (m.isItemStackMessage()) {
ItemStack modItemStack = m.getItemStackValue(); ItemStack modItemStack = m.getItemStackValue();
BuildCraftTransport.facadeItem.addFacade(modItemStack);
Block block = Block.getBlockFromItem(modItemStack.getItem());
if (block != null && block.getRenderType() != 0 && block.getRenderType() != 31) {
BuildCraftTransport.facadeItem.addFacade(modItemStack);
} else if (block != null) {
logRedundantAddFacadeMessage(m, block.toString());
}
} }
} catch (Exception ex) { } catch (Exception ex) {
} }
@ -230,11 +220,6 @@ public final class InterModComms {
} }
} }
private static void logRedundantAddFacadeMessage(IMCMessage m, String blockName)
{
BCLog.logger.warn(String.format("%s is trying to add %s - a facade that BuildCraft will add later. Facade addition not necessary.", m.getSender(), blockName));
}
public static void processOilLakeBiomeIMC(IMCEvent event, IMCMessage m) { public static void processOilLakeBiomeIMC(IMCEvent event, IMCMessage m) {
try { try {
String biomeID = m.getStringValue().trim(); String biomeID = m.getStringValue().trim();