diff --git a/src/main/java/net/minecraftforge/client/model/ModelLoader.java b/src/main/java/net/minecraftforge/client/model/ModelLoader.java index 91ea08db90..e04f64222e 100644 --- a/src/main/java/net/minecraftforge/client/model/ModelLoader.java +++ b/src/main/java/net/minecraftforge/client/model/ModelLoader.java @@ -56,7 +56,6 @@ import com.google.common.collect.Sets; public class ModelLoader extends ModelBakery { private final Map stateModels = new HashMap(); - private final Set resolveTextures = new HashSet(); private final Set textures = new HashSet(); private final Set loadingModels = new HashSet(); private final Set missingVariants = Sets.newHashSet(); @@ -145,7 +144,6 @@ public class ModelLoader extends ModelBakery { ResourceLocation file = getItemLocation(s); ModelResourceLocation memory = new ModelResourceLocation(s, "inventory"); - resolveTextures.add(ModelLoaderRegistry.getActualLocation(file)); IModel model = getModel(file); if(model == null || model == getMissingModel()) { @@ -217,10 +215,7 @@ public class ModelLoader extends ModelBakery } } - if(!resolveTextures.contains(location)) return Collections.emptyList(); - ImmutableSet.Builder builder = ImmutableSet.builder(); - builder.add(new ResourceLocation(model.resolveTextureName("particle"))); if(hasItemModel(model)) { @@ -243,9 +238,12 @@ public class ModelLoader extends ModelBakery } } } - if(location.getResourcePath().startsWith("models/block/") || !ModelLoader.this.isBuiltinModel(model.getRootModel())) + for(String s : (Iterable)model.textures.values()) { - builder.addAll(ModelLoader.this.getTextureLocations(model)); + if(!s.startsWith("#")) + { + builder.add(new ResourceLocation(s)); + } } return builder.build(); } @@ -328,7 +326,6 @@ public class ModelLoader extends ModelBakery for(Variant v : (List)variants.getVariants()) { ResourceLocation loc = v.getModelLocation(); - resolveTextures.add(ModelLoaderRegistry.getActualLocation(loc)); locations.add(loc); IModel model = new WeightedPartWrapper(getModel(loc)); models.add(model); @@ -344,12 +341,6 @@ public class ModelLoader extends ModelBakery public Collection getTextures() { - /*ImmutableSet.Builder builder = ImmutableSet.builder(); - for(ResourceLocation loc : locations) - { - builder.addAll(getModel(loc).getTextures()); - } - return builder.build();*/ return Collections.emptyList(); } diff --git a/src/main/resources/forge_at.cfg b/src/main/resources/forge_at.cfg index 11d7172bba..a1b87c4f67 100644 --- a/src/main/resources/forge_at.cfg +++ b/src/main/resources/forge_at.cfg @@ -123,6 +123,7 @@ public net.minecraft.item.crafting.RecipesBanners$RecipeDuplicatePattern public net.minecraft.block.state.BlockState$StateImplementation protected net.minecraft.block.state.BlockState$StateImplementation (Lnet/minecraft/block/Block;Lcom/google/common/collect/ImmutableMap;)V protected net.minecraft.block.state.BlockState$StateImplementation field_177238_c # propertyValueTable +public net.minecraft.client.renderer.block.model.ModelBlock field_178318_c # textures public net.minecraft.client.renderer.block.model.ModelBlock field_178315_d # parent protected net.minecraft.client.resources.model.ModelBakery field_177602_b # LOCATIONS_BUILTIN_TEXTURES protected net.minecraft.client.resources.model.ModelBakery field_177598_f # resourceManager