Skip to content

Commit a0fb2b6

Browse files
committed
Add support for Paper/Spigot 1.8.8+
- Target Java 8 instead of Java 17 - Use Spigot API 1.8.8-R0.1-SNAPSHOT instead of Paper 1.20.4 - Remove Adventure API (net.kyori), use ChatColor.translateAlternateColorCodes - Remove Java 16 pattern matching instanceof in VerifyCommand - Replace Bukkit.getMinecraftVersion() with getBukkitVersion() (1.8.8 compat) - Remove api-version from plugin.yml (not supported before 1.13)
1 parent ad069ba commit a0fb2b6

5 files changed

Lines changed: 19 additions & 19 deletions

File tree

pom.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,24 +14,24 @@
1414
<url>https://mcsets.com</url>
1515

1616
<properties>
17-
<maven.compiler.source>17</maven.compiler.source>
18-
<maven.compiler.target>17</maven.compiler.target>
17+
<maven.compiler.source>8</maven.compiler.source>
18+
<maven.compiler.target>8</maven.compiler.target>
1919
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2020
</properties>
2121

2222
<repositories>
2323
<repository>
24-
<id>papermc</id>
25-
<url>https://repo.papermc.io/repository/maven-public/</url>
24+
<id>spigotmc</id>
25+
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
2626
</repository>
2727
</repositories>
2828

2929
<dependencies>
30-
<!-- Paper API -->
30+
<!-- Spigot API (1.8.8+) -->
3131
<dependency>
32-
<groupId>io.papermc.paper</groupId>
33-
<artifactId>paper-api</artifactId>
34-
<version>1.20.4-R0.1-SNAPSHOT</version>
32+
<groupId>org.spigotmc</groupId>
33+
<artifactId>spigot-api</artifactId>
34+
<version>1.8.8-R0.1-SNAPSHOT</version>
3535
<scope>provided</scope>
3636
</dependency>
3737

@@ -84,8 +84,8 @@
8484
<artifactId>maven-compiler-plugin</artifactId>
8585
<version>3.11.0</version>
8686
<configuration>
87-
<source>17</source>
88-
<target>17</target>
87+
<source>8</source>
88+
<target>8</target>
8989
</configuration>
9090
</plugin>
9191
<plugin>

src/main/java/com/mcsets/setstore/SetStorePlugin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ public void connect() {
142142

143143
String serverIp = pluginConfig.getServerIp();
144144
int serverPort = pluginConfig.getServerPort();
145-
String serverVersion = Bukkit.getMinecraftVersion();
145+
String serverVersion = Bukkit.getBukkitVersion().split("-")[0];
146146
List<String> onlinePlayers = getOnlinePlayerNames();
147147

148148
try {

src/main/java/com/mcsets/setstore/commands/VerifyCommand.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,13 @@ public VerifyCommand(SetStorePlugin plugin) {
3939

4040
@Override
4141
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
42-
if (!(sender instanceof Player player)) {
42+
if (!(sender instanceof Player)) {
4343
sender.sendMessage(plugin.getPluginConfig().formatMessage("&cThis command can only be used by players!"));
4444
return true;
4545
}
4646

47+
final Player player = (Player) sender;
48+
4749
if (!player.hasPermission("mcsets.verify")) {
4850
player.sendMessage(plugin.getPluginConfig().getMessage("no-permission"));
4951
return true;

src/main/java/com/mcsets/setstore/config/PluginConfig.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
package com.mcsets.setstore.config;
1111

1212
import com.mcsets.setstore.SetStorePlugin;
13-
import net.kyori.adventure.text.Component;
14-
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
13+
import org.bukkit.ChatColor;
1514
import org.bukkit.configuration.file.FileConfiguration;
1615

1716
/**
@@ -139,12 +138,12 @@ public String getMessagePrefix() {
139138
return config.getString("messages.prefix", "&8[&bSetStore&8] &7");
140139
}
141140

142-
public Component getMessage(String key) {
141+
public String getMessage(String key) {
143142
String message = config.getString("messages." + key, "");
144143
return formatMessage(getMessagePrefix() + message);
145144
}
146145

147-
public Component getMessage(String key, String... replacements) {
146+
public String getMessage(String key, String... replacements) {
148147
String message = config.getString("messages." + key, "");
149148
String fullMessage = getMessagePrefix() + message;
150149

@@ -157,8 +156,8 @@ public Component getMessage(String key, String... replacements) {
157156
return formatMessage(fullMessage);
158157
}
159158

160-
public Component formatMessage(String message) {
161-
return LegacyComponentSerializer.legacyAmpersand().deserialize(message);
159+
public String formatMessage(String message) {
160+
return ChatColor.translateAlternateColorCodes('&', message);
162161
}
163162

164163
// ==================== Logging Settings ====================

src/main/resources/plugin.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
name: MCSetsSetStore
22
version: ${project.version}
33
main: com.mcsets.setstore.SetStorePlugin
4-
api-version: '1.20'
54
description: MCSets SetStore integration for automatic purchase delivery
65
author: MCSets
76
website: https://mcsets.com

0 commit comments

Comments
 (0)