From 4053291b10e8170f8a6685352d8586ed8759344e Mon Sep 17 00:00:00 2001 From: ItsLewizzz <lewisduncan7@hotmail.com> Date: Fri, 10 Jun 2022 17:22:32 +0100 Subject: [PATCH] Spigot 1.19 support --- pom.xml | 19 ++++++++++--------- .../deluxehub/command/CommandManager.java | 6 +++--- src/main/resources/config.yml | 2 +- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index 76456b23..ba53c832 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <groupId>fun.lewisdev</groupId> <artifactId>DeluxeHub</artifactId> - <version>3.5.1</version> + <version>3.5.2</version> <packaging>jar</packaging> <name>DeluxeHub</name> @@ -51,7 +51,7 @@ <artifactSet> <includes> <include>org.bstats:bstats-bukkit-lite</include> - <include>cl.bgmp:command-framework-bukkit</include> + <include>com.github.BGMP.CommandFramework:command-framework-bukkit</include> <include>javax.inject:javax.inject</include> <include>de.tr7zw:item-nbt-api</include> </includes> @@ -64,11 +64,11 @@ </relocation> <relocation> <pattern>cl.bgmp</pattern> - <shadedPattern>fun.lewisdev.deluxehub.libs.commandframework</shadedPattern> + <shadedPattern>fun.lewisdev.deluxehub.libs.command</shadedPattern> </relocation> <relocation> <pattern>de.tr7zw.changeme.nbtapi</pattern> - <shadedPattern>fun.lewisdev.deluxehub.libs.nbtapi</shadedPattern> + <shadedPattern>fun.lewisdev.deluxehub.libs.nbt</shadedPattern> </relocation> </relocations> </configuration> @@ -94,8 +94,8 @@ <url>https://oss.sonatype.org/content/groups/public/</url> </repository> <repository> - <id>bgm</id> - <url>https://maven.bgmp.cl/</url> + <id>jitpack.io</id> + <url>https://jitpack.io</url> </repository> <repository> <id>CodeMC</id> @@ -153,14 +153,15 @@ <version>1.2</version> </dependency> <dependency> - <groupId>cl.bgmp</groupId> + <groupId>com.github.BGMP.CommandFramework</groupId> <artifactId>command-framework-bukkit</artifactId> - <version>1.0.3-SNAPSHOT</version> + <version>master</version> + <scope>compile</scope> </dependency> <dependency> <groupId>de.tr7zw</groupId> <artifactId>item-nbt-api</artifactId> - <version>2.9.2</version> + <version>2.10.0-SNAPSHOT</version> </dependency> <dependency> <groupId>com.github.shynixn.headdatabase</groupId> diff --git a/src/main/java/fun/lewisdev/deluxehub/command/CommandManager.java b/src/main/java/fun/lewisdev/deluxehub/command/CommandManager.java index 3fbb7916..2446b7e1 100644 --- a/src/main/java/fun/lewisdev/deluxehub/command/CommandManager.java +++ b/src/main/java/fun/lewisdev/deluxehub/command/CommandManager.java @@ -16,13 +16,13 @@ public class CommandManager { - private DeluxeHubPlugin plugin; - private FileConfiguration config; + private final DeluxeHubPlugin plugin; + private final FileConfiguration config; private CommandsManager commands; private CommandsManagerRegistration commandRegistry; - private List<CustomCommand> customCommands; + private final List<CustomCommand> customCommands; public CommandManager(DeluxeHubPlugin plugin) { this.plugin = plugin; diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 32c63092..dd62e720 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -39,7 +39,7 @@ # [CLOSE] - Close an open inventory gui #-------- # MESSAGE FORMATTING: -# {#hex-code} - Hex chat colour (requires Spigot 1.16+) (e.g. "{#5fad95}Hello!") +# HEX colors formatting: https://wiki.lewisdev.fun/text-colours-rgb # <center> Centered message! </center> - Centers a message in chat # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~#