From fb5a20c603b2c397d74ef9f0d72e00cf9f8310ca Mon Sep 17 00:00:00 2001 From: Jeffrey Kosse Date: Tue, 7 Jun 2022 21:55:18 +0200 Subject: [PATCH 1/4] updated to 1.19 --- pom.xml | 8 +++++++- .../thebusybiscuit/slimefun4/api/MinecraftVersion.java | 6 ++++++ .../resources/tags/block_placer_ignored_materials.json | 9 ++++++++- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 5d6a9c934..9df4a7dd9 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ 1.8 - 1.18.1 + 1.19 https://hub.spigotmc.org/javadocs/spigot/ @@ -502,5 +502,11 @@ + + + commons-lang + commons-lang + 2.6 + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/MinecraftVersion.java b/src/main/java/io/github/thebusybiscuit/slimefun4/api/MinecraftVersion.java index eaf6f6f84..f0b767ef2 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/MinecraftVersion.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/api/MinecraftVersion.java @@ -49,6 +49,12 @@ public enum MinecraftVersion { */ MINECRAFT_1_18(18, "1.18.x"), + /** + * This constant represents Minecraft (Java Edition) Version 1.19 + * ("The Wild Update") + */ + MINECRAFT_1_19(19, "1.19.x"), + /** * This constant represents an exceptional state in which we were unable * to identify the Minecraft Version we are using diff --git a/src/main/resources/tags/block_placer_ignored_materials.json b/src/main/resources/tags/block_placer_ignored_materials.json index 0e84d9d81..03e5593a2 100644 --- a/src/main/resources/tags/block_placer_ignored_materials.json +++ b/src/main/resources/tags/block_placer_ignored_materials.json @@ -11,7 +11,14 @@ "#minecraft:small_flowers", "#minecraft:coral_blocks", "#minecraft:corals", - "#minecraft:carpets", + { + "id" : "#minecraft:carpets", + "required" : false + }, + { + "id" : "#minecraft:wool_carpets", + "required" : false + }, "#minecraft:banners", "minecraft:sugar_cane", "minecraft:cactus", From eb8fa9c522d7ac21065cd770848ee5906c97521d Mon Sep 17 00:00:00 2001 From: Jeffrey Kosse Date: Tue, 7 Jun 2022 22:07:52 +0200 Subject: [PATCH 2/4] fixed tests --- src/test/resources/biomes/1.19.x.json | 183 ++++++++++++++++++++++++++ 1 file changed, 183 insertions(+) create mode 100644 src/test/resources/biomes/1.19.x.json diff --git a/src/test/resources/biomes/1.19.x.json b/src/test/resources/biomes/1.19.x.json new file mode 100644 index 000000000..94b4fd1e8 --- /dev/null +++ b/src/test/resources/biomes/1.19.x.json @@ -0,0 +1,183 @@ +[ + "minecraft:swamp", + "minecraft:mangrove_swamp", + "minecraft:lush_caves", + "minecraft:swamp", + "minecraft:mangrove_swamp", + "minecraft:badlands", + "minecraft:eroded_badlands", + "minecraft:wooded_badlands", + "minecraft:beach", + "minecraft:snowy_beach", + "minecraft:deep_frozen_ocean", + "minecraft:deep_cold_ocean", + "minecraft:deep_ocean", + "minecraft:deep_lukewarm_ocean", + "minecraft:the_end", + "minecraft:end_highlands", + "minecraft:end_midlands", + "minecraft:small_end_islands", + "minecraft:end_barrens", + "minecraft:forest", + "minecraft:flower_forest", + "minecraft:birch_forest", + "minecraft:old_growth_birch_forest", + "minecraft:dark_forest", + "minecraft:grove", + "minecraft:windswept_hills", + "minecraft:windswept_forest", + "minecraft:windswept_gravelly_hills", + "minecraft:bamboo_jungle", + "minecraft:jungle", + "minecraft:sparse_jungle", + "minecraft:meadow", + "minecraft:frozen_peaks", + "minecraft:jagged_peaks", + "minecraft:stony_peaks", + "minecraft:snowy_slopes", + "minecraft:nether_wastes", + "minecraft:soul_sand_valley", + "minecraft:crimson_forest", + "minecraft:warped_forest", + "minecraft:basalt_deltas", + "#minecraft:is_deep_ocean", + "minecraft:frozen_ocean", + "minecraft:ocean", + "minecraft:cold_ocean", + "minecraft:lukewarm_ocean", + "minecraft:warm_ocean", + "minecraft:mushroom_fields", + "minecraft:deep_frozen_ocean", + "minecraft:frozen_ocean", + "minecraft:deep_cold_ocean", + "minecraft:cold_ocean", + "minecraft:deep_ocean", + "minecraft:ocean", + "minecraft:deep_lukewarm_ocean", + "minecraft:lukewarm_ocean", + "minecraft:warm_ocean", + "minecraft:stony_shore", + "minecraft:swamp", + "minecraft:mangrove_swamp", + "minecraft:snowy_slopes", + "minecraft:snowy_plains", + "minecraft:snowy_beach", + "minecraft:windswept_gravelly_hills", + "minecraft:grove", + "minecraft:windswept_hills", + "minecraft:snowy_taiga", + "minecraft:windswept_forest", + "minecraft:taiga", + "minecraft:plains", + "minecraft:meadow", + "minecraft:beach", + "minecraft:forest", + "minecraft:old_growth_spruce_taiga", + "minecraft:flower_forest", + "minecraft:birch_forest", + "minecraft:dark_forest", + "minecraft:savanna_plateau", + "minecraft:savanna", + "minecraft:jungle", + "minecraft:badlands", + "minecraft:desert", + "minecraft:wooded_badlands", + "minecraft:jagged_peaks", + "minecraft:stony_peaks", + "minecraft:frozen_river", + "minecraft:river", + "minecraft:ice_spikes", + "minecraft:old_growth_pine_taiga", + "minecraft:sunflower_plains", + "minecraft:old_growth_birch_forest", + "minecraft:sparse_jungle", + "minecraft:bamboo_jungle", + "minecraft:eroded_badlands", + "minecraft:windswept_savanna", + "minecraft:frozen_peaks", + "minecraft:dripstone_caves", + "minecraft:lush_caves", + "minecraft:deep_dark", + "minecraft:river", + "minecraft:frozen_river", + "minecraft:savanna", + "minecraft:savanna_plateau", + "minecraft:windswept_savanna", + "minecraft:taiga", + "minecraft:snowy_taiga", + "minecraft:old_growth_pine_taiga", + "minecraft:old_growth_spruce_taiga", + "minecraft:deep_dark", + "#minecraft:is_river", + "minecraft:desert", + "#minecraft:is_ocean", + "#minecraft:is_river", + "minecraft:frozen_ocean", + "minecraft:deep_frozen_ocean", + "minecraft:warm_ocean", + "#minecraft:is_river", + "#minecraft:is_ocean", + "#minecraft:is_river", + "minecraft:snowy_plains", + "minecraft:ice_spikes", + "minecraft:frozen_peaks", + "minecraft:jagged_peaks", + "minecraft:snowy_slopes", + "minecraft:frozen_ocean", + "minecraft:deep_frozen_ocean", + "minecraft:grove", + "minecraft:deep_dark", + "minecraft:frozen_river", + "minecraft:snowy_taiga", + "minecraft:snowy_beach", + "#minecraft:is_end", + "minecraft:desert", + "minecraft:warm_ocean", + "#minecraft:is_jungle", + "#minecraft:is_savanna", + "#minecraft:is_nether", + "#minecraft:is_badlands", + "minecraft:mangrove_swamp", + "minecraft:plains", + "minecraft:sunflower_plains", + "minecraft:snowy_plains", + "minecraft:ice_spikes", + "minecraft:desert", + "minecraft:forest", + "minecraft:flower_forest", + "minecraft:birch_forest", + "minecraft:dark_forest", + "minecraft:old_growth_birch_forest", + "minecraft:old_growth_pine_taiga", + "minecraft:old_growth_spruce_taiga", + "minecraft:taiga", + "minecraft:snowy_taiga", + "minecraft:savanna", + "minecraft:savanna_plateau", + "minecraft:windswept_hills", + "minecraft:windswept_gravelly_hills", + "minecraft:windswept_forest", + "minecraft:windswept_savanna", + "minecraft:jungle", + "minecraft:sparse_jungle", + "minecraft:bamboo_jungle", + "minecraft:badlands", + "minecraft:eroded_badlands", + "minecraft:wooded_badlands", + "minecraft:meadow", + "minecraft:grove", + "minecraft:snowy_slopes", + "minecraft:frozen_peaks", + "minecraft:jagged_peaks", + "minecraft:stony_peaks", + "minecraft:mushroom_fields", + "minecraft:dripstone_caves", + "minecraft:lush_caves", + "#minecraft:is_ocean", + "#minecraft:is_river", + "minecraft:swamp", + "minecraft:mangrove_swamp", + "minecraft:mushroom_fields", + "minecraft:the_void", + "minecraft:mushroom_fields" +] \ No newline at end of file From f8b44cb63f2936a5adc2e72db32c2759fcaf1631 Mon Sep 17 00:00:00 2001 From: Jeffrey Kosse Date: Tue, 7 Jun 2022 22:17:55 +0200 Subject: [PATCH 3/4] removed illegal values --- src/test/resources/biomes/1.19.x.json | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/src/test/resources/biomes/1.19.x.json b/src/test/resources/biomes/1.19.x.json index 94b4fd1e8..43bb5d5ac 100644 --- a/src/test/resources/biomes/1.19.x.json +++ b/src/test/resources/biomes/1.19.x.json @@ -40,7 +40,6 @@ "minecraft:crimson_forest", "minecraft:warped_forest", "minecraft:basalt_deltas", - "#minecraft:is_deep_ocean", "minecraft:frozen_ocean", "minecraft:ocean", "minecraft:cold_ocean", @@ -108,16 +107,10 @@ "minecraft:old_growth_pine_taiga", "minecraft:old_growth_spruce_taiga", "minecraft:deep_dark", - "#minecraft:is_river", "minecraft:desert", - "#minecraft:is_ocean", - "#minecraft:is_river", "minecraft:frozen_ocean", "minecraft:deep_frozen_ocean", "minecraft:warm_ocean", - "#minecraft:is_river", - "#minecraft:is_ocean", - "#minecraft:is_river", "minecraft:snowy_plains", "minecraft:ice_spikes", "minecraft:frozen_peaks", @@ -130,13 +123,8 @@ "minecraft:frozen_river", "minecraft:snowy_taiga", "minecraft:snowy_beach", - "#minecraft:is_end", "minecraft:desert", "minecraft:warm_ocean", - "#minecraft:is_jungle", - "#minecraft:is_savanna", - "#minecraft:is_nether", - "#minecraft:is_badlands", "minecraft:mangrove_swamp", "minecraft:plains", "minecraft:sunflower_plains", @@ -173,8 +161,6 @@ "minecraft:mushroom_fields", "minecraft:dripstone_caves", "minecraft:lush_caves", - "#minecraft:is_ocean", - "#minecraft:is_river", "minecraft:swamp", "minecraft:mangrove_swamp", "minecraft:mushroom_fields", From 90bd28a10e23ec29629d64122b4f80166ff758a1 Mon Sep 17 00:00:00 2001 From: Jeffrey Kosse Date: Thu, 9 Jun 2022 08:05:07 +0200 Subject: [PATCH 4/4] changed worldedit manen dependency --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9df4a7dd9..d34c65bb1 100644 --- a/pom.xml +++ b/pom.xml @@ -73,7 +73,7 @@ worldedit-repo - https://maven.sk89q.com/repo + https://maven.enginehub.org/repo