diff --git a/src/main/java/forestry/arboriculture/items/ItemBlockWood.java b/src/main/java/forestry/arboriculture/items/ItemBlockWood.java index b798f562f..57ad32bd2 100644 --- a/src/main/java/forestry/arboriculture/items/ItemBlockWood.java +++ b/src/main/java/forestry/arboriculture/items/ItemBlockWood.java @@ -121,7 +121,7 @@ public class ItemBlockWood extends ItemBlockForestry { if (ordinal >= 0 && ordinal < EnumWoodType.VALUES.length) { return EnumWoodType.VALUES[ordinal]; } - return null; + return EnumWoodType.LARCH; } @Override diff --git a/src/main/java/forestry/arboriculture/render/IconProviderWood.java b/src/main/java/forestry/arboriculture/render/IconProviderWood.java index 8eb48ca85..fcbb91c4e 100644 --- a/src/main/java/forestry/arboriculture/render/IconProviderWood.java +++ b/src/main/java/forestry/arboriculture/render/IconProviderWood.java @@ -40,16 +40,25 @@ public abstract class IconProviderWood { @SideOnly(Side.CLIENT) public static IIcon getPlankIcon(EnumWoodType woodType) { + if (woodType == null) { + woodType = EnumWoodType.LARCH; + } return icons[0][woodType.ordinal()]; } @SideOnly(Side.CLIENT) public static IIcon getBarkIcon(EnumWoodType woodType) { + if (woodType == null) { + woodType = EnumWoodType.LARCH; + } return icons[1][woodType.ordinal()]; } @SideOnly(Side.CLIENT) public static IIcon getHeartIcon(EnumWoodType woodType) { + if (woodType == null) { + woodType = EnumWoodType.LARCH; + } return icons[2][woodType.ordinal()]; }