Update dependencies & bump version

TechnicJelle · Feb 2, 2025 · e9d5955 · e9d5955
1 parent 1d11a17
commit e9d5955
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 19 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -0,0 +1,25 @@
+name: Java CI with Maven
+
+on:
+  push:
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+      - name: Build with Maven
+        run: mvn -B package --file pom.xml
+      - name: Upload a Build Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          path: |
+            target/*.jar
+            !target/original-*.jar
diff --git a/pom.xml b/pom.xml
@@ -6,13 +6,13 @@
 
 	<groupId>com.technicjelle</groupId>
 	<artifactId>BlueMapPlayerControl</artifactId>
-	<version>1.5</version>
+	<version>1.6</version>
 	<packaging>jar</packaging>
 
 	<name>BlueMapPlayerControl</name>
 
 	<properties>
-		<java.version>11</java.version>
+		<java.version>21</java.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 
@@ -21,7 +21,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.8.1</version>
+				<version>3.13.0</version>
 				<configuration>
 					<source>${java.version}</source>
 					<target>${java.version}</target>
@@ -30,12 +30,16 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>
-				<version>3.2.4</version>
+				<version>3.6.0</version>
 				<configuration>
 					<relocations>
+						<relocation>
+							<pattern>com.technicjelle.UpdateChecker</pattern>
+							<shadedPattern>com.technicjelle.bluemapplayercontrol.shadow.UpdateChecker</shadedPattern>
+						</relocation>
 						<relocation>
 							<pattern>org.bstats</pattern>
-							<shadedPattern>com.technicjelle.bluemapplayercontrol</shadedPattern>
+							<shadedPattern>com.technicjelle.bluemapplayercontrol.shadow.bstats</shadedPattern>
 						</relocation>
 					</relocations>
 				</configuration>
@@ -62,24 +66,26 @@
 
 	<repositories>
 		<repository>
-			<id>papermc-repo</id>
+			<id>papermc</id>
 			<url>https://repo.papermc.io/repository/maven-public/</url>
 		</repository>
 		<repository>
 			<id>sonatype</id>
 			<url>https://oss.sonatype.org/content/groups/public/</url>
 		</repository>
 		<repository>
-			<id>jitpack.io</id>
-			<url>https://jitpack.io</url>
+			<id>bluecolored-releases</id>
+			<name>BlueColored Repository</name>
+			<url>https://repo.bluecolored.de/releases</url>
 		</repository>
 	</repositories>
 
 	<dependencies>
 		<dependency>
-			<groupId>com.github.TechnicJelle</groupId>
-			<artifactId>UpdateCheckerJava</artifactId>
-			<version>v2.3</version>
+			<groupId>com.technicjelle</groupId>
+			<artifactId>UpdateChecker</artifactId>
+			<version>2.5.1</version>
+			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.destroystokyo.paper</groupId>
@@ -88,9 +94,9 @@
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>com.github.BlueMap-Minecraft</groupId>
-			<artifactId>BlueMapAPI</artifactId>
-			<version>v2.6.1</version>
+			<groupId>de.bluecolored</groupId>
+			<artifactId>bluemap-api</artifactId>
+			<version>2.7.3</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -102,7 +108,7 @@
 		<dependency>
 			<groupId>org.bstats</groupId>
 			<artifactId>bstats-bukkit</artifactId>
-			<version>3.0.2</version>
+			<version>3.1.0</version>
 			<scope>compile</scope>
 		</dependency>
 	</dependencies>

diff --git a/src/main/java/com/technicjelle/bluemapplayercontrol/commands/BMPC.java b/src/main/java/com/technicjelle/bluemapplayercontrol/commands/BMPC.java
@@ -15,6 +15,7 @@
 import java.util.List;
 import java.util.UUID;
 
+@SuppressWarnings("UnstableApiUsage")
 public class BMPC implements CommandExecutor, TabCompleter {
 
 	public BMPC() {
@@ -26,8 +27,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
 			BlueMapAPI api = BlueMapAPI.getInstance().get();
 
 			// === SELF ===
-			if (sender instanceof Player) { // only players can self
-				Player player = (Player) sender;
+			if (sender instanceof Player player) { // only players can self
 				UUID senderUUID = player.getUniqueId();
 				if (args.length == 0) {
 					//toggle
@@ -65,8 +65,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
 					return true;
 				}
 				for (Entity target : targets) {
-					if (!(target instanceof Player)) continue;
-					Player targetPlayer = (Player) target;
+					if (!(target instanceof Player targetPlayer)) continue;
 					if (args.length == 1) {
 						//toggle
 						if (api.getWebApp().getPlayerVisibility(targetPlayer.getUniqueId())) {