From fb5a20c603b2c397d74ef9f0d72e00cf9f8310ca Mon Sep 17 00:00:00 2001 From: Jeffrey Kosse Date: Tue, 7 Jun 2022 21:55:18 +0200 Subject: [PATCH 01/10] 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 5d6a9c934d..9df4a7dd96 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 eaf6f6f845..f0b767ef26 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 0e84d9d81b..03e5593a24 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 02/10] 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 0000000000..94b4fd1e8c --- /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 03/10] 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 94b4fd1e8c..43bb5d5ac9 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 04/10] changed worldedit manen dependency --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9df4a7dd96..d34c65bb1e 100644 --- a/pom.xml +++ b/pom.xml @@ -73,7 +73,7 @@ worldedit-repo - https://maven.sk89q.com/repo + https://maven.enginehub.org/repo From 29388bef37bbc1749c948297d44fb8190d17efbc Mon Sep 17 00:00:00 2001 From: TheBusyBiscuit Date: Sat, 11 Jun 2022 12:23:30 +0200 Subject: [PATCH 05/10] Updated readme and issue template --- .github/ISSUE_TEMPLATE/bug-report.yaml | 1 + README.md | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/bug-report.yaml b/.github/ISSUE_TEMPLATE/bug-report.yaml index 8e2cd0454c..82477eda22 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yaml +++ b/.github/ISSUE_TEMPLATE/bug-report.yaml @@ -113,6 +113,7 @@ body: label: '🎮 Minecraft Version' description: 'Please select the Minecraft version of the server' options: + - 1.19.x - 1.18.x - 1.17.x - 1.16.x diff --git a/README.md b/README.md index 2dbc36f5e6..b7b3c7acf1 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ Here is a full summary of the differences between the two different versions of | | development (latest) | "stable" | | ------------------ | -------- | -------- | -| **Minecraft version(s)** | :video_game: **1.14.\* - 1.18.\*** | :video_game: **1.14.\* - 1.18.\*** | +| **Minecraft version(s)** | :video_game: **1.14.\* - 1.19.\*** | :video_game: **1.14.\* - 1.18.\*** | | **automatic updates** | :heavy_check_mark: | :heavy_check_mark: | | **frequent updates** | :heavy_check_mark: | :x: | | **latest content** | :heavy_check_mark: | :x: | From 9226ccf1c9596569610c5587244c13ef925f5e4e Mon Sep 17 00:00:00 2001 From: TheBusyBiscuit Date: Sat, 11 Jun 2022 12:25:32 +0200 Subject: [PATCH 06/10] Updated `pom.xml` --- pom.xml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index ac45ed17d9..e781b9720c 100644 --- a/pom.xml +++ b/pom.xml @@ -208,6 +208,10 @@ kong.unirest io.github.thebusybiscuit.slimefun4.libraries.unirest + + org.apache.commons.lang + io.github.thebusybiscuit.slimefun4.libraries.commons.lang + @@ -350,7 +354,7 @@ io.github.baked-libs dough-api - 1.1.3 + 1.2.0 compile @@ -390,7 +394,7 @@ com.github.seeseemelk MockBukkit-v1.18 - 2.0.0 + 2.22.5 test @@ -502,11 +506,12 @@ - + commons-lang commons-lang 2.6 + compile From 8674e1f5de0fb46601abaa66378bc37c5a7baa4a Mon Sep 17 00:00:00 2001 From: TheBusyBiscuit Date: Sat, 11 Jun 2022 12:45:02 +0200 Subject: [PATCH 07/10] Revert to old MockBukkit version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e781b9720c..2c63cd61bb 100644 --- a/pom.xml +++ b/pom.xml @@ -394,7 +394,7 @@ com.github.seeseemelk MockBukkit-v1.18 - 2.22.5 + 2.0.0 test From cea698036801bf1b03336b8a9326bcf0de9726c6 Mon Sep 17 00:00:00 2001 From: TheBusyBiscuit Date: Sat, 11 Jun 2022 13:07:07 +0200 Subject: [PATCH 08/10] Fixed biome-map for 1.19 --- src/test/resources/biomes/1.19.x.json | 178 ++++++-------------------- 1 file changed, 37 insertions(+), 141 deletions(-) diff --git a/src/test/resources/biomes/1.19.x.json b/src/test/resources/biomes/1.19.x.json index 43bb5d5ac9..65022a47a0 100644 --- a/src/test/resources/biomes/1.19.x.json +++ b/src/test/resources/biomes/1.19.x.json @@ -1,169 +1,65 @@ [ + "minecraft:ocean", + "minecraft:plains", + "minecraft:desert", + "minecraft:windswept_hills", + "minecraft:forest", + "minecraft:taiga", "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:river", "minecraft:nether_wastes", - "minecraft:soul_sand_valley", - "minecraft:crimson_forest", - "minecraft:warped_forest", - "minecraft:basalt_deltas", + "minecraft:the_end", "minecraft:frozen_ocean", - "minecraft:ocean", - "minecraft:cold_ocean", - "minecraft:lukewarm_ocean", - "minecraft:warm_ocean", + "minecraft:frozen_river", + "minecraft:snowy_plains", "minecraft:mushroom_fields", - "minecraft:deep_frozen_ocean", - "minecraft:frozen_ocean", - "minecraft:deep_cold_ocean", - "minecraft:cold_ocean", + "minecraft:beach", + "minecraft:jungle", + "minecraft:sparse_jungle", "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:snowy_taiga", "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:windswept_forest", "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:desert", - "minecraft:frozen_ocean", - "minecraft:deep_frozen_ocean", + "minecraft:badlands", + "minecraft:wooded_badlands", + "minecraft:small_end_islands", + "minecraft:end_midlands", + "minecraft:end_highlands", + "minecraft:end_barrens", "minecraft:warm_ocean", - "minecraft:snowy_plains", - "minecraft:ice_spikes", - "minecraft:frozen_peaks", - "minecraft:jagged_peaks", - "minecraft:snowy_slopes", - "minecraft:frozen_ocean", + "minecraft:lukewarm_ocean", + "minecraft:cold_ocean", + "minecraft:deep_lukewarm_ocean", + "minecraft:deep_cold_ocean", "minecraft:deep_frozen_ocean", - "minecraft:grove", - "minecraft:deep_dark", - "minecraft:frozen_river", - "minecraft:snowy_taiga", - "minecraft:snowy_beach", - "minecraft:desert", - "minecraft:warm_ocean", - "minecraft:mangrove_swamp", - "minecraft:plains", + "minecraft:the_void", "minecraft:sunflower_plains", - "minecraft:snowy_plains", - "minecraft:ice_spikes", - "minecraft:desert", - "minecraft:forest", + "minecraft:windswept_gravelly_hills", "minecraft:flower_forest", - "minecraft:birch_forest", - "minecraft:dark_forest", + "minecraft:ice_spikes", "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:bamboo_jungle", + "minecraft:soul_sand_valley", + "minecraft:crimson_forest", + "minecraft:warped_forest", + "minecraft:basalt_deltas", + "minecraft:dripstone_caves", + "minecraft:lush_caves", + "minecraft:deep_dark", "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:swamp", - "minecraft:mangrove_swamp", - "minecraft:mushroom_fields", - "minecraft:the_void", - "minecraft:mushroom_fields" + "minecraft:stony_peaks" ] \ No newline at end of file From c05420565d0b4d465d35d944857a0d9462d6f975 Mon Sep 17 00:00:00 2001 From: TheBusyBiscuit Date: Sat, 11 Jun 2022 13:07:17 +0200 Subject: [PATCH 09/10] Added test cases for 1.19 biome maps --- .../utils/biomes/TestBiomeMapCompatibility.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/utils/biomes/TestBiomeMapCompatibility.java b/src/test/java/io/github/thebusybiscuit/slimefun4/utils/biomes/TestBiomeMapCompatibility.java index ac9ca22ea6..bec5087a86 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/utils/biomes/TestBiomeMapCompatibility.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun4/utils/biomes/TestBiomeMapCompatibility.java @@ -106,7 +106,8 @@ void testCompatibilities(String name, MinecraftVersion version) { testCases.put("nether_ice_v1.16", new MinecraftVersion[] { MinecraftVersion.MINECRAFT_1_16, MinecraftVersion.MINECRAFT_1_17, - MinecraftVersion.MINECRAFT_1_18 + MinecraftVersion.MINECRAFT_1_18, + MinecraftVersion.MINECRAFT_1_19 }); testCases.put("oil_v1.14", new MinecraftVersion[] { @@ -117,7 +118,8 @@ void testCompatibilities(String name, MinecraftVersion version) { }); testCases.put("oil_v1.18", new MinecraftVersion[] { - MinecraftVersion.MINECRAFT_1_18 + MinecraftVersion.MINECRAFT_1_18, + MinecraftVersion.MINECRAFT_1_19 }); testCases.put("salt_v1.14", new MinecraftVersion[] { @@ -128,7 +130,8 @@ void testCompatibilities(String name, MinecraftVersion version) { }); testCases.put("salt_v1.18", new MinecraftVersion[] { - MinecraftVersion.MINECRAFT_1_18 + MinecraftVersion.MINECRAFT_1_18, + MinecraftVersion.MINECRAFT_1_19 }); testCases.put("uranium_v1.14", new MinecraftVersion[] { @@ -145,7 +148,8 @@ void testCompatibilities(String name, MinecraftVersion version) { }); testCases.put("uranium_v1.18", new MinecraftVersion[] { - MinecraftVersion.MINECRAFT_1_18 + MinecraftVersion.MINECRAFT_1_18, + MinecraftVersion.MINECRAFT_1_19 }); // @formatter:on From 9a3a763f58635a7e84bab1c046e003c2728fed8a Mon Sep 17 00:00:00 2001 From: TheBusyBiscuit Date: Sat, 11 Jun 2022 13:12:09 +0200 Subject: [PATCH 10/10] Updated changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 69fcb2dfe5..ce8874b2e2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -38,6 +38,7 @@ #### Additions * Added Organic Food for Seagrass * Added Organic Fertilizer for Seagrass +* Added compatibility for Minecraft 1.19 #### Changes * Removed support for ChestTerminal @@ -48,6 +49,7 @@ * Fixed #3534 * Fixed #3538 * Fixed #3548 +* Fixed an issue with machines being placed below y=0 ## Release Candidate 31 (14 Mar 2022) https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#31