diff --git a/bukkit-loader/src/main/resources/resources/default/configuration/items.yml b/bukkit-loader/src/main/resources/resources/default/configuration/items.yml index 06c9a5553..f4bd6bf6b 100644 --- a/bukkit-loader/src/main/resources/resources/default/configuration/items.yml +++ b/bukkit-loader/src/main/resources/resources/default/configuration/items.yml @@ -1,25 +1,49 @@ items: - default:beginner_rod: + default:topaz_rod: material: fishing_rod custom-model-data: 1000 data: - display-name: "Beginner Rod" - lore: - - "This is the description" + display-name: "<#FF8C00>Topaz Rod" model: - type: "minecraft:condition" - property: "minecraft:fishing_rod/cast" - on-false: - type: "minecraft:model" - path: "minecraft:item/custom/beginner_rod" - generation: - parent: "minecraft:item/fishing_rod" - textures: - "layer0": "minecraft:item/custom/beginner_rod" - on-true: - type: "minecraft:model" - path: "minecraft:item/custom/beginner_rod_cast" - generation: - parent: "minecraft:item/fishing_rod" - textures: - "layer0": "minecraft:item/custom/beginner_rod_cast" \ No newline at end of file + template: models:fishing_rod_2d + arguments: + rod_model: minecraft:item/custom/topaz_rod + rod_texture: minecraft:item/custom/topaz_rod + rod_cast_model: minecraft:item/custom/topaz_rod_cast + rod_cast_texture: minecraft:item/custom/topaz_rod_cast + default:topaz_bow: + material: bow + custom-model-data: 1000 + data: + display-name: "<#FF8C00>Topaz Bow" + model: + template: models:bow_2d + arguments: + bow_model: minecraft:item/custom/topaz_bow + bow_texture: minecraft:item/custom/topaz_bow + bow_pulling_0_model: minecraft:item/custom/topaz_bow_pulling_0 + bow_pulling_0_texture: minecraft:item/custom/topaz_bow_pulling_0 + bow_pulling_1_model: minecraft:item/custom/topaz_bow_pulling_1 + bow_pulling_1_texture: minecraft:item/custom/topaz_bow_pulling_1 + bow_pulling_2_model: minecraft:item/custom/topaz_bow_pulling_2 + bow_pulling_2_texture: minecraft:item/custom/topaz_bow_pulling_2 + default:topaz_crossbow: + material: crossbow + custom-model-data: 1000 + data: + display-name: "<#FF8C00>Topaz Crossbow" + model: + template: models:crossbow_2d + arguments: + crossbow_model: minecraft:item/custom/topaz_crossbow + crossbow_texture: minecraft:item/custom/topaz_crossbow + crossbow_pulling_0_model: minecraft:item/custom/topaz_crossbow_pulling_0 + crossbow_pulling_0_texture: minecraft:item/custom/topaz_crossbow_pulling_0 + crossbow_pulling_1_model: minecraft:item/custom/topaz_crossbow_pulling_1 + crossbow_pulling_1_texture: minecraft:item/custom/topaz_crossbow_pulling_1 + crossbow_pulling_2_model: minecraft:item/custom/topaz_crossbow_pulling_2 + crossbow_pulling_2_texture: minecraft:item/custom/topaz_crossbow_pulling_2 + crossbow_arrow_texture: minecraft:item/custom/topaz_crossbow_arrow + crossbow_arrow_model: minecraft:item/custom/topaz_crossbow_arrow + crossbow_firework_texture: minecraft:item/custom/topaz_crossbow_firework + crossbow_firework_model: minecraft:item/custom/topaz_crossbow_firework \ No newline at end of file diff --git a/bukkit-loader/src/main/resources/resources/default/configuration/ores.yml b/bukkit-loader/src/main/resources/resources/default/configuration/ores.yml index cd61392c9..ed469676a 100644 --- a/bukkit-loader/src/main/resources/resources/default/configuration/ores.yml +++ b/bukkit-loader/src/main/resources/resources/default/configuration/ores.yml @@ -29,7 +29,7 @@ items: material: paper custom-model-data: 1012 data: - display-name: "Topaz" + display-name: "<#FF8C00>Topaz" model: template: models:generated arguments: diff --git a/bukkit-loader/src/main/resources/resources/default/configuration/palm_tree.yml b/bukkit-loader/src/main/resources/resources/default/configuration/palm_tree.yml index ba0a4824a..e6076e8b7 100644 --- a/bukkit-loader/src/main/resources/resources/default/configuration/palm_tree.yml +++ b/bukkit-loader/src/main/resources/resources/default/configuration/palm_tree.yml @@ -222,6 +222,16 @@ items: behavior: type: block_item block: default:palm_planks + default:palm_sapling: + material: paper + custom-model-data: 1005 + data: + display-name: "Palm Sapling" + model: + template: models:generated + arguments: + model_path: "minecraft:item/custom/palm_sapling" + texture_path: "minecraft:block/custom/palm_sapling" default:palm_leaves: material: oak_leaves custom-model-data: 1000 diff --git a/bukkit-loader/src/main/resources/resources/default/configuration/templates.yml b/bukkit-loader/src/main/resources/resources/default/configuration/templates.yml index 6d70a9ef7..485074ab7 100644 --- a/bukkit-loader/src/main/resources/resources/default/configuration/templates.yml +++ b/bukkit-loader/src/main/resources/resources/default/configuration/templates.yml @@ -8,6 +8,118 @@ templates: parent: "minecraft:item/generated" textures: "layer0": "{texture_path}" + models:fishing_rod_2d: + type: "minecraft:condition" + property: "minecraft:fishing_rod/cast" + on-false: + type: "minecraft:model" + path: "{rod_model}" + generation: + parent: "minecraft:item/fishing_rod" + textures: + "layer0": "{rod_texture}" + on-true: + type: "minecraft:model" + path: "{rod_cast_model}" + generation: + parent: "minecraft:item/fishing_rod" + textures: + "layer0": "{rod_cast_texture}" + models:bow_2d: + type: "minecraft:condition" + property: "minecraft:using_item" + on-false: + type: "minecraft:model" + path: "{bow_model}" + generation: + parent: "minecraft:item/bow" + textures: + "layer0": "{bow_texture}" + on-true: + type: "minecraft:range_dispatch" + property: "minecraft:use_duration" + scale: 0.05 + entries: + - model: + type: minecraft:model + path: "{bow_pulling_1_model}" + generation: + parent: "minecraft:item/bow_pulling_1" + textures: + "layer0": "{bow_pulling_1_texture}" + threshold: 0.65 + - model: + type: minecraft:model + path: "{bow_pulling_2_model}" + generation: + parent: "minecraft:item/bow_pulling_2" + textures: + "layer0": "{bow_pulling_2_texture}" + threshold: 0.65 + fallback: + type: minecraft:model + path: "{bow_pulling_0_model}" + generation: + parent: "minecraft:item/bow_pulling_0" + textures: + "layer0": "{bow_pulling_0_texture}" + models:crossbow_2d: + type: "minecraft:condition" + property: "minecraft:using_item" + on-false: + type: "minecraft:select" + property: "minecraft:charge_type" + cases: + - when: arrow + model: + type: minecraft:model + path: "{crossbow_arrow_model}" + generation: + parent: "minecraft:item/crossbow_arrow" + textures: + "layer0": "{crossbow_arrow_texture}" + - when: rocket + model: + type: minecraft:model + path: "{crossbow_firework_model}" + generation: + parent: "minecraft:item/crossbow_firework" + textures: + "layer0": "{crossbow_firework_texture}" + fallback: + type: minecraft:model + path: "{crossbow_model}" + generation: + parent: "minecraft:item/crossbow" + textures: + "layer0": "{crossbow_texture}" + on-true: + type: "minecraft:range_dispatch" + property: "minecraft:crossbow/pull" + entries: + - model: + type: minecraft:model + path: "{crossbow_pulling_1_model}" + generation: + parent: "minecraft:item/crossbow_pulling_1" + textures: + "layer0": "{crossbow_pulling_1_texture}" + threshold: 0.58 + - model: + type: minecraft:model + path: "{crossbow_pulling_2_model}" + generation: + parent: "minecraft:item/crossbow_pulling_2" + textures: + "layer0": "{crossbow_pulling_2_texture}" + threshold: 1.0 + fallback: + type: minecraft:model + path: "{crossbow_pulling_0_model}" + generation: + parent: "minecraft:item/crossbow_pulling_0" + textures: + "layer0": "{crossbow_pulling_0_texture}" # Block Settings block_settings:surface_decoration: diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/chinese_lantern.png b/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/chinese_lantern.png new file mode 100644 index 000000000..b8f5402c6 Binary files /dev/null and b/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/chinese_lantern.png differ diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/chinese_lantern.png.mcmeta b/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/chinese_lantern.png.mcmeta new file mode 100644 index 000000000..4894b537c --- /dev/null +++ b/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/chinese_lantern.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "interpolate": true, + "frametime": 10 + } +} diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/chinese_lantern_top.png b/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/chinese_lantern_top.png new file mode 100644 index 000000000..610d8d7ee Binary files /dev/null and b/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/chinese_lantern_top.png differ diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/chinese_lantern_top.png.mcmeta b/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/chinese_lantern_top.png.mcmeta new file mode 100644 index 000000000..4894b537c --- /dev/null +++ b/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/chinese_lantern_top.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "interpolate": true, + "frametime": 10 + } +} diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/deepslate_topaz_ore.png b/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/deepslate_topaz_ore.png index 49f185bd6..b270e5ebd 100644 Binary files a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/deepslate_topaz_ore.png and b/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/deepslate_topaz_ore.png differ diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/beginner_rod.png b/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/beginner_rod.png deleted file mode 100644 index 87b5ad10b..000000000 Binary files a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/beginner_rod.png and /dev/null differ diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/beginner_rod_cast.png b/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/beginner_rod_cast.png deleted file mode 100644 index 354b5371f..000000000 Binary files a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/beginner_rod_cast.png and /dev/null differ diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_bow.png b/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_bow.png new file mode 100644 index 000000000..afbaf13a1 Binary files /dev/null and b/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_bow.png differ diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_bow_pulling_0.png b/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_bow_pulling_0.png new file mode 100644 index 000000000..6f2cb5b93 Binary files /dev/null and b/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_bow_pulling_0.png differ diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_bow_pulling_1.png b/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_bow_pulling_1.png new file mode 100644 index 000000000..99c78b5fe Binary files /dev/null and b/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_bow_pulling_1.png differ diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_bow_pulling_2.png b/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_bow_pulling_2.png new file mode 100644 index 000000000..ca228d215 Binary files /dev/null and b/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_bow_pulling_2.png differ diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow.png b/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow.png new file mode 100644 index 000000000..2337f1d11 Binary files /dev/null and b/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow.png differ diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow_arrow.png b/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow_arrow.png new file mode 100644 index 000000000..4998fce17 Binary files /dev/null and b/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow_arrow.png differ diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow_firework.png b/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow_firework.png new file mode 100644 index 000000000..6a047932f Binary files /dev/null and b/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow_firework.png differ diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow_pulling_0.png b/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow_pulling_0.png new file mode 100644 index 000000000..48441b490 Binary files /dev/null and b/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow_pulling_0.png differ diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow_pulling_1.png b/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow_pulling_1.png new file mode 100644 index 000000000..f3c452c83 Binary files /dev/null and b/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow_pulling_1.png differ diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow_pulling_2.png b/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow_pulling_2.png new file mode 100644 index 000000000..f5326edf3 Binary files /dev/null and b/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow_pulling_2.png differ diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_rod.png b/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_rod.png new file mode 100644 index 000000000..629092f8b Binary files /dev/null and b/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_rod.png differ diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_rod_cast.png b/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_rod_cast.png new file mode 100644 index 000000000..ce042dcdd Binary files /dev/null and b/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_rod_cast.png differ diff --git a/core/src/main/java/net/momirealms/craftengine/core/pack/PackManagerImpl.java b/core/src/main/java/net/momirealms/craftengine/core/pack/PackManagerImpl.java index d41c2fa4e..eef7018e9 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/pack/PackManagerImpl.java +++ b/core/src/main/java/net/momirealms/craftengine/core/pack/PackManagerImpl.java @@ -130,8 +130,18 @@ public class PackManagerImpl implements PackManager { plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/font/image/icons.png"); // items plugin.saveResource("resources/default/configuration/items.yml"); - plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/item/custom/beginner_rod.png"); - plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/item/custom/beginner_rod_cast.png"); + plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_rod.png"); + plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_rod_cast.png"); + plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_bow.png"); + plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_bow_pulling_0.png"); + plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_bow_pulling_1.png"); + plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_bow_pulling_2.png"); + plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow_arrow.png"); + plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow_firework.png"); + plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow_pulling_0.png"); + plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow_pulling_1.png"); + plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow_pulling_2.png"); + plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow.png"); // ores plugin.saveResource("resources/default/configuration/ores.yml"); plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/block/custom/deepslate_topaz_ore.png"); diff --git a/core/src/main/java/net/momirealms/craftengine/core/pack/model/RangeDispatchItemModel.java b/core/src/main/java/net/momirealms/craftengine/core/pack/model/RangeDispatchItemModel.java index b5af44f76..63eafae65 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/pack/model/RangeDispatchItemModel.java +++ b/core/src/main/java/net/momirealms/craftengine/core/pack/model/RangeDispatchItemModel.java @@ -62,6 +62,7 @@ public class RangeDispatchItemModel implements ItemModel { jo.add("model", model.get()); array.add(jo); } + json.add("entries", array); if (scale != 1) { json.addProperty("scale", scale); }