From 9c118e5d1d1bf55813bc86946a73cae8280a078e Mon Sep 17 00:00:00 2001
From: "BT (calcastor/mame)" <43831917+calcastor@users.noreply.github.com>
Date: Tue, 20 May 2025 11:00:51 -0700
Subject: [PATCH] Build against SportPaper-Paper intersect jar

---
 pom.xml                                       | 39 ++++++++++++-------
 .../occ/environment/EnvironmentCommand.java   |  2 +-
 2 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index 86c8cdb..4fd0714 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,8 +7,7 @@
   <description>An environment variable API plugin for Minecraft</description>
 
   <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.release>21</maven.compiler.release>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.bukkit.main>tc.oc.occ.environment.Environment</project.bukkit.main>
         <project.author>applenick</project.author>
@@ -38,11 +37,11 @@
     </repositories>
 
     <dependencies>
-        <!-- SportPaper 1.8 -->
+        <!-- Bukkit/Paper API -->
         <dependency>
-            <groupId>app.ashcon</groupId>
-            <artifactId>sportpaper</artifactId>
-            <version>1.8.8-R0.1-SNAPSHOT</version>
+            <groupId>dev.pgm.paper</groupId>
+            <artifactId>paper-api</artifactId>
+            <version>1.8_1.21.10-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
@@ -52,6 +51,14 @@
             <artifactId>acf-bukkit</artifactId>
             <version>0.5.1-SNAPSHOT</version>
         </dependency>
+
+        <!-- BungeeCord api, same as in Paper 1.21 -->
+        <dependency>
+            <groupId>net.md-5</groupId>
+            <artifactId>bungeecord-api</artifactId>
+            <version>1.21-R0.2</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -67,7 +74,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
+                <version>3.14.1</version>
                 <configuration>
                     <compilerArgs>
                         <arg>-parameters</arg> <!-- Required for aikar/commands to auto generate syntax -->
@@ -78,7 +85,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.3</version>
+                <version>3.6.1</version>
                 <configuration>
                     <relocations>
                         <relocation>
@@ -114,19 +121,23 @@
 
             <!-- Validates that code is properly formatted with Google's code style -->
             <plugin>
-                <groupId>com.coveo</groupId>
+                <groupId>com.spotify.fmt</groupId>
                 <artifactId>fmt-maven-plugin</artifactId>
-                <version>2.9</version>
-                <configuration>
-                    <style>google</style>
-                </configuration>
+                <version>2.27</version>
                 <executions>
                     <execution>
                         <goals>
-                            <goal>check</goal>
+                            <goal>format</goal>
                         </goals>
                     </execution>
                 </executions>
+                <dependencies>
+                    <dependency>
+                        <groupId>com.google.googlejavaformat</groupId>
+                        <artifactId>google-java-format</artifactId>
+                        <version>1.27.0</version>
+                    </dependency>
+                </dependencies>
             </plugin>
         </plugins>
     </build>
diff --git a/src/main/java/tc/oc/occ/environment/EnvironmentCommand.java b/src/main/java/tc/oc/occ/environment/EnvironmentCommand.java
index 99662b1..1ef2ab5 100644
--- a/src/main/java/tc/oc/occ/environment/EnvironmentCommand.java
+++ b/src/main/java/tc/oc/occ/environment/EnvironmentCommand.java
@@ -8,7 +8,7 @@
 import co.aikar.commands.annotation.Dependency;
 import co.aikar.commands.annotation.Subcommand;
 import java.util.Set;
-import net.md_5.bungee.api.ChatColor;
+import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 
 @CommandAlias("env")