添加elytra配置

bukkit/loader/src/main/resources/resources/default/configuration/blocks.yml

@@ -13,9 +13,7 @@ items#misc:
       type: block_item
       block:
         loot:
-          template: "default:loot_table/basic"
-          arguments:
-            item: default:chinese_lantern
+          template: "default:loot_table/self"
         settings:
           template:
             - default:hardness/wool
@@ -27,7 +25,6 @@ items#misc:
             instrument: HARP
             luminance: 15
             map-color: 36
-            item: default:chinese_lantern
         state:
           id: 15
           state: note_block:15
@@ -52,9 +49,7 @@ items#misc:
       type: block_item
       block:
         loot:
-          template: "default:loot_table/basic"
-          arguments:
-            item: default:netherite_anvil
+          template: "default:loot_table/self"
         behavior:
           type: falling_block
           hurt-amount: 4
@@ -80,7 +75,6 @@ items#misc:
               fall: minecraft:block.anvil.fall
               land: minecraft:block.anvil.land
               destroy: minecraft:block.anvil.destroy
-            item: default:netherite_anvil
             map-color: 29
             hardness: 10.0
             resistance: 1200
@@ -137,9 +131,7 @@ items#misc:
             solid-block: default:solid_gunpowder_block
           - type: falling_block
         loot:
-          template: "default:loot_table/basic"
-          arguments:
-            item: default:gunpowder_block
+          template: "default:loot_table/self"
         settings:
           template:
             - default:sound/sand
@@ -149,7 +141,6 @@ items#misc:
             resistance: 0.5
             instrument: SNARE
             map-color: 45
-            item: default:gunpowder_block
         state:
           id: 16
           state: note_block:16
@@ -173,9 +164,7 @@ items#misc:
       type: block_item
       block:
         loot:
-          template: "default:loot_table/basic"
-          arguments:
-            item: default:solid_gunpowder_block
+          template: "default:loot_table/self"
         settings:
           template:
             - default:sound/sand
@@ -186,7 +175,6 @@ items#misc:
             resistance: 1.8
             instrument: BASEDRUM
             map-color: 45
-            item: default:solid_gunpowder_block
         state:
           id: 17
           state: note_block:17
@@ -210,9 +198,7 @@ items#misc:
       type: block_item
       block:
         loot:
-          template: "default:loot_table/basic"
-          arguments:
-            item: default:copper_coil
+          template: "default:loot_table/self"
         settings:
           template:
             - default:sound/metal
@@ -225,7 +211,6 @@ items#misc:
             is-suffocating: true
             instrument: BASEDRUM
             map-color: 15
-            item: default:copper_coil
         behavior:
           type: lamp_block
         states:

bukkit/loader/src/main/resources/resources/default/configuration/categories.yml

@@ -67,4 +67,5 @@ categories:
       - default:gui_head_size_1
       - default:gui_head_size_4
       - minecraft:air
-      - default:copper_coil
+      - default:copper_coil
+      - default:flame_elytra

bukkit/loader/src/main/resources/resources/default/configuration/i18n.yml

@@ -35,6 +35,7 @@ i18n:
     item.gunpowder_block: "GunPowder Block"
     item.solid_gunpowder_block: "Solid GunPowder Block"
     item.copper_coil: "Copper Coil"
+    item.flame_elytra: "Flame Elytra"
     category.default.name: "Default Assets"
     category.default.lore: "Contains the default configuration of CraftEngine"
     category.palm_tree: "Palm Tree"
@@ -80,6 +81,7 @@ i18n:
     item.gunpowder_block: "火药粉末"
     item.solid_gunpowder_block: "凝固火药块"
     item.copper_coil: "铜线圈"
+    item.flame_elytra: "烈焰鞘翅"
     category.default.name: "默认资产"
     category.default.lore: "包含了CraftEngine的默认配置"
     category.palm_tree: "棕榈树"

bukkit/loader/src/main/resources/resources/default/configuration/items.yml

@@ -211,6 +211,22 @@ items#topaz_gears:
         on-false:
           type: minecraft:model
           path: minecraft:item/custom/topaz_trident_in_hand
+  default:flame_elytra:
+    material: elytra
+    custom-model-data: 1000
+    settings:
+      equippable:
+        slot: chest
+        asset-id: flame
+        wings: flame_elytra
+    data:
+      item-name: "<!i><#FF8C00><i18n:item.flame_elytra>"
+    model:
+      template: default:model/simplified_elytra
+      arguments:
+        path: "minecraft:item/custom/flame_elytra"
+        broken_path: "minecraft:item/custom/broken_flame_elytra"
+
 templates:
   default:armor/topaz:
     material: "chainmail_{part}"

bukkit/loader/src/main/resources/resources/default/configuration/ores.yml

@@ -51,8 +51,6 @@ blocks:
         max_exp: 7
     settings:
       template: "default:settings/ore"
-      overrides:
-        item: default:topaz_ore
       arguments:
         break_power: 2
     state:
@@ -72,8 +70,6 @@ blocks:
         max_exp: 7
     settings:
       template: "default:settings/deepslate_ore"
-      overrides:
-        item: default:deepslate_topaz_ore
       arguments:
         break_power: 2
     state:

bukkit/loader/src/main/resources/resources/default/configuration/palm_tree.yml

@@ -22,13 +22,9 @@ items:
           type: strippable_block
           stripped: default:stripped_palm_log
         loot:
-          template: "default:loot_table/basic"
-          arguments:
-            item: default:palm_log
+          template: "default:loot_table/self"
         settings:
           template: "default:settings/wood"
-          overrides:
-            item: default:palm_log
         states:
           template: "default:block_state/pillar"
           arguments:
@@ -65,13 +61,9 @@ items:
       type: block_item
       block:
         loot:
-          template: "default:loot_table/basic"
-          arguments:
-            item: default:stripped_palm_log
+          template: "default:loot_table/self"
         settings:
           template: "default:settings/wood"
-          overrides:
-            item: default:stripped_palm_log
         states:
           template: "default:block_state/pillar"
           arguments:
@@ -111,13 +103,9 @@ items:
           type: strippable_block
           stripped: default:stripped_palm_wood
         loot:
-          template: "default:loot_table/basic"
-          arguments:
-            item: default:palm_wood
+          template: "default:loot_table/self"
         settings:
           template: "default:settings/wood"
-          overrides:
-            item: default:palm_wood
         states:
           template: "default:block_state/pillar"
           arguments:
@@ -154,13 +142,9 @@ items:
       type: block_item
       block:
         loot:
-          template: "default:loot_table/basic"
-          arguments:
-            item: default:stripped_palm_wood
+          template: "default:loot_table/self"
         settings:
           template: "default:settings/wood"
-          overrides:
-            item: default:stripped_palm_wood
         states:
           template: "default:block_state/pillar"
           arguments:
@@ -197,12 +181,8 @@ items:
       block:
         settings:
           template: "default:settings/planks"
-          overrides:
-            item: default:palm_planks
         loot:
-          template: "default:loot_table/basic"
-          arguments:
-            item: default:palm_planks
+          template: "default:loot_table/self"
         state:
           model:
             template: "default:model/simplified_cube_all"
@@ -227,8 +207,6 @@ items:
       block:
         settings:
           template: "default:settings/sapling"
-          overrides:
-            item: default:palm_sapling
         behaviors:
           - type: bush_block
             bottom-block-tags:
@@ -241,9 +219,7 @@ items:
             feature: minecraft:fancy_oak
             bone-meal-success-chance: 0.45
         loot:
-          template: "default:loot_table/basic"
-          arguments:
-            item: default:palm_sapling
+          template: "default:loot_table/self"
         states:
           properties:
             stage:
@@ -297,8 +273,6 @@ items:
             sapling: default:palm_sapling
         settings:
           template: "default:settings/leaves"
-          overrides:
-            item: default:palm_leaves
         states:
           template: "default:block_state/leaves"
           arguments:

bukkit/loader/src/main/resources/resources/default/configuration/plants.yml

@@ -63,9 +63,7 @@ blocks:
         - minecraft:dirt
         - minecraft:farmland
     loot:
-      template: "default:loot_table/basic"
-      arguments:
-        item: default:fairy_flower
+      template: "default:loot_table/self"
     state:
       id: 0
       state: sugar_cane:0
@@ -96,7 +94,6 @@ blocks:
         - default:hardness/none
         - default:sound/grass
       overrides:
-        item: default:reed
         push-reaction: DESTROY
         map-color: 60
     behavior:
@@ -105,9 +102,7 @@ blocks:
       positions:
         - 0,-1,0
     loot:
-      template: "default:loot_table/basic"
-      arguments:
-        item: default:reed
+      template: "default:loot_table/self"
     state:
       id: 1
       state: sugar_cane:1
@@ -119,7 +114,6 @@ blocks:
         - default:hardness/none
         - default:sound/grass
       overrides:
-        item: default:flame_cane
         push-reaction: DESTROY
         map-color: 15
         is-randomly-ticking: true
@@ -149,9 +143,7 @@ blocks:
           - 0,-1,-1
           - 0,-1,1
     loot:
-      template: "default:loot_table/basic"
-      arguments:
-        item: default:flame_cane
+      template: "default:loot_table/self"
     states:
       properties:
         age:

bukkit/loader/src/main/resources/resources/default/configuration/templates.yml

@@ -14,7 +14,7 @@ templates#models#block:
         "all": "{texture}"
   # template: default:model/simplified_cube_all
   # arguments:
-  #   path: model/texture_path
+  #   path: [model/texture]_path
   default:model/simplified_cube_all:
     path: "{path}"
     generation:
@@ -71,7 +71,7 @@ templates#models#2d:
         "layer0": "{texture}"
   # template: default:model/simplified_generated
   # arguments:
-  #   path: model_path/texture_path
+  #   path: [model/texture]_path
   default:model/simplified_generated:
     type: "minecraft:model"
     path: "{path}"
@@ -105,7 +105,7 @@ templates#models#2d:
         "layer0": "{texture}"
   # template: default:model/simplified_handheld
   # arguments:
-  #   path: model_path/texture_path
+  #   path: [model/texture]_path
   default:model/simplified_handheld:
     type: "minecraft:model"
     path: "{path}"
@@ -113,6 +113,36 @@ templates#models#2d:
       parent: "minecraft:item/handheld"
       textures:
         "layer0": "{path}"
+  # template: default:model/elytra
+  # arguments:
+  #   model: model_path
+  #   broken_model: broken_model_path
+  #   texture: texture_path
+  #   broken_texture: broken_texture_path
+  default:model/elytra:
+    type: "minecraft:condition"
+    property: minecraft:broken
+    on-false:
+      template: default:model/generated
+      arguments:
+        model: "{model}"
+        texture: "{texture}"
+    on-true:
+      template: default:model/generated
+      arguments:
+        model: "{broken_model}"
+        texture: "{broken_texture}"
+  # template: default:model/simplified_elytra
+  # arguments:
+  #   path: [model/texture]_path
+  #   broken_path: broken_[model/texture]_path
+  default:model/simplified_elytra:
+    template: default:model/elytra
+    arguments:
+      model: "{path}"
+      broken_model: "{broken_path}"
+      texture: "{path}"
+      broken_texture: "{broken_path}"
 
 # shield
 templates#models#shield:
@@ -170,8 +200,8 @@ templates#models#fishing_rod:
           "layer0": "{cast_texture}"
   # template: default:model/simplified_fishing_rod_2d
   # arguments:
-  #   path: rod_model/texture_path
-  #   cast_path: rod_cast_model/texture_path
+  #   path: rod_[model/texture]_path
+  #   cast_path: rod_cast_[model/texture]_path
   default:model/simplified_fishing_rod_2d:
     template: default:model/fishing_rod_2d
     arguments:
@@ -260,10 +290,10 @@ templates#models#bow:
             "layer0": "{pulling_0_texture}"
   # template: default:model/simplified_bow_2d
   # arguments:
-  #   path: bow_model/texture_path
-  #   pulling_0_path: bow_pulling_0_model/texture_path
-  #   pulling_1_path: bow_pulling_1_model/texture_path
-  #   pulling_2_path: bow_pulling_2_model/texture_path
+  #   path: bow_[model/texture]_path
+  #   pulling_0_path: bow_pulling_0_[model/texture]_path
+  #   pulling_1_path: bow_pulling_1_[model/texture]_path
+  #   pulling_2_path: bow_pulling_2_[model/texture]_path
   default:model/simplified_bow_2d:
     template: default:model/bow_2d
     arguments:
@@ -392,12 +422,12 @@ templates#models#crossbow:
             "layer0": "{pulling_0_texture}"
   # template: default:model/simplified_crossbow_2d
   # arguments:
-  #   path: crossbow_model/texture_path
-  #   arrow_path: crossbow_arrow_model/texture_path
-  #   firework_path: crossbow_firework_model/texture_path
-  #   pulling_0_path: crossbow_pulling_0_model/texture_path
-  #   pulling_1_path: crossbow_pulling_1_model/texture_path
-  #   pulling_2_path: crossbow_pulling_2_model/texture_path
+  #   path: crossbow_[model/texture]_path
+  #   arrow_path: crossbow_arrow_[model/texture]_path
+  #   firework_path: crossbow_firework_[model/texture]_path
+  #   pulling_0_path: crossbow_pulling_0_[model/texture]_path
+  #   pulling_1_path: crossbow_pulling_1_[model/texture]_path
+  #   pulling_2_path: crossbow_pulling_2_[model/texture]_path
   default:model/simplified_crossbow_2d:
     template: default:model/crossbow_2d
     arguments:
@@ -581,6 +611,8 @@ templates#settings#break_level:
 
 # block settings
 templates#settings#blocks:
+  default:settings/middle_click_pick_itself:
+    item: "{__NAMESPACE__}:{__ID__}"
   default:settings/solid_1x1x1:
     is-suffocating: true
     replaceable: false
@@ -957,6 +989,18 @@ templates#recipes:
 # loot tables
 templates#loot_tables:
 
+  # drop itself
+
+  # template: default:loot_table/self
+  default:loot_table/self:
+    pools:
+      - rolls: 1
+        conditions:
+          - type: survives_explosion
+        entries:
+          - type: item
+            item: "{__NAMESPACE__}:{__ID__}"
+
   # drop one item
 
   # template: default:loot_table/basic