Merge remote-tracking branch 'Slimefun/master'

DEV - 1015 Slimefun日誌: - 增加 1.19 兼容性 - 修復當放置機器在y=0以下的問題
xMikux · Jun 11, 2022 · 3bc6d14 · 3bc6d14
2 parents 2f8e1b0 + 2c4f886
commit 3bc6d14
Show file tree

Hide file tree

Showing 9 changed files with 113 additions and 18 deletions.
diff --git a/.github/workflows/discord-webhook.yml b/.github/workflows/discord-webhook.yml
@@ -21,7 +21,7 @@ jobs:
       uses: actions/[email protected]
 
     - name: Set up Java JDK 17
-      uses: actions/setup-java@v3.2.0
+      uses: actions/setup-java@v3.3.0
       with:
         distribution: 'adopt'
         java-version: '17'

diff --git a/.github/workflows/maven-compiler.yml b/.github/workflows/maven-compiler.yml
@@ -24,7 +24,7 @@ jobs:
       uses: actions/checkout@v3
 
     - name: Set up JDK 17
-      uses: actions/setup-java@v3.2.0
+      uses: actions/setup-java@v3.3.0
       with:
         distribution: 'adopt'
         java-version: '17'

diff --git 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

diff --git a/README.md b/README.md
@@ -41,7 +41,7 @@
 
 | | 開發版 (最新) | "穩定版 (官方)" |
 | ------------------ | -------- | -------- |
-| **Minecraft 版本** | :video_game: **1.14.\* - 1.18.\*** | :video_game: **1.14.\* - 1.18.\*** |
+| **Minecraft 版本** | :video_game: **1.14.\* - 1.19.\*** | :video_game: **1.14.\* - 1.18.\*** |
 | **自動更新** | :heavy_check_mark: | :heavy_check_mark: |
 | **頻繁的更新** | :heavy_check_mark: | :x: |
 | **最新內容** | :heavy_check_mark: | :x: |

diff --git a/pom.xml b/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 -->
@@ -73,7 +73,7 @@
         <repository>
             <!-- WorldEdit -->
             <id>worldedit-repo</id>
-            <url>https://maven.sk89q.com/repo</url>
+            <url>https://maven.enginehub.org/repo/</url>
         </repository>
         <repository>
             <!-- PlaceholderAPI -->
@@ -146,7 +146,7 @@
                 <!-- Plugin for Unit Tests -->
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.0.0-M6</version>
+                <version>3.0.0-M7</version>
 
                 <configuration>
                     <junitArtifactName>org.junit.jupiter:junit-jupiter</junitArtifactName>
@@ -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>
@@ -384,13 +388,13 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>4.5.1</version>
+            <version>4.6.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.github.seeseemelk</groupId>
             <artifactId>MockBukkit-v1.18</artifactId>
-            <version>1.24.1</version>
+            <version>2.0.0</version>
             <scope>test</scope>
 
             <exclusions>
@@ -407,7 +411,7 @@
         <dependency>
             <groupId>com.sk89q.worldedit</groupId>
             <artifactId>worldedit-core</artifactId>
-            <version>7.2.8</version>
+            <version>7.2.10</version>
             <scope>provided</scope>
 
             <exclusions>
@@ -421,7 +425,7 @@
         <dependency>
             <groupId>com.sk89q.worldedit</groupId>
             <artifactId>worldedit-bukkit</artifactId>
-            <version>7.2.8</version>
+            <version>7.2.10</version>
             <scope>provided</scope>
 
             <exclusions>
@@ -435,7 +439,7 @@
         <dependency>
             <groupId>com.gmail.nossr50.mcMMO</groupId>
             <artifactId>mcMMO</artifactId>
-            <version>2.1.212</version>
+            <version>2.1.214</version>
             <scope>provided</scope>
 
             <exclusions>
@@ -477,7 +481,7 @@
         <dependency>
             <groupId>com.github.LoneDev6</groupId>
             <artifactId>itemsadder-api</artifactId>
-            <version>3.1.0b</version>
+            <version>3.1.6</version>
             <scope>provided</scope>
 
             <exclusions>
@@ -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>
diff --git 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
@@ -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",

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

diff --git a/src/test/resources/biomes/1.19.x.json b/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"
+]