Skip to content

Commit 42d1d64

Browse files
foxfirecodesfoxfirecodes
committed
modernize and update
1 parent e54c3a1 commit 42d1d64

4 files changed

Lines changed: 78 additions & 876 deletions

File tree

‎pom.xml‎

Lines changed: 50 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,38 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.perceivedev</groupId>
55
<artifactId>clickabletpa</artifactId>
6-
<version>1.0</version>
7-
<name>Clickable TPA</name>
6+
<version>1.1.0</version>
7+
<name>ClickableTPA</name>
8+
<properties>
9+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
10+
</properties>
11+
812
<repositories>
913
<repository>
1014
<id>spigotmc-repo</id>
1115
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
1216
</repository>
17+
<repository>
18+
<id>rayzr-repo</id>
19+
<url>https://rayzr.dev/repo/</url>
20+
</repository>
1321
</repositories>
1422

1523
<dependencies>
1624
<dependency>
1725
<groupId>org.spigotmc</groupId>
1826
<artifactId>spigot-api</artifactId>
19-
<version>1.10.2-R0.1-SNAPSHOT</version>
27+
<version>1.12.2-R0.1-SNAPSHOT</version>
28+
<scope>provided</scope>
29+
</dependency>
30+
<dependency>
31+
<groupId>me.rayzr522</groupId>
32+
<artifactId>jsonmessage</artifactId>
33+
<version>1.3.1</version>
2034
</dependency>
2135
</dependencies>
2236

2337
<build>
24-
<finalName>${project.name} ${project.version}</finalName>
2538
<sourceDirectory>${basedir}/src/main/java</sourceDirectory>
2639
<defaultGoal>clean package</defaultGoal>
2740
<resources>
@@ -30,20 +43,51 @@
3043
<filtering>true</filtering>
3144
<directory>${basedir}/src/main/resources</directory>
3245
<includes>
33-
<include>*.yml</include>
46+
<include>**/*</include>
3447
</includes>
3548
</resource>
3649
</resources>
3750
<plugins>
3851
<plugin>
3952
<groupId>org.apache.maven.plugins</groupId>
4053
<artifactId>maven-compiler-plugin</artifactId>
41-
<version>3.5.1</version>
54+
<version>3.8.1</version>
4255
<configuration>
4356
<source>1.8</source>
4457
<target>1.8</target>
4558
</configuration>
4659
</plugin>
60+
<plugin>
61+
<groupId>org.apache.maven.plugins</groupId>
62+
<artifactId>maven-shade-plugin</artifactId>
63+
<version>3.2.4</version>
64+
<configuration>
65+
<minimizeJar>true</minimizeJar>
66+
<finalName>${project.name}-${project.version}</finalName>
67+
<filters>
68+
<filter>
69+
<artifact>me.rayzr522:jsonmessage</artifact>
70+
<excludes>
71+
<exclude>META-INF/MANIFEST.MF</exclude>
72+
</excludes>
73+
</filter>
74+
</filters>
75+
<relocations>
76+
<relocation>
77+
<pattern>me.rayzr522.jsonmessage.</pattern>
78+
<shadedPattern>com.perceivedev.clicktpa.lib.jsonmessage.</shadedPattern>
79+
</relocation>
80+
</relocations>
81+
</configuration>
82+
<executions>
83+
<execution>
84+
<phase>package</phase>
85+
<goals>
86+
<goal>shade</goal>
87+
</goals>
88+
</execution>
89+
</executions>
90+
</plugin>
4791
</plugins>
4892
</build>
4993

‎src/main/java/com/perceivedev/clicktpa/ClickableTPA.java‎

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.perceivedev.clicktpa;
22

3+
import me.rayzr522.jsonmessage.JSONMessage;
34
import org.bukkit.Bukkit;
45
import org.bukkit.ChatColor;
56
import org.bukkit.configuration.file.FileConfiguration;
@@ -55,46 +56,44 @@ public void run() {
5556
}
5657
}
5758

58-
private JSONMessage getLine(Player player, String configPath) {
59+
private void sendClickableMessage(Player player) {
5960
FileConfiguration config = getConfig();
60-
boolean useDisplayName = config.getBoolean("message.use-display-name");
61+
String configMessage = config.getString("message.line", "");
62+
if (configMessage.isEmpty()) {
63+
return;
64+
}
65+
6166
JSONMessage message = JSONMessage.create();
62-
if (config.getString("message." + configPath) != "") {
63-
String[] words = config.getString("message." + configPath).split(" ");
64-
for (int i = 0; i < words.length; i++) {
65-
String word = trans(words[i].replace("%player%", useDisplayName ? player.getDisplayName() : player.getName()));
66-
if (word.equalsIgnoreCase("%accept%")) {
67-
message.then(trans(config.getString("message.accept"))).runCommand("/tpaccept");
68-
} else if (word.equalsIgnoreCase("%deny%")) {
69-
message.then(trans(config.getString("message.deny"))).runCommand("/tpdeny");
70-
} else {
71-
message.then(word).color(ChatColor.GOLD);
72-
}
73-
message.then(" ");
67+
boolean useDisplayName = config.getBoolean("message.use-display-name");
68+
for (String word : configMessage.split(" ")) {
69+
if (word.equalsIgnoreCase("%accept%")) {
70+
message.then(colorize(config.getString("message.accept"))).runCommand("/tpaccept");
71+
} else if (word.equalsIgnoreCase("%deny%")) {
72+
message.then(colorize(config.getString("message.deny"))).runCommand("/tpdeny");
73+
} else {
74+
message.then(colorize(word.replace("%player%", useDisplayName ? player.getDisplayName() : player.getName()))).color(ChatColor.GOLD);
7475
}
76+
message.then(" ");
7577
}
76-
return message;
78+
message.send(player);
7779
}
7880

7981
private void sendMessages(Player player) {
80-
String spacer = getConfig().getString("message.spacer");
81-
sendSpacer(player, spacer);
82-
getLine(player, "line").send(player);
83-
sendSpacer(player, spacer);
82+
sendSpacer(player);
83+
sendClickableMessage(player);
84+
sendSpacer(player);
8485
}
8586

86-
private void sendSpacer(Player player, String spacer) {
87-
if (spacer.equals("")) {
88-
return;
89-
} else if (spacer.equals("bar")) {
87+
private void sendSpacer(Player player) {
88+
String spacer = getConfig().getString("message.spacer", "");
89+
if (spacer.equals("bar")) {
9090
JSONMessage.create().bar().send(player);
91-
} else {
92-
player.sendMessage(trans(spacer));
91+
} else if (!spacer.isEmpty()) {
92+
player.sendMessage(colorize(spacer));
9393
}
9494
}
9595

96-
private String trans(String string) {
96+
private String colorize(String string) {
9797
return ChatColor.translateAlternateColorCodes('&', string);
9898
}
99-
10099
}

0 commit comments

Comments
 (0)