diff --git a/common-files/src/main/resources/resources/default/configuration/block_name.yml b/common-files/src/main/resources/resources/default/configuration/block_name.yml index 0b89fc743..f097abe8a 100644 --- a/common-files/src/main/resources/resources/default/configuration/block_name.yml +++ b/common-files/src/main/resources/resources/default/configuration/block_name.yml @@ -26,7 +26,8 @@ lang: block_name:default:gunpowder_block: GunPowder Block block_name:default:solid_gunpowder_block: Solid GunPowder Block block_name:default:copper_coil: Copper Coil - block_name:default:chessboard: Chessboard + block_name:default:chessboard_block: Chessboard Block + block_name:default:safe_block: Safe Block zh_cn: block_name:default:chinese_lantern: 灯笼 block_name:default:netherite_anvil: 下界合金砧 @@ -51,4 +52,5 @@ lang: block_name:default:gunpowder_block: 火药粉末 block_name:default:solid_gunpowder_block: 凝固火药块 block_name:default:copper_coil: 铜线圈 - block_name:default:chessboard: 棋盘 \ No newline at end of file + block_name:default:chessboard_block: 棋盘方块 + block_name:default:safe_block: 保险柜 \ No newline at end of file diff --git a/common-files/src/main/resources/resources/default/configuration/blocks.yml b/common-files/src/main/resources/resources/default/configuration/blocks.yml index 530b5f9b9..746bf00b4 100644 --- a/common-files/src/main/resources/resources/default/configuration/blocks.yml +++ b/common-files/src/main/resources/resources/default/configuration/blocks.yml @@ -435,6 +435,79 @@ items#misc: facing=west: appearance: west id: 21 + default:safe_block: + material: nether_brick + custom-model-data: 3007 + data: + item-name: + model: + type: minecraft:model + path: minecraft:item/custom/safe_block + generation: + parent: minecraft:block/custom/safe_block + behavior: + type: block_item + block: + loot: + template: default:loot_table/self + settings: + hardness: 5 + resistance: 5 + is-suffocating: true + is-redstone-conductor: true + push-reaction: BLOCK + instrument: BASEDRUM + map-color: 6 + sounds: + break: minecraft:block.stone.break + fall: minecraft:block.stone.fall + hit: minecraft:block.stone.hit + place: minecraft:block.stone.place + step: minecraft:block.stone.step + states: + properties: + facing: + type: 4-direction + default: north + appearances: + east: + state: note_block:22 + model: + path: minecraft:block/custom/safe_block + y: 90 + generation: + parent: minecraft:block/orientable + textures: + front: minecraft:block/custom/safe_block_front + side: minecraft:block/custom/safe_block_side + top: minecraft:block/custom/safe_block_top + north: + state: note_block:23 + model: + path: minecraft:block/custom/safe_block + south: + state: note_block:24 + model: + path: minecraft:block/custom/safe_block + y: 180 + west: + state: note_block:25 + model: + path: minecraft:block/custom/safe_block + y: 270 + variants: + facing=east: + appearance: east + id: 22 + facing=north: + appearance: north + id: 23 + facing=south: + appearance: south + id: 24 + facing=west: + appearance: west + id: 25 recipes#misc: default:chinese_lantern: type: shaped diff --git a/common-files/src/main/resources/resources/default/configuration/categories.yml b/common-files/src/main/resources/resources/default/configuration/categories.yml index 79c4e3fa9..abe2f99fd 100644 --- a/common-files/src/main/resources/resources/default/configuration/categories.yml +++ b/common-files/src/main/resources/resources/default/configuration/categories.yml @@ -78,4 +78,5 @@ categories: - default:flame_elytra - default:cap - default:pebble - - default:chessboard_block \ No newline at end of file + - default:chessboard_block + - default:safe_block \ No newline at end of file diff --git a/common-files/src/main/resources/resources/default/configuration/i18n.yml b/common-files/src/main/resources/resources/default/configuration/i18n.yml index a2cfc0ddc..cf3e1cb2e 100644 --- a/common-files/src/main/resources/resources/default/configuration/i18n.yml +++ b/common-files/src/main/resources/resources/default/configuration/i18n.yml @@ -46,6 +46,7 @@ i18n: item.cap: Cap item.flower_basket: Flower Basket item.chessboard_block: Chessboard Block + item.safe_block: Safe Block category.default.name: Default Assets category.default.lore: Contains the default configuration of CraftEngine category.palm_tree: Palm Tree @@ -102,6 +103,7 @@ i18n: item.cap: 鸭舌帽 item.flower_basket: 花篮 item.chessboard_block: 棋盘方块 + item.safe_block: 保险柜 category.default.name: 默认资产 category.default.lore: 包含了CraftEngine的默认配置 category.palm_tree: 棕榈树 diff --git a/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/safe_block_bottom.png b/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/safe_block_bottom.png new file mode 100644 index 000000000..c7b03c170 Binary files /dev/null and b/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/safe_block_bottom.png differ diff --git a/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/safe_block_front.png b/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/safe_block_front.png new file mode 100644 index 000000000..e523f39e5 Binary files /dev/null and b/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/safe_block_front.png differ diff --git a/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/safe_block_side.png b/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/safe_block_side.png new file mode 100644 index 000000000..c345df934 Binary files /dev/null and b/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/safe_block_side.png differ diff --git a/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/safe_block_top.png b/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/safe_block_top.png new file mode 100644 index 000000000..86e1624ed Binary files /dev/null and b/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/safe_block_top.png differ 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 f68ae92f7..80831f27b 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 @@ -422,6 +422,10 @@ public abstract class AbstractPackManager implements PackManager { plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/block/custom/copper_coil_on.png"); plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/block/custom/copper_coil_on_side.png"); plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/block/custom/chessboard_block.png"); + plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/block/custom/safe_block_top.png"); + plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/block/custom/safe_block_bottom.png"); + plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/block/custom/safe_block_side.png"); + plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/block/custom/safe_block_front.png"); // items plugin.saveResource("resources/default/configuration/items.yml"); plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_rod.png");