⬆️ Bump to 1.20.1 (#1401)

ProjectTSB · Jun 26, 2023 · 05f37c8 · 05f37c8
1 parent 80e053e
commit 05f37c8
Show file tree

Hide file tree

Showing 27 changed files with 1,348 additions and 1,222 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,13 +1,11 @@
 {
-    "datapack.env.cmdVersion": "1.19",
-    "datapack.env.dataSource": "GitHub",
-    "datapack.env.dataVersion": "1.19",
+    "datapack.env.cmdVersion": "1.20",
+    "datapack.env.dataVersion": "1.20.1",
     "datapack.env.defaultVisibility": "public",
     "datapack.env.dependsOnVanilla": true,
     "datapack.env.detectionDepth": 1,
     "datapack.env.exclude": [],
     "datapack.env.include": [],
-    "datapack.env.jsonVersion": "1.19",
     "datapack.env.permissionLevel": 2,
     "datapack.features.semanticColoring": false,
     "datapack.lint.blockStateBracketSpacing": {

diff --git a/TheSkyBlessing/data/lib/predicates/has_health_modify_score.json b/TheSkyBlessing/data/lib/predicates/has_health_modify_score.json
@@ -1,5 +1,5 @@
 {
-    "condition": "alternative",
+    "condition": "any_of",
     "terms": [
         {
             "condition": "entity_scores",

diff --git a/TheSkyBlessing/data/lib/predicates/is_ban_tp_area.json b/TheSkyBlessing/data/lib/predicates/is_ban_tp_area.json
@@ -1,5 +1,5 @@
 {
-    "condition": "alternative",
+    "condition": "any_of",
     "terms": [
         {
             "condition": "reference",

diff --git a/TheSkyBlessing/data/lib/tags/blocks/command_blocks.json b/TheSkyBlessing/data/lib/tags/blocks/command_blocks.json
@@ -1,7 +1,7 @@
 {
     "values": [
+        "chain_command_block",
         "command_block",
-        "repeating_command_block",
-        "chain_command_block"
+        "repeating_command_block"
     ]
 }
diff --git a/TheSkyBlessing/data/lib/tags/blocks/containers.json b/TheSkyBlessing/data/lib/tags/blocks/containers.json
@@ -1,14 +1,14 @@
 {
     "values": [
+        "#shulker_boxes",
+        "blast_furnace",
         "brewing_stand",
         "chest",
-        "trapped_chest",
         "dispenser",
         "dropper",
-        "hopper",
-        "furnace",
-        "blast_furnace",
         "ender_chest",
-        "#shulker_boxes"
+        "furnace",
+        "hopper",
+        "trapped_chest"
     ]
 }
diff --git a/TheSkyBlessing/data/lib/tags/blocks/dirts.json b/TheSkyBlessing/data/lib/tags/blocks/dirts.json
@@ -1,12 +1,12 @@
 {
     "values": [
-        "dirt",
         "coarse_dirt",
-        "podzol",
-        "mycelium",
-        "warped_nylium",
         "crimson_nylium",
+        "dirt",
+        "mycelium",
+        "podzol",
+        "rooted_dirt",
         "soul_soil",
-        "rooted_dirt"
+        "warped_nylium"
     ]
 }
diff --git a/TheSkyBlessing/data/lib/tags/blocks/glass_panes.json b/TheSkyBlessing/data/lib/tags/blocks/glass_panes.json
@@ -1,21 +1,21 @@
 {
     "values": [
+        "black_stained_glass_pane",
+        "blue_stained_glass_pane",
+        "brown_stained_glass_pane",
+        "cyan_stained_glass_pane",
         "glass_pane",
-        "white_stained_glass_pane",
-        "orange_stained_glass_pane",
-        "magenta_stained_glass_pane",
+        "gray_stained_glass_pane",
+        "green_stained_glass_pane",
         "light_blue_stained_glass_pane",
-        "yellow_stained_glass_pane",
+        "light_gray_stained_glass_pane",
         "lime_stained_glass_pane",
+        "magenta_stained_glass_pane",
+        "orange_stained_glass_pane",
         "pink_stained_glass_pane",
-        "gray_stained_glass_pane",
-        "light_gray_stained_glass_pane",
-        "cyan_stained_glass_pane",
         "purple_stained_glass_pane",
-        "blue_stained_glass_pane",
-        "brown_stained_glass_pane",
-        "green_stained_glass_pane",
         "red_stained_glass_pane",
-        "black_stained_glass_pane"
+        "white_stained_glass_pane",
+        "yellow_stained_glass_pane"
     ]
 }
diff --git a/TheSkyBlessing/data/lib/tags/blocks/glasses.json b/TheSkyBlessing/data/lib/tags/blocks/glasses.json
@@ -1,22 +1,22 @@
 {
     "values": [
+        "black_stained_glass",
+        "blue_stained_glass",
+        "brown_stained_glass",
+        "cyan_stained_glass",
         "glass",
-        "white_stained_glass",
-        "orange_stained_glass",
-        "magenta_stained_glass",
+        "gray_stained_glass",
+        "green_stained_glass",
         "light_blue_stained_glass",
-        "yellow_stained_glass",
+        "light_gray_stained_glass",
         "lime_stained_glass",
+        "magenta_stained_glass",
+        "orange_stained_glass",
         "pink_stained_glass",
-        "gray_stained_glass",
-        "light_gray_stained_glass",
-        "cyan_stained_glass",
         "purple_stained_glass",
-        "blue_stained_glass",
-        "brown_stained_glass",
-        "green_stained_glass",
         "red_stained_glass",
-        "black_stained_glass",
-        "tinted_glass"
+        "tinted_glass",
+        "white_stained_glass",
+        "yellow_stained_glass"
     ]
 }
diff --git a/TheSkyBlessing/data/lib/tags/blocks/has_inventory.json b/TheSkyBlessing/data/lib/tags/blocks/has_inventory.json
@@ -1,14 +1,14 @@
 {
     "values": [
-        "#lib:containers",
-        "#lib:command_blocks",
         "#anvil",
-        "enchanting_table",
-        "loom",
-        "stonecutter",
-        "crafting_table",
+        "#lib:command_blocks",
+        "#lib:containers",
         "beacon",
         "cartography_table",
-        "smithing_table"
+        "crafting_table",
+        "enchanting_table",
+        "loom",
+        "smithing_table",
+        "stonecutter"
     ]
 }
diff --git a/TheSkyBlessing/data/lib/tags/blocks/no_collision.json b/TheSkyBlessing/data/lib/tags/blocks/no_collision.json
@@ -1,6 +1,7 @@
 {
     "replace": false,
     "values": [
+        "#minecraft:all_hanging_signs",
         "#minecraft:banners",
         "#minecraft:buttons",
         "#minecraft:corals",
@@ -14,6 +15,7 @@
         "#minecraft:standing_signs",
         "#minecraft:wall_corals",
         "#minecraft:wall_signs",
+        "#minecraft:wool_carpets",
         "minecraft:air",
         "minecraft:attached_melon_stem",
         "minecraft:attached_pumpkin_stem",
@@ -50,13 +52,17 @@
         "minecraft:hanging_roots",
         "minecraft:kelp",
         "minecraft:kelp_plant",
+        "minecraft:ladder",
         "minecraft:large_fern",
         "minecraft:lava",
         "minecraft:lever",
         "minecraft:light",
+        "minecraft:mangrove_propagule",
+        "minecraft:moss_carpet",
         "minecraft:moving_piston",
         "minecraft:nether_sprouts",
         "minecraft:nether_wart",
+        "minecraft:pitcher_plant",
         "minecraft:powder_snow",
         "minecraft:red_mushroom",
         "minecraft:redstone_torch",
@@ -75,6 +81,8 @@
         "minecraft:tall_grass",
         "minecraft:tall_seagrass",
         "minecraft:torch",
+        "minecraft:torchflower",
+        "minecraft:torchflower_crop",
         "minecraft:tripwire",
         "minecraft:tripwire_hook",
         "minecraft:twisting_vines",

diff --git a/TheSkyBlessing/data/lib/tags/blocks/no_collision_without_fluid.json b/TheSkyBlessing/data/lib/tags/blocks/no_collision_without_fluid.json
@@ -1,6 +1,7 @@
 {
     "replace": false,
     "values": [
+        "#minecraft:all_hanging_signs",
         "#minecraft:banners",
         "#minecraft:buttons",
         "#minecraft:crops",
@@ -13,6 +14,7 @@
         "#minecraft:standing_signs",
         "#minecraft:wall_corals",
         "#minecraft:wall_signs",
+        "#minecraft:wool_carpets",
         "minecraft:air",
         "minecraft:attached_melon_stem",
         "minecraft:attached_pumpkin_stem",
@@ -43,23 +45,27 @@
         "minecraft:dead_tube_coral_fan",
         "minecraft:dead_tube_coral_wall_fan",
         "minecraft:fern",
+        "minecraft:frogspawn",
         "minecraft:glow_lichen",
         "minecraft:grass",
         "minecraft:hanging_roots",
+        "minecraft:ladder",
         "minecraft:large_fern",
         "minecraft:lever",
         "minecraft:light",
+        "minecraft:mangrove_propagule",
+        "minecraft:moss_carpet",
         "minecraft:moving_piston",
         "minecraft:nether_sprouts",
         "minecraft:nether_wart",
+        "minecraft:pitcher_plant",
         "minecraft:powder_snow",
         "minecraft:red_mushroom",
         "minecraft:redstone_torch",
         "minecraft:redstone_wall_torch",
         "minecraft:redstone_wire",
         "minecraft:scaffolding",
         "minecraft:sculk_vein",
-        "minecraft:frogspawn",
         "minecraft:small_dripleaf",
         "minecraft:soul_torch",
         "minecraft:soul_wall_torch",
@@ -69,6 +75,8 @@
         "minecraft:sweet_berry_bush",
         "minecraft:tall_grass",
         "minecraft:torch",
+        "minecraft:torchflower",
+        "minecraft:torchflower_crop",
         "minecraft:tripwire",
         "minecraft:tripwire_hook",
         "minecraft:twisting_vines",

diff --git a/TheSkyBlessing/data/lib/tags/blocks/ores.json b/TheSkyBlessing/data/lib/tags/blocks/ores.json
@@ -2,13 +2,13 @@
     "values": [
         "#coal_ores",
         "#copper_ores",
-        "#iron_ores",
+        "#diamond_ores",
+        "#emerald_ores",
         "#gold_ores",
+        "#iron_ores",
         "#lapis_ores",
-        "#emerald_ores",
-        "#diamond_ores",
         "#redstone_ores",
-        "nether_quartz_ore",
-        "ancient_debris"
+        "ancient_debris",
+        "nether_quartz_ore"
     ]
 }
diff --git a/TheSkyBlessing/data/lib/tags/blocks/torches.json b/TheSkyBlessing/data/lib/tags/blocks/torches.json
@@ -1,9 +1,10 @@
 {
     "values": [
-        "soul_torch",
+        "minecraft:redstone_torch",
+        "minecraft:redstone_wall_torch",
         "minecraft:torch",
         "minecraft:wall_torch",
-        "minecraft:redstone_torch",
-        "minecraft:redstone_wall_torch"
+        "soul_torch",
+        "soul_wall_torch"
     ]
 }
diff --git a/TheSkyBlessing/data/lib/tags/blocks/unbreakable.json b/TheSkyBlessing/data/lib/tags/blocks/unbreakable.json
@@ -5,6 +5,7 @@
         "minecraft:chain_command_block",
         "minecraft:command_block",
         "minecraft:jigsaw",
+        "minecraft:reinforced_deepslate",
         "minecraft:repeating_command_block",
         "minecraft:structure_block"
     ]

diff --git a/TheSkyBlessing/data/lib/tags/entity_types/living.json b/TheSkyBlessing/data/lib/tags/entity_types/living.json
@@ -5,6 +5,7 @@
         "bat",
         "bee",
         "blaze",
+        "camel",
         "cat",
         "cave_spider",
         "chicken",
@@ -19,8 +20,8 @@
         "enderman",
         "endermite",
         "evoker",
-        "frog",
         "fox",
+        "frog",
         "ghast",
         "giant",
         "glow_squid",
@@ -55,6 +56,7 @@
         "skeleton",
         "skeleton_horse",
         "slime",
+        "sniffer",
         "snow_golem",
         "spider",
         "squid",
@@ -67,8 +69,8 @@
         "vex",
         "villager",
         "vindicator",
-        "warden",
         "wandering_trader",
+        "warden",
         "witch",
         "wither",
         "wither_skeleton",

diff --git a/TheSkyBlessing/data/lib/tags/entity_types/passive.json b/TheSkyBlessing/data/lib/tags/entity_types/passive.json
@@ -3,13 +3,14 @@
         "allay",
         "axolotl",
         "bat",
+        "camel",
         "cat",
         "chicken",
         "cod",
         "cow",
         "donkey",
-        "frog",
         "fox",
+        "frog",
         "glow_squid",
         "mooshroom",
         "mule",
@@ -20,6 +21,7 @@
         "salmon",
         "sheep",
         "skeleton_horse",
+        "sniffer",
         "snow_golem",
         "squid",
         "strider",

diff --git a/TheSkyBlessing/data/lib/tags/entity_types/placeable_vehicles.json b/TheSkyBlessing/data/lib/tags/entity_types/placeable_vehicles.json
@@ -1,6 +1,7 @@
 {
     "values": [
         "minecraft:boat",
+        "minecraft:chest_boat",
         "minecraft:minecart"
     ]
 }