From 1b6a5da519fdc89d7842b9513cf75e78f91abaf8 Mon Sep 17 00:00:00 2001 From: XiaoMoMi Date: Thu, 19 Jun 2025 02:07:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=BB=98=E8=AE=A4=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bukkit/entity/data/EntityData.java | 3 + .../feature/DebugMigrateTemplatesCommand.java | 10 +- .../reflection/minecraft/CoreReflections.java | 21 +- .../default/configuration/block_name.yml | 77 +- .../default/configuration/blocks.yml | 162 ++--- .../default/configuration/categories.yml | 20 +- .../resources/default/configuration/emoji.yml | 133 ++-- .../configuration/fix_client_visual.yml | 26 +- .../default/configuration/furniture.yml | 26 +- .../resources/default/configuration/i18n.yml | 190 ++--- .../resources/default/configuration/icons.yml | 4 +- .../resources/default/configuration/items.yml | 247 +++---- .../resources/default/configuration/ores.yml | 58 +- .../default/configuration/palm_tree.yml | 194 ++--- .../default/configuration/plants.yml | 149 ++-- .../default/configuration/templates.yml | 661 +++++++++--------- .../resources/internal/configuration/gui.yml | 106 ++- .../resources/internal/configuration/i18n.yml | 48 +- .../internal/configuration/offset_chars.yml | 88 +-- .../core/entity/data/ClassTreeIdRegistry.java | 5 +- 20 files changed, 1119 insertions(+), 1109 deletions(-) diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/data/EntityData.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/data/EntityData.java index 258a5ad0f..da99028c4 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/data/EntityData.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/data/EntityData.java @@ -5,8 +5,11 @@ import java.util.List; public interface EntityData { Object serializer(); + int id(); + T defaultValue(); + Object entityDataAccessor(); default Object createEntityDataIfNotDefaultValue(T value) { diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/command/feature/DebugMigrateTemplatesCommand.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/command/feature/DebugMigrateTemplatesCommand.java index 227b0f19f..e90f055f1 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/command/feature/DebugMigrateTemplatesCommand.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/command/feature/DebugMigrateTemplatesCommand.java @@ -8,6 +8,8 @@ import net.momirealms.craftengine.core.plugin.command.CraftEngineCommandManager; import net.momirealms.craftengine.core.util.FileUtils; import org.bukkit.command.CommandSender; import org.incendo.cloud.Command; +import org.yaml.snakeyaml.DumperOptions; +import org.yaml.snakeyaml.Yaml; import java.io.IOException; import java.nio.file.Files; @@ -29,7 +31,13 @@ public class DebugMigrateTemplatesCommand extends BukkitCommandFeature instance$ItemStack$CODEC; - - @SuppressWarnings("unchecked") - private static Codec getInstance$ItemStack$CODEC() throws IllegalAccessException { - return (Codec) field$ItemStack$CODEC.get(null); - } + public static final Codec instance$ItemStack$CODEC; static { try { - if (VersionHelper.isOrAbove1_20_5()) { - instance$ItemStack$CODEC = getInstance$ItemStack$CODEC(); - } else { - instance$ItemStack$CODEC = null; - } - } catch (Exception e) { - throw new RuntimeException(e); + instance$ItemStack$CODEC = VersionHelper.isOrAbove1_20_5() ? (Codec) field$ItemStack$CODEC.get(null) : null; + } catch (ReflectiveOperationException e) { + throw new ReflectionInitException("Failed to init ItemStack$CODEC", e); } } } 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 0665394b7..b572e1a70 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 @@ -1,37 +1,46 @@ +# This file is for localizing internal block IDs (craftengine:xxx_xx). +# Some other plugins support displaying block names using lang components. +# This might be useful for the client-side, but it's not mandatory. lang: en_us: - block_name:default:chinese_lantern: "Chinese Lantern" - block_name:default:netherite_anvil: "Netherite Anvil" - block_name:default:topaz_ore: "Topaz Ore" - block_name:default:deepslate_topaz_ore: "Deepslate Topaz Ore" - block_name:default:palm_log: "Palm Log" - block_name:default:stripped_palm_log: "Stripped Palm Log" - block_name:default:palm_wood: "Palm Wood" - block_name:default:stripped_palm_wood: "Stripped Palm Wood" - block_name:default:palm_planks: "Palm Planks" - block_name:default:palm_sapling: "Palm Sapling" - block_name:default:palm_leaves: "Palm Leaves" - block_name:default:fairy_flower: "Fairy Flower" - block_name:default:reed: "Reed" - block_name:default:flame_cane: "Flame Cane" - block_name:default:ender_pearl_flower: "Ender Pearl Flower" - block_name:default:gunpowder_block: "GunPowder Block" - block_name:default:solid_gunpowder_block: "Solid GunPowder Block" + block_name:default:chinese_lantern: Chinese Lantern + block_name:default:netherite_anvil: Netherite Anvil + block_name:default:topaz_ore: Topaz Ore + block_name:default:deepslate_topaz_ore: Deepslate Topaz Ore + block_name:default:palm_log: Palm Log + block_name:default:stripped_palm_log: Stripped Palm Log + block_name:default:palm_wood: Palm Wood + block_name:default:stripped_palm_wood: Stripped Palm Wood + block_name:default:palm_planks: Palm Planks + block_name:default:palm_sapling: Palm Sapling + block_name:default:palm_leaves: Palm Leaves + block_name:default:palm_trapdoor: Palm Trapdoor + block_name:default:palm_door: Palm Door + block_name:default:fairy_flower: Fairy Flower + block_name:default:reed: Reed + block_name:default:flame_cane: Flame Cane + block_name:default:ender_pearl_flower: Ender Pearl Flower + block_name:default:gunpowder_block: GunPowder Block + block_name:default:solid_gunpowder_block: Solid GunPowder Block + block_name:default:copper_coil: Copper Coil zh_cn: - block_name:default:chinese_lantern: "灯笼" - block_name:default:netherite_anvil: "下界合金砧" - block_name:default:topaz_ore: "黄玉矿石" - block_name:default:deepslate_topaz_ore: "深层黄玉矿石" - block_name:default:palm_log: "棕榈原木" - block_name:default:stripped_palm_log: "去皮棕榈原木" - block_name:default:palm_wood: "棕榈木" - block_name:default:stripped_palm_wood: "去皮棕榈木" - block_name:default:palm_planks: "棕榈木板" - block_name:default:palm_sapling: "棕榈树苗" - block_name:default:palm_leaves: "棕榈树叶" - block_name:default:fairy_flower: "仙灵花" - block_name:default:reed: "芦苇" - block_name:default:flame_cane: "烈焰甘蔗" - block_name:default:ender_pearl_flower: "末影珍珠花" - block_name:default:gunpowder_block: "火药粉末" - block_name:default:solid_gunpowder_block: "凝固火药块" \ No newline at end of file + block_name:default:chinese_lantern: 灯笼 + block_name:default:netherite_anvil: 下界合金砧 + block_name:default:topaz_ore: 黄玉矿石 + block_name:default:deepslate_topaz_ore: 深层黄玉矿石 + block_name:default:palm_log: 棕榈原木 + block_name:default:stripped_palm_log: 去皮棕榈原木 + block_name:default:palm_wood: 棕榈木 + block_name:default:stripped_palm_wood: 去皮棕榈木 + block_name:default:palm_planks: 棕榈木板 + block_name:default:palm_sapling: 棕榈树苗 + block_name:default:palm_leaves: 棕榈树叶 + block_name:default:palm_trapdoor: 棕榈木活板门 + block_name:default:palm_door: 棕榈木门 + block_name:default:fairy_flower: 仙灵花 + block_name:default:reed: 芦苇 + block_name:default:flame_cane: 烈焰甘蔗 + block_name:default:ender_pearl_flower: 末影珍珠花 + block_name:default:gunpowder_block: 火药粉末 + block_name:default:solid_gunpowder_block: 凝固火药块 + block_name:default:copper_coil: 铜线圈 \ 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 3fa3526c9..974ca4eb8 100644 --- a/common-files/src/main/resources/resources/default/configuration/blocks.yml +++ b/common-files/src/main/resources/resources/default/configuration/blocks.yml @@ -3,17 +3,17 @@ items#misc: material: nether_brick custom-model-data: 3000 data: - item-name: "" + item-name: model: - type: "minecraft:model" - path: "minecraft:item/custom/chinese_lantern" + type: minecraft:model + path: minecraft:item/custom/chinese_lantern generation: - parent: "minecraft:block/custom/chinese_lantern" + parent: minecraft:block/custom/chinese_lantern behavior: type: block_item block: loot: - template: "default:loot_table/self" + template: default:loot_table/self settings: template: - default:hardness/wool @@ -29,40 +29,40 @@ items#misc: id: 15 state: note_block:15 model: - path: "minecraft:block/custom/chinese_lantern" + path: minecraft:block/custom/chinese_lantern generation: - parent: "minecraft:block/cube_column" + parent: minecraft:block/cube_column textures: - "end": "minecraft:block/custom/chinese_lantern_top" - "side": "minecraft:block/custom/chinese_lantern" + end: minecraft:block/custom/chinese_lantern_top + side: minecraft:block/custom/chinese_lantern default:netherite_anvil: material: nether_brick custom-model-data: 3001 data: - item-name: "" + item-name: model: - type: "minecraft:model" - path: "minecraft:item/custom/netherite_anvil" + type: minecraft:model + path: minecraft:item/custom/netherite_anvil generation: - parent: "minecraft:block/custom/netherite_anvil" + parent: minecraft:block/custom/netherite_anvil behavior: type: block_item block: loot: - template: "default:loot_table/self" + template: default:loot_table/self behavior: type: falling_block hurt-amount: 4 max-hurt: 80 events: - - on: right_click + - true: right_click functions: - type: open_window gui-type: anvil - type: cancel_event conditions: - type: expression - expression: "!" + expression: '!' settings: template: - default:pickaxe_power/level_4 @@ -86,20 +86,20 @@ items#misc: default: north appearances: axisX: - state: "minecraft:anvil[facing=east]" + state: minecraft:anvil[facing=east] model: - path: "minecraft:block/custom/netherite_anvil" + path: minecraft:block/custom/netherite_anvil y: 90 generation: - parent: "minecraft:block/anvil" + parent: minecraft:block/anvil textures: - "top": "minecraft:block/custom/netherite_anvil_top" - "body": "minecraft:block/custom/netherite_anvil" - "particle": "minecraft:block/custom/netherite_anvil" + top: minecraft:block/custom/netherite_anvil_top + body: minecraft:block/custom/netherite_anvil + particle: minecraft:block/custom/netherite_anvil axisZ: - state: "minecraft:anvil[facing=north]" + state: minecraft:anvil[facing=north] model: - path: "minecraft:block/custom/netherite_anvil" + path: minecraft:block/custom/netherite_anvil variants: facing_clockwise=east: appearance: axisX @@ -117,12 +117,12 @@ items#misc: material: nether_brick custom-model-data: 3002 data: - item-name: "" + item-name: model: - type: "minecraft:model" - path: "minecraft:item/custom/gunpowder_block" + type: minecraft:model + path: minecraft:item/custom/gunpowder_block generation: - parent: "minecraft:block/custom/gunpowder_block" + parent: minecraft:block/custom/gunpowder_block behavior: type: block_item block: @@ -131,7 +131,7 @@ items#misc: solid-block: default:solid_gunpowder_block - type: falling_block loot: - template: "default:loot_table/self" + template: default:loot_table/self settings: template: - default:sound/sand @@ -145,26 +145,26 @@ items#misc: id: 16 state: note_block:16 model: - path: "minecraft:block/custom/gunpowder_block" + path: minecraft:block/custom/gunpowder_block generation: - parent: "minecraft:block/cube_all" + parent: minecraft:block/cube_all textures: - "all": "minecraft:block/custom/gunpowder_block" + all: minecraft:block/custom/gunpowder_block default:solid_gunpowder_block: material: nether_brick custom-model-data: 3003 data: - item-name: "" + item-name: model: - type: "minecraft:model" - path: "minecraft:item/custom/solid_gunpowder_block" + type: minecraft:model + path: minecraft:item/custom/solid_gunpowder_block generation: - parent: "minecraft:block/custom/solid_gunpowder_block" + parent: minecraft:block/custom/solid_gunpowder_block behavior: type: block_item block: loot: - template: "default:loot_table/self" + template: default:loot_table/self settings: template: - default:sound/stone @@ -179,26 +179,26 @@ items#misc: id: 17 state: note_block:17 model: - path: "minecraft:block/custom/solid_gunpowder_block" + path: minecraft:block/custom/solid_gunpowder_block generation: - parent: "minecraft:block/cube_all" + parent: minecraft:block/cube_all textures: - "all": "minecraft:block/custom/solid_gunpowder_block" + all: minecraft:block/custom/solid_gunpowder_block default:copper_coil: material: nether_brick custom-model-data: 3004 data: - item-name: "" + item-name: model: - type: "minecraft:model" - path: "minecraft:item/custom/copper_coil" + type: minecraft:model + path: minecraft:item/custom/copper_coil generation: - parent: "minecraft:block/custom/copper_coil" + parent: minecraft:block/custom/copper_coil behavior: type: block_item block: loot: - template: "default:loot_table/self" + template: default:loot_table/self settings: template: - default:sound/metal @@ -220,33 +220,33 @@ items#misc: default: false appearances: off: - state: "cactus:0" + state: cactus:0 model: - path: "minecraft:block/custom/copper_coil" + path: minecraft:block/custom/copper_coil generation: - parent: "minecraft:block/cactus" + parent: minecraft:block/cactus textures: - "particle": "minecraft:block/custom/copper_coil" - "bottom": "minecraft:block/custom/copper_coil" - "top": "minecraft:block/custom/copper_coil" - "side": "minecraft:block/custom/copper_coil_side" + particle: minecraft:block/custom/copper_coil + bottom: minecraft:block/custom/copper_coil + top: minecraft:block/custom/copper_coil + side: minecraft:block/custom/copper_coil_side on: - state: "cactus:1" + state: cactus:1 model: - path: "minecraft:block/custom/copper_coil_on" + path: minecraft:block/custom/copper_coil_on generation: - parent: "minecraft:block/cactus" + parent: minecraft:block/cactus textures: - "particle": "minecraft:block/custom/copper_coil_on" - "bottom": "minecraft:block/custom/copper_coil_on" - "top": "minecraft:block/custom/copper_coil_on" - "side": "minecraft:block/custom/copper_coil_on_side" + particle: minecraft:block/custom/copper_coil_on + bottom: minecraft:block/custom/copper_coil_on + top: minecraft:block/custom/copper_coil_on + side: minecraft:block/custom/copper_coil_on_side variants: lit=false: - appearance: "off" + appearance: 'off' id: 0 lit=true: - appearance: "on" + appearance: 'on' id: 1 settings: luminance: 8 @@ -254,54 +254,54 @@ recipes#misc: default:chinese_lantern: type: shaped pattern: - - "ABA" - - "BCB" - - "ABA" + - ABA + - BCB + - ABA ingredients: - A: "#minecraft:planks" - B: "minecraft:stick" - C: "minecraft:torch" + A: '#minecraft:planks' + B: minecraft:stick + C: minecraft:torch result: id: default:chinese_lantern count: 1 default:netherite_anvil: type: shaped pattern: - - " B " - - "BAB" - - " B " + - ' B ' + - BAB + - ' B ' ingredients: - A: "minecraft:anvil" - B: "minecraft:netherite_ingot" + A: minecraft:anvil + B: minecraft:netherite_ingot result: id: default:netherite_anvil count: 1 default:gunpowder_from_block: type: shapeless ingredients: - A: "default:gunpowder_block" + A: default:gunpowder_block result: id: minecraft:gunpowder count: 9 default:gunpowder_block: type: shaped pattern: - - "AAA" - - "AAA" - - "AAA" + - AAA + - AAA + - AAA ingredients: - A: "minecraft:gunpowder" + A: minecraft:gunpowder result: id: default:gunpowder_block count: 1 default:copper_coil: type: shaped pattern: - - "AAA" - - "A A" - - "AAA" + - AAA + - A A + - AAA ingredients: - A: "minecraft:copper_ingot" + A: minecraft:copper_ingot result: id: default:copper_coil count: 1 \ No newline at end of file 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 c588fff8d..128180d77 100644 --- a/common-files/src/main/resources/resources/default/configuration/categories.yml +++ b/common-files/src/main/resources/resources/default/configuration/categories.yml @@ -1,17 +1,17 @@ categories: default:default: priority: 1 - name: "" + name: lore: - - "" + - icon: default:topaz list: - - "#default:palm_tree" - - "#default:topaz" - - "#default:furniture" - - "#default:misc" + - '#default:palm_tree' + - '#default:topaz' + - '#default:furniture' + - '#default:misc' default:palm_tree: - name: "" + name: hidden: true icon: default:palm_log list: @@ -24,7 +24,7 @@ categories: - default:palm_planks - default:palm_trapdoor default:topaz: - name: "<#FF8C00>" + name: <#FF8C00> hidden: true icon: default:topaz list: @@ -45,7 +45,7 @@ categories: - default:topaz_leggings - default:topaz_boots default:furniture: - name: "<#FFD700>" + name: <#FFD700> hidden: true icon: default:table_lamp list: @@ -53,7 +53,7 @@ categories: - default:table_lamp - default:wooden_chair default:misc: - name: "" + name: hidden: true icon: default:chinese_lantern list: diff --git a/common-files/src/main/resources/resources/default/configuration/emoji.yml b/common-files/src/main/resources/resources/default/configuration/emoji.yml index 95dda77c6..ef8173f57 100644 --- a/common-files/src/main/resources/resources/default/configuration/emoji.yml +++ b/common-files/src/main/resources/resources/default/configuration/emoji.yml @@ -1,145 +1,142 @@ templates: default:emoji/basic: - content: "'>" + content: '> default:emoji/addition_info: - content: "'>${text}" - + content: '>${text} emoji: default:emoji_location: - template: "default:emoji/addition_info" + template: default:emoji/addition_info arguments: - text: "" + text: overrides: - image: "default:icons:0:0" + image: default:icons:0:0 permission: emoji.location keywords: - - ":location:" - - ":pos:" + - ':location:' + - ':pos:' default:emoji_time: - template: "default:emoji/addition_info" + template: default:emoji/addition_info arguments: - text: "" + text: overrides: - image: "default:icons:0:1" + image: default:icons:0:1 permission: emoji.time keywords: - - ":time:" - + - ':time:' default:emoji_smiley: - template: "default:emoji/basic" + template: default:emoji/basic overrides: - image: "default:emojis:0:0" + image: default:emojis:0:0 permission: emoji.smile keywords: - - ":)" - - ":smiley:" - - ":smile:" + - :) + - ':smiley:' + - ':smile:' default:emoji_angry: - template: "default:emoji/basic" + template: default:emoji/basic overrides: - image: "default:emojis:0:1" + image: default:emojis:0:1 permission: emoji.angry keywords: - - ":angry:" + - ':angry:' default:emoji_grin: - template: "default:emoji/basic" + template: default:emoji/basic overrides: - image: "default:emojis:0:2" + image: default:emojis:0:2 permission: emoji.grin keywords: - - ":grin:" + - ':grin:' default:emoji_sob: - template: "default:emoji/basic" + template: default:emoji/basic overrides: - image: "default:emojis:0:3" + image: default:emojis:0:3 permission: emoji.sob keywords: - - ":sob:" + - ':sob:' default:emoji_sweat_smile: - template: "default:emoji/basic" + template: default:emoji/basic overrides: - image: "default:emojis:1:0" + image: default:emojis:1:0 permission: emoji.sweat_smile keywords: - - ":sweat_smile:" + - ':sweat_smile:' default:emoji_blush: - template: "default:emoji/basic" + template: default:emoji/basic overrides: - image: "default:emojis:1:1" + image: default:emojis:1:1 permission: emoji.blush keywords: - - ":blush:" + - ':blush:' default:emoji_joy: - template: "default:emoji/basic" + template: default:emoji/basic overrides: - image: "default:emojis:1:2" + image: default:emojis:1:2 permission: emoji.joy keywords: - - ":joy:" + - ':joy:' default:emoji_slight_frown: - template: "default:emoji/basic" + template: default:emoji/basic overrides: - image: "default:emojis:1:3" + image: default:emojis:1:3 permission: emoji.slight_frown keywords: - - ":slight_frown:" + - ':slight_frown:' default:emoji_unamused: - template: "default:emoji/basic" + template: default:emoji/basic overrides: - image: "default:emojis:2:0" + image: default:emojis:2:0 permission: emoji.unamused keywords: - - ":unamused:" + - ':unamused:' default:emoji_laughing: - template: "default:emoji/basic" + template: default:emoji/basic overrides: - image: "default:emojis:2:1" + image: default:emojis:2:1 permission: emoji.laughing keywords: - - ":laughing:" + - ':laughing:' default:emoji_sunglasses: - template: "default:emoji/basic" + template: default:emoji/basic overrides: - image: "default:emojis:2:2" + image: default:emojis:2:2 permission: emoji.sunglasses keywords: - - ":sunglasses:" + - ':sunglasses:' default:emoji_innocent: - template: "default:emoji/basic" + template: default:emoji/basic overrides: - image: "default:emojis:2:3" + image: default:emojis:2:3 permission: emoji.innocent keywords: - - ":innocent:" + - ':innocent:' default:emoji_face_vomiting: - template: "default:emoji/basic" + template: default:emoji/basic overrides: - image: "default:emojis:3:0" + image: default:emojis:3:0 permission: emoji.face_vomiting keywords: - - ":face_vomiting:" + - ':face_vomiting:' default:emoji_rolling_eyes: - template: "default:emoji/basic" + template: default:emoji/basic overrides: - image: "default:emojis:3:1" + image: default:emojis:3:1 permission: emoji.rolling_eyes keywords: - - ":rolling_eyes:" + - ':rolling_eyes:' default:emoji_yum: - template: "default:emoji/basic" + template: default:emoji/basic overrides: - image: "default:emojis:3:2" + image: default:emojis:3:2 permission: emoji.yum keywords: - - ":yum:" + - ':yum:' default:emoji_confounded: - template: "default:emoji/basic" + template: default:emoji/basic overrides: - image: "default:emojis:3:2" + image: default:emojis:3:2 permission: emoji.confounded keywords: - - ":confounded:" - + - ':confounded:' images: default:emojis: height: 11 @@ -147,7 +144,7 @@ images: font: minecraft:emoji file: minecraft:font/image/emojis.png chars: - - '\ub000\ub001\ub002\ub003' - - '\ub004\ub005\ub006\ub007' - - '\ub008\ub009\ub00a\ub00b' - - '\ub00c\ub00d\ub00e\ub00f' \ No newline at end of file + - \ub000\ub001\ub002\ub003 + - \ub004\ub005\ub006\ub007 + - \ub008\ub009\ub00a\ub00b + - \ub00c\ub00d\ub00e\ub00f \ No newline at end of file diff --git a/common-files/src/main/resources/resources/default/configuration/fix_client_visual.yml b/common-files/src/main/resources/resources/default/configuration/fix_client_visual.yml index d4167b5c0..440e9964b 100644 --- a/common-files/src/main/resources/resources/default/configuration/fix_client_visual.yml +++ b/common-files/src/main/resources/resources/default/configuration/fix_client_visual.yml @@ -1,23 +1,27 @@ +# When placing tripwires, the client predicts their block states. +# By specifying the state type, we can prevent certain visual issues during placement. items: minecraft:string: client-bound-data: components: minecraft:block_state: - attached: "false" - disarmed: "false" - east: "true" - north: "true" - powered: "true" - south: "true" - west: "true" + attached: 'false' + disarmed: 'false' + east: 'true' + north: 'true' + powered: 'true' + south: 'true' + west: 'true' minecraft:note_block: client-bound-data: components: minecraft:block_state: - instrument: "harp" - powered: "false" - note: "0" - + instrument: harp + powered: 'false' + note: '0' +# For the client to determine if a beacon can activate, it needs the beacon_base_blocks tag to render the beam. +# This allows custom blocks (like note blocks) to work as beacon bases. +# However, whether the beacon actually grants potion effects depends on the block's real tag (server-side check). blocks: minecraft:note_block: settings: diff --git a/common-files/src/main/resources/resources/default/configuration/furniture.yml b/common-files/src/main/resources/resources/default/configuration/furniture.yml index 2816c5458..35b568623 100644 --- a/common-files/src/main/resources/resources/default/configuration/furniture.yml +++ b/common-files/src/main/resources/resources/default/configuration/furniture.yml @@ -3,10 +3,10 @@ items: material: nether_brick custom-model-data: 2000 data: - item-name: "" + item-name: model: - type: "minecraft:model" - path: "minecraft:item/custom/bench" + type: minecraft:model + path: minecraft:item/custom/bench behavior: type: furniture_item furniture: @@ -19,9 +19,7 @@ items: ground: loot-spawn-offset: 0.5,0.5,0 rules: - # ANY / FOUR / EIGHT / SIXTEEN / NORTH / EAST / WEST / SOUTH rotation: FOUR - # ANY / CENTER / HALF / QUARTER / CORNER alignment: CENTER elements: - item: default:bench @@ -41,17 +39,17 @@ items: - 0,0,-0.1 0 - 1,0,-0.1 0 loot: - template: "default:loot_table/furniture" + template: default:loot_table/furniture arguments: item: default:bench default:table_lamp: material: nether_brick custom-model-data: 2001 data: - item-name: "" + item-name: model: - type: "minecraft:model" - path: "minecraft:item/custom/table_lamp" + type: minecraft:model + path: minecraft:item/custom/table_lamp behavior: type: furniture_item furniture: @@ -92,17 +90,17 @@ items: height: 0.4 interactive: true loot: - template: "default:loot_table/furniture" + template: default:loot_table/furniture arguments: item: default:table_lamp default:wooden_chair: material: nether_brick custom-model-data: 2002 data: - item-name: "" + item-name: model: - type: "minecraft:model" - path: "minecraft:item/custom/wooden_chair" + type: minecraft:model + path: minecraft:item/custom/wooden_chair behavior: type: furniture_item furniture: @@ -132,6 +130,6 @@ items: seats: - 0,0,-0.1 0 loot: - template: "default:loot_table/furniture" + template: default:loot_table/furniture arguments: item: default:wooden_chair \ 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 31ccf4ced..dfa781334 100644 --- a/common-files/src/main/resources/resources/default/configuration/i18n.yml +++ b/common-files/src/main/resources/resources/default/configuration/i18n.yml @@ -1,97 +1,99 @@ i18n: en: - item.chinese_lantern: "Chinese Lantern" - item.fairy_flower: "Fairy Flower" - item.reed: "Reed" - item.flame_cane: "Flame Cane" - item.ender_pearl_flower_seeds: "Ender Pearl Flower Seeds" - item.bench: "Bench" - item.table_lamp: "Table Lamp" - item.wooden_chair: "Wooden Chair" - item.topaz_rod: "Topaz Rod" - item.topaz_bow: "Topaz Bow" - item.topaz_crossbow: "Topaz Crossbow" - item.topaz_pickaxe: "Topaz Pickaxe" - item.topaz_axe: "Topaz Axe" - item.topaz_hoe: "Topaz Hoe" - item.topaz_shovel: "Topaz Shovel" - item.topaz_sword: "Topaz Sword" - item.topaz_helmet: "Topaz Helmet" - item.topaz_chestplate: "Topaz Chestplate" - item.topaz_leggings: "Topaz Leggings" - item.topaz_boots: "Topaz Boots" - item.topaz_trident: "Topaz Trident" - item.topaz_ore: "Topaz Ore" - item.deepslate_topaz_ore: "Deepslate Topaz Ore" - item.topaz: "Topaz" - item.palm_log: "Palm Log" - item.stripped_palm_log: "Stripped Palm Log" - item.palm_wood: "Palm Wood" - item.stripped_palm_wood: "Stripped Palm Wood" - item.palm_planks: "Palm Planks" - item.palm_sapling: "Palm Sapling" - item.palm_leaves: "Palm Leaves" - item.palm_trapdoor: "Palm Trapdoor" - item.netherite_anvil: "Netherite Anvil" - item.gunpowder_block: "GunPowder Block" - item.solid_gunpowder_block: "Solid GunPowder Block" - item.copper_coil: "Copper Coil" - item.flame_elytra: "Flame Elytra" - item.cap: "Cap" - category.default.name: "Default Assets" - category.default.lore: "Contains the default configuration of CraftEngine" - category.palm_tree: "Palm Tree" - category.topaz: "Topaz" - category.furniture: "Furniture" - category.misc: "Misc" - emoji.tip: "Use '' to send the '' emoji" - emoji.time: "Current time: " - emoji.location: "Current coordinates: ,," + item.chinese_lantern: Chinese Lantern + item.fairy_flower: Fairy Flower + item.reed: Reed + item.flame_cane: Flame Cane + item.ender_pearl_flower_seeds: Ender Pearl Flower Seeds + item.bench: Bench + item.table_lamp: Table Lamp + item.wooden_chair: Wooden Chair + item.topaz_rod: Topaz Rod + item.topaz_bow: Topaz Bow + item.topaz_crossbow: Topaz Crossbow + item.topaz_pickaxe: Topaz Pickaxe + item.topaz_axe: Topaz Axe + item.topaz_hoe: Topaz Hoe + item.topaz_shovel: Topaz Shovel + item.topaz_sword: Topaz Sword + item.topaz_helmet: Topaz Helmet + item.topaz_chestplate: Topaz Chestplate + item.topaz_leggings: Topaz Leggings + item.topaz_boots: Topaz Boots + item.topaz_trident: Topaz Trident + item.topaz_ore: Topaz Ore + item.deepslate_topaz_ore: Deepslate Topaz Ore + item.topaz: Topaz + item.palm_log: Palm Log + item.stripped_palm_log: Stripped Palm Log + item.palm_wood: Palm Wood + item.stripped_palm_wood: Stripped Palm Wood + item.palm_planks: Palm Planks + item.palm_sapling: Palm Sapling + item.palm_leaves: Palm Leaves + item.palm_trapdoor: Palm Trapdoor + item.palm_door: Palm Door + item.netherite_anvil: Netherite Anvil + item.gunpowder_block: GunPowder Block + item.solid_gunpowder_block: Solid GunPowder Block + item.copper_coil: Copper Coil + item.flame_elytra: Flame Elytra + item.cap: Cap + category.default.name: Default Assets + category.default.lore: Contains the default configuration of CraftEngine + category.palm_tree: Palm Tree + category.topaz: Topaz + category.furniture: Furniture + category.misc: Misc + emoji.tip: Use '' to send the '' emoji + emoji.time: 'Current time: ' + emoji.location: 'Current coordinates: ,,' zh_cn: - item.chinese_lantern: "灯笼" - item.fairy_flower: "仙灵花" - item.reed: "芦苇" - item.flame_cane: "烈焰甘蔗" - item.ender_pearl_flower_seeds: "末影珍珠花种子" - item.bench: "长椅" - item.table_lamp: "台灯" - item.wooden_chair: "木椅" - item.topaz_rod: "黄玉钓竿" - item.topaz_bow: "黄玉弓" - item.topaz_crossbow: "黄玉弩" - item.topaz_pickaxe: "黄玉镐" - item.topaz_axe: "黄玉斧" - item.topaz_hoe: "黄玉锄" - item.topaz_shovel: "黄玉锹" - item.topaz_sword: "黄玉剑" - item.topaz_helmet: "黄玉头盔" - item.topaz_chestplate: "黄玉胸甲" - item.topaz_leggings: "黄玉护腿" - item.topaz_boots: "黄玉靴子" - item.topaz_trident: "黄玉三叉戟" - item.topaz_ore: "黄玉矿石" - item.deepslate_topaz_ore: "深层黄玉矿石" - item.topaz: "黄玉" - item.palm_log: "棕榈原木" - item.stripped_palm_log: "去皮棕榈原木" - item.palm_wood: "棕榈木" - item.stripped_palm_wood: "去皮棕榈木" - item.palm_planks: "棕榈木板" - item.palm_sapling: "棕榈树苗" - item.palm_leaves: "棕榈树叶" - item.palm_trapdoor: "棕榈活板门" - item.netherite_anvil: "下界合金砧" - item.gunpowder_block: "火药粉末" - item.solid_gunpowder_block: "凝固火药块" - item.copper_coil: "铜线圈" - item.flame_elytra: "烈焰鞘翅" - item.cap: "鸭舌帽" - category.default.name: "默认资产" - category.default.lore: "包含了CraftEngine的默认配置" - category.palm_tree: "棕榈树" - category.topaz: "黄玉" - category.furniture: "家具" - category.misc: "杂项" - emoji.tip: "使用''来发送表情''" - emoji.time: "当前时间: " - emoji.location: "当前坐标: ,," \ No newline at end of file + item.chinese_lantern: 灯笼 + item.fairy_flower: 仙灵花 + item.reed: 芦苇 + item.flame_cane: 烈焰甘蔗 + item.ender_pearl_flower_seeds: 末影珍珠花种子 + item.bench: 长椅 + item.table_lamp: 台灯 + item.wooden_chair: 木椅 + item.topaz_rod: 黄玉钓竿 + item.topaz_bow: 黄玉弓 + item.topaz_crossbow: 黄玉弩 + item.topaz_pickaxe: 黄玉镐 + item.topaz_axe: 黄玉斧 + item.topaz_hoe: 黄玉锄 + item.topaz_shovel: 黄玉锹 + item.topaz_sword: 黄玉剑 + item.topaz_helmet: 黄玉头盔 + item.topaz_chestplate: 黄玉胸甲 + item.topaz_leggings: 黄玉护腿 + item.topaz_boots: 黄玉靴子 + item.topaz_trident: 黄玉三叉戟 + item.topaz_ore: 黄玉矿石 + item.deepslate_topaz_ore: 深层黄玉矿石 + item.topaz: 黄玉 + item.palm_log: 棕榈原木 + item.stripped_palm_log: 去皮棕榈原木 + item.palm_wood: 棕榈木 + item.stripped_palm_wood: 去皮棕榈木 + item.palm_planks: 棕榈木板 + item.palm_sapling: 棕榈树苗 + item.palm_leaves: 棕榈树叶 + item.palm_trapdoor: 棕榈木活板门 + item.palm_door: 棕榈木门 + item.netherite_anvil: 下界合金砧 + item.gunpowder_block: 火药粉末 + item.solid_gunpowder_block: 凝固火药块 + item.copper_coil: 铜线圈 + item.flame_elytra: 烈焰鞘翅 + item.cap: 鸭舌帽 + category.default.name: 默认资产 + category.default.lore: 包含了CraftEngine的默认配置 + category.palm_tree: 棕榈树 + category.topaz: 黄玉 + category.furniture: 家具 + category.misc: 杂项 + emoji.tip: 使用''来发送表情'' + emoji.time: '当前时间: ' + emoji.location: '当前坐标: ,,' \ No newline at end of file diff --git a/common-files/src/main/resources/resources/default/configuration/icons.yml b/common-files/src/main/resources/resources/default/configuration/icons.yml index d54812865..62b8500e6 100644 --- a/common-files/src/main/resources/resources/default/configuration/icons.yml +++ b/common-files/src/main/resources/resources/default/configuration/icons.yml @@ -5,5 +5,5 @@ images: font: minecraft:icons file: minecraft:font/image/icons.png chars: - - '\ub000\ub001' - - '\ub002\ub003' \ No newline at end of file + - \ub000\ub001 + - \ub002\ub003 \ No newline at end of file diff --git a/common-files/src/main/resources/resources/default/configuration/items.yml b/common-files/src/main/resources/resources/default/configuration/items.yml index a2b34926e..ebeb08279 100644 --- a/common-files/src/main/resources/resources/default/configuration/items.yml +++ b/common-files/src/main/resources/resources/default/configuration/items.yml @@ -37,9 +37,9 @@ items#topaz_gears: custom-model-data: 1000 settings: tags: - - "default:topaz_tools" + - default:topaz_tools data: - item-name: "<#FF8C00>" + item-name: <#FF8C00> tooltip-style: minecraft:topaz model: template: default:model/simplified_fishing_rod_2d @@ -51,9 +51,9 @@ items#topaz_gears: custom-model-data: 1000 settings: tags: - - "default:topaz_tools" + - default:topaz_tools data: - item-name: "<#FF8C00>" + item-name: <#FF8C00> tooltip-style: minecraft:topaz model: template: default:model/simplified_bow_2d @@ -67,9 +67,9 @@ items#topaz_gears: custom-model-data: 1000 settings: tags: - - "default:topaz_tools" + - default:topaz_tools data: - item-name: "<#FF8C00>" + item-name: <#FF8C00> tooltip-style: minecraft:topaz model: template: default:model/simplified_crossbow_2d @@ -85,76 +85,76 @@ items#topaz_gears: custom-model-data: 1000 settings: tags: - - "default:topaz_tools" + - default:topaz_tools data: - item-name: "<#FF8C00>" + item-name: <#FF8C00> tooltip-style: minecraft:topaz components: minecraft:max_damage: 64 model: template: default:model/simplified_handheld arguments: - path: "minecraft:item/custom/topaz_pickaxe" + path: minecraft:item/custom/topaz_pickaxe default:topaz_axe: material: golden_axe custom-model-data: 1000 settings: tags: - - "default:topaz_tools" + - default:topaz_tools data: - item-name: "<#FF8C00>" + item-name: <#FF8C00> tooltip-style: minecraft:topaz components: minecraft:max_damage: 64 model: template: default:model/simplified_handheld arguments: - path: "minecraft:item/custom/topaz_axe" + path: minecraft:item/custom/topaz_axe default:topaz_hoe: material: golden_hoe custom-model-data: 1000 settings: tags: - - "default:topaz_tools" + - default:topaz_tools data: - item-name: "<#FF8C00>" + item-name: <#FF8C00> tooltip-style: minecraft:topaz components: minecraft:max_damage: 64 model: template: default:model/simplified_handheld arguments: - path: "minecraft:item/custom/topaz_hoe" + path: minecraft:item/custom/topaz_hoe default:topaz_shovel: material: golden_shovel custom-model-data: 1000 settings: tags: - - "default:topaz_tools" + - default:topaz_tools data: - item-name: "<#FF8C00>" + item-name: <#FF8C00> tooltip-style: minecraft:topaz components: minecraft:max_damage: 64 model: template: default:model/simplified_handheld arguments: - path: "minecraft:item/custom/topaz_shovel" + path: minecraft:item/custom/topaz_shovel default:topaz_sword: material: golden_sword custom-model-data: 1000 settings: tags: - - "default:topaz_tools" + - default:topaz_tools data: - item-name: "<#FF8C00>" + item-name: <#FF8C00> tooltip-style: minecraft:topaz components: minecraft:max_damage: 64 model: template: default:model/simplified_handheld arguments: - path: "minecraft:item/custom/topaz_sword" + path: minecraft:item/custom/topaz_sword default:topaz_helmet: template: default:armor/topaz arguments: @@ -186,15 +186,18 @@ items#topaz_gears: display-transform: NONE scale: 0.5 tags: - - "default:topaz_tools" + - default:topaz_tools data: - item-name: "<#FF8C00>" + item-name: <#FF8C00> tooltip-style: minecraft:topaz model: type: minecraft:select property: minecraft:display_context cases: - - when: ["gui", "ground", "fixed"] + - when: + - gui + - ground + - fixed model: type: minecraft:model path: minecraft:item/custom/topaz_trident @@ -220,18 +223,18 @@ items#topaz_gears: asset-id: flame wings: flame_elytra data: - item-name: "<#FF8C00>" + item-name: <#FF8C00> model: template: default:model/simplified_elytra arguments: - path: "minecraft:item/custom/flame_elytra" - broken_path: "minecraft:item/custom/broken_flame_elytra" + path: minecraft:item/custom/flame_elytra + broken_path: minecraft:item/custom/broken_flame_elytra default:cap: material: leather_helmet client-bound-material: leather_horse_armor custom-model-data: 1000 data: - item-name: "" + item-name: unbreakable: true remove-components: - attribute_modifiers @@ -241,233 +244,231 @@ items#topaz_gears: tints: - type: minecraft:dye default: -6265536 - templates: default:armor/topaz: - material: "chainmail_${part}" + material: chainmail_${part} custom-model-data: 1000 data: - item-name: "<#FF8C00>" + item-name: <#FF8C00> tooltip-style: minecraft:topaz settings: tags: - - "default:topaz_tools" + - default:topaz_tools equippable: - slot: "${slot}" + slot: ${slot} asset-id: topaz - humanoid: "minecraft:topaz" - humanoid-leggings: "minecraft:topaz" + humanoid: minecraft:topaz + humanoid-leggings: minecraft:topaz model: type: minecraft:select property: minecraft:trim_material fallback: type: minecraft:model - path: "minecraft:item/custom/topaz_${part}" + path: minecraft:item/custom/topaz_${part} generation: - parent: "minecraft:item/generated" + parent: minecraft:item/generated textures: - "layer0": "minecraft:item/custom/topaz_${part}" + layer0: minecraft:item/custom/topaz_${part} cases: - when: minecraft:quartz model: type: minecraft:model - path: "minecraft:item/custom/topaz_${part}_quartz_trim" + path: minecraft:item/custom/topaz_${part}_quartz_trim generation: - parent: "minecraft:item/generated" + parent: minecraft:item/generated textures: - "layer0": "minecraft:item/custom/topaz_${part}" - "layer1": "minecraft:trims/items/${part}_trim_quartz" + layer0: minecraft:item/custom/topaz_${part} + layer1: minecraft:trims/items/${part}_trim_quartz - when: minecraft:iron model: type: minecraft:model - path: "minecraft:item/custom/topaz_${part}_iron_trim" + path: minecraft:item/custom/topaz_${part}_iron_trim generation: - parent: "minecraft:item/generated" + parent: minecraft:item/generated textures: - "layer0": "minecraft:item/custom/topaz_${part}" - "layer1": "minecraft:trims/items/${part}_trim_iron" + layer0: minecraft:item/custom/topaz_${part} + layer1: minecraft:trims/items/${part}_trim_iron - when: minecraft:netherite model: type: minecraft:model - path: "minecraft:item/custom/topaz_${part}_netherite_trim" + path: minecraft:item/custom/topaz_${part}_netherite_trim generation: - parent: "minecraft:item/generated" + parent: minecraft:item/generated textures: - "layer0": "minecraft:item/custom/topaz_${part}" - "layer1": "minecraft:trims/items/${part}_trim_netherite" + layer0: minecraft:item/custom/topaz_${part} + layer1: minecraft:trims/items/${part}_trim_netherite - when: minecraft:redstone model: type: minecraft:model - path: "minecraft:item/custom/topaz_${part}_redstone_trim" + path: minecraft:item/custom/topaz_${part}_redstone_trim generation: - parent: "minecraft:item/generated" + parent: minecraft:item/generated textures: - "layer0": "minecraft:item/custom/topaz_${part}" - "layer1": "minecraft:trims/items/${part}_trim_redstone" + layer0: minecraft:item/custom/topaz_${part} + layer1: minecraft:trims/items/${part}_trim_redstone - when: minecraft:copper model: type: minecraft:model - path: "minecraft:item/custom/topaz_${part}_copper_trim" + path: minecraft:item/custom/topaz_${part}_copper_trim generation: - parent: "minecraft:item/generated" + parent: minecraft:item/generated textures: - "layer0": "minecraft:item/custom/topaz_${part}" - "layer1": "minecraft:trims/items/${part}_trim_copper" + layer0: minecraft:item/custom/topaz_${part} + layer1: minecraft:trims/items/${part}_trim_copper - when: minecraft:gold model: type: minecraft:model - path: "minecraft:item/custom/topaz_${part}_gold_trim" + path: minecraft:item/custom/topaz_${part}_gold_trim generation: - parent: "minecraft:item/generated" + parent: minecraft:item/generated textures: - "layer0": "minecraft:item/custom/topaz_${part}" - "layer1": "minecraft:trims/items/${part}_trim_gold" + layer0: minecraft:item/custom/topaz_${part} + layer1: minecraft:trims/items/${part}_trim_gold - when: minecraft:emerald model: type: minecraft:model - path: "minecraft:item/custom/topaz_${part}_emerald_trim" + path: minecraft:item/custom/topaz_${part}_emerald_trim generation: - parent: "minecraft:item/generated" + parent: minecraft:item/generated textures: - "layer0": "minecraft:item/custom/topaz_${part}" - "layer1": "minecraft:trims/items/${part}_trim_emerald" + layer0: minecraft:item/custom/topaz_${part} + layer1: minecraft:trims/items/${part}_trim_emerald - when: minecraft:diamond model: type: minecraft:model - path: "minecraft:item/custom/topaz_${part}_diamond_trim" + path: minecraft:item/custom/topaz_${part}_diamond_trim generation: - parent: "minecraft:item/generated" + parent: minecraft:item/generated textures: - "layer0": "minecraft:item/custom/topaz_${part}" - "layer1": "minecraft:trims/items/${part}_trim_diamond" + layer0: minecraft:item/custom/topaz_${part} + layer1: minecraft:trims/items/${part}_trim_diamond - when: minecraft:lapis model: type: minecraft:model - path: "minecraft:item/custom/topaz_${part}_lapis_trim" + path: minecraft:item/custom/topaz_${part}_lapis_trim generation: - parent: "minecraft:item/generated" + parent: minecraft:item/generated textures: - "layer0": "minecraft:item/custom/topaz_${part}" - "layer1": "minecraft:trims/items/${part}_trim_lapis" + layer0: minecraft:item/custom/topaz_${part} + layer1: minecraft:trims/items/${part}_trim_lapis - when: minecraft:amethyst model: type: minecraft:model - path: "minecraft:item/custom/topaz_${part}_amethyst_trim" + path: minecraft:item/custom/topaz_${part}_amethyst_trim generation: - parent: "minecraft:item/generated" + parent: minecraft:item/generated textures: - "layer0": "minecraft:item/custom/topaz_${part}" - "layer1": "minecraft:trims/items/${part}_trim_amethyst" + layer0: minecraft:item/custom/topaz_${part} + layer1: minecraft:trims/items/${part}_trim_amethyst - when: minecraft:resin model: type: minecraft:model - path: "minecraft:item/custom/topaz_${part}_resin_trim" + path: minecraft:item/custom/topaz_${part}_resin_trim generation: - parent: "minecraft:item/generated" + parent: minecraft:item/generated textures: - "layer0": "minecraft:item/custom/topaz_${part}" - "layer1": "minecraft:trims/items/${part}_trim_resin" - -recipes#11: + layer0: minecraft:item/custom/topaz_${part} + layer1: minecraft:trims/items/${part}_trim_resin +recipes#topaz_gears: default:topaz_shovel: type: shaped pattern: - - "A" - - "B" - - "B" + - A + - B + - B ingredients: - A: "default:topaz" - B: "minecraft:stick" + A: default:topaz + B: minecraft:stick result: id: default:topaz_shovel count: 1 default:topaz_axe: type: shaped pattern: - - "AA" - - "AB" - - " B" + - 'AA' + - 'AB' + - ' B' ingredients: - A: "default:topaz" - B: "minecraft:stick" + A: default:topaz + B: minecraft:stick result: id: default:topaz_axe count: 1 default:topaz_sword: type: shaped pattern: - - "A" - - "A" - - "B" + - A + - A + - B ingredients: - A: "default:topaz" - B: "minecraft:stick" + A: default:topaz + B: minecraft:stick result: id: default:topaz_sword count: 1 default:topaz_hoe: type: shaped pattern: - - "AA" - - " B" - - " B" + - 'AA' + - ' B' + - ' B' ingredients: - A: "default:topaz" - B: "minecraft:stick" + A: default:topaz + B: minecraft:stick result: id: default:topaz_hoe count: 1 default:topaz_pickaxe: type: shaped pattern: - - "AAA" - - " B " - - " B " + - 'AAA' + - ' B ' + - ' B ' ingredients: - A: "default:topaz" - B: "minecraft:stick" + A: default:topaz + B: minecraft:stick result: id: default:topaz_pickaxe count: 1 default:topaz_helmet: type: shaped pattern: - - "AAA" - - "A A" + - AAA + - A A ingredients: - A: "default:topaz" + A: default:topaz result: id: default:topaz_helmet count: 1 default:topaz_chestplate: type: shaped pattern: - - "A A" - - "AAA" - - "AAA" + - A A + - AAA + - AAA ingredients: - A: "default:topaz" + A: default:topaz result: id: default:topaz_chestplate count: 1 default:topaz_leggings: type: shaped pattern: - - "AAA" - - "A A" - - "A A" + - AAA + - A A + - A A ingredients: - A: "default:topaz" + A: default:topaz result: id: default:topaz_leggings count: 1 default:topaz_boots: type: shaped pattern: - - "A A" - - "A A" + - A A + - A A ingredients: - A: "default:topaz" + A: default:topaz result: id: default:topaz_boots count: 1 diff --git a/common-files/src/main/resources/resources/default/configuration/ores.yml b/common-files/src/main/resources/resources/default/configuration/ores.yml index d7d21562f..0513a1191 100644 --- a/common-files/src/main/resources/resources/default/configuration/ores.yml +++ b/common-files/src/main/resources/resources/default/configuration/ores.yml @@ -3,12 +3,12 @@ items: material: nether_brick custom-model-data: 1010 data: - item-name: "" + item-name: model: - type: "minecraft:model" - path: "minecraft:item/custom/topaz_ore" + type: minecraft:model + path: minecraft:item/custom/topaz_ore generation: - parent: "minecraft:block/custom/topaz_ore" + parent: minecraft:block/custom/topaz_ore behavior: type: block_item block: default:topaz_ore @@ -16,12 +16,12 @@ items: material: nether_brick custom-model-data: 1011 data: - item-name: "" + item-name: model: - type: "minecraft:model" - path: "minecraft:item/custom/deepslate_topaz_ore" + type: minecraft:model + path: minecraft:item/custom/deepslate_topaz_ore generation: - parent: "minecraft:block/custom/deepslate_topaz_ore" + parent: minecraft:block/custom/deepslate_topaz_ore behavior: type: block_item block: default:deepslate_topaz_ore @@ -31,77 +31,75 @@ items: settings: anvil-repair-item: - target: - - "#default:topaz_tools" + - '#default:topaz_tools' percent: 0.25 data: - item-name: "<#FF8C00>" + item-name: <#FF8C00> model: - template: "default:model/simplified_generated" + template: default:model/simplified_generated arguments: - path: "minecraft:item/custom/topaz" - + path: minecraft:item/custom/topaz blocks: default:topaz_ore: loot: - template: "default:loot_table/ore" + template: default:loot_table/ore arguments: ore_drop: default:topaz ore_block: default:topaz_ore min_exp: 3 max_exp: 7 settings: - template: "default:settings/ore" + template: default:settings/ore arguments: break_power: 2 state: id: 13 state: note_block:13 model: - template: "default:model/simplified_cube_all" + template: default:model/simplified_cube_all arguments: - path: "minecraft:block/custom/topaz_ore" + path: minecraft:block/custom/topaz_ore default:deepslate_topaz_ore: loot: - template: "default:loot_table/ore" + template: default:loot_table/ore arguments: ore_drop: default:topaz ore_block: default:deepslate_topaz_ore min_exp: 3 max_exp: 7 settings: - template: "default:settings/deepslate_ore" + template: default:settings/deepslate_ore arguments: break_power: 2 state: id: 14 state: note_block:14 model: - template: "default:model/simplified_cube_all" + template: default:model/simplified_cube_all arguments: - path: "minecraft:block/custom/deepslate_topaz_ore" - + path: minecraft:block/custom/deepslate_topaz_ore recipes: default:topaz_from_smelting_topaz_ore: template: default:recipe/smelting_ore arguments: exp: 1.0 - ingredient: "default:topaz_ore" - result: "default:topaz" + ingredient: default:topaz_ore + result: default:topaz default:topaz_from_smelting_deepslate_topaz_ore: template: default:recipe/smelting_ore arguments: exp: 1.0 - ingredient: "default:deepslate_topaz_ore" - result: "default:topaz" + ingredient: default:deepslate_topaz_ore + result: default:topaz default:topaz_from_blasting_topaz_ore: template: default:recipe/blasting_ore arguments: exp: 1.0 - ingredient: "default:topaz_ore" - result: "default:topaz" + ingredient: default:topaz_ore + result: default:topaz default:topaz_from_blasting_deepslate_topaz_ore: template: default:recipe/blasting_ore arguments: exp: 1.0 - ingredient: "default:deepslate_topaz_ore" - result: "default:topaz" \ No newline at end of file + ingredient: default:deepslate_topaz_ore + result: default:topaz \ No newline at end of file diff --git a/common-files/src/main/resources/resources/default/configuration/palm_tree.yml b/common-files/src/main/resources/resources/default/configuration/palm_tree.yml index 84d72c230..c3d56d240 100644 --- a/common-files/src/main/resources/resources/default/configuration/palm_tree.yml +++ b/common-files/src/main/resources/resources/default/configuration/palm_tree.yml @@ -5,16 +5,16 @@ items: settings: fuel-time: 300 tags: - - "default:palm_logs" - - "minecraft:logs" - - "minecraft:logs_that_burn" + - default:palm_logs + - minecraft:logs + - minecraft:logs_that_burn data: - item-name: "" + item-name: model: - type: "minecraft:model" - path: "minecraft:item/custom/palm_log" + type: minecraft:model + path: minecraft:item/custom/palm_log generation: - parent: "minecraft:block/custom/palm_log" + parent: minecraft:block/custom/palm_log behavior: type: block_item block: @@ -22,11 +22,11 @@ items: type: strippable_block stripped: default:stripped_palm_log loot: - template: "default:loot_table/self" + template: default:loot_table/self settings: - template: "default:settings/wood" + template: default:settings/wood states: - template: "default:block_state/pillar" + template: default:block_state/pillar arguments: base_block: note_block texture_top_path: minecraft:block/custom/palm_log_top @@ -47,25 +47,25 @@ items: settings: fuel-time: 300 tags: - - "default:palm_logs" - - "minecraft:logs" - - "minecraft:logs_that_burn" + - default:palm_logs + - minecraft:logs + - minecraft:logs_that_burn data: - item-name: "" + item-name: model: - type: "minecraft:model" - path: "minecraft:item/custom/stripped_palm_log" + type: minecraft:model + path: minecraft:item/custom/stripped_palm_log generation: - parent: "minecraft:block/custom/stripped_palm_log" + parent: minecraft:block/custom/stripped_palm_log behavior: type: block_item block: loot: - template: "default:loot_table/self" + template: default:loot_table/self settings: - template: "default:settings/wood" + template: default:settings/wood states: - template: "default:block_state/pillar" + template: default:block_state/pillar arguments: base_block: note_block texture_top_path: minecraft:block/custom/stripped_palm_log_top @@ -86,16 +86,16 @@ items: settings: fuel-time: 300 tags: - - "default:palm_logs" - - "minecraft:logs" - - "minecraft:logs_that_burn" + - default:palm_logs + - minecraft:logs + - minecraft:logs_that_burn data: - item-name: "" + item-name: model: - type: "minecraft:model" - path: "minecraft:item/custom/palm_wood" + type: minecraft:model + path: minecraft:item/custom/palm_wood generation: - parent: "minecraft:block/custom/palm_wood" + parent: minecraft:block/custom/palm_wood behavior: type: block_item block: @@ -103,11 +103,11 @@ items: type: strippable_block stripped: default:stripped_palm_wood loot: - template: "default:loot_table/self" + template: default:loot_table/self settings: - template: "default:settings/wood" + template: default:settings/wood states: - template: "default:block_state/pillar" + template: default:block_state/pillar arguments: base_block: note_block texture_top_path: minecraft:block/custom/palm_log @@ -128,25 +128,25 @@ items: settings: fuel-time: 300 tags: - - "default:palm_logs" - - "minecraft:logs" - - "minecraft:logs_that_burn" + - default:palm_logs + - minecraft:logs + - minecraft:logs_that_burn data: - item-name: "" + item-name: model: - type: "minecraft:model" - path: "minecraft:item/custom/stripped_palm_wood" + type: minecraft:model + path: minecraft:item/custom/stripped_palm_wood generation: - parent: "minecraft:block/custom/stripped_palm_wood" + parent: minecraft:block/custom/stripped_palm_wood behavior: type: block_item block: loot: - template: "default:loot_table/self" + template: default:loot_table/self settings: - template: "default:settings/wood" + template: default:settings/wood states: - template: "default:block_state/pillar" + template: default:block_state/pillar arguments: base_block: note_block texture_top_path: minecraft:block/custom/stripped_palm_log @@ -167,27 +167,27 @@ items: settings: fuel-time: 300 tags: - - "minecraft:planks" - - "minecraft:wooden_tool_materials" + - minecraft:planks + - minecraft:wooden_tool_materials data: - item-name: "" + item-name: model: - type: "minecraft:model" - path: "minecraft:item/custom/palm_planks" + type: minecraft:model + path: minecraft:item/custom/palm_planks generation: - parent: "minecraft:block/custom/palm_planks" + parent: minecraft:block/custom/palm_planks behavior: type: block_item block: settings: - template: "default:settings/planks" + template: default:settings/planks loot: - template: "default:loot_table/self" + template: default:loot_table/self state: model: - template: "default:model/simplified_cube_all" + template: default:model/simplified_cube_all arguments: - path: "minecraft:block/custom/palm_planks" + path: minecraft:block/custom/palm_planks id: 12 state: note_block:12 default:palm_sapling: @@ -196,17 +196,17 @@ items: settings: fuel-time: 100 data: - item-name: "" + item-name: model: - template: "default:model/generated" + template: default:model/generated arguments: - model: "minecraft:item/custom/palm_sapling" - texture: "minecraft:block/custom/palm_sapling" + model: minecraft:item/custom/palm_sapling + texture: minecraft:block/custom/palm_sapling behavior: type: block_item block: settings: - template: "default:settings/sapling" + template: default:settings/sapling behaviors: - type: bush_block bottom-block-tags: @@ -214,12 +214,10 @@ items: - minecraft:farmland - minecraft:sand - type: sapling_block - # This requires you to register a custom tree configuration with data pack - # To prevent errors, we use tree feature from vanilla here feature: minecraft:fancy_oak bone-meal-success-chance: 0.45 loot: - template: "default:loot_table/self" + template: default:loot_table/self states: properties: stage: @@ -230,36 +228,35 @@ items: default: state: oak_sapling:0 model: - path: "minecraft:block/custom/palm_sapling" + path: minecraft:block/custom/palm_sapling generation: - parent: "minecraft:block/cross" + parent: minecraft:block/cross textures: - "cross": "minecraft:block/custom/palm_sapling" + cross: minecraft:block/custom/palm_sapling variants: stage=0: - appearance: "default" + appearance: default id: 0 stage=1: - appearance: "default" + appearance: default id: 1 default:palm_leaves: material: oak_leaves custom-model-data: 1000 data: - item-name: "" - # reduce visual issues + item-name: components: minecraft:block_state: - distance: "1" - persistent: "false" - waterlogged: "false" + distance: '1' + persistent: 'false' + waterlogged: 'false' model: - type: "minecraft:model" - path: "minecraft:item/custom/palm_leaves" + type: minecraft:model + path: minecraft:item/custom/palm_leaves generation: - parent: "minecraft:block/custom/palm_leaves" + parent: minecraft:block/custom/palm_leaves tints: - - type: "minecraft:constant" + - type: minecraft:constant value: -12012264 behavior: type: block_item @@ -267,19 +264,19 @@ items: behavior: type: leaves_block loot: - template: "default:loot_table/leaves" + template: default:loot_table/leaves arguments: leaves: default:palm_leaves sapling: default:palm_sapling settings: - template: "default:settings/leaves" + template: default:settings/leaves states: - template: "default:block_state/leaves" + template: default:block_state/leaves arguments: default_state: oak_leaves[distance=1,persistent=false,waterlogged=false] waterlogged_state: oak_leaves[distance=1,persistent=false,waterlogged=true] - model_path: "minecraft:block/custom/palm_leaves" - texture_path: "minecraft:block/custom/palm_leaves" + model_path: minecraft:block/custom/palm_leaves + texture_path: minecraft:block/custom/palm_leaves internal_id: type: self_increase_int from: 0 @@ -288,12 +285,12 @@ items: material: nether_brick custom-model-data: 1006 data: - item-name: "" + item-name: model: - type: "minecraft:model" - path: "minecraft:item/custom/palm_trapdoor" + type: minecraft:model + path: minecraft:item/custom/palm_trapdoor generation: - parent: "minecraft:block/custom/palm_trapdoor_bottom" + parent: minecraft:block/custom/palm_trapdoor_bottom behavior: type: block_item block: @@ -305,7 +302,7 @@ items: open: block.wooden_trapdoor.open close: block.wooden_trapdoor.close loot: - template: "default:loot_table/self" + template: default:loot_table/self settings: template: - default:sound/wood @@ -319,25 +316,24 @@ items: - minecraft:mineable/axe - minecraft:trapdoors states: - template: "default:block_state/trapdoor" + template: default:block_state/trapdoor arguments: base_block: acacia_trapdoor - model_bottom_path: "minecraft:block/custom/palm_trapdoor_bottom" + model_bottom_path: minecraft:block/custom/palm_trapdoor_bottom model_bottom_generation: - parent: "minecraft:block/template_orientable_trapdoor_bottom" + parent: minecraft:block/template_orientable_trapdoor_bottom textures: - texture: "minecraft:block/custom/palm_trapdoor" - model_open_path: "minecraft:block/custom/palm_trapdoor_open" + texture: minecraft:block/custom/palm_trapdoor + model_open_path: minecraft:block/custom/palm_trapdoor_open model_open_generation: - parent: "minecraft:block/template_orientable_trapdoor_open" + parent: minecraft:block/template_orientable_trapdoor_open textures: - texture: "minecraft:block/custom/palm_trapdoor" - model_top_path: "minecraft:block/custom/palm_trapdoor_top" + texture: minecraft:block/custom/palm_trapdoor + model_top_path: minecraft:block/custom/palm_trapdoor_top model_top_generation: - parent: "minecraft:block/template_orientable_trapdoor_top" + parent: minecraft:block/template_orientable_trapdoor_top textures: - texture: "minecraft:block/custom/palm_trapdoor" - + texture: minecraft:block/custom/palm_trapdoor recipes: default:palm_planks: template: default:recipe/planks @@ -350,4 +346,14 @@ recipes: default:stripped_palm_wood: template: default:recipe/log_2_wood arguments: - wood_type: stripped_palm \ No newline at end of file + wood_type: stripped_palm + default:palm_trapdoor: + type: shaped + pattern: + - AAA + - AAA + ingredients: + A: default:palm_planks + result: + id: default:palm_trapdoor + count: 2 \ No newline at end of file diff --git a/common-files/src/main/resources/resources/default/configuration/plants.yml b/common-files/src/main/resources/resources/default/configuration/plants.yml index 0fec00087..2f30b3ff5 100644 --- a/common-files/src/main/resources/resources/default/configuration/plants.yml +++ b/common-files/src/main/resources/resources/default/configuration/plants.yml @@ -3,11 +3,11 @@ items: material: nether_brick custom-model-data: 4000 data: - item-name: "" + item-name: model: template: default:model/simplified_generated arguments: - path: "minecraft:item/custom/fairy_flower" + path: minecraft:item/custom/fairy_flower behavior: type: block_item block: default:fairy_flower @@ -15,11 +15,11 @@ items: material: nether_brick custom-model-data: 4001 data: - item-name: "" + item-name: model: template: default:model/simplified_generated arguments: - path: "minecraft:item/custom/reed" + path: minecraft:item/custom/reed behavior: type: liquid_collision_block_item block: default:reed @@ -27,11 +27,11 @@ items: material: nether_brick custom-model-data: 4002 data: - item-name: "" + item-name: model: template: default:model/simplified_generated arguments: - path: "minecraft:item/custom/flame_cane" + path: minecraft:item/custom/flame_cane behavior: type: block_item block: default:flame_cane @@ -39,11 +39,11 @@ items: material: nether_brick custom-model-data: 4003 data: - item-name: "" + item-name: model: template: default:model/simplified_generated arguments: - path: "minecraft:item/custom/ender_pearl_flower_seeds" + path: minecraft:item/custom/ender_pearl_flower_seeds behavior: type: block_item block: default:ender_pearl_flower @@ -63,31 +63,31 @@ blocks: - minecraft:dirt - minecraft:farmland loot: - template: "default:loot_table/self" + template: default:loot_table/self state: id: 0 state: sugar_cane:0 models: - - path: "minecraft:block/custom/fairy_flower_1" + - path: minecraft:block/custom/fairy_flower_1 weight: 100 - - path: "minecraft:block/custom/fairy_flower_2" + - path: minecraft:block/custom/fairy_flower_2 weight: 5 generation: - parent: "minecraft:block/custom/fairy_flower_1" + parent: minecraft:block/custom/fairy_flower_1 textures: - "0": "minecraft:block/custom/fairy_flower_2" - - path: "minecraft:block/custom/fairy_flower_3" + '0': minecraft:block/custom/fairy_flower_2 + - path: minecraft:block/custom/fairy_flower_3 weight: 5 generation: - parent: "minecraft:block/custom/fairy_flower_1" + parent: minecraft:block/custom/fairy_flower_1 textures: - "0": "minecraft:block/custom/fairy_flower_3" - - path: "minecraft:block/custom/fairy_flower_4" + '0': minecraft:block/custom/fairy_flower_3 + - path: minecraft:block/custom/fairy_flower_4 weight: 5 generation: - parent: "minecraft:block/custom/fairy_flower_1" + parent: minecraft:block/custom/fairy_flower_1 textures: - "0": "minecraft:block/custom/fairy_flower_4" + '0': minecraft:block/custom/fairy_flower_4 default:reed: settings: template: @@ -102,12 +102,12 @@ blocks: positions: - 0,-1,0 loot: - template: "default:loot_table/self" + template: default:loot_table/self state: id: 1 state: sugar_cane:1 model: - path: "minecraft:block/custom/reed" + path: minecraft:block/custom/reed default:flame_cane: settings: template: @@ -143,7 +143,7 @@ blocks: - 0,-1,-1 - 0,-1,1 loot: - template: "default:loot_table/self" + template: default:loot_table/self states: properties: age: @@ -152,20 +152,20 @@ blocks: range: 0~5 appearances: default: - state: "sugar_cane:2" + state: sugar_cane:2 models: - - path: "minecraft:block/custom/flame_cane_1" + - path: minecraft:block/custom/flame_cane_1 weight: 1 generation: - parent: "minecraft:block/sugar_cane" + parent: minecraft:block/sugar_cane textures: - "cross": "minecraft:block/custom/flame_cane_1" - - path: "minecraft:block/custom/flame_cane_2" + cross: minecraft:block/custom/flame_cane_1 + - path: minecraft:block/custom/flame_cane_2 weight: 1 generation: - parent: "minecraft:block/sugar_cane" + parent: minecraft:block/sugar_cane textures: - "cross": "minecraft:block/custom/flame_cane_2" + cross: minecraft:block/custom/flame_cane_2 variants: age=0: appearance: default @@ -211,17 +211,17 @@ blocks: crop_seed: default:ender_pearl_flower_seeds ripe_age: 2 events: - - on: break + - true: break conditions: - type: match_block_property properties: age: 2 functions: - type: particle - x: " + 0.5" - y: " + 0.5" - z: " + 0.5" - particle: "minecraft:end_rod" + x: + 0.5 + y: + 0.5 + z: + 0.5 + particle: minecraft:end_rod count: 15 offset-x: 0.05 offset-y: 0.05 @@ -229,28 +229,28 @@ blocks: speed: 0.1 - type: play_sound sound: minecraft:entity.enderman.teleport - x: " + 0.5" - y: " + 0.5" - z: " + 0.5" - - on: right_click + x: + 0.5 + y: + 0.5 + z: + 0.5 + - true: right_click conditions: - type: match_block_property properties: age: 2 - - type: "!is_null" - argument: "item_in_hand" - - type: "equals" - value1: "" - value2: "default:ender_pearl_flower_seeds" + - type: '!is_null' + argument: item_in_hand + - type: equals + value1: + value2: default:ender_pearl_flower_seeds functions: - type: break_block - x: "" - y: "" - z: "" + x: + y: + z: - type: place_block - x: "" - y: "" - z: "" + x: + y: + z: block-state: default:ender_pearl_flower[age=0] - type: set_count add: true @@ -264,29 +264,29 @@ blocks: range: 0~2 appearances: stage_0: - state: "tripwire:1" + state: tripwire:1 models: - - path: "minecraft:block/custom/ender_pearl_flower_stage_0" + - path: minecraft:block/custom/ender_pearl_flower_stage_0 generation: - parent: "minecraft:block/cross" + parent: minecraft:block/cross textures: - "cross": "minecraft:block/custom/ender_pearl_flower_stage_0" + cross: minecraft:block/custom/ender_pearl_flower_stage_0 stage_1: - state: "tripwire:0" + state: tripwire:0 models: - - path: "minecraft:block/custom/ender_pearl_flower_stage_1" + - path: minecraft:block/custom/ender_pearl_flower_stage_1 generation: - parent: "minecraft:block/cross" + parent: minecraft:block/cross textures: - "cross": "minecraft:block/custom/ender_pearl_flower_stage_1" + cross: minecraft:block/custom/ender_pearl_flower_stage_1 stage_2: - state: "sugar_cane:3" + state: sugar_cane:3 models: - - path: "minecraft:block/custom/ender_pearl_flower_stage_2" + - path: minecraft:block/custom/ender_pearl_flower_stage_2 generation: - parent: "minecraft:block/cross" + parent: minecraft:block/cross textures: - "cross": "minecraft:block/custom/ender_pearl_flower_stage_2" + cross: minecraft:block/custom/ender_pearl_flower_stage_2 variants: age=0: appearance: stage_0 @@ -301,39 +301,38 @@ recipes: default:paper_from_reed: type: shaped pattern: - - "AAA" + - AAA ingredients: - A: "default:reed" + A: default:reed result: id: minecraft:paper count: 3 default:magma_cream: type: shaped pattern: - - " A " - - "ABA" - - " A " + - ' A ' + - ABA + - ' A ' ingredients: - A: "default:flame_cane" - B: "minecraft:slime_ball" + A: default:flame_cane + B: minecraft:slime_ball result: id: minecraft:magma_cream count: 1 default:magma_block: type: shapeless ingredients: - A1: "minecraft:cobblestone" - A2: "minecraft:cobblestone" - B1: "default:flame_cane" - B2: "default:flame_cane" + A1: minecraft:cobblestone + A2: minecraft:cobblestone + B1: default:flame_cane + B2: default:flame_cane result: id: minecraft:magma_block count: 2 - vanilla-loots: minecraft:ender_pearl_flower_seeds_from_endermite: type: entity - target: "minecraft:endermite" + target: minecraft:endermite override: false loot: pools: @@ -348,4 +347,4 @@ vanilla-loots: - 1 entries: - type: item - item: "default:ender_pearl_flower_seeds" \ No newline at end of file + item: default:ender_pearl_flower_seeds \ No newline at end of file diff --git a/common-files/src/main/resources/resources/default/configuration/templates.yml b/common-files/src/main/resources/resources/default/configuration/templates.yml index 0df24c5bf..f8381343f 100644 --- a/common-files/src/main/resources/resources/default/configuration/templates.yml +++ b/common-files/src/main/resources/resources/default/configuration/templates.yml @@ -2,21 +2,20 @@ # These templates let you ditch the real custom_model_data on the server side. # Instead, we use client side components sent via packets to control how items look. -templates#client_bound_model: - default:item/client_bound_custom_model_data: - custom-model-data: "${custom_model_data}" - data: - remove-components: - - minecraft:custom_model_data - client-bound-data: - custom-model-data: "${custom_model_data}" - default:item/client_bound_item_model: - item-model: "${item_model}" - data: - remove-components: - - minecraft:item_model - client-bound-data: - item-model: "${item_model}" +default:item/client_bound_custom_model_data: + custom-model-data: ${custom_model_data} + data: + remove-components: + - minecraft:custom_model_data + client-bound-data: + custom-model-data: ${custom_model_data} +default:item/client_bound_item_model: + item-model: ${item_model} + data: + remove-components: + - minecraft:item_model + client-bound-data: + item-model: ${item_model} # blocks templates#models#block: @@ -25,32 +24,32 @@ templates#models#block: # model: model_path # texture: texture_path default:model/cube_all: - path: "${model}" + path: ${model} generation: - parent: "minecraft:block/cube_all" + parent: minecraft:block/cube_all textures: - "all": "${texture}" + all: ${texture} # template: default:model/simplified_cube_all # arguments: # path: [model/texture]_path default:model/simplified_cube_all: - path: "${path}" + path: ${path} generation: - parent: "minecraft:block/cube_all" + parent: minecraft:block/cube_all textures: - "all": "${path}" + all: ${path} # template: default:model/cube_column # arguments: # model: model_path # end_texture: end_texture_path # side_texture: side_texture_path default:model/cube_column: - path: "${model}" + path: ${model} generation: - parent: "minecraft:block/cube_column" + parent: minecraft:block/cube_column textures: - "end": "${end_texture}" - "side": "${side_texture}" + end: ${end_texture} + side: ${side_texture} # template: default:model/cube # arguments: # model: model_path @@ -62,17 +61,17 @@ templates#models#block: # south_texture: south_texture_path # west_texture: west_texture_path default:model/cube: - path: "${model}" + path: ${model} generation: - parent: "minecraft:block/cube_column" + parent: minecraft:block/cube_column textures: - "particle": "minecraft:block/custom/block_particle" - "down": "minecraft:block/custom/block_down" - "up": "minecraft:block/custom/block_up" - "north": "minecraft:block/custom/block_north" - "east": "minecraft:block/custom/block_east" - "south": "minecraft:block/custom/block_south" - "west": "minecraft:block/custom/block_west" + particle: minecraft:block/custom/block_particle + down: minecraft:block/custom/block_down + up: minecraft:block/custom/block_up + north: minecraft:block/custom/block_north + east: minecraft:block/custom/block_east + south: minecraft:block/custom/block_south + west: minecraft:block/custom/block_west # 2D items templates#models#2d: @@ -81,56 +80,56 @@ templates#models#2d: # model: model_path # texture: texture_path default:model/generated: - type: "minecraft:model" - path: "${model}" + type: minecraft:model + path: ${model} generation: - parent: "minecraft:item/generated" + parent: minecraft:item/generated textures: - "layer0": "${texture}" + layer0: ${texture} # template: default:model/simplified_generated # arguments: # path: [model/texture]_path default:model/simplified_generated: - type: "minecraft:model" - path: "${path}" + type: minecraft:model + path: ${path} generation: - parent: "minecraft:item/generated" + parent: minecraft:item/generated textures: - "layer0": "${path}" + layer0: ${path} # template: default:model/2_layer_generated # arguments: # model: model_path # layer0: texture_path # layer1: texture_path default:model/2_layer_generated: - type: "minecraft:model" - path: "${model}" + type: minecraft:model + path: ${model} generation: - parent: "minecraft:item/generated" + parent: minecraft:item/generated textures: - "layer0": "${layer0}" - "layer1": "${layer1}" + layer0: ${layer0} + layer1: ${layer1} # template: default:model/handheld # arguments: # model: model_path # texture: texture_path default:model/handheld: - type: "minecraft:model" - path: "${model}" + type: minecraft:model + path: ${model} generation: - parent: "minecraft:item/handheld" + parent: minecraft:item/handheld textures: - "layer0": "${texture}" + layer0: ${texture} # template: default:model/simplified_handheld # arguments: # path: [model/texture]_path default:model/simplified_handheld: - type: "minecraft:model" - path: "${path}" + type: minecraft:model + path: ${path} generation: - parent: "minecraft:item/handheld" + parent: minecraft:item/handheld textures: - "layer0": "${path}" + layer0: ${path} # template: default:model/elytra # arguments: # model: model_path @@ -138,20 +137,20 @@ templates#models#2d: # texture: texture_path # broken_texture: broken_texture_path default:model/elytra: - type: "minecraft:condition" + type: minecraft:condition property: minecraft:broken on-false: - path: "${model}" + path: ${model} generation: - parent: "minecraft:item/generated" + parent: minecraft:item/generated textures: - "layer0": "${texture}" + layer0: ${texture} on-true: - path: "${broken_model}" + path: ${broken_model} generation: - parent: "minecraft:item/generated" + parent: minecraft:item/generated textures: - "layer0": "${broken_texture}" + layer0: ${broken_texture} # template: default:model/simplified_elytra # arguments: # path: [model/texture]_path @@ -159,10 +158,10 @@ templates#models#2d: default:model/simplified_elytra: template: default:model/elytra arguments: - model: "${path}" - texture: "${path}" - broken_model: "${broken_path}" - broken_texture: "${broken_path}" + model: ${path} + texture: ${path} + broken_model: ${broken_path} + broken_texture: ${broken_path} # shield templates#models#shield: @@ -171,14 +170,14 @@ templates#models#shield: # model: shield_model_path # block_model: shield_block_model_path default:model/shield_3d: - type: "minecraft:condition" - property: "minecraft:using_item" + type: minecraft:condition + property: minecraft:using_item on-false: type: minecraft:model - path: "${model}" + path: ${model} on-true: type: minecraft:model - path: "${block_model}" + path: ${block_model} # fishing rods templates#models#fishing_rod: @@ -187,14 +186,14 @@ templates#models#fishing_rod: # model: rod_model_path # cast_model: rod_cast_model_path default:model/fishing_rod_3d: - type: "minecraft:condition" - property: "minecraft:fishing_rod/cast" + type: minecraft:condition + property: minecraft:fishing_rod/cast on-false: - type: "minecraft:model" - path: "${model}" + type: minecraft:model + path: ${model} on-true: - type: "minecraft:model" - path: "${cast_model}" + type: minecraft:model + path: ${cast_model} # template: default:model/fishing_rod_2d # arguments: # model: rod_model_path @@ -202,22 +201,22 @@ templates#models#fishing_rod: # texture: rod_texture_path # cast_texture: rod_cast_texture_path default:model/fishing_rod_2d: - type: "minecraft:condition" - property: "minecraft:fishing_rod/cast" + type: minecraft:condition + property: minecraft:fishing_rod/cast on-false: - type: "minecraft:model" - path: "${model}" + type: minecraft:model + path: ${model} generation: - parent: "minecraft:item/fishing_rod" + parent: minecraft:item/fishing_rod textures: - "layer0": "${texture}" + layer0: ${texture} on-true: - type: "minecraft:model" - path: "${cast_model}" + type: minecraft:model + path: ${cast_model} generation: - parent: "minecraft:item/fishing_rod" + parent: minecraft:item/fishing_rod textures: - "layer0": "${cast_texture}" + layer0: ${cast_texture} # template: default:model/simplified_fishing_rod_2d # arguments: # path: rod_[model/texture]_path @@ -225,10 +224,10 @@ templates#models#fishing_rod: default:model/simplified_fishing_rod_2d: template: default:model/fishing_rod_2d arguments: - texture: "${path}" - model: "${path}" - cast_texture: "${cast_path}" - cast_model: "${cast_path}" + texture: ${path} + model: ${path} + cast_texture: ${cast_path} + cast_model: ${cast_path} # bows templates#models#bow: @@ -239,27 +238,27 @@ templates#models#bow: # pulling_1_model: bow_pulling_1_model_path # pulling_2_model: bow_pulling_2_model_path default:model/bow_3d: - type: "minecraft:condition" - property: "minecraft:using_item" + type: minecraft:condition + property: minecraft:using_item on-false: - type: "minecraft:model" - path: "${model}" + type: minecraft:model + path: ${model} on-true: - type: "minecraft:range_dispatch" - property: "minecraft:use_duration" + type: minecraft:range_dispatch + property: minecraft:use_duration scale: 0.05 entries: - model: type: minecraft:model - path: "${pulling_1_model}" + path: ${pulling_1_model} threshold: 0.65 - model: type: minecraft:model - path: "${pulling_2_model}" + path: ${pulling_2_model} threshold: 0.9 fallback: type: minecraft:model - path: "${pulling_0_model}" + path: ${pulling_0_model} # template: default:model/bow_2d # arguments: # model: bow_model_path @@ -271,43 +270,43 @@ templates#models#bow: # pulling_1_texture: bow_pulling_1_texture_path # pulling_2_texture: bow_pulling_2_texture_path default:model/bow_2d: - type: "minecraft:condition" - property: "minecraft:using_item" + type: minecraft:condition + property: minecraft:using_item on-false: - type: "minecraft:model" - path: "${model}" + type: minecraft:model + path: ${model} generation: - parent: "minecraft:item/bow" + parent: minecraft:item/bow textures: - "layer0": "${texture}" + layer0: ${texture} on-true: - type: "minecraft:range_dispatch" - property: "minecraft:use_duration" + type: minecraft:range_dispatch + property: minecraft:use_duration scale: 0.05 entries: - model: type: minecraft:model - path: "${pulling_1_model}" + path: ${pulling_1_model} generation: - parent: "minecraft:item/bow_pulling_1" + parent: minecraft:item/bow_pulling_1 textures: - "layer0": "${pulling_1_texture}" + layer0: ${pulling_1_texture} threshold: 0.65 - model: type: minecraft:model - path: "${pulling_2_model}" + path: ${pulling_2_model} generation: - parent: "minecraft:item/bow_pulling_2" + parent: minecraft:item/bow_pulling_2 textures: - "layer0": "${pulling_2_texture}" + layer0: ${pulling_2_texture} threshold: 0.9 fallback: type: minecraft:model - path: "${pulling_0_model}" + path: ${pulling_0_model} generation: - parent: "minecraft:item/bow_pulling_0" + parent: minecraft:item/bow_pulling_0 textures: - "layer0": "${pulling_0_texture}" + layer0: ${pulling_0_texture} # template: default:model/simplified_bow_2d # arguments: # path: bow_[model/texture]_path @@ -317,14 +316,14 @@ templates#models#bow: default:model/simplified_bow_2d: template: default:model/bow_2d arguments: - model: "${path}" - pulling_0_model: "${pulling_0_path}" - pulling_1_model: "${pulling_1_path}" - pulling_2_model: "${pulling_2_path}" - texture: "${path}" - pulling_0_texture: "${pulling_0_path}" - pulling_1_texture: "${pulling_1_path}" - pulling_2_texture: "${pulling_2_path}" + model: ${path} + pulling_0_model: ${pulling_0_path} + pulling_1_model: ${pulling_1_path} + pulling_2_model: ${pulling_2_path} + texture: ${path} + pulling_0_texture: ${pulling_0_path} + pulling_1_texture: ${pulling_1_path} + pulling_2_texture: ${pulling_2_path} # crossbows templates#models#crossbow: @@ -337,38 +336,38 @@ templates#models#crossbow: # pulling_1_model: crossbow_pulling_1_model_path # pulling_2_model: crossbow_pulling_2_model_path default:model/crossbow_3d: - type: "minecraft:condition" - property: "minecraft:using_item" + type: minecraft:condition + property: minecraft:using_item on-false: - type: "minecraft:select" - property: "minecraft:charge_type" + type: minecraft:select + property: minecraft:charge_type cases: - when: arrow model: type: minecraft:model - path: "${arrow_model}" + path: ${arrow_model} - when: rocket model: type: minecraft:model - path: "${firework_model}" + path: ${firework_model} fallback: type: minecraft:model - path: "${model}" + path: ${model} on-true: - type: "minecraft:range_dispatch" - property: "minecraft:crossbow/pull" + type: minecraft:range_dispatch + property: minecraft:crossbow/pull entries: - model: type: minecraft:model - path: "${pulling_1_model}" + path: ${pulling_1_model} threshold: 0.58 - model: type: minecraft:model - path: "${pulling_2_model}" + path: ${pulling_2_model} threshold: 1.0 fallback: type: minecraft:model - path: "${pulling_0_model}" + path: ${pulling_0_model} # template: default:model/crossbow_2d # arguments: # model: crossbow_model_path @@ -384,62 +383,62 @@ templates#models#crossbow: # pulling_2_model: crossbow_pulling_2_model_path # pulling_2_texture: crossbow_pulling_2_texture_path default:model/crossbow_2d: - type: "minecraft:condition" - property: "minecraft:using_item" + type: minecraft:condition + property: minecraft:using_item on-false: - type: "minecraft:select" - property: "minecraft:charge_type" + type: minecraft:select + property: minecraft:charge_type cases: - when: arrow model: type: minecraft:model - path: "${arrow_model}" + path: ${arrow_model} generation: - parent: "minecraft:item/crossbow_arrow" + parent: minecraft:item/crossbow_arrow textures: - "layer0": "${arrow_texture}" + layer0: ${arrow_texture} - when: rocket model: type: minecraft:model - path: "${firework_model}" + path: ${firework_model} generation: - parent: "minecraft:item/crossbow_firework" + parent: minecraft:item/crossbow_firework textures: - "layer0": "${firework_texture}" + layer0: ${firework_texture} fallback: type: minecraft:model - path: "${model}" + path: ${model} generation: - parent: "minecraft:item/crossbow" + parent: minecraft:item/crossbow textures: - "layer0": "${texture}" + layer0: ${texture} on-true: - type: "minecraft:range_dispatch" - property: "minecraft:crossbow/pull" + type: minecraft:range_dispatch + property: minecraft:crossbow/pull entries: - model: type: minecraft:model - path: "${pulling_1_model}" + path: ${pulling_1_model} generation: - parent: "minecraft:item/crossbow_pulling_1" + parent: minecraft:item/crossbow_pulling_1 textures: - "layer0": "${pulling_1_texture}" + layer0: ${pulling_1_texture} threshold: 0.58 - model: type: minecraft:model - path: "${pulling_2_model}" + path: ${pulling_2_model} generation: - parent: "minecraft:item/crossbow_pulling_2" + parent: minecraft:item/crossbow_pulling_2 textures: - "layer0": "${pulling_2_texture}" + layer0: ${pulling_2_texture} threshold: 1.0 fallback: type: minecraft:model - path: "${pulling_0_model}" + path: ${pulling_0_model} generation: - parent: "minecraft:item/crossbow_pulling_0" + parent: minecraft:item/crossbow_pulling_0 textures: - "layer0": "${pulling_0_texture}" + layer0: ${pulling_0_texture} # template: default:model/simplified_crossbow_2d # arguments: # path: crossbow_[model/texture]_path @@ -451,35 +450,35 @@ templates#models#crossbow: default:model/simplified_crossbow_2d: template: default:model/crossbow_2d arguments: - model: "${path}" - texture: "${path}" - arrow_model: "${arrow_path}" - arrow_texture: "${arrow_path}" - firework_model: "${firework_path}" - firework_texture: "${firework_path}" - pulling_0_model: "${pulling_0_path}" - pulling_0_texture: "${pulling_0_path}" - pulling_1_model: "${pulling_1_path}" - pulling_1_texture: "${pulling_1_path}" - pulling_2_model: "${pulling_2_path}" - pulling_2_texture: "${pulling_2_path}" + model: ${path} + texture: ${path} + arrow_model: ${arrow_path} + arrow_texture: ${arrow_path} + firework_model: ${firework_path} + firework_texture: ${firework_path} + pulling_0_model: ${pulling_0_path} + pulling_0_texture: ${pulling_0_path} + pulling_1_model: ${pulling_1_path} + pulling_1_texture: ${pulling_1_path} + pulling_2_model: ${pulling_2_path} + pulling_2_texture: ${pulling_2_path} # sounds templates#settings#sounds: default:sound/block_template: sounds: - break: "minecraft:block.${block_type}.break" - step: "minecraft:block.${block_type}.step" - place: "minecraft:block.${block_type}.place" - hit: "minecraft:block.${block_type}.hit" - fall: "minecraft:block.${block_type}.fall" + break: minecraft:block.${block_type}.break + step: minecraft:block.${block_type}.step + place: minecraft:block.${block_type}.place + hit: minecraft:block.${block_type}.hit + fall: minecraft:block.${block_type}.fall default:sound/crop: sounds: - break: "minecraft:block.crop.break" - step: "minecraft:block.grass.step" - place: "minecraft:item.crop.plant" - hit: "minecraft:block.grass.hit" - fall: "minecraft:block.grass.fall" + break: minecraft:block.crop.break + step: minecraft:block.grass.step + place: minecraft:item.crop.plant + hit: minecraft:block.grass.hit + fall: minecraft:block.grass.fall default:sound/grass: template: default:sound/block_template arguments: @@ -632,7 +631,7 @@ templates#settings#break_level: # block settings templates#settings#blocks: default:settings/middle_click_pick_itself: - item: "${__NAMESPACE__}:${__ID__}" + item: ${__NAMESPACE__}:${__ID__} default:settings/solid_1x1x1: is-suffocating: true replaceable: false @@ -713,8 +712,8 @@ templates#settings#blocks: # ore default:settings/ore: template: - - "default:sound/stone" - - "default:pickaxe_power/level_${break_power}" + - default:sound/stone + - default:pickaxe_power/level_${break_power} overrides: hardness: 3.0 resistance: 3.0 @@ -729,8 +728,8 @@ templates#settings#blocks: # deepslate ore default:settings/deepslate_ore: template: - - "default:sound/deepslate" - - "default:pickaxe_power/level_${break_power}" + - default:sound/deepslate + - default:pickaxe_power/level_${break_power} overrides: hardness: 4.5 resistance: 3.0 @@ -753,45 +752,45 @@ templates#block_states: default: y appearances: axisY: - state: "${base_block}:${vanilla_id}" + state: ${base_block}:${vanilla_id} model: - path: "${model_vertical_path}" + path: ${model_vertical_path} generation: - parent: "minecraft:block/cube_column" + parent: minecraft:block/cube_column textures: - "end": "${texture_top_path}" - "side": "${texture_side_path}" + end: ${texture_top_path} + side: ${texture_side_path} axisX: - state: "${base_block}:${vanilla_id}" + state: ${base_block}:${vanilla_id} model: x: 90 y: 90 - path: "${model_horizontal_path}" + path: ${model_horizontal_path} generation: - parent: "minecraft:block/cube_column_horizontal" + parent: minecraft:block/cube_column_horizontal textures: - "end": "${texture_top_path}" - "side": "${texture_side_path}" + end: ${texture_top_path} + side: ${texture_side_path} axisZ: - state: "${base_block}:${vanilla_id}" + state: ${base_block}:${vanilla_id} model: x: 90 - path: "${model_horizontal_path}" + path: ${model_horizontal_path} generation: - parent: "minecraft:block/cube_column_horizontal" + parent: minecraft:block/cube_column_horizontal textures: - "end": "${texture_top_path}" - "side": "${texture_side_path}" + end: ${texture_top_path} + side: ${texture_side_path} variants: axis=x: appearance: axisX - id: "${internal_id}" + id: ${internal_id} axis=y: appearance: axisY - id: "${internal_id}" + id: ${internal_id} axis=z: appearance: axisZ - id: "${internal_id}" + id: ${internal_id} # leaves block default:block_state/leaves: properties: @@ -807,157 +806,157 @@ templates#block_states: range: 1~7 appearances: default: - state: "${default_state}" + state: ${default_state} model: - path: "${model_path}" + path: ${model_path} generation: - parent: "minecraft:block/leaves" + parent: minecraft:block/leaves textures: - "all": "${texture_path}" + all: ${texture_path} waterlogged: - state: "${waterlogged_state}" + state: ${waterlogged_state} model: - path: "${model_path}" + path: ${model_path} variants: distance=1,persistent=false,waterlogged=false: - appearance: "default" - id: "${internal_id}" + appearance: default + id: ${internal_id} distance=2,persistent=false,waterlogged=false: - appearance: "default" - id: "${internal_id}" + appearance: default + id: ${internal_id} distance=3,persistent=false,waterlogged=false: - appearance: "default" - id: "${internal_id}" + appearance: default + id: ${internal_id} distance=4,persistent=false,waterlogged=false: - appearance: "default" - id: "${internal_id}" + appearance: default + id: ${internal_id} distance=5,persistent=false,waterlogged=false: - appearance: "default" - id: "${internal_id}" + appearance: default + id: ${internal_id} distance=6,persistent=false,waterlogged=false: - appearance: "default" - id: "${internal_id}" + appearance: default + id: ${internal_id} distance=7,persistent=false,waterlogged=false: - appearance: "default" - id: "${internal_id}" + appearance: default + id: ${internal_id} settings: is-randomly-ticking: true distance=1,persistent=true,waterlogged=false: - appearance: "default" - id: "${internal_id}" + appearance: default + id: ${internal_id} distance=2,persistent=true,waterlogged=false: - appearance: "default" - id: "${internal_id}" + appearance: default + id: ${internal_id} distance=3,persistent=true,waterlogged=false: - appearance: "default" - id: "${internal_id}" + appearance: default + id: ${internal_id} distance=4,persistent=true,waterlogged=false: - appearance: "default" - id: "${internal_id}" + appearance: default + id: ${internal_id} distance=5,persistent=true,waterlogged=false: - appearance: "default" - id: "${internal_id}" + appearance: default + id: ${internal_id} distance=6,persistent=true,waterlogged=false: - appearance: "default" - id: "${internal_id}" + appearance: default + id: ${internal_id} distance=7,persistent=true,waterlogged=false: - appearance: "default" - id: "${internal_id}" + appearance: default + id: ${internal_id} distance=1,persistent=false,waterlogged=true: - appearance: "waterlogged" - id: "${internal_id}" + appearance: waterlogged + id: ${internal_id} settings: resistance: 1200.0 burnable: false fluid-state: water distance=2,persistent=false,waterlogged=true: - appearance: "waterlogged" - id: "${internal_id}" + appearance: waterlogged + id: ${internal_id} settings: resistance: 1200.0 burnable: false fluid-state: water distance=3,persistent=false,waterlogged=true: - appearance: "waterlogged" - id: "${internal_id}" + appearance: waterlogged + id: ${internal_id} settings: resistance: 1200.0 burnable: false fluid-state: water distance=4,persistent=false,waterlogged=true: - appearance: "waterlogged" - id: "${internal_id}" + appearance: waterlogged + id: ${internal_id} settings: resistance: 1200.0 burnable: false fluid-state: water distance=5,persistent=false,waterlogged=true: - appearance: "waterlogged" - id: "${internal_id}" + appearance: waterlogged + id: ${internal_id} settings: resistance: 1200.0 burnable: false fluid-state: water distance=6,persistent=false,waterlogged=true: - appearance: "waterlogged" - id: "${internal_id}" + appearance: waterlogged + id: ${internal_id} settings: resistance: 1200.0 burnable: false fluid-state: water distance=7,persistent=false,waterlogged=true: - appearance: "waterlogged" - id: "${internal_id}" + appearance: waterlogged + id: ${internal_id} settings: resistance: 1200.0 burnable: false is-randomly-ticking: true fluid-state: water distance=1,persistent=true,waterlogged=true: - appearance: "waterlogged" - id: "${internal_id}" + appearance: waterlogged + id: ${internal_id} settings: resistance: 1200.0 burnable: false fluid-state: water distance=2,persistent=true,waterlogged=true: - appearance: "waterlogged" - id: "${internal_id}" + appearance: waterlogged + id: ${internal_id} settings: resistance: 1200.0 burnable: false fluid-state: water distance=3,persistent=true,waterlogged=true: - appearance: "waterlogged" - id: "${internal_id}" + appearance: waterlogged + id: ${internal_id} settings: resistance: 1200.0 burnable: false fluid-state: water distance=4,persistent=true,waterlogged=true: - appearance: "waterlogged" - id: "${internal_id}" + appearance: waterlogged + id: ${internal_id} settings: resistance: 1200.0 burnable: false fluid-state: water distance=5,persistent=true,waterlogged=true: - appearance: "waterlogged" - id: "${internal_id}" + appearance: waterlogged + id: ${internal_id} settings: resistance: 1200.0 burnable: false fluid-state: water distance=6,persistent=true,waterlogged=true: - appearance: "waterlogged" - id: "${internal_id}" + appearance: waterlogged + id: ${internal_id} settings: resistance: 1200.0 burnable: false fluid-state: water distance=7,persistent=true,waterlogged=true: - appearance: "waterlogged" - id: "${internal_id}" + appearance: waterlogged + id: ${internal_id} settings: resistance: 1200.0 burnable: false @@ -980,166 +979,166 @@ templates#block_states: type: single_block_half appearances: facing=east,half=bottom,open=false,waterlogged=false: - state: "${base_block}[facing=east,half=bottom,open=false,powered=true,waterlogged=false]" + state: ${base_block}[facing=east,half=bottom,open=false,powered=true,waterlogged=false] model: path: ${model_bottom_path} y: 90 generation: ${model_bottom_generation} facing=east,half=bottom,open=true,waterlogged=false: - state: "${base_block}[facing=east,half=bottom,open=true,powered=true,waterlogged=false]" + state: ${base_block}[facing=east,half=bottom,open=true,powered=true,waterlogged=false] model: path: ${model_open_path} y: 90 generation: ${model_open_generation} facing=east,half=top,open=false,waterlogged=false: - state: "${base_block}[facing=east,half=top,open=false,powered=true,waterlogged=false]" + state: ${base_block}[facing=east,half=top,open=false,powered=true,waterlogged=false] model: path: ${model_top_path} y: 90 generation: ${model_top_generation} facing=east,half=top,open=true,waterlogged=false: - state: "${base_block}[facing=east,half=top,open=true,powered=true,waterlogged=false]" + state: ${base_block}[facing=east,half=top,open=true,powered=true,waterlogged=false] model: path: ${model_open_path} x: 180 y: 270 facing=north,half=bottom,open=false,waterlogged=false: - state: "${base_block}[facing=north,half=bottom,open=false,powered=true,waterlogged=false]" + state: ${base_block}[facing=north,half=bottom,open=false,powered=true,waterlogged=false] model: path: ${model_bottom_path} facing=north,half=bottom,open=true,waterlogged=false: - state: "${base_block}[facing=north,half=bottom,open=true,powered=true,waterlogged=false]" + state: ${base_block}[facing=north,half=bottom,open=true,powered=true,waterlogged=false] model: path: ${model_open_path} facing=north,half=top,open=false,waterlogged=false: - state: "${base_block}[facing=north,half=top,open=false,powered=true,waterlogged=false]" + state: ${base_block}[facing=north,half=top,open=false,powered=true,waterlogged=false] model: path: ${model_top_path} facing=north,half=top,open=true,waterlogged=false: - state: "${base_block}[facing=north,half=top,open=true,powered=true,waterlogged=false]" + state: ${base_block}[facing=north,half=top,open=true,powered=true,waterlogged=false] model: path: ${model_open_path} x: 180 y: 180 facing=south,half=bottom,open=false,waterlogged=false: - state: "${base_block}[facing=south,half=bottom,open=false,powered=true,waterlogged=false]" + state: ${base_block}[facing=south,half=bottom,open=false,powered=true,waterlogged=false] model: path: ${model_bottom_path} y: 180 facing=south,half=bottom,open=true,waterlogged=false: - state: "${base_block}[facing=south,half=bottom,open=true,powered=true,waterlogged=false]" + state: ${base_block}[facing=south,half=bottom,open=true,powered=true,waterlogged=false] model: path: ${model_open_path} y: 180 facing=south,half=top,open=false,waterlogged=false: - state: "${base_block}[facing=south,half=top,open=false,powered=true,waterlogged=false]" + state: ${base_block}[facing=south,half=top,open=false,powered=true,waterlogged=false] model: path: ${model_top_path} y: 180 facing=south,half=top,open=true,waterlogged=false: - state: "${base_block}[facing=south,half=top,open=true,powered=true,waterlogged=false]" + state: ${base_block}[facing=south,half=top,open=true,powered=true,waterlogged=false] model: path: ${model_open_path} x: 180 y: 0 facing=west,half=bottom,open=false,waterlogged=false: - state: "${base_block}[facing=west,half=bottom,open=false,powered=true,waterlogged=false]" + state: ${base_block}[facing=west,half=bottom,open=false,powered=true,waterlogged=false] model: path: ${model_bottom_path} y: 270 facing=west,half=bottom,open=true,waterlogged=false: - state: "${base_block}[facing=west,half=bottom,open=true,powered=true,waterlogged=false]" + state: ${base_block}[facing=west,half=bottom,open=true,powered=true,waterlogged=false] model: path: ${model_open_path} y: 270 facing=west,half=top,open=false,waterlogged=false: - state: "${base_block}[facing=west,half=top,open=false,powered=true,waterlogged=false]" + state: ${base_block}[facing=west,half=top,open=false,powered=true,waterlogged=false] model: path: ${model_top_path} y: 270 facing=west,half=top,open=true,waterlogged=false: - state: "${base_block}[facing=west,half=top,open=true,powered=true,waterlogged=false]" + state: ${base_block}[facing=west,half=top,open=true,powered=true,waterlogged=false] model: path: ${model_open_path} x: 180 y: 90 facing=east,half=bottom,open=false,waterlogged=true: - state: "${base_block}[facing=east,half=bottom,open=false,powered=true,waterlogged=true]" + state: ${base_block}[facing=east,half=bottom,open=false,powered=true,waterlogged=true] model: path: ${model_bottom_path} y: 90 facing=east,half=bottom,open=true,waterlogged=true: - state: "${base_block}[facing=east,half=bottom,open=true,powered=true,waterlogged=true]" + state: ${base_block}[facing=east,half=bottom,open=true,powered=true,waterlogged=true] model: path: ${model_open_path} y: 90 facing=east,half=top,open=false,waterlogged=true: - state: "${base_block}[facing=east,half=top,open=false,powered=true,waterlogged=true]" + state: ${base_block}[facing=east,half=top,open=false,powered=true,waterlogged=true] model: path: ${model_top_path} y: 90 facing=east,half=top,open=true,waterlogged=true: - state: "${base_block}[facing=east,half=top,open=true,powered=true,waterlogged=true]" + state: ${base_block}[facing=east,half=top,open=true,powered=true,waterlogged=true] model: path: ${model_open_path} x: 180 y: 270 facing=north,half=bottom,open=false,waterlogged=true: - state: "${base_block}[facing=north,half=bottom,open=false,powered=true,waterlogged=true]" + state: ${base_block}[facing=north,half=bottom,open=false,powered=true,waterlogged=true] model: path: ${model_bottom_path} facing=north,half=bottom,open=true,waterlogged=true: - state: "${base_block}[facing=north,half=bottom,open=true,powered=true,waterlogged=true]" + state: ${base_block}[facing=north,half=bottom,open=true,powered=true,waterlogged=true] model: path: ${model_open_path} facing=north,half=top,open=false,waterlogged=true: - state: "${base_block}[facing=north,half=top,open=false,powered=true,waterlogged=true]" + state: ${base_block}[facing=north,half=top,open=false,powered=true,waterlogged=true] model: path: ${model_top_path} facing=north,half=top,open=true,waterlogged=true: - state: "${base_block}[facing=north,half=top,open=true,powered=true,waterlogged=true]" + state: ${base_block}[facing=north,half=top,open=true,powered=true,waterlogged=true] model: path: ${model_open_path} x: 180 y: 180 facing=south,half=bottom,open=false,waterlogged=true: - state: "${base_block}[facing=south,half=bottom,open=false,powered=true,waterlogged=true]" + state: ${base_block}[facing=south,half=bottom,open=false,powered=true,waterlogged=true] model: path: ${model_bottom_path} y: 180 facing=south,half=bottom,open=true,waterlogged=true: - state: "${base_block}[facing=south,half=bottom,open=true,powered=true,waterlogged=true]" + state: ${base_block}[facing=south,half=bottom,open=true,powered=true,waterlogged=true] model: path: ${model_open_path} y: 180 facing=south,half=top,open=false,waterlogged=true: - state: "${base_block}[facing=south,half=top,open=false,powered=true,waterlogged=true]" + state: ${base_block}[facing=south,half=top,open=false,powered=true,waterlogged=true] model: path: ${model_top_path} y: 180 facing=south,half=top,open=true,waterlogged=true: - state: "${base_block}[facing=south,half=top,open=true,powered=true,waterlogged=true]" + state: ${base_block}[facing=south,half=top,open=true,powered=true,waterlogged=true] model: path: ${model_open_path} x: 180 y: 0 facing=west,half=bottom,open=false,waterlogged=true: - state: "${base_block}[facing=west,half=bottom,open=false,powered=true,waterlogged=true]" + state: ${base_block}[facing=west,half=bottom,open=false,powered=true,waterlogged=true] model: path: ${model_bottom_path} y: 270 facing=west,half=bottom,open=true,waterlogged=true: - state: "${base_block}[facing=west,half=bottom,open=true,powered=true,waterlogged=true]" + state: ${base_block}[facing=west,half=bottom,open=true,powered=true,waterlogged=true] model: path: ${model_open_path} y: 270 facing=west,half=top,open=false,waterlogged=true: - state: "${base_block}[facing=west,half=top,open=false,powered=true,waterlogged=true]" + state: ${base_block}[facing=west,half=top,open=false,powered=true,waterlogged=true] model: path: ${model_top_path} y: 270 facing=west,half=top,open=true,waterlogged=true: - state: "${base_block}[facing=west,half=top,open=true,powered=true,waterlogged=true]" + state: ${base_block}[facing=west,half=top,open=true,powered=true,waterlogged=true] model: path: ${model_open_path} x: 180 @@ -1471,41 +1470,41 @@ templates#recipes: category: building group: planks ingredients: - A: "#default:${wood_type}_logs" + A: '#default:${wood_type}_logs' result: - id: "default:${wood_type}_planks" + id: default:${wood_type}_planks count: 4 default:recipe/log_2_wood: type: shaped category: building group: bark pattern: - - "AA" - - "AA" + - AA + - AA ingredients: - A: "default:${wood_type}_log" + A: default:${wood_type}_log result: - id: "default:${wood_type}_wood" + id: default:${wood_type}_wood count: 3 default:recipe/smelting_ore: type: smelting - experience: "${exp}" + experience: ${exp} category: misc group: topaz time: 200 - ingredient: "${ingredient}" + ingredient: ${ingredient} result: - id: "${result}" + id: ${result} count: 1 default:recipe/blasting_ore: type: blasting - experience: "${exp}" + experience: ${exp} category: misc group: topaz time: 100 - ingredient: "${ingredient}" + ingredient: ${ingredient} result: - id: "${result}" + id: ${result} count: 1 # loot tables @@ -1521,7 +1520,7 @@ templates#loot_tables: - type: survives_explosion entries: - type: item - item: "${__NAMESPACE__}:${__ID__}" + item: ${__NAMESPACE__}:${__ID__} # drop one item @@ -1535,7 +1534,7 @@ templates#loot_tables: - type: survives_explosion entries: - type: item - item: "${item}" + item: ${item} # drop the original furniture item or a fallback item @@ -1547,7 +1546,7 @@ templates#loot_tables: - rolls: 1 entries: - type: furniture_item - item: "${item}" + item: ${item} # drop with silk touch @@ -1562,7 +1561,7 @@ templates#loot_tables: predicate: minecraft:silk_touch>=1 entries: - type: item - item: "${item}" + item: ${item} # crop drops @@ -1578,21 +1577,21 @@ templates#loot_tables: - type: alternatives children: - type: item - item: "${crop_item}" + item: ${crop_item} conditions: - type: match_block_property properties: - age: "${ripe_age}" + age: ${ripe_age} - type: item - item: "${crop_seed}" + item: ${crop_seed} - rolls: 1 conditions: - type: match_block_property properties: - age: "${ripe_age}" + age: ${ripe_age} entries: - type: item - item: "${crop_seed}" + item: ${crop_seed} functions: - type: apply_bonus enchantment: minecraft:fortune @@ -1610,15 +1609,15 @@ templates#loot_tables: - rolls: 1 entries: - type: item - item: "${crop_item}" + item: ${crop_item} - rolls: 1 conditions: - type: match_block_property properties: - age: "${ripe_age}" + age: ${ripe_age} entries: - type: item - item: "${crop_item}" + item: ${crop_item} functions: - type: apply_bonus enchantment: minecraft:fortune @@ -1642,12 +1641,12 @@ templates#loot_tables: - type: alternatives children: - type: item - item: "${ore_block}" + item: ${ore_block} conditions: - type: enchantment predicate: minecraft:silk_touch>=1 - type: item - item: "${ore_drop}" + item: ${ore_drop} functions: - type: apply_bonus enchantment: minecraft:fortune @@ -1657,8 +1656,8 @@ templates#loot_tables: - type: drop_exp count: type: uniform - min: "${min_exp:-2}" - max: "${max_exp:-4}" + min: ${min_exp:-2} + max: ${max_exp:-4} # template: default:loot_table/ore_no_exp # arguments: @@ -1671,12 +1670,12 @@ templates#loot_tables: - type: alternatives children: - type: item - item: "${ore_block}" + item: ${ore_block} conditions: - type: enchantment predicate: minecraft:silk_touch>=1 - type: item - item: "${ore_drop}" + item: ${ore_drop} functions: - type: apply_bonus enchantment: minecraft:fortune @@ -1697,7 +1696,7 @@ templates#loot_tables: - type: alternatives children: - type: item - item: "${leaves}" + item: ${leaves} conditions: - type: any_of terms: @@ -1706,7 +1705,7 @@ templates#loot_tables: - type: enchantment predicate: minecraft:silk_touch>=1 - type: item - item: "${sapling}" + item: ${sapling} conditions: - type: survives_explosion - type: table_bonus diff --git a/common-files/src/main/resources/resources/internal/configuration/gui.yml b/common-files/src/main/resources/resources/internal/configuration/gui.yml index f01daf055..e5955723a 100644 --- a/common-files/src/main/resources/resources/internal/configuration/gui.yml +++ b/common-files/src/main/resources/resources/internal/configuration/gui.yml @@ -4,177 +4,175 @@ images: ascent: 18 font: minecraft:gui file: minecraft:font/gui/custom/item_browser.png - char: '\ub000' + char: \ub000 internal:category: height: 140 ascent: 18 font: minecraft:gui file: minecraft:font/gui/custom/category.png - char: '\ub001' + char: \ub001 internal:crafting_recipe: height: 142 ascent: 20 font: minecraft:gui file: minecraft:font/gui/custom/crafting_recipe.png - char: '\ub002' + char: \ub002 internal:cooking_recipe: height: 138 ascent: 16 font: minecraft:gui file: minecraft:font/gui/custom/cooking_recipe.png - char: '\ub003' + char: \ub003 internal:smelting: height: 23 ascent: 20 font: minecraft:gui file: minecraft:font/gui/custom/smelting.png - char: '\ub004' + char: \ub004 internal:smoking: height: 23 ascent: 20 font: minecraft:gui file: minecraft:font/gui/custom/smoking.png - char: '\ub005' + char: \ub005 internal:blasting: height: 23 ascent: 20 font: minecraft:gui file: minecraft:font/gui/custom/blasting.png - char: '\ub006' + char: \ub006 internal:campfire: height: 23 ascent: 20 font: minecraft:gui file: minecraft:font/gui/custom/campfire.png - char: '\ub007' + char: \ub007 internal:stonecutting_recipe: height: 142 ascent: 20 font: minecraft:gui file: minecraft:font/gui/custom/stonecutting_recipe.png - char: '\ub008' + char: \ub008 internal:smithing_transform_recipe: height: 142 ascent: 20 font: minecraft:gui file: minecraft:font/gui/custom/smithing_transform_recipe.png - char: '\ub009' + char: \ub009 internal:no_recipe: height: 140 ascent: 18 font: minecraft:gui file: minecraft:font/gui/custom/no_recipe.png - char: '\ub00a' - + char: \ub00a templates: internal:icon/2d: material: arrow - custom-model-data: "${model_data}" + custom-model-data: ${model_data} data: - item-name: "${name}" - lore: "${lore}" + item-name: ${name} + lore: ${lore} model: - template: "internal:model/simplified_generated" + template: internal:model/simplified_generated arguments: - path: "minecraft:item/custom/gui/${texture}" + path: minecraft:item/custom/gui/${texture} internal:model/simplified_generated: - type: "minecraft:model" - path: "${path}" + type: minecraft:model + path: ${path} generation: - parent: "minecraft:item/generated" + parent: minecraft:item/generated textures: - "layer0": "${path}" - + layer0: ${path} items: internal:next_page_0: - template: "internal:icon/2d" + template: internal:icon/2d arguments: model_data: 1000 texture: next_page_0 - name: "<#FAFAD2>" + name: <#FAFAD2> lore: - - "<#F5F5F5>/" + - <#F5F5F5>/ internal:next_page_1: - template: "internal:icon/2d" + template: internal:icon/2d arguments: model_data: 1001 texture: next_page_1 - name: "<#808080>" + name: <#808080> lore: - - "<#696969>/" + - <#696969>/ internal:previous_page_0: - template: "internal:icon/2d" + template: internal:icon/2d arguments: model_data: 1002 texture: previous_page_0 - name: "<#FAFAD2>" + name: <#FAFAD2> lore: - - "<#F5F5F5>/" + - <#F5F5F5>/ internal:previous_page_1: - template: "internal:icon/2d" + template: internal:icon/2d arguments: model_data: 1003 texture: previous_page_1 - name: "<#808080>" + name: <#808080> lore: - - "<#696969>/" + - <#696969>/ internal:return: - template: "internal:icon/2d" + template: internal:icon/2d arguments: model_data: 1004 texture: return - name: "<#DAA520>" + name: <#DAA520> lore: null internal:next_recipe_0: material: arrow custom-model-data: 1000 data: - item-name: "<#FAFAD2>" + item-name: <#FAFAD2> lore: - - "<#F5F5F5>/" + - <#F5F5F5>/ internal:next_recipe_1: material: arrow custom-model-data: 1001 data: - item-name: "<#808080>" + item-name: <#808080> lore: - - "<#696969>/" + - <#696969>/ internal:previous_recipe_0: material: arrow custom-model-data: 1002 data: - item-name: "<#FAFAD2>" + item-name: <#FAFAD2> lore: - - "<#F5F5F5>/" + - <#F5F5F5>/ internal:previous_recipe_1: material: arrow custom-model-data: 1003 data: - item-name: "<#808080>" + item-name: <#808080> lore: - - "<#696969>/" + - <#696969>/ internal:get_item: - template: "internal:icon/2d" + template: internal:icon/2d arguments: model_data: 1005 texture: get_item - name: "<#DAA520>" + name: <#DAA520> lore: - - "" - - "" + - + - internal:cooking_info: - template: "internal:icon/2d" + template: internal:icon/2d arguments: model_data: 1006 texture: cooking_info - name: "<#FF8C00>" + name: <#FF8C00> lore: - - "" - - "" + - + - internal:exit: - template: "internal:icon/2d" + template: internal:icon/2d arguments: model_data: 1007 texture: exit - name: "<#DAA520>" + name: <#DAA520> lore: null \ No newline at end of file diff --git a/common-files/src/main/resources/resources/internal/configuration/i18n.yml b/common-files/src/main/resources/resources/internal/configuration/i18n.yml index 5f4af8c2d..f338e11d7 100644 --- a/common-files/src/main/resources/resources/internal/configuration/i18n.yml +++ b/common-files/src/main/resources/resources/internal/configuration/i18n.yml @@ -1,27 +1,27 @@ i18n: en: - internal.next_page: "Next Page" - internal.previous_page: "Previous Page" - internal.return: "Return to Parent Page" - internal.exit: "Exit" - internal.next_recipe: "Next Recipe" - internal.previous_recipe: "Previous Recipe" - internal.get_item: "Get Item" - internal.get_item.0: "Left Click to take one" - internal.get_item.1: "Right Click to take a stack" - internal.cooking_info: "Recipe Information" - internal.cooking_info.0: "Time: ticks" - internal.cooking_info.1: "Experience: " + internal.next_page: Next Page + internal.previous_page: Previous Page + internal.return: Return to Parent Page + internal.exit: Exit + internal.next_recipe: Next Recipe + internal.previous_recipe: Previous Recipe + internal.get_item: Get Item + internal.get_item.0: Left Click to take one + internal.get_item.1: Right Click to take a stack + internal.cooking_info: Recipe Information + internal.cooking_info.0: 'Time: ticks' + internal.cooking_info.1: 'Experience: ' zh_cn: - internal.next_page: "下一页" - internal.previous_page: "上一页" - internal.return: "返回上一级" - internal.exit: "退出" - internal.next_recipe: "下一个配方" - internal.previous_recipe: "上一个配方" - internal.get_item: "获取物品" - internal.get_item.0: "左键单击取一个" - internal.get_item.1: "右键单击取一组" - internal.cooking_info: "配方信息" - internal.cooking_info.0: "时间: 刻" - internal.cooking_info.1: "经验: " \ No newline at end of file + internal.next_page: 下一页 + internal.previous_page: 上一页 + internal.return: 返回上一级 + internal.exit: 退出 + internal.next_recipe: 下一个配方 + internal.previous_recipe: 上一个配方 + internal.get_item: 获取物品 + internal.get_item.0: 左键单击取一个 + internal.get_item.1: 右键单击取一组 + internal.cooking_info: 配方信息 + internal.cooking_info.0: '时间: 刻' + internal.cooking_info.1: '经验: ' \ No newline at end of file diff --git a/common-files/src/main/resources/resources/internal/configuration/offset_chars.yml b/common-files/src/main/resources/resources/internal/configuration/offset_chars.yml index 45b1c925a..f315f2571 100644 --- a/common-files/src/main/resources/resources/internal/configuration/offset_chars.yml +++ b/common-files/src/main/resources/resources/internal/configuration/offset_chars.yml @@ -4,262 +4,262 @@ images: ascent: -5000 font: minecraft:offset_chars file: minecraft:font/offset/space_split.png - char: '\uf800' + char: \uf800 internal:neg_2: height: -4 ascent: -5000 font: minecraft:offset_chars file: minecraft:font/offset/space_split.png - char: '\uf801' + char: \uf801 internal:neg_3: height: -5 ascent: -5000 font: minecraft:offset_chars file: minecraft:font/offset/space_split.png - char: '\uf802' + char: \uf802 internal:neg_4: height: -6 ascent: -5000 font: minecraft:offset_chars file: minecraft:font/offset/space_split.png - char: '\uf803' + char: \uf803 internal:neg_5: height: -7 ascent: -5000 font: minecraft:offset_chars file: minecraft:font/offset/space_split.png - char: '\uf804' + char: \uf804 internal:neg_6: height: -8 ascent: -5000 font: minecraft:offset_chars file: minecraft:font/offset/space_split.png - char: '\uf805' + char: \uf805 internal:neg_7: height: -9 ascent: -5000 font: minecraft:offset_chars file: minecraft:font/offset/space_split.png - char: '\uf806' + char: \uf806 internal:neg_8: height: -10 ascent: -5000 font: minecraft:offset_chars file: minecraft:font/offset/space_split.png - char: '\uf807' + char: \uf807 internal:neg_9: height: -11 ascent: -5000 font: minecraft:offset_chars file: minecraft:font/offset/space_split.png - char: '\uf808' + char: \uf808 internal:neg_10: height: -12 ascent: -5000 font: minecraft:offset_chars file: minecraft:font/offset/space_split.png - char: '\uf809' + char: \uf809 internal:neg_11: height: -13 ascent: -5000 font: minecraft:offset_chars file: minecraft:font/offset/space_split.png - char: '\uf80a' + char: \uf80a internal:neg_12: height: -14 ascent: -5000 font: minecraft:offset_chars file: minecraft:font/offset/space_split.png - char: '\uf80b' + char: \uf80b internal:neg_13: height: -15 ascent: -5000 font: minecraft:offset_chars file: minecraft:font/offset/space_split.png - char: '\uf80c' + char: \uf80c internal:neg_14: height: -16 ascent: -5000 font: minecraft:offset_chars file: minecraft:font/offset/space_split.png - char: '\uf80d' + char: \uf80d internal:neg_15: height: -17 ascent: -5000 font: minecraft:offset_chars file: minecraft:font/offset/space_split.png - char: '\uf80e' + char: \uf80e internal:neg_16: height: -18 ascent: -5000 font: minecraft:offset_chars file: minecraft:font/offset/space_split.png - char: '\uf80f' + char: \uf80f internal:neg_24: height: -26 ascent: -5000 font: minecraft:offset_chars file: minecraft:font/offset/space_split.png - char: '\uf810' + char: \uf810 internal:neg_32: height: -34 ascent: -5000 font: minecraft:offset_chars file: minecraft:font/offset/space_split.png - char: '\uf811' + char: \uf811 internal:neg_48: height: -50 ascent: -5000 font: minecraft:offset_chars file: minecraft:font/offset/space_split.png - char: '\uf812' + char: \uf812 internal:neg_64: height: -66 ascent: -5000 font: minecraft:offset_chars file: minecraft:font/offset/space_split.png - char: '\uf813' + char: \uf813 internal:neg_128: height: -130 ascent: -5000 font: minecraft:offset_chars file: minecraft:font/offset/space_split.png - char: '\uf814' + char: \uf814 internal:neg_256: height: -258 ascent: -5000 font: minecraft:offset_chars file: minecraft:font/offset/space_split.png - char: '\uf815' + char: \uf815 internal:pos_1: height: -1 ascent: -5000 font: minecraft:offset_chars file: minecraft:font/offset/space_split.png - char: '\uf830' + char: \uf830 internal:pos_2: height: 1 ascent: -5000 font: minecraft:offset_chars file: minecraft:font/offset/space_split.png - char: '\uf831' + char: \uf831 internal:pos_3: height: 2 ascent: -5000 font: minecraft:offset_chars file: minecraft:font/offset/space_split.png - char: '\uf832' + char: \uf832 internal:pos_4: height: 3 ascent: -5000 font: minecraft:offset_chars file: minecraft:font/offset/space_split.png - char: '\uf833' + char: \uf833 internal:pos_5: height: 4 ascent: -5000 font: minecraft:offset_chars file: minecraft:font/offset/space_split.png - char: '\uf834' + char: \uf834 internal:pos_6: height: 5 ascent: -5000 font: minecraft:offset_chars file: minecraft:font/offset/space_split.png - char: '\uf835' + char: \uf835 internal:pos_7: height: 6 ascent: -5000 font: minecraft:offset_chars file: minecraft:font/offset/space_split.png - char: '\uf836' + char: \uf836 internal:pos_8: height: 7 ascent: -5000 font: minecraft:offset_chars file: minecraft:font/offset/space_split.png - char: '\uf837' + char: \uf837 internal:pos_9: height: 8 ascent: -5000 font: minecraft:offset_chars file: minecraft:font/offset/space_split.png - char: '\uf838' + char: \uf838 internal:pos_10: height: 9 ascent: -5000 font: minecraft:offset_chars file: minecraft:font/offset/space_split.png - char: '\uf839' + char: \uf839 internal:pos_11: height: 10 ascent: -5000 font: minecraft:offset_chars file: minecraft:font/offset/space_split.png - char: '\uf83a' + char: \uf83a internal:pos_12: height: 11 ascent: -5000 font: minecraft:offset_chars file: minecraft:font/offset/space_split.png - char: '\uf83b' + char: \uf83b internal:pos_13: height: 12 ascent: -5000 font: minecraft:offset_chars file: minecraft:font/offset/space_split.png - char: '\uf83c' + char: \uf83c internal:pos_14: height: 13 ascent: -5000 font: minecraft:offset_chars file: minecraft:font/offset/space_split.png - char: '\uf83d' + char: \uf83d internal:pos_15: height: 14 ascent: -5000 font: minecraft:offset_chars file: minecraft:font/offset/space_split.png - char: '\uf83e' + char: \uf83e internal:pos_16: height: 15 ascent: -5000 font: minecraft:offset_chars file: minecraft:font/offset/space_split.png - char: '\uf83f' + char: \uf83f internal:pos_24: height: 23 ascent: -5000 font: minecraft:offset_chars file: minecraft:font/offset/space_split.png - char: '\uf840' + char: \uf840 internal:pos_32: height: 31 ascent: -5000 font: minecraft:offset_chars file: minecraft:font/offset/space_split.png - char: '\uf841' + char: \uf841 internal:pos_48: height: 47 ascent: -5000 font: minecraft:offset_chars file: minecraft:font/offset/space_split.png - char: '\uf842' + char: \uf842 internal:pos_64: height: 63 ascent: -5000 font: minecraft:offset_chars file: minecraft:font/offset/space_split.png - char: '\uf843' + char: \uf843 internal:pos_128: height: 127 ascent: -5000 font: minecraft:offset_chars file: minecraft:font/offset/space_split.png - char: '\uf844' + char: \uf844 internal:pos_256: height: 255 ascent: -5000 font: minecraft:offset_chars file: minecraft:font/offset/space_split.png - char: '\uf845' \ No newline at end of file + char: \uf845 \ No newline at end of file diff --git a/core/src/main/java/net/momirealms/craftengine/core/entity/data/ClassTreeIdRegistry.java b/core/src/main/java/net/momirealms/craftengine/core/entity/data/ClassTreeIdRegistry.java index a3ff48d6f..8d4f86d70 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/entity/data/ClassTreeIdRegistry.java +++ b/core/src/main/java/net/momirealms/craftengine/core/entity/data/ClassTreeIdRegistry.java @@ -4,11 +4,11 @@ import it.unimi.dsi.fastutil.objects.Object2IntMap; import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; import net.momirealms.craftengine.core.plugin.CraftEngine; -public class ClassTreeIdRegistry { +public final class ClassTreeIdRegistry { private final Object2IntMap> classToLastIdCache = new Object2IntOpenHashMap<>(); public ClassTreeIdRegistry() { - classToLastIdCache.defaultReturnValue(-1); + this.classToLastIdCache.defaultReturnValue(-1); } public int getLastIdFor(Class clazz) { @@ -31,7 +31,6 @@ public class ClassTreeIdRegistry { int lastId = this.getLastIdFor(clazz); int nextId = lastId == -1 ? 0 : lastId + 1; this.classToLastIdCache.put(clazz, nextId); - CraftEngine.instance().debug(() -> "Defined " + clazz.getSimpleName() + " with id " + nextId); return nextId; } } \ No newline at end of file