diff --git a/bukkit/build.gradle.kts b/bukkit/build.gradle.kts index b1d1e570b..99ba6dad3 100644 --- a/bukkit/build.gradle.kts +++ b/bukkit/build.gradle.kts @@ -92,7 +92,6 @@ tasks { relocate("com.saicone.rtag", "net.momirealms.craftengine.libraries.tag") relocate("org.incendo", "net.momirealms.craftengine.libraries") relocate("dev.dejvokep", "net.momirealms.craftengine.libraries") - relocate("org.apache.commons.io", "net.momirealms.craftengine.libraries.commons.io") relocate("org.bstats", "net.momirealms.craftengine.libraries.bstats") relocate("com.github.benmanes.caffeine", "net.momirealms.craftengine.libraries.caffeine") relocate("net.bytebuddy", "net.momirealms.craftengine.libraries.bytebuddy") @@ -100,7 +99,8 @@ tasks { relocate("org.ahocorasick", "net.momirealms.craftengine.libraries.ahocorasick") relocate("com.ezylang.evalex", "net.momirealms.craftengine.libraries.evalex") relocate("com.google.common.jimfs", "net.momirealms.craftengine.libraries.jimfs") - relocate("org.apache.commons.imaging", "net.momirealms.craftengine.libraries.imaging") + relocate("org.apache.commons.imaging", "net.momirealms.craftengine.libraries.commons.imaging") + relocate("org.apache.commons.io", "net.momirealms.craftengine.libraries.commons.io") } } diff --git a/bukkit/loader/build.gradle.kts b/bukkit/loader/build.gradle.kts index f90ee42e0..3d19d27cf 100644 --- a/bukkit/loader/build.gradle.kts +++ b/bukkit/loader/build.gradle.kts @@ -67,7 +67,6 @@ tasks { relocate("com.saicone.rtag", "net.momirealms.craftengine.libraries.tag") relocate("org.incendo", "net.momirealms.craftengine.libraries") relocate("dev.dejvokep", "net.momirealms.craftengine.libraries") - relocate("org.apache.commons.io", "net.momirealms.craftengine.libraries.commons.io") relocate("org.bstats", "net.momirealms.craftengine.libraries.bstats") relocate("com.github.benmanes.caffeine", "net.momirealms.craftengine.libraries.caffeine") relocate("com.ezylang.evalex", "net.momirealms.craftengine.libraries.evalex") @@ -78,6 +77,7 @@ tasks { relocate("software.amazon.awssdk", "net.momirealms.craftengine.libraries.awssdk") relocate("software.amazon.eventstream", "net.momirealms.craftengine.libraries.eventstream") relocate("com.google.common.jimfs", "net.momirealms.craftengine.libraries.jimfs") - relocate("org.apache.commons.imaging", "net.momirealms.craftengine.libraries.imaging") + relocate("org.apache.commons.imaging", "net.momirealms.craftengine.libraries.commons.imaging") + relocate("org.apache.commons.io", "net.momirealms.craftengine.libraries.commons.io") } } diff --git a/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/models/item/custom/cap.json b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/models/item/custom/cap.json new file mode 100644 index 000000000..69faf92b2 --- /dev/null +++ b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/models/item/custom/cap.json @@ -0,0 +1,85 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "textures": { + "0": "item/custom/cap", + "particle": "item/custom/cap" + }, + "elements": [ + { + "from": [3.5, 0, -5], + "to": [12.5, 0, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [0, 0, 4.5, 0], "texture": "#0"}, + "east": {"uv": [0, 0, 4.5, 0], "texture": "#0"}, + "south": {"uv": [0, 0, 4.5, 0], "texture": "#0"}, + "west": {"uv": [0, 0, 4.5, 0], "texture": "#0"}, + "up": {"uv": [4.5, 4.5, 0, 0], "texture": "#0", "tintindex": 0}, + "down": {"uv": [4.5, 0, 0, 4.5], "texture": "#0", "tintindex": 0} + } + }, + { + "from": [3.3, -0.2, 3.8], + "to": [12.7, 4.2, 13.2], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [2.5, 14, 7, 16], "texture": "#0", "tintindex": 0}, + "east": {"uv": [16, 14, 11.5, 16], "texture": "#0", "tintindex": 0}, + "south": {"uv": [11.5, 12, 16, 14], "texture": "#0", "tintindex": 0}, + "west": {"uv": [11.5, 14, 16, 16], "texture": "#0", "tintindex": 0}, + "up": {"uv": [11.5, 16, 7, 11.5], "texture": "#0", "tintindex": 0}, + "down": {"uv": [11.5, 11.5, 7, 16], "texture": "#0", "tintindex": 0} + } + }, + { + "from": [3.5, 0, 4], + "to": [12.5, 4, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [0, 9, 4.5, 11], "texture": "#0", "tintindex": 0}, + "east": {"uv": [13.5, 4, 9, 6], "texture": "#0", "tintindex": 0}, + "south": {"uv": [9, 2, 13.5, 4], "texture": "#0", "tintindex": 0}, + "west": {"uv": [9, 4, 13.5, 6], "texture": "#0", "tintindex": 0}, + "up": {"uv": [9, 4.5, 4.5, 0], "texture": "#0", "tintindex": 0}, + "down": {"uv": [9, 4.5, 4.5, 9], "texture": "#0", "tintindex": 0} + } + } + ], + "gui_light": "front", + "display": { + "thirdperson_righthand": { + "rotation": [45, 49, 0], + "translation": [0, 4.5, 2.25], + "scale": [0.5, 0.5, 0.5] + }, + "thirdperson_lefthand": { + "rotation": [45, 49, 0], + "translation": [0, 4.5, 2.25], + "scale": [0.5, 0.5, 0.5] + }, + "firstperson_righthand": { + "rotation": [0, 34, 0], + "translation": [5.25, 4.75, 0], + "scale": [0.75, 0.75, 0.75] + }, + "firstperson_lefthand": { + "rotation": [0, 34, 0], + "translation": [5.25, 4.75, 0], + "scale": [0.75, 0.75, 0.75] + }, + "ground": { + "translation": [0, 4.5, 0], + "scale": [0.75, 0.75, 0.75] + }, + "gui": { + "rotation": [35, 135, 0], + "translation": [0.5, 4.5, 0], + "scale": [0.9, 0.9, 0.9] + }, + "head": { + "translation": [0, 15, -0.75], + "scale": [1.5, 1.5, 1.5] + } + } +} \ No newline at end of file diff --git a/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/cap.png b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/cap.png new file mode 100644 index 000000000..d7e3923ea Binary files /dev/null and b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/cap.png differ diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 29856d15b..9b1785c7a 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -96,7 +96,7 @@ tasks { relocate("software.amazon.eventstream", "net.momirealms.craftengine.libraries.eventstream") // awssdk relocate("com.ezylang.evalex", "net.momirealms.craftengine.libraries.evalex") relocate("com.google.common.jimfs", "net.momirealms.craftengine.libraries.jimfs") - relocate("org.apache.commons.imaging", "net.momirealms.craftengine.libraries.imaging") + relocate("org.apache.commons.imaging", "net.momirealms.craftengine.libraries.commons.imaging") } } 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 1a50ef672..4232496ab 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 @@ -380,6 +380,8 @@ public abstract class AbstractPackManager implements PackManager { plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/item/custom/flame_elytra.png"); plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/item/custom/broken_flame_elytra.png"); plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/entity/equipment/wings/flame_elytra.png"); + plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/item/custom/cap.png"); + plugin.saveResource("resources/default/resourcepack/assets/minecraft/models/item/custom/cap.json"); // ores plugin.saveResource("resources/default/configuration/ores.yml"); diff --git a/gradle.properties b/gradle.properties index f48015a49..bc9dcb2a0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx1G # Project settings # Rule: [major update].[feature update].[bug fix] -project_version=0.0.55.3 +project_version=0.0.55.4 config_version=34 lang_version=14 project_group=net.momirealms