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

fix #2234

Browse source
This commit is contained in:
asiekierka 2014-11-29 13:12:12 +01:00
parent f5d885343d
commit 6b9d5d8330
2 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -190,9 +190,7 @@ public final class InterModComms {
} else {
Block block = (Block) Block.blockRegistry.getObject(blockName);
if (block.getRenderType() != 0 && block.getRenderType() != 31) {
BuildCraftTransport.facadeItem.addFacade(
"buildcraft:facade{" + blockName + "}",
new ItemStack(block, 1, metaId));
BuildCraftTransport.facadeItem.addFacade(new ItemStack(block, 1, metaId));
} else {
logRedundantAddFacadeMessage(m, block.toString());
}
@ -203,9 +201,7 @@ public final class InterModComms {
Block block = Block.getBlockFromItem(modItemStack.getItem());
if (block != null && block.getRenderType() != 0 && block.getRenderType() != 31) {
BuildCraftTransport.facadeItem.addFacade(
"buildcraft:facade{" + Block.blockRegistry.getNameForObject(block) + "}",
modItemStack);
BuildCraftTransport.facadeItem.addFacade(modItemStack);
} else if (block != null) {
logRedundantAddFacadeMessage(m, block.toString());
}

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

@ -265,8 +265,7 @@ public class ItemFacade extends ItemBuildCraft implements IFacadeItem {
if (!Strings.isNullOrEmpty(stack.getUnlocalizedName())
&& names.add(stack.getUnlocalizedName())) {
addFacade("buildcraft:facade{" + Block.blockRegistry.getNameForObject(block) + "#"
+ stack.getItemDamage() + "}", stack);
addFacade(stack);
// prevent adding multiple facades if it's a rotatable block
if (block.getRenderType() == 31 || (block.getRenderType() == 39 && i == 2)) {
@ -415,12 +414,20 @@ public class ItemFacade extends ItemBuildCraft implements IFacadeItem {
return true;
}
public void addFacade(String id, ItemStack itemStack) {
public void addFacade(ItemStack itemStack) {
if (itemStack.stackSize == 0) {
itemStack.stackSize = 1;
}
ItemStack facade = getFacadeForBlock(Block.getBlockFromItem(itemStack.getItem()), itemStack.getItemDamage());
Block block = Block.getBlockFromItem(itemStack.getItem());
if (block == null) {
return;
}
String recipeId = "buildcraft:facade{" + Block.blockRegistry.getNameForObject(block) + "#"
+ itemStack.getItemDamage() + "}";
ItemStack facade = getFacadeForBlock(block, itemStack.getItemDamage());
if (!allFacades.contains(facade)) {
allFacades.add(facade);
@ -428,7 +435,7 @@ public class ItemFacade extends ItemBuildCraft implements IFacadeItem {
facade6.stackSize = 6;
// 3 Structurepipes + this block makes 6 facades
BuildcraftRecipeRegistry.assemblyTable.addRecipe(id, 8000, facade6, new ItemStack(
BuildcraftRecipeRegistry.assemblyTable.addRecipe(recipeId, 8000, facade6, new ItemStack(
BuildCraftTransport.pipeStructureCobblestone, 3), itemStack);
}
}