diff --git a/build.gradle.kts b/build.gradle.kts index 52f55789a..ba47f3e27 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -23,7 +23,7 @@ subprojects { apply(plugin = "java") group = "org.oddlama.vane" - version = "1.14.0" + version = "1.15.0" repositories { mavenLocal() diff --git a/docs/resourcepacks/v1.15.0.zip b/docs/resourcepacks/v1.15.0.zip new file mode 100644 index 000000000..c401ebff5 Binary files /dev/null and b/docs/resourcepacks/v1.15.0.zip differ diff --git a/flake.nix b/flake.nix index 93e5c391c..79a7bb7e0 100644 --- a/flake.nix +++ b/flake.nix @@ -58,8 +58,8 @@ devshell.startup.pre-commit.text = self.checks.${localSystem}.pre-commit.shellHook; packages = [ - pkgs.temurin-bin-17 - (pkgs.gradle.override {java = pkgs.temurin-bin-17;}) + pkgs.temurin-bin + (pkgs.gradle.override {java = pkgs.temurin-bin;}) (pkgs.python3.withPackages (ps: [ ps.markdown ps.toml diff --git a/vane-core/src/main/java/org/oddlama/vane/core/resourcepack/ResourcePackGenerator.java b/vane-core/src/main/java/org/oddlama/vane/core/resourcepack/ResourcePackGenerator.java index 64845af27..21e615b56 100644 --- a/vane-core/src/main/java/org/oddlama/vane/core/resourcepack/ResourcePackGenerator.java +++ b/vane-core/src/main/java/org/oddlama/vane/core/resourcepack/ResourcePackGenerator.java @@ -50,7 +50,7 @@ public JSONObject translations(String namespace, String lang_code) { } return lang_map; } - + public void add_item_model(NamespacedKey key, InputStream texture_png, Key parent) throws IOException { item_textures.put(key, new PackEntry(texture_png.readAllBytes(), parent)); } @@ -77,7 +77,7 @@ public void add_item_override( private String generate_pack_mcmeta() { final var pack = new JSONObject(); - pack.put("pack_format", 32); + pack.put("pack_format", 34); pack.put("description", description); final var root = new JSONObject(); @@ -108,7 +108,7 @@ private JSONObject create_item_model(NamespacedKey texture, Key item_type) { final var textures = new JSONObject(); if (texture.getNamespace().equals("minecraft") && texture.getKey().endsWith("shulker_box")) { model.put("parent", "minecraft:item/template_shulker_box"); - + textures.put("particle", "minecraft:block/" + texture.getKey()); model.put("textures", textures); } else { @@ -221,7 +221,7 @@ class PackEntry { /** * Gives the type of parent used by the given item - * + * * @param item_key * @return a key containing the parent type */