diff --git a/README.md b/README.md index 33bd80f46..ea3c73de8 100644 --- a/README.md +++ b/README.md @@ -135,7 +135,7 @@ repositories { ``` ```kotlin dependencies { - compileOnly("net.momirealms:craft-engine-core:0.0.29") - compileOnly("net.momirealms:craft-engine-bukkit:0.0.29") + compileOnly("net.momirealms:craft-engine-core:0.0.34") + compileOnly("net.momirealms:craft-engine-bukkit:0.0.34") } ``` 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 f2aefb28d..b3446fb13 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 @@ -314,12 +314,12 @@ recipes: default:palm_planks: template: default:recipe/planks arguments: - tree_type: palm + wood_type: palm default:palm_wood: template: default:recipe/log_2_wood arguments: - tree_type: palm + wood_type: palm default:stripped_palm_wood: template: default:recipe/log_2_wood arguments: - tree_type: stripped_palm \ No newline at end of file + wood_type: stripped_palm \ No newline at end of file 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 4a7a39aa8..d365adc15 100644 --- a/bukkit-loader/src/main/resources/resources/default/configuration/templates.yml +++ b/bukkit-loader/src/main/resources/resources/default/configuration/templates.yml @@ -92,6 +92,22 @@ templates#models#generated: textures: "layer0": "{path}" +# shield +templates#models#shield: + # template: default:model/shield_3d + # arguments: + # model: shield_model_path + # block_model: shield_block_model_path + default:model/shield_3d: + type: "minecraft:condition" + property: "minecraft:using_item" + on-false: + type: minecraft:model + path: "{model}" + on-true: + type: minecraft:model + path: "{block_model}" + # fishing rods templates#models#fishing_rod: # template: default:model/fishing_rod_3d @@ -305,7 +321,7 @@ templates#models#crossbow: - when: arrow model: type: minecraft:model - path: "{arrow_path}" + path: "{arrow_model}" generation: parent: "minecraft:item/crossbow_arrow" textures: @@ -320,7 +336,7 @@ templates#models#crossbow: "layer0": "{firework_texture}" fallback: type: minecraft:model - path: "{path}" + path: "{model}" generation: parent: "minecraft:item/crossbow" textures: @@ -339,7 +355,7 @@ templates#models#crossbow: threshold: 0.58 - model: type: minecraft:model - path: "{pulling_2_path}" + path: "{pulling_2_model}" generation: parent: "minecraft:item/crossbow_pulling_2" textures: @@ -862,9 +878,9 @@ templates#recipes: category: building group: planks ingredients: - A: "#default:{tree_type}_logs" + A: "#default:{wood_type}_logs" result: - id: "default:{tree_type}_planks" + id: "default:{wood_type}_planks" count: 4 default:recipe/log_2_wood: type: shaped @@ -874,9 +890,9 @@ templates#recipes: - "AA" - "AA" ingredients: - A: "default:{tree_type}_log" + A: "default:{wood_type}_log" result: - id: "default:{tree_type}_wood" + id: "default:{wood_type}_wood" count: 3 default:recipe/smelting_ore: type: smelting