feat: adds support for Minecraft 1.20.4

timbru31 · Dec 12, 2023 · e5acf55 · e5acf55
1 parent 01523b3
commit e5acf55
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 29 deletions.
diff --git a/.github/workflows/maven-pr.yml b/.github/workflows/maven-pr.yml
@@ -73,7 +73,7 @@ jobs:
           [ -f ~/.m2/repository/org/spigotmc/spigot/1.19.3-R0.1-SNAPSHOT/spigot-1.19.3-R0.1-SNAPSHOT-remapped-mojang.jar ] || java -jar BuildTools.jar --rev 1.19.3 --remapped
           [ -f ~/.m2/repository/org/spigotmc/spigot/1.19.4-R0.1-SNAPSHOT/spigot-1.19.4-R0.1-SNAPSHOT-remapped-mojang.jar ] || java -jar BuildTools.jar --rev 1.19.4 --remapped
           [ -f ~/.m2/repository/org/spigotmc/spigot/1.20.1-R0.1-SNAPSHOT/spigot-1.20.1-R0.1-SNAPSHOT-remapped-mojang.jar ] || java -jar BuildTools.jar --rev 1.20.1 --remapped
-          [ -f ~/.m2/repository/org/spigotmc/spigot/1.20.2-R0.1-SNAPSHOT/spigot-1.20.2-R0.1-SNAPSHOT-remapped-mojang.jar ] || java -jar BuildTools.jar --rev 1.20.2 --remapped
+          [ -f ~/.m2/repository/org/spigotmc/spigot/1.20.4-R0.1-SNAPSHOT/spigot-1.20.4-R0.1-SNAPSHOT-remapped-mojang.jar ] || java -jar BuildTools.jar --rev 1.20.4 --remapped
 
       - name: Build with Maven
         run: mvn -D"http.keepAlive=false" -D"maven.wagon.http.pool=false" -D"maven.wagon.httpconnectionManager.ttlSeconds=120" "-Dhttps.protocols=TLSv1.2" -DskipTests=true "-Dmaven.javadoc.skip=true" -B clean package

diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ This Bukkit (compatible with CraftBukkit, Spigot, Paper) plugin adds a way to ob
 - Economy addon [SilkSpawnersEcoAddon](https://dev.bukkit.org/projects/silkspawnersecoaddon)
 - Shop addon [SilkSpawnersShopAddon](https://spigotmc.org/resources/12028/) (login required, Premium Plugin)
 - BossBarAPI support for >= 1.9, otherwise BarAPI can be used
-- Support for multiple Minecraft versions, from 1.8.8 to 1.20.2 (with exlusion of 1.9 and 1.10)
+- Support for multiple Minecraft versions, from 1.8.8 to 1.20.4 (with exlusion of 1.9 and 1.10)
 
 _Third party features, all of them can be disabled_
 
@@ -315,7 +315,7 @@ Unfortunately, I can't give access to https://repo.dustplanet.de/artifactory/pri
 mkdir -p BuildTools
 cd BuildTools
 wget -q https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar
-java -jar BuildTools.jar --rev 1.20.2 --remapped
+java -jar BuildTools.jar --rev 1.20.4 --remapped
 java -jar BuildTools.jar --rev 1.20.1 --remapped
 java -jar BuildTools.jar --rev 1.19.4 --remapped
 java -jar BuildTools.jar --rev 1.19.3 --remapped

diff --git a/modules/API/pom.xml b/modules/API/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>silkspawners-API</artifactId>
   <packaging>jar</packaging>
@@ -23,7 +24,7 @@
     <dependency>
       <groupId>org.spigotmc</groupId>
       <artifactId>spigot-api</artifactId>
-      <version>1.20.2-R0.1-SNAPSHOT</version>
+      <version>1.20.4-R0.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

diff --git a/modules/SilkSpawners/pom.xml b/modules/SilkSpawners/pom.xml
@@ -42,7 +42,7 @@
     <dependency>
       <groupId>org.spigotmc</groupId>
       <artifactId>spigot-api</artifactId>
-      <version>1.20.2-R0.1-SNAPSHOT</version>
+      <version>1.20.4-R0.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.sk89q</groupId>
@@ -190,7 +190,7 @@
     </dependency>
     <dependency>
       <groupId>de.dustplanet</groupId>
-      <artifactId>silkspawners-v1_20_R2</artifactId>
+      <artifactId>silkspawners-v1_20_R3</artifactId>
       <version>7.5.1-SNAPSHOT</version>
     </dependency>
     <dependency>

diff --git a/modules/SilkSpawners/src/main/java/de/dustplanet/silkspawners/SilkSpawners.java b/modules/SilkSpawners/src/main/java/de/dustplanet/silkspawners/SilkSpawners.java
@@ -53,9 +53,9 @@ public class SilkSpawners extends JavaPlugin {
     private String nmsVersion;
     private static final int PLUGIN_ID = 35_890;
     private static final int BSTATS_PLUGIN_ID = 273;
-    private static final String[] COMPATIBLE_MINECRAFT_VERSIONS = { "v1_8_R3", "v1_11_R1", "v1_12_R1",
-            "v1_13_R2", "v1_14_R1", "v1_15_R1", "v1_16_R1", "v1_16_R2", "v1_16_R3", "v1_17_R1", "v1_18_R1", "v1_18_R2", "v1_19_R1",
-            "v1_19_R2", "v1_19_R3", "v1_20_R1", "v1_20_R2" };
+    private static final String[] COMPATIBLE_MINECRAFT_VERSIONS = { "v1_8_R3", "v1_11_R1", "v1_12_R1", "v1_13_R2", "v1_14_R1", "v1_15_R1",
+            "v1_16_R1", "v1_16_R2", "v1_16_R3", "v1_17_R1", "v1_18_R1", "v1_18_R2", "v1_19_R1", "v1_19_R2", "v1_19_R3", "v1_20_R1",
+            "v1_20_R3" };
     public CommentedConfiguration config;
     public CommentedConfiguration localization;
     @Getter

diff --git a/modules/v1_20_R2/pom.xml → modules/v1_20_R3/pom.xml b/modules/v1_20_R2/pom.xml → modules/v1_20_R3/pom.xml
@@ -1,9 +1,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>silkspawners-v1_20_R2</artifactId>
+  <artifactId>silkspawners-v1_20_R3</artifactId>
   <packaging>jar</packaging>
-  <name>SilkSpawners for v1_20_R2</name>
+  <name>SilkSpawners for v1_20_R3</name>
 
   <parent>
     <groupId>de.dustplanet</groupId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>org.spigotmc</groupId>
       <artifactId>spigot</artifactId>
-      <version>1.20.2-R0.1-SNAPSHOT</version>
+      <version>1.20.4-R0.1-SNAPSHOT</version>
       <scope>provided</scope>
       <classifier>remapped-mojang</classifier>
       <exclusions>
@@ -47,9 +47,9 @@
             </goals>
             <id>remap-mojang</id>
             <configuration>
-              <srgIn>org.spigotmc:minecraft-server:1.20.2-R0.1-SNAPSHOT:txt:maps-mojang</srgIn>
+              <srgIn>org.spigotmc:minecraft-server:1.20.4-R0.1-SNAPSHOT:txt:maps-mojang</srgIn>
               <reverse>true</reverse>
-              <remappedDependencies>org.spigotmc:spigot:1.20.2-R0.1-SNAPSHOT:jar:remapped-mojang</remappedDependencies>
+              <remappedDependencies>org.spigotmc:spigot:1.20.4-R0.1-SNAPSHOT:jar:remapped-mojang</remappedDependencies>
               <remappedArtifactAttached>true</remappedArtifactAttached>
               <remappedClassifierName>remapped-mojang</remappedClassifierName>
             </configuration>
@@ -62,8 +62,8 @@
             <id>remap-spigot</id>
             <configuration>
               <inputFile>${project.build.directory}/${project.artifactId}-${project.version}-remapped-mojang.jar</inputFile>
-              <srgIn>org.spigotmc:minecraft-server:1.20.2-R0.1-SNAPSHOT:csrg:maps-spigot</srgIn>
-              <remappedDependencies>org.spigotmc:spigot:1.20.2-R0.1-SNAPSHOT:jar:remapped-mojang</remappedDependencies>
+              <srgIn>org.spigotmc:minecraft-server:1.20.4-R0.1-SNAPSHOT:csrg:maps-spigot</srgIn>
+              <remappedDependencies>org.spigotmc:spigot:1.20.4-R0.1-SNAPSHOT:jar:remapped-mojang</remappedDependencies>
             </configuration>
           </execution>
         </executions>

diff --git a/...kspawners/compat/v1_20_R2/NMSHandler.java → ...kspawners/compat/v1_20_R3/NMSHandler.java b/...kspawners/compat/v1_20_R2/NMSHandler.java → ...kspawners/compat/v1_20_R3/NMSHandler.java
@@ -1,4 +1,4 @@
-package de.dustplanet.silkspawners.compat.v1_20_R2;
+package de.dustplanet.silkspawners.compat.v1_20_R3;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -22,12 +22,12 @@
 import org.bukkit.boss.BarColor;
 import org.bukkit.boss.BarStyle;
 import org.bukkit.boss.BossBar;
-import org.bukkit.craftbukkit.v1_20_R2.CraftServer;
-import org.bukkit.craftbukkit.v1_20_R2.CraftWorld;
-import org.bukkit.craftbukkit.v1_20_R2.block.CraftBlockEntityState;
-import org.bukkit.craftbukkit.v1_20_R2.block.CraftCreatureSpawner;
-import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer;
-import org.bukkit.craftbukkit.v1_20_R2.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.v1_20_R3.CraftServer;
+import org.bukkit.craftbukkit.v1_20_R3.CraftWorld;
+import org.bukkit.craftbukkit.v1_20_R3.block.CraftBlockEntityState;
+import org.bukkit.craftbukkit.v1_20_R3.block.CraftCreatureSpawner;
+import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_20_R3.inventory.CraftItemStack;
 import org.bukkit.entity.Player;
 import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
 import org.bukkit.inventory.ItemStack;
@@ -53,7 +53,6 @@
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.network.ServerPlayerConnection;
-import net.minecraft.util.RandomSource;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.item.Item;
@@ -202,9 +201,8 @@ public boolean setMobNameOfSpawner(final BlockState blockState, final String mob
             final SpawnerBlockEntity tile = (SpawnerBlockEntity) tileField.get(spawner);
             final Registry<EntityType<?>> entityTypeRegistry = BuiltInRegistries.ENTITY_TYPE;
             final ResourceLocation resourceLocation = new ResourceLocation(safeMobID);
-            final RandomSource rand = RandomSource.create();
-            tile.getSpawner().setEntityId(entityTypeRegistry.get(resourceLocation), spawner.getWorldHandle().getMinecraftWorld(), rand,
-                    spawner.getPosition());
+            tile.getSpawner().setEntityId(entityTypeRegistry.get(resourceLocation), spawner.getWorldHandle().getMinecraftWorld(),
+                    spawner.getWorldHandle().getRandom(), spawner.getPosition());
             return true;
         } catch (IllegalArgumentException | IllegalAccessException e) {
             Bukkit.getLogger().warning("[SilkSpawners] Reflection failed: " + e.getMessage());

diff --git a/pom.xml b/pom.xml
@@ -37,7 +37,7 @@
     <module>modules/v1_19_R2</module>
     <module>modules/v1_19_R3</module>
     <module>modules/v1_20_R1</module>
-    <module>modules/v1_20_R2</module>
+    <module>modules/v1_20_R3</module>
     <module>modules/SilkSpawners</module>
   </modules>