Merge pull request #59 from Xiao-MoMi/dev

0.0.38

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

@@ -1,66 +0,0 @@
-items:
-  default:chinese_lantern:
-    material: paper
-    custom-model-data: 3000
-    data:
-      item-name: "<!i><i18n:item.chinese_lantern>"
-    model:
-      type: "minecraft:model"
-      path: "minecraft:item/custom/chinese_lantern"
-      generation:
-        parent: "minecraft:block/custom/chinese_lantern"
-    behavior:
-      type: block_item
-      block:
-        loot:
-          template: "default:loot_table/basic"
-          arguments:
-            item: default:chinese_lantern
-        settings:
-          template:
-            - default:hardness/wool
-            - default:burn_data/planks
-            - default:sound/wood
-          overrides:
-            push-reaction: NORMAL
-            replaceable: false
-            is-redstone-conductor: true
-            is-suffocating: false
-            instrument: HARP
-            luminance: 15
-            map-color: 36
-            item: default:chinese_lantern
-        state:
-          id: 15
-          state: note_block:15
-          model:
-            path: "minecraft:block/custom/chinese_lantern"
-            generation:
-              parent: "minecraft:block/cube_column"
-              textures:
-                "end": "minecraft:block/custom/chinese_lantern_top"
-                "side": "minecraft:block/custom/chinese_lantern"
-
-recipes:
-  default:chinese_lantern:
-    type: shaped
-    pattern:
-      - "ABA"
-      - "BCB"
-      - "ABA"
-    ingredients:
-      A: "#minecraft:planks"
-      B: "minecraft:stick"
-      C: "minecraft:torch"
-    result:
-      id: default:chinese_lantern
-      count: 1
-  default:paper_from_reed:
-    type: shaped
-    pattern:
-      - "AAA"
-    ingredients:
-      A: "default:reed"
-    result:
-      id: minecraft:paper
-      count: 3

bukkit/loader/src/main/resources/additional-real-blocks.yml

@@ -23,4 +23,6 @@ minecraft:spruce_sapling: 1
 minecraft:jungle_sapling: 1
 minecraft:dark_oak_sapling: 1
 minecraft:acacia_sapling: 1
-minecraft:cherry_sapling: 1
+minecraft:cherry_sapling: 1
+
+minecraft:anvil: 2

bukkit/loader/src/main/resources/config.yml

@@ -13,12 +13,10 @@ resource-pack:
   # Should those images in minecraft:default font also work in minecraft:uniform
   override-uniform-font: true
   # Generate assets for CraftEngine fabric mod
-  # Note: CraftEngine fabric mod is used for Axiom mod, most users do not need to install it
+  # Note: fabric mod is used for clientside Axiom/WorldEdit mod
   generate-mod-assets: false
   # Resource pack protection
   protection:
-    # Warning: Do not attempt to unzip the resource pack with crash tools enabled.
-    # Warning: Do not attempt to unzip the resource pack with crash tools enabled.
     # Warning: Do not attempt to unzip the resource pack with crash tools enabled.
     # You can enable all the methods at the same time.
     crash-tools:
@@ -55,7 +53,6 @@ resource-pack:
         bypass-models: []
         bypass-sounds: []
         bypass-equipments: []
-
   supported-version:
     min: "1.20"
     max: LATEST
@@ -140,6 +137,16 @@ furniture:
     list:
       - "xxx:invalid_furniture"
 
+image:
+  # Prevent players from using images set in minecraft:default font
+  # Players with `craftengine.filter.bypass.xxx` would ignore the limitation
+  illegal-characters-filter:
+    anvil: true
+    book: true
+    chat: true
+    command: true
+    sign: true
+
 recipe:
   enable: true
 
@@ -210,6 +217,10 @@ performance:
     # Disabling this option prevents the plugin from converting custom blocks to vanilla states when chunks are unloaded.
     # While this can improve performance, custom blocks will turn into air if the plugin is uninstalled.
     restore-vanilla-blocks-on-chunk-unload: true
+    # When you edit a map locally using CraftEngine fabric mod, the custom block data is not immediately synchronized with the
+    # server's CraftEngine internal data. Enabling this option will synchronize the data when the chunk is loaded.
+    # (This option only slightly impacts performance, which has been fully optimized, so you don't need to worry too much.)
+    sync-custom-blocks-on-chunk-load: false
     # If you disable this, it's a must to disable the above option.
     restore-custom-blocks-on-chunk-load: true
 

bukkit/loader/src/main/resources/mappings.yml

@@ -1,4 +1,8 @@
 ########################################################################################################################################################################################################################
+# Anvil Block
+minecraft:anvil[facing=north]: minecraft:anvil[facing=south]
+minecraft:anvil[facing=east]: minecraft:anvil[facing=west]
+########################################################################################################################################################################################################################
 # Sapling Block
 minecraft:oak_sapling[stage=1]: minecraft:oak_sapling[stage=0]
 minecraft:birch_sapling[stage=1]: minecraft:birch_sapling[stage=0]

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

@@ -0,0 +1,148 @@
+items:
+  default:chinese_lantern:
+    material: paper
+    custom-model-data: 3000
+    data:
+      item-name: "<!i><i18n:item.chinese_lantern>"
+    model:
+      type: "minecraft:model"
+      path: "minecraft:item/custom/chinese_lantern"
+      generation:
+        parent: "minecraft:block/custom/chinese_lantern"
+    behavior:
+      type: block_item
+      block:
+        loot:
+          template: "default:loot_table/basic"
+          arguments:
+            item: default:chinese_lantern
+        settings:
+          template:
+            - default:hardness/wool
+            - default:burn_data/planks
+            - default:sound/wood
+          overrides:
+            push-reaction: NORMAL
+            replaceable: false
+            is-redstone-conductor: true
+            is-suffocating: false
+            instrument: HARP
+            luminance: 15
+            map-color: 36
+            item: default:chinese_lantern
+        state:
+          id: 15
+          state: note_block:15
+          model:
+            path: "minecraft:block/custom/chinese_lantern"
+            generation:
+              parent: "minecraft:block/cube_column"
+              textures:
+                "end": "minecraft:block/custom/chinese_lantern_top"
+                "side": "minecraft:block/custom/chinese_lantern"
+  default:netherite_anvil:
+    material: paper
+    custom-model-data: 3001
+    data:
+      item-name: "<!i><i18n:item.netherite_anvil>"
+    model:
+      type: "minecraft:model"
+      path: "minecraft:item/custom/netherite_anvil"
+      generation:
+        parent: "minecraft:block/custom/netherite_anvil"
+    behavior:
+      type: block_item
+      block:
+        loot:
+          template: "default:loot_table/basic"
+          arguments:
+            item: default:netherite_anvil
+        behavior:
+          type: falling_block
+          hurt-amount: 4
+          max-hurt: 80
+        settings:
+          template:
+            - default:pickaxe_power/level_4
+          overrides:
+            sounds:
+              break: minecraft:block.anvil.break
+              step: minecraft:block.anvil.step
+              place: minecraft:block.anvil.place
+              hit: minecraft:block.anvil.hit
+              fall: minecraft:block.anvil.fall
+              land: minecraft:block.anvil.land
+            item: default:netherite_anvil
+            map-color: 29
+            hardness: 10.0
+            resistance: 1200
+            push-reaction: BLOCK
+        states:
+          properties:
+            facing_clockwise:
+              type: 4-direction
+              default: north
+          appearances:
+            axisX:
+              state: "minecraft:anvil[facing=east]"
+              model:
+                path: "minecraft:block/custom/netherite_anvil"
+                y: 90
+                generation:
+                  parent: "minecraft:block/anvil"
+                  textures:
+                    "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]"
+              model:
+                path: "minecraft:block/custom/netherite_anvil"
+          variants:
+            facing_clockwise=east:
+              appearance: axisX
+              id: 0
+            facing_clockwise=west:
+              appearance: axisX
+              id: 1
+            facing_clockwise=north:
+              appearance: axisZ
+              id: 2
+            facing_clockwise=south:
+              appearance: axisZ
+              id: 3
+recipes:
+  default:chinese_lantern:
+    type: shaped
+    pattern:
+      - "ABA"
+      - "BCB"
+      - "ABA"
+    ingredients:
+      A: "#minecraft:planks"
+      B: "minecraft:stick"
+      C: "minecraft:torch"
+    result:
+      id: default:chinese_lantern
+      count: 1
+  default:paper_from_reed:
+    type: shaped
+    pattern:
+      - "AAA"
+    ingredients:
+      A: "default:reed"
+    result:
+      id: minecraft:paper
+      count: 3
+  default:netherite_anvil:
+    type: shaped
+    pattern:
+      - " B "
+      - "BAB"
+      - " B "
+    ingredients:
+      A: "minecraft:anvil"
+      B: "minecraft:netherite_ingot"
+    result:
+      id: default:netherite_anvil
+      count: 1

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

@@ -56,5 +56,6 @@ categories:
     icon: default:chinese_lantern
     list:
       - default:chinese_lantern
+      - default:netherite_anvil
       - default:fairy_flower
       - default:reed

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

@@ -28,6 +28,7 @@ i18n:
     item.palm_planks: "Palm Planks"
     item.palm_sapling: "Palm Sapling"
     item.palm_leaves: "Palm Leaves"
+    item.netherite_anvil: "Netherite Anvil"
     category.default.name: "Default Assets"
     category.default.lore: "Contains the default configuration of CraftEngine"
     category.palm_tree: "Palm Tree"
@@ -63,6 +64,7 @@ i18n:
     item.palm_planks: "棕榈木板"
     item.palm_sapling: "棕榈树苗"
     item.palm_leaves: "棕榈树叶"
+    item.netherite_anvil: "下界合金砧"
     category.default.name: "默认资产"
     category.default.lore: "包含了CraftEngine的默认配置"
     category.palm_tree: "棕榈树"

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

@@ -1,7 +1,7 @@
 items:
   default:fairy_flower:
     material: paper
-    custom-model-data: 3001
+    custom-model-data: 4000
     data:
       item-name: "<!i><i18n:item.fairy_flower>"
     model:
@@ -13,7 +13,7 @@ items:
       block: default:fairy_flower
   default:reed:
     material: paper
-    custom-model-data: 3002
+    custom-model-data: 4001
     data:
       item-name: "<!i><i18n:item.reed>"
     model: