From 1497aada57d0ec82b46d42daada0276953230da4 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Sat, 13 Aug 2016 17:24:26 +0200 Subject: [PATCH] Improve the woodtextures class. --- .../forestry/arboriculture/models/WoodTextures.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/main/java/forestry/arboriculture/models/WoodTextures.java b/src/main/java/forestry/arboriculture/models/WoodTextures.java index 874ffd0bc..9b40d63b4 100644 --- a/src/main/java/forestry/arboriculture/models/WoodTextures.java +++ b/src/main/java/forestry/arboriculture/models/WoodTextures.java @@ -28,7 +28,6 @@ public class WoodTextures { public static final Gson GSON = new GsonBuilder().create(); protected static final Map textures = new HashMap<>(); - protected static KindTexture kindTextures; public static void deserializeFile(){ try { @@ -84,14 +83,11 @@ public class WoodTextures { public static ImmutableMap getLocations(IWoodType woodType, WoodBlockKind blockKind){ if(woodType != null && blockKind != null && woodType.getName() != null){ String kindName = blockKind.toString(); - SimpleTexture kindTex = null; + Texture kindTex = textures.get(blockKind); Texture tex = textures.get(woodType.getName().toLowerCase(Locale.ENGLISH)); - if(kindTextures != null){ - kindTex = kindTextures.kindLocations.get(kindName); - } Map locations = new HashMap<>(); - if(kindTex != null){ - locations.putAll(kindTex.locations); + if(kindTex != null && kindTex instanceof SimpleTexture){ + locations.putAll(((SimpleTexture)kindTex).locations); } if(tex != null){ if(tex instanceof SimpleTexture){