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

Merge pull request #1433 from fabricator77/BuildCraft-5.0.x

Browse source 
Fix IIcon sided crashes on dedicated server
This commit is contained in:
SpaceToad 2014-02-15 14:06:26 +01:00
commit 8a30d95286
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -136,7 +136,9 @@ public class ItemFacade extends ItemBuildCraft {
if (base != null) {
List <ItemStack> stackList = new ArrayList<ItemStack> ();
base.getSubItems(base, null, stackList);
if ( FMLCommonHandler.instance().getSide() == Side.CLIENT ) {
base.getSubItems(base, null, stackList);
}
for (ItemStack s : stackList) {
ItemFacade.addFacade(s);

6
common/buildcraft/transport/gates/GateDefinition.java
View file

@ -34,13 +34,17 @@ public final class GateDefinition {
public final int guiHeight;
public final int numSlots;
public final boolean hasParameterSlot;
@SideOnly(Side.CLIENT)
private IIcon iconBlock;
@SideOnly(Side.CLIENT)
private IIcon iconItem;
@SideOnly(Side.CLIENT)
public IIcon getIconBlock() {
return iconBlock;
}
@SideOnly(Side.CLIENT)
public IIcon getIconItem() {
return iconItem;
}
@ -49,11 +53,13 @@ public final class GateDefinition {
return name().toLowerCase(Locale.ENGLISH);
}
@SideOnly(Side.CLIENT)
public void registerBlockIcon(IIconRegister iconRegister) {
if (this != REDSTONE)
iconBlock = iconRegister.registerIcon("buildcraft:gates/gate_material_" + getTag());
}
@SideOnly(Side.CLIENT)
public void registerItemIcon(IIconRegister iconRegister) {
if (this != REDSTONE)
iconItem = iconRegister.registerIcon("buildcraft:gates/gate_material_" + getTag());