Merge branch 'master' of github.com:LTCatt/LTW3

data/minecraft/recipes/book.json

@@ -1,20 +0,0 @@
-{
-  "type": "minecraft:crafting_shapeless",
-  "ingredients": [
-    {
-      "item": "minecraft:paper"
-    },
-    {
-      "item": "minecraft:paper"
-    },
-    {
-      "item": "minecraft:paper"
-    },
-    {
-      "item": "minecraft:leather"
-    }
-  ],
-  "result": {
-    "item": "minecraft:book"
-  }
-}

data/minecraft/recipes/cartography_table.json

@@ -1,19 +0,0 @@
-{
-  "type": "minecraft:crafting_shaped",
-  "pattern": [
-    "@@",
-    "##",
-    "##"
-  ],
-  "key": {
-    "#": {
-      "tag": "minecraft:planks"
-    },
-    "@": {
-      "item": "minecraft:paper"
-    }
-  },
-  "result": {
-    "item": "minecraft:cartography_table"
-  }
-}

data/minecraft/recipes/creeper_banner_pattern.json

@@ -1,14 +0,0 @@
-{
-  "type": "minecraft:crafting_shapeless",
-  "ingredients": [
-    {
-      "item": "minecraft:paper"
-    },
-    {
-      "item": "minecraft:creeper_head"
-    }
-  ],
-  "result": {
-    "item": "minecraft:creeper_banner_pattern"
-  }
-}

data/minecraft/recipes/flower_banner_pattern.json

@@ -1,14 +0,0 @@
-{
-  "type": "minecraft:crafting_shapeless",
-  "ingredients": [
-    {
-      "item": "minecraft:paper"
-    },
-    {
-      "item": "minecraft:oxeye_daisy"
-    }
-  ],
-  "result": {
-    "item": "minecraft:flower_banner_pattern"
-  }
-}

data/minecraft/recipes/map.json

@@ -1,19 +0,0 @@
-{
-  "type": "minecraft:crafting_shaped",
-  "pattern": [
-    "###",
-    "#X#",
-    "###"
-  ],
-  "key": {
-    "#": {
-      "item": "minecraft:paper"
-    },
-    "X": {
-      "item": "minecraft:compass"
-    }
-  },
-  "result": {
-    "item": "minecraft:map"
-  }
-}

data/minecraft/recipes/mojang_banner_pattern.json

@@ -1,14 +0,0 @@
-{
-  "type": "minecraft:crafting_shapeless",
-  "ingredients": [
-    {
-      "item": "minecraft:paper"
-    },
-    {
-      "item": "minecraft:enchanted_golden_apple"
-    }
-  ],
-  "result": {
-    "item": "minecraft:mojang_banner_pattern"
-  }
-}

data/minecraft/recipes/paper.json

@@ -1,15 +0,0 @@
-{
-  "type": "minecraft:crafting_shaped",
-  "pattern": [
-    "###"
-  ],
-  "key": {
-    "#": {
-      "item": "minecraft:sugar_cane"
-    }
-  },
-  "result": {
-    "item": "minecraft:paper",
-    "count": 3
-  }
-}

data/minecraft/recipes/skull_banner_pattern.json

@@ -1,14 +0,0 @@
-{
-  "type": "minecraft:crafting_shapeless",
-  "ingredients": [
-    {
-      "item": "minecraft:paper"
-    },
-    {
-      "item": "minecraft:wither_skeleton_skull"
-    }
-  ],
-  "result": {
-    "item": "minecraft:skull_banner_pattern"
-  }
-}

data/mini/functions/diamond/player_death.mcfunction

@@ -1,5 +1,5 @@
 # 执行重生方法
-function mini:diamond/game/respawn1
+function mini:diamond/game/respawn
 
 # 复活特效
 execute as @a at @s run function lib:sounds/error

data/mini/functions/trade/player_enter.mcfunction

@@ -19,4 +19,4 @@ gamemode survival @s[team=playing,tag=!rejoining]
 
 # 执行重生方法
 tag @s remove respawning
-function mini:trade/game/respawn1
+function mini:trade/game/respawn