Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 25 additions & 14 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -38,11 +37,11 @@
</repositories>

<dependencies>
<!-- SportPaper 1.8 -->
<!-- Intersected SportPaper 1.8-Paper 1.21.5 jar -->
<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>

Expand All @@ -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>
Comment on lines +55 to +61
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this needed? The net.md_5.bungee.api.ChatColor in the original code was likely an oversight, as org.bukkit.ChatColor should have been used from the beginning. You were right to correct the import; I’m just curious why the bungeecord-api dependency was added here as well.

</dependencies>

<build>
Expand All @@ -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 -->
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down