1.20 (#3839)

.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.20.x
       - 1.19.x
       - 1.18.x
       - 1.17.x

.github/PULL_REQUEST_TEMPLATE.md

@@ -17,7 +17,7 @@
 <!-- Don't worry, these are not requirements. They only serve as guidance. -->
 - [ ] I have fully tested the proposed changes and promise that they will not break everything into chaos.
 - [ ] I have also tested the proposed changes in combination with various popular addons and can confirm my changes do not break them.
-- [ ] I have made sure that the proposed changes do not break compatibility across the supported Minecraft versions (1.16.* - 1.19.*).
+- [ ] I have made sure that the proposed changes do not break compatibility across the supported Minecraft versions (1.16.* - 1.20.*).
 - [ ] I followed the existing code standards and didn't mess up the formatting.
 - [ ] I did my best to add documentation to any public classes or methods I added.
 - [ ] I have added `Nonnull` and `Nullable` annotations to my methods to indicate their behaviour for null values

CHANGELOG.md

@@ -45,6 +45,7 @@
 * (API) Added EnergyNet#getConsumers()
 * Added Bamboo as a fuel type for Tier 1 Androids
 * Added "Basalt -> Blackstone" recipe to the Grind Stone
+* Added compatibility for Minecraft 1.20
 
 #### Changes
 * Removed 1.14.* and 1.15.* support

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.16.\* - 1.19.\*** | :video_game: **1.14.\* - 1.19.\*** |
+| **Minecraft version(s)** | :video_game: **1.16.\* - 1.20.\*** | :video_game: **1.14.\* - 1.19.\*** |
 | **Java version** | :computer: **Java 16 (or higher)** | :computer: **Java 16 (or higher)** |
 | **automatic updates** | :heavy_check_mark: | :heavy_check_mark: |
 | **frequent updates** | :heavy_check_mark: | :x: |

pom.xml

@@ -26,7 +26,7 @@
         <maven.compiler.target>16</maven.compiler.target>
 
         <!-- Spigot properties -->
-        <spigot.version>1.19</spigot.version>
+        <spigot.version>1.20</spigot.version>
         <spigot.javadocs>https://hub.spigotmc.org/javadocs/spigot/</spigot.javadocs>
 
         <!-- Default settings for sonarcloud.io -->
@@ -351,10 +351,11 @@
         </dependency>
 
         <!-- Shaded packages -->
+        <!-- TODO: Revert changes back to maven when dough 1.3 released -->
         <dependency>
-            <groupId>io.github.baked-libs</groupId>
+            <groupId>com.github.baked-libs.dough</groupId>
             <artifactId>dough-api</artifactId>
-            <version>1.2.0</version>
+            <version>39856a32c4</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

src/main/java/io/github/thebusybiscuit/slimefun4/api/MinecraftVersion.java

@@ -43,6 +43,12 @@ public enum MinecraftVersion {
      */
     MINECRAFT_1_19(19, "1.19.x"),
 
+    /**
+     * This constant represents Minecraft (Java Edition) Version 1.20
+     * ("The Trails & Tales Update")
+     */
+    MINECRAFT_1_20(20, "1.20.x"),
+
     /**
      * This constant represents an exceptional state in which we were unable
      * to identify the Minecraft Version we are using

src/test/java/io/github/thebusybiscuit/slimefun4/utils/biomes/TestBiomeMapCompatibility.java

@@ -102,7 +102,8 @@ class TestBiomeMapCompatibility {
             MinecraftVersion.MINECRAFT_1_16,
             MinecraftVersion.MINECRAFT_1_17,
             MinecraftVersion.MINECRAFT_1_18,
-            MinecraftVersion.MINECRAFT_1_19
+            MinecraftVersion.MINECRAFT_1_19,
+            MinecraftVersion.MINECRAFT_1_20
         });
         
         testCases.put("oil_v1.16", new MinecraftVersion[] {
@@ -112,7 +113,8 @@ class TestBiomeMapCompatibility {
         
         testCases.put("oil_v1.18", new MinecraftVersion[] {
             MinecraftVersion.MINECRAFT_1_18,
-            MinecraftVersion.MINECRAFT_1_19
+            MinecraftVersion.MINECRAFT_1_19,
+            MinecraftVersion.MINECRAFT_1_20
         });
         
         testCases.put("salt_v1.16", new MinecraftVersion[] {
@@ -122,7 +124,8 @@ class TestBiomeMapCompatibility {
         
         testCases.put("salt_v1.18", new MinecraftVersion[] {
             MinecraftVersion.MINECRAFT_1_18,
-            MinecraftVersion.MINECRAFT_1_19
+            MinecraftVersion.MINECRAFT_1_19,
+            MinecraftVersion.MINECRAFT_1_20
         });
         
         testCases.put("uranium_v1.16", new MinecraftVersion[] {
@@ -135,7 +138,8 @@ class TestBiomeMapCompatibility {
         
         testCases.put("uranium_v1.18", new MinecraftVersion[] {
             MinecraftVersion.MINECRAFT_1_18,
-            MinecraftVersion.MINECRAFT_1_19
+            MinecraftVersion.MINECRAFT_1_19,
+            MinecraftVersion.MINECRAFT_1_20
         });
         // @formatter:on
 

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

@@ -0,0 +1,67 @@
+[
+  "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",
+  "minecraft:cherry_grove",
+  "minecraft:custom",
+]