From dbfcff12a9a40c625f4e062430e4089b5f78cd90 Mon Sep 17 00:00:00 2001 From: KnightMiner Date: Thu, 31 Dec 2020 17:06:10 -0500 Subject: [PATCH] Make baked model constructors public Easier to extend them --- .../slimeknights/mantle/client/model/RetexturedModel.java | 2 +- .../mantle/client/model/connected/ConnectedModel.java | 2 +- .../mantle/client/model/data/package-info.java | 7 +++++++ .../mantle/client/model/fluid/FluidsModel.java | 2 +- .../mantle/client/model/inventory/InventoryModel.java | 2 +- 5 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 src/main/java/slimeknights/mantle/client/model/data/package-info.java diff --git a/src/main/java/slimeknights/mantle/client/model/RetexturedModel.java b/src/main/java/slimeknights/mantle/client/model/RetexturedModel.java index a59467d..7d4ef53 100644 --- a/src/main/java/slimeknights/mantle/client/model/RetexturedModel.java +++ b/src/main/java/slimeknights/mantle/client/model/RetexturedModel.java @@ -158,7 +158,7 @@ public class RetexturedModel implements IModelGeometry { /** List of texture names that are retextured */ private final Set retextured; - protected BakedModel(IBakedModel baked, IModelConfiguration owner, SimpleBlockModel model, IModelTransform transform, Set retextured) { + public BakedModel(IBakedModel baked, IModelConfiguration owner, SimpleBlockModel model, IModelTransform transform, Set retextured) { super(baked); this.model = model; this.owner = owner; diff --git a/src/main/java/slimeknights/mantle/client/model/connected/ConnectedModel.java b/src/main/java/slimeknights/mantle/client/model/connected/ConnectedModel.java index 3ba8b88..cc12c49 100644 --- a/src/main/java/slimeknights/mantle/client/model/connected/ConnectedModel.java +++ b/src/main/java/slimeknights/mantle/client/model/connected/ConnectedModel.java @@ -143,7 +143,7 @@ public class ConnectedModel implements IModelGeometry { private final IBakedModel[] cache = new IBakedModel[64]; private final Map nameMappingCache = new HashMap<>(); private final ModelTextureIteratable modelTextures; - protected BakedModel(ConnectedModel parent, IModelConfiguration owner, IModelTransform transforms, IBakedModel baked) { + public BakedModel(ConnectedModel parent, IModelConfiguration owner, IModelTransform transforms, IBakedModel baked) { super(baked); this.parent = parent; this.owner = owner; diff --git a/src/main/java/slimeknights/mantle/client/model/data/package-info.java b/src/main/java/slimeknights/mantle/client/model/data/package-info.java new file mode 100644 index 0000000..4e93a38 --- /dev/null +++ b/src/main/java/slimeknights/mantle/client/model/data/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package slimeknights.mantle.client.model.data; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/slimeknights/mantle/client/model/fluid/FluidsModel.java b/src/main/java/slimeknights/mantle/client/model/fluid/FluidsModel.java index 85478e9..8f17f28 100644 --- a/src/main/java/slimeknights/mantle/client/model/fluid/FluidsModel.java +++ b/src/main/java/slimeknights/mantle/client/model/fluid/FluidsModel.java @@ -49,7 +49,7 @@ public class FluidsModel implements IModelGeometry { public static class BakedModel extends BakedModelWrapper { @Getter private final List fluids; - private BakedModel(IBakedModel originalModel, List fluids) { + public BakedModel(IBakedModel originalModel, List fluids) { super(originalModel); this.fluids = fluids; } diff --git a/src/main/java/slimeknights/mantle/client/model/inventory/InventoryModel.java b/src/main/java/slimeknights/mantle/client/model/inventory/InventoryModel.java index 7cb7083..6df0000 100644 --- a/src/main/java/slimeknights/mantle/client/model/inventory/InventoryModel.java +++ b/src/main/java/slimeknights/mantle/client/model/inventory/InventoryModel.java @@ -49,7 +49,7 @@ public class InventoryModel implements IModelGeometry { public static class BakedModel extends BakedModelWrapper { @Getter private final List items; - protected BakedModel(IBakedModel originalModel, List items) { + public BakedModel(IBakedModel originalModel, List items) { super(originalModel); this.items = items; }