Skip to content

Commit f9d768c

Browse files
Ghost-chuGhost-chu
committed
Remove all Adventure Lib imports and usage from QuickShop
1 parent 07dafbd commit f9d768c

File tree

9 files changed

+223
-462
lines changed

9 files changed

+223
-462
lines changed

‎pom.xml‎

Lines changed: 13 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<artifactId>QuickShop</artifactId>
2626

2727
<properties>
28-
<pluginver>4.0.10.0</pluginver>
28+
<pluginver>5.0.0.0</pluginver>
2929
<package>org.maxgamer.quickshop</package>
3030
<developer>Ghost-chu</developer>
3131
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -208,22 +208,10 @@
208208
<pattern>org.enginehub.squirrelid.</pattern>
209209
<shadedPattern>org.maxgamer.quickshop.shade.org.enginehub.squirrelid.</shadedPattern>
210210
</relocation>
211-
<relocation>
212-
<pattern>net.kyori.</pattern>
213-
<shadedPattern>org.maxgamer.quickshop.shade.org.net.kyori.</shadedPattern>
214-
</relocation>
215211
<relocation>
216212
<pattern>com.squareup.</pattern>
217213
<shadedPattern>org.maxgamer.quickshop.shade.org.com.squareup.</shadedPattern>
218214
</relocation>
219-
<relocation>
220-
<pattern>net.kyori.examination.</pattern>
221-
<shadedPattern>org.maxgamer.quickshop.shade.net.kyori.examination</shadedPattern>
222-
</relocation>
223-
<relocation>
224-
<pattern>net.kyori.adventure.</pattern>
225-
<shadedPattern>org.maxgamer.quickshop.shade.kyori.adventure</shadedPattern>
226-
</relocation>
227215

228216

229217

@@ -846,12 +834,6 @@
846834
<version>[1.0,)</version>
847835
<artifactId>rollbar-java</artifactId>
848836
</dependency>
849-
<!-- <dependency>-->
850-
<!-- <groupId>de.themoep</groupId>-->
851-
<!-- <artifactId>minedown</artifactId>-->
852-
<!-- <version>1.7.1-SNAPSHOT</version>-->
853-
<!-- <scope>compile</scope>-->
854-
<!-- </dependency>-->
855837
<dependency>
856838
<groupId>de.themoep</groupId>
857839
<artifactId>minedown</artifactId>
@@ -872,18 +854,18 @@
872854
<version>4.9.2</version>
873855
<systemPath>${project.basedir}/lib/TNE.jar</systemPath>
874856
</dependency>
875-
<!-- <dependency>-->
876-
<!-- <groupId>com.songoda</groupId>-->
877-
<!-- <artifactId>skyblock</artifactId>-->
878-
<!-- <version>2.2.13</version>-->
879-
<!-- <scope>provided</scope>-->
880-
<!-- <exclusions>-->
881-
<!-- <exclusion>-->
882-
<!-- <artifactId>MVdWPlaceholderAPI</artifactId>-->
883-
<!-- <groupId>be.maximvdw</groupId>-->
884-
<!-- </exclusion>-->
885-
<!-- </exclusions>-->
886-
<!-- </dependency>-->
857+
<dependency>
858+
<groupId>com.songoda</groupId>
859+
<artifactId>skyblock</artifactId>
860+
<version>2.2.13</version>
861+
<scope>provided</scope>
862+
<exclusions>
863+
<exclusion>
864+
<artifactId>MVdWPlaceholderAPI</artifactId>
865+
<groupId>be.maximvdw</groupId>
866+
</exclusion>
867+
</exclusions>
868+
</dependency>
887869
<!-- <dependency>-->
888870
<!-- <groupId>team.aura_dev.lib.slf4j-plugin.spigot</groupId>-->
889871
<!-- <artifactId>slf4j-plugin-spigot</artifactId>-->

‎src/main/java/org/maxgamer/quickshop/QuickShop.java‎

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,9 @@
2323
import com.google.common.collect.Lists;
2424
import com.sk89q.worldedit.bukkit.WorldEditPlugin;
2525
import lombok.Getter;
26-
import lombok.NonNull;
2726
import lombok.Setter;
2827
import me.minebuilders.clearlag.Clearlag;
2928
import me.minebuilders.clearlag.listeners.ItemMergeListener;
30-
import net.kyori.adventure.platform.bukkit.BukkitAudiences;
3129
import org.apache.commons.lang.StringUtils;
3230
import org.bukkit.Bukkit;
3331
import org.bukkit.OfflinePlayer;
@@ -46,6 +44,7 @@
4644
import org.jetbrains.annotations.NotNull;
4745
import org.jetbrains.annotations.Nullable;
4846
import org.maxgamer.quickshop.api.QuickShopAPI;
47+
import org.maxgamer.quickshop.chat.QuickChat;
4948
import org.maxgamer.quickshop.command.CommandManager;
5049
import org.maxgamer.quickshop.database.*;
5150
import org.maxgamer.quickshop.economy.*;
@@ -254,8 +253,8 @@ public class QuickShop extends JavaPlugin {
254253
private BuildInfo buildInfo;
255254
// @Getter
256255
// private QuickChatType quickChatType = QuickChatType.ADVENTURE;
257-
// @Getter
258-
// private QuickChat quickChat = new AdventureQuickChat();
256+
@Getter
257+
private QuickChat quickChat = new BungeeChat();
259258
@Getter
260259
@Nullable
261260
private String currency = null;
@@ -267,7 +266,6 @@ public class QuickShop extends JavaPlugin {
267266
private Plugin worldEditPlugin;
268267
@Getter
269268
private WorldEditAdapter worldEditAdapter;
270-
private BukkitAudiences adventure;
271269
@Getter
272270
private TextManager textManager ;
273271

@@ -666,10 +664,6 @@ public final void onDisable() {
666664
Util.debugLog("Unregistering plugin services...");
667665
getServer().getServicesManager().unregisterAll(this);
668666
Util.debugLog("Cleanup...");
669-
if(this.adventure != null) {
670-
this.adventure.close();
671-
this.adventure = null;
672-
}
673667
Util.debugLog("All shutdown work is finished.");
674668

675669
}
@@ -788,9 +782,8 @@ public final void onEnable() {
788782
getLogger().info("Developers: " + Util.list2String(this.getDescription().getAuthors()));
789783
getLogger().info("Original author: Netherfoam, Timtower, KaiNoMood");
790784
getLogger().info("Let's start loading the plugin");
791-
this.adventure = BukkitAudiences.create(this);
792785
//getLogger().info("Chat processor selected: " + this.quickChatType.name());
793-
getLogger().info("Chat processor selected: Hardcoded Adventure Lib");
786+
getLogger().info("Chat processor selected: Hardcoded BungeeChat Lib");
794787
/* Process Metrics and Sentry error reporter. */
795788
metrics = new Metrics(this, 3320);
796789

@@ -1963,13 +1956,6 @@ public void registerCustomCommands() {
19631956
Util.debugLog("Command alias successfully registered.");
19641957
}
19651958

1966-
public @NonNull BukkitAudiences adventure() {
1967-
if(this.adventure == null) {
1968-
throw new IllegalStateException("Tried to access Adventure when the plugin was disabled!");
1969-
}
1970-
return this.adventure;
1971-
}
1972-
19731959
public @NotNull TextManager text(){
19741960
return textManager;
19751961
}

‎src/main/java/org/maxgamer/quickshop/chat/QuickChatType.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@
2020
package org.maxgamer.quickshop.chat;
2121

2222
import org.jetbrains.annotations.NotNull;
23-
import org.maxgamer.quickshop.chat.platform.minedown.AdventureQuickChat;
23+
import org.maxgamer.quickshop.chat.platform.minedown.BungeeQuickChat;
2424

2525
public enum QuickChatType {
2626
/*
2727
* BUNGEECHAT = Use the chat lib that Spigot offered.
2828
* ADVENTURE = Use the chat lib Adventure, it can resolve player disconnected issue but have no message output bug.
2929
*/
30-
//BUNGEECHAT(0),
31-
ADVENTURE(1);
30+
BUNGEECHAT(0);
31+
//ADVENTURE(1);
3232

3333
private final int id;
3434

@@ -42,28 +42,28 @@ public enum QuickChatType {
4242
return type;
4343
}
4444
}
45-
return ADVENTURE;
45+
return BUNGEECHAT;
4646
}
4747

4848
public static int toID(@NotNull QuickChatType type) {
4949
return type.id;
5050
}
5151

5252
public static QuickChat createById(int id) {
53-
QuickChatType type = fromID(id);
54-
if (type == QuickChatType.ADVENTURE) {
55-
return new AdventureQuickChat();
56-
}
57-
return new AdventureQuickChat();
58-
// return new BungeeQuickChat();
53+
// QuickChatType type = fromID(id);
54+
// if (type == QuickChatType.ADVENTURE) {
55+
// return new AdventureQuickChat();
56+
// }
57+
return new BungeeQuickChat();
5958
}
6059

6160
public static QuickChat createByType(QuickChatType type) {
62-
if (type == QuickChatType.ADVENTURE) {
63-
return new AdventureQuickChat();
64-
}
65-
return new AdventureQuickChat();
61+
// if (type == QuickChatType.ADVENTURE) {
62+
// return new AdventureQuickChat();
63+
// }
64+
return new BungeeQuickChat();
6665
}
66+
6767
public int toID() {
6868
return id;
6969
}

‎src/main/java/org/maxgamer/quickshop/chat/platform/minedown/AdventureQuickChat.java‎

Lines changed: 0 additions & 126 deletions
This file was deleted.

0 commit comments

Comments
 (0)