From 6ef41d4cd8a9e204ccb4faf0009187580b65f90c Mon Sep 17 00:00:00 2001 From: mezz Date: Wed, 8 Feb 2017 22:29:33 -0800 Subject: [PATCH] Allow IWoodTypes besides EnumForestryWoodType to use Forestry models --- src/main/java/forestry/arboriculture/WoodHelper.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/main/java/forestry/arboriculture/WoodHelper.java b/src/main/java/forestry/arboriculture/WoodHelper.java index 8eda7a240..dc83a6cef 100644 --- a/src/main/java/forestry/arboriculture/WoodHelper.java +++ b/src/main/java/forestry/arboriculture/WoodHelper.java @@ -57,10 +57,10 @@ public class WoodHelper { List resourceLocations = new ArrayList<>(); WoodBlockKind blockKind = typed.getBlockKind(); for (IWoodType woodType : typed.getWoodTypes()) { - if (woodType instanceof EnumForestryWoodType) { - resourceLocations.add(new ResourceLocation(Constants.MOD_ID, blockKind + "/" + woodType)); - } else if (woodType instanceof EnumVanillaWoodType) { + if (woodType instanceof EnumVanillaWoodType) { resourceLocations.add(new ResourceLocation("minecraft", woodType + "_" + blockKind)); + } else { + resourceLocations.add(new ResourceLocation(Constants.MOD_ID, blockKind + "/" + woodType)); } } return resourceLocations.toArray(new ResourceLocation[resourceLocations.size()]); @@ -83,12 +83,10 @@ public class WoodHelper { int meta = stack.getMetadata(); IWoodType woodType = wood.getWoodType(meta); WoodBlockKind blockKind = wood.getBlockKind(); - if (woodType instanceof EnumForestryWoodType) { - return ModelManager.getInstance().getModelLocation(blockKind + "/" + woodType); - } else if (woodType instanceof EnumVanillaWoodType) { + if (woodType instanceof EnumVanillaWoodType) { return new ModelResourceLocation("minecraft:" + woodType + "_" + blockKind, "inventory"); } else { - throw new IllegalArgumentException("Unknown wood type: " + woodType); + return ModelManager.getInstance().getModelLocation(blockKind + "/" + woodType); } }