Merge pull request Slimefun#3585 from Slimefun/major/1.19

1.19 compatibility

.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

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

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: |

pom.xml

@@ -26,7 +26,7 @@
         <maven.compiler.target>1.8</maven.compiler.target>
 
         <!-- Spigot properties -->
-        <spigot.version>1.18.1</spigot.version>
+        <spigot.version>1.19</spigot.version>
         <spigot.javadocs>https://hub.spigotmc.org/javadocs/spigot/</spigot.javadocs>
 
         <!-- Default settings for sonarcloud.io -->
@@ -208,6 +208,10 @@
                             <pattern>kong.unirest</pattern>
                             <shadedPattern>io.github.thebusybiscuit.slimefun4.libraries.unirest</shadedPattern>
                         </relocation>
+                        <relocation>
+                            <pattern>org.apache.commons.lang</pattern>
+                            <shadedPattern>io.github.thebusybiscuit.slimefun4.libraries.commons.lang</shadedPattern>
+                        </relocation>
                     </relocations>
 
                     <!-- Exclude unneeded metadata files from shaded dependencies -->
@@ -350,7 +354,7 @@
         <dependency>
             <groupId>io.github.baked-libs</groupId>
             <artifactId>dough-api</artifactId>
-            <version>1.1.3</version>
+            <version>1.2.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -502,5 +506,12 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <!-- TODO: Remove this dependency -->
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <version>2.6</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 </project>

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

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",

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
 

src/test/resources/biomes/1.19.x.json

@@ -0,0 +1,65 @@
+[
+  "minecraft:ocean",
+  "minecraft:plains",
+  "minecraft:desert",
+  "minecraft:windswept_hills",
+  "minecraft:forest",
+  "minecraft:taiga",
+  "minecraft:swamp",
+  "minecraft:mangrove_swamp",
+  "minecraft:river",
+  "minecraft:nether_wastes",
+  "minecraft:the_end",
+  "minecraft:frozen_ocean",
+  "minecraft:frozen_river",
+  "minecraft:snowy_plains",
+  "minecraft:mushroom_fields",
+  "minecraft:beach",
+  "minecraft:jungle",
+  "minecraft:sparse_jungle",
+  "minecraft:deep_ocean",
+  "minecraft:stony_shore",
+  "minecraft:snowy_beach",
+  "minecraft:birch_forest",
+  "minecraft:dark_forest",
+  "minecraft:snowy_taiga",
+  "minecraft:old_growth_pine_taiga",
+  "minecraft:windswept_forest",
+  "minecraft:savanna",
+  "minecraft:savanna_plateau",
+  "minecraft:badlands",
+  "minecraft:wooded_badlands",
+  "minecraft:small_end_islands",
+  "minecraft:end_midlands",
+  "minecraft:end_highlands",
+  "minecraft:end_barrens",
+  "minecraft:warm_ocean",
+  "minecraft:lukewarm_ocean",
+  "minecraft:cold_ocean",
+  "minecraft:deep_lukewarm_ocean",
+  "minecraft:deep_cold_ocean",
+  "minecraft:deep_frozen_ocean",
+  "minecraft:the_void",
+  "minecraft:sunflower_plains",
+  "minecraft:windswept_gravelly_hills",
+  "minecraft:flower_forest",
+  "minecraft:ice_spikes",
+  "minecraft:old_growth_birch_forest",
+  "minecraft:old_growth_spruce_taiga",
+  "minecraft:windswept_savanna",
+  "minecraft:eroded_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"
+]