diff --git a/src/main/java/forestry/arboriculture/models/SimpleModel.java b/src/main/java/forestry/arboriculture/models/SimpleModel.java index 9e66996a9..b499fcbfc 100755 --- a/src/main/java/forestry/arboriculture/models/SimpleModel.java +++ b/src/main/java/forestry/arboriculture/models/SimpleModel.java @@ -47,28 +47,35 @@ public class SimpleModel implements IModel { private static final ModelResourceLocation MISSING = new ModelResourceLocation("builtin/missing", "missing"); private final List variants; - private final List locations = new ArrayList<>(); - private final Set textures = Sets.newHashSet(); - private final List models = new ArrayList<>(); + private final ImmutableList locations; + private final ImmutableSet textures; + private final ImmutableList models; private final IModelState defaultState; public SimpleModel(List locations, List models, List variants, IModelState defaultState) { - this.locations.addAll(locations); - this.models.addAll(models); this.variants = variants; + this.locations = ImmutableList.copyOf(locations); + this.models = ImmutableList.copyOf(models); this.defaultState = defaultState; + + ImmutableSet.Builder texturesBuilder = ImmutableSet.builder(); for (IModel model : models) { - textures.addAll(model.getTextures()); + texturesBuilder.addAll(model.getTextures()); } + textures = texturesBuilder.build(); } public SimpleModel(ResourceLocation parent, VariantList variants) throws Exception { this.variants = variants.getVariantList(); ImmutableList.Builder> builder = ImmutableList.builder(); + ImmutableList.Builder modelsBuilder = ImmutableList.builder(); + ImmutableList.Builder locationsBuilder = ImmutableList.builder(); + ImmutableSet.Builder texturesBuilder = ImmutableSet.builder(); + for (Variant variant : this.variants) { ResourceLocation loc = variant.getModelLocation(); - locations.add(loc); + locationsBuilder.add(loc); IModel model; if (loc.equals(MISSING)) { @@ -81,19 +88,23 @@ public class SimpleModel implements IModel { for (ResourceLocation location : model.getDependencies()) { ModelLoaderRegistry.getModelOrMissing(location); } - textures.addAll(model.getTextures()); + texturesBuilder.addAll(model.getTextures()); - models.add(model); + modelsBuilder.add(model); builder.add(Pair.of(model, variant.getState())); } - if (models.size() == 0) { + if (this.variants.size() == 0) { IModel missing = ModelLoaderRegistry.getMissingModel(); - models.add(missing); + modelsBuilder.add(missing); builder.add(Pair.of(missing, TRSRTransformation.identity())); } defaultState = new MultiModelState(builder.build()); + + locations = locationsBuilder.build(); + models = modelsBuilder.build(); + textures = texturesBuilder.build(); } @Override @@ -129,6 +140,7 @@ public class SimpleModel implements IModel { @Override public IModel retexture(ImmutableMap textures) { + List locations = new ArrayList<>(); List models = new ArrayList<>(); ImmutableList.Builder> builder = ImmutableList.builder(); for (Variant variant : this.variants) {