From 18f1a1a5de6a9c05a93b59b64760bf3b90e2d90c Mon Sep 17 00:00:00 2001 From: XiaoMoMi Date: Thu, 13 Feb 2025 19:17:55 +0800 Subject: [PATCH] Added Chinese Lantern --- .../default/configuration/blocks.yml | 49 +++++++++++++++++++ .../default/configuration/fairy_flower.yml | 2 +- .../item/recipe/BukkitRecipeManager.java | 1 + .../core/pack/PackManagerImpl.java | 6 +++ 4 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 bukkit-loader/src/main/resources/resources/default/configuration/blocks.yml diff --git a/bukkit-loader/src/main/resources/resources/default/configuration/blocks.yml b/bukkit-loader/src/main/resources/resources/default/configuration/blocks.yml new file mode 100644 index 000000000..5d4157b59 --- /dev/null +++ b/bukkit-loader/src/main/resources/resources/default/configuration/blocks.yml @@ -0,0 +1,49 @@ +items: + default:chinese_lantern: + material: paper + custom-model-data: 3001 + data: + display-name: "Chinese Lantern" + model: + type: "minecraft:model" + path: "minecraft:item/custom/chinese_lantern" + generation: + parent: "minecraft:block/custom/chinese_lantern" + behavior: + type: block_item + block: default:chinese_lantern +blocks: + default:chinese_lantern: + loot: + template: loot_table:normal + arguments: + item: default:chinese_lantern + settings: + hardness: 0.5 + resistance: 0.5 + push-reaction: NORMAL + replaceable: false + burnable: true + burn-chance: 30 + fire-spread-chance: 100 + is-redstone-conductor: true + is-suffocating: false + instrument: HARP + luminance: 15 + map-color: 36 + sounds: + break: minecraft:block.wood.break + step: minecraft:block.wood.step + place: minecraft:block.wood.place + hit: minecraft:block.wood.hit + fall: minecraft:block.wood.fall + state: + id: 15 + state: note_block:15 + model: + path: "minecraft:block/custom/chinese_lantern" + generation: + parent: "minecraft:block/cube_column" + textures: + "end": "minecraft:block/custom/chinese_lantern_top" + "side": "minecraft:block/custom/chinese_lantern" \ No newline at end of file diff --git a/bukkit-loader/src/main/resources/resources/default/configuration/fairy_flower.yml b/bukkit-loader/src/main/resources/resources/default/configuration/fairy_flower.yml index a96cf2b0c..43f720a8b 100644 --- a/bukkit-loader/src/main/resources/resources/default/configuration/fairy_flower.yml +++ b/bukkit-loader/src/main/resources/resources/default/configuration/fairy_flower.yml @@ -3,7 +3,7 @@ items: material: paper custom-model-data: 3000 data: - display-name: "Fairy Flower" + display-name: "Fairy Flower" model: type: "minecraft:model" path: "minecraft:item/custom/fairy_flower" diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/recipe/BukkitRecipeManager.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/recipe/BukkitRecipeManager.java index 8f39af2d1..cf506c818 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/recipe/BukkitRecipeManager.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/recipe/BukkitRecipeManager.java @@ -175,6 +175,7 @@ public class BukkitRecipeManager implements RecipeManager { this.customRecipes.clear(); try { + // do not unregister them // for (NamespacedKey key : this.injectedDataPackRecipes) { // unregisterRecipe(key); // } 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 28cfe228d..183e10525 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 @@ -131,6 +131,12 @@ public class PackManagerImpl implements PackManager { // icons plugin.saveResource("resources/default/configuration/icons.yml"); plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/font/image/icons.png"); + // blocks + plugin.saveResource("resources/default/configuration/blocks.yml"); + plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/block/custom/chinese_lantern.png"); + plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/block/custom/chinese_lantern.png.mcmeta"); + plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/block/custom/chinese_lantern_top.png"); + plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/block/custom/chinese_lantern_top.png.mcmeta"); // items plugin.saveResource("resources/default/configuration/items.yml"); plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_rod.png");