9
0
mirror of https://github.com/Xiao-MoMi/craft-engine.git synced 2025-12-31 12:56:28 +00:00

Merge remote-tracking branch 'origin/dev-momi' into dev

# Conflicts:
#	bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/Reflections.java
This commit is contained in:
jhqwqmc
2025-03-26 22:20:16 +08:00
35 changed files with 522 additions and 45 deletions

View File

@@ -77,6 +77,13 @@ debug_set_block:
- /craftengine debug setblock
- /ce debug setblock
debug_spawn_furniture:
enable: true
permission: ce.command.debug.spawn_furniture
usage:
- /craftengine debug spawn-furniture
- /ce debug spawn-furniture
debug_get_block_state_registry_id:
enable: true
permission: ce.command.debug.get_block_state_registry_id

View File

@@ -114,6 +114,86 @@ items#misc:
facing_clockwise=south:
appearance: axisZ
id: 3
default:gunpowder_block:
material: paper
custom-model-data: 3002
data:
item-name: "<!i><i18n:item.gunpowder_block>"
model:
type: "minecraft:model"
path: "minecraft:item/custom/gunpowder_block"
generation:
parent: "minecraft:block/custom/gunpowder_block"
behavior:
type: block_item
block:
behavior:
type: concrete_powder_block
solid-block: default:solid_gunpowder_block
loot:
template: "default:loot_table/basic"
arguments:
item: default:gunpowder_block
settings:
template:
- default:sound/sand
overrides:
hardness: 0.5
resistance: 0.5
replaceable: false
is-redstone-conductor: true
is-suffocating: true
instrument: SNARE
map-color: 45
item: default:gunpowder_block
state:
id: 16
state: note_block:16
model:
path: "minecraft:block/custom/gunpowder_block"
generation:
parent: "minecraft:block/cube_all"
textures:
"all": "minecraft:block/custom/gunpowder_block"
default:solid_gunpowder_block:
material: paper
custom-model-data: 3003
data:
item-name: "<!i><i18n:item.solid_gunpowder_block>"
model:
type: "minecraft:model"
path: "minecraft:item/custom/solid_gunpowder_block"
generation:
parent: "minecraft:block/custom/solid_gunpowder_block"
behavior:
type: block_item
block:
loot:
template: "default:loot_table/basic"
arguments:
item: default:solid_gunpowder_block
settings:
template:
- default:sound/sand
- default:pickaxe_power/level_1
overrides:
hardness: 1.8
resistance: 1.8
replaceable: false
is-redstone-conductor: true
is-suffocating: true
instrument: BASEDRUM
map-color: 45
item: default:solid_gunpowder_block
state:
id: 17
state: note_block:17
model:
path: "minecraft:block/custom/solid_gunpowder_block"
generation:
parent: "minecraft:block/cube_all"
textures:
"all": "minecraft:block/custom/solid_gunpowder_block"
recipes#misc:
default:chinese_lantern:
type: shaped
@@ -148,4 +228,22 @@ recipes#misc:
B: "minecraft:netherite_ingot"
result:
id: default:netherite_anvil
count: 1
default:gunpowder_from_block:
type: shapeless
ingredients:
A: "default:gunpowder_block"
result:
id: minecraft:gunpowder
count: 9
default:gunpowder_block:
type: shaped
pattern:
- "AAA"
- "AAA"
- "AAA"
ingredients:
A: "minecraft:gunpowder"
result:
id: default:gunpowder_block
count: 1

View File

@@ -58,4 +58,6 @@ categories:
- default:chinese_lantern
- default:netherite_anvil
- default:fairy_flower
- default:reed
- default:reed
- default:gunpowder_block
- default:solid_gunpowder_block

View File

@@ -29,6 +29,8 @@ i18n:
item.palm_sapling: "Palm Sapling"
item.palm_leaves: "Palm Leaves"
item.netherite_anvil: "Netherite Anvil"
item.gunpowder_block: "GunPowder Block"
item.solid_gunpowder_block: "Solid GunPowder Block"
category.default.name: "Default Assets"
category.default.lore: "Contains the default configuration of CraftEngine"
category.palm_tree: "Palm Tree"
@@ -65,6 +67,8 @@ i18n:
item.palm_sapling: "棕榈树苗"
item.palm_leaves: "棕榈树叶"
item.netherite_anvil: "下界合金砧"
item.gunpowder_block: "火药粉末"
item.solid_gunpowder_block: "凝固火药块"
category.default.name: "默认资产"
category.default.lore: "包含了CraftEngine的默认配置"
category.palm_tree: "棕榈树"