diff --git a/core/src/main/java/net/momirealms/craftengine/core/pack/AbstractPackManager.java b/core/src/main/java/net/momirealms/craftengine/core/pack/AbstractPackManager.java index 1c9f0bd85..1aa740527 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/pack/AbstractPackManager.java +++ b/core/src/main/java/net/momirealms/craftengine/core/pack/AbstractPackManager.java @@ -90,7 +90,7 @@ public abstract class AbstractPackManager implements PackManager { public static final String NEW_TRIM_MATERIAL = "custom"; public static final Set ALLOWED_VANILLA_EQUIPMENT = Set.of("chainmail", "diamond", "gold", "iron", "netherite"); - public static final Set ALLOWED_MODEL_TAGS = Set.of("parent", "ambientocclusion", "display", "textures", "elementConfigs", "gui_light", "overrides"); + public static final Set ALLOWED_MODEL_TAGS = Set.of("parent", "ambientocclusion", "display", "textures", "elements", "gui_light", "overrides"); private static final byte[] EMPTY_1X1_IMAGE; private static final byte[] EMPTY_EQUIPMENT_IMAGE; @@ -2136,7 +2136,7 @@ public abstract class AbstractPackManager implements PackManager { .resolve("empty.png"); try { Files.createDirectories(modelPath.getParent()); - Files.writeString(modelPath, "{\"textures\":{\"particle\":\"block/empty\"},\"elementConfigs\":[{\"from\":[0,0,0],\"to\":[0,0,0],\"color\":0,\"faces\":{\"north\":{\"uv\":[0,0,0,0],\"texture\":\"#particle\"},\"east\":{\"uv\":[0,0,0,0],\"texture\":\"#particle\"},\"south\":{\"uv\":[0,0,0,0],\"texture\":\"#particle\"},\"west\":{\"uv\":[0,0,0,0],\"texture\":\"#particle\"},\"up\":{\"uv\":[0,0,0,0],\"texture\":\"#particle\"},\"down\":{\"uv\":[0,0,0,0],\"texture\":\"#particle\"}}}]}"); + Files.writeString(modelPath, "{\"textures\":{\"particle\":\"block/empty\"},\"elements\":[{\"from\":[0,0,0],\"to\":[0,0,0],\"color\":0,\"faces\":{\"north\":{\"uv\":[0,0,0,0],\"texture\":\"#particle\"},\"east\":{\"uv\":[0,0,0,0],\"texture\":\"#particle\"},\"south\":{\"uv\":[0,0,0,0],\"texture\":\"#particle\"},\"west\":{\"uv\":[0,0,0,0],\"texture\":\"#particle\"},\"up\":{\"uv\":[0,0,0,0],\"texture\":\"#particle\"},\"down\":{\"uv\":[0,0,0,0],\"texture\":\"#particle\"}}}]}"); } catch (IOException e) { this.plugin.logger().severe("Error writing empty block model", e); } diff --git a/core/src/main/java/net/momirealms/craftengine/core/plugin/config/blockbench/BBModel.java b/core/src/main/java/net/momirealms/craftengine/core/plugin/config/blockbench/BBModel.java index 942a704a4..8c4b0e176 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/plugin/config/blockbench/BBModel.java +++ b/core/src/main/java/net/momirealms/craftengine/core/plugin/config/blockbench/BBModel.java @@ -11,7 +11,7 @@ public class BBModel { private String model_identifier; @SerializedName("visible_box") private int[] visible_box; - @SerializedName("elementConfigs") + @SerializedName("elements") private Element[] elements; @SerializedName("outliner") private OutLiner[] outliner; diff --git a/core/src/main/java/net/momirealms/craftengine/core/util/BlockEntityTickersList.java b/core/src/main/java/net/momirealms/craftengine/core/util/BlockEntityTickersList.java index 639bd31b2..4ff57411a 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/util/BlockEntityTickersList.java +++ b/core/src/main/java/net/momirealms/craftengine/core/util/BlockEntityTickersList.java @@ -54,7 +54,7 @@ public final class BlockEntityTickersList extends ObjectArrayList because we want to avoid autoboxing when using contains final int requiredMatches = c.size();