Skip to content

Add hex codes and optimize pom.xml #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DopeDealers wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add hex codes and optimize pom.xml #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
71 changes: 22 additions & 49 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,54 +12,25 @@
<name>${project.artifactId}</name>

<properties>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<build>
<defaultGoal>clean package</defaultGoal>
<finalName>${project.artifactId}-${project.version}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<source>${java.version}</source>
<target>${java.version}</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.1</version>
<configuration>
<relocations>
<relocation>
<pattern>com.cryptomorin.xseries</pattern>
<shadedPattern>com.planetgallium.kitpvp</shadedPattern>
</relocation>
</relocations>
<filters>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>com/cryptomorin/xseries/messages/ActionBar*</exclude>
<exclude>com/cryptomorin/xseries/messages/Titles*</exclude>
<exclude>com/cryptomorin/xseries/particles/*</exclude>
<exclude>com/cryptomorin/xseries/NMSExtras*</exclude>
<exclude>com/cryptomorin/xseries/NoteBlockMusic*</exclude>
<exclude>com/cryptomorin/xseries/ReflectionUtils*</exclude>
<exclude>com/cryptomorin/xseries/XBlock*</exclude>
<exclude>com/cryptomorin/xseries/SkullUtils*</exclude>
<exclude>com/cryptomorin/xseries/XBiome*</exclude>
<exclude>com/cryptomorin/xseries/XEnchantment*</exclude>
<exclude>com/cryptomorin/xseries/XEntity*</exclude>
<exclude>com/cryptomorin/xseries/XItemStack*</exclude>
<exclude>com/cryptomorin/xseries/XPotion*</exclude>
</excludes>
</filter>
</filters>
</configuration>
<version>3.3.0</version>
<executions>
<execution>
<phase>package</phase>
Expand All @@ -68,8 +39,6 @@
</goals>
<configuration>
<createDependencyReducedPom>false</createDependencyReducedPom>
<shadedArtifactAttached>false</shadedArtifactAttached>
<outputFile>/Users/nico/Developer/Spigot/Latest/plugins/${project.artifactId}.jar</outputFile>
</configuration>
</execution>
</executions>
Expand All @@ -82,18 +51,27 @@
</resource>
</resources>
</build>

<repositories>
<repository>
<id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
</repository>
<repository>
<id>placeholderapi</id>
<url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.19.2-R0.1-SNAPSHOT</version>
<version>1.20.1-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>me.clip</groupId>
<artifactId>placeholderapi</artifactId>
<version>2.10.3</version>
<version>2.10.9</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand All @@ -114,16 +92,11 @@
<version>3.0.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
<version>24.0.0</version>
<scope>compile</scope>
</dependency>
</dependencies>

<repositories>
<repository>
<id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
</repository>
<repository>
<id>placeholderapi</id>
<url>http://repo.extendedclip.com/content/repositories/placeholderapi/</url>
</repository>
</repositories>
</project>
13 changes: 12 additions & 1 deletion src/main/java/me/cervinakuy/joineventspro/command/MainCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ private void executeMaintenanceCommand(CommandSender sender) {
}

private void executeSetMaxPlayersCommand(CommandSender sender, String[] args) {
if (!Toolkit.isNumeric(args[1])) {
if (isNumeric(args[1])) {
sender.sendMessage(messages.fetchString("Messages.Error.Number"));
return;
}
Expand Down Expand Up @@ -216,5 +216,16 @@ private boolean hasPermission(CommandSender sender, String permission) {
return false;

}
public static boolean isNumeric(String strNum) {
if (strNum == null) {
return false;
}
try {
double d = Double.parseDouble(strNum);
} catch (NumberFormatException nfe) {
return false;
}
return true;
}

}
31 changes: 22 additions & 9 deletions src/main/java/me/cervinakuy/joineventspro/util/Resource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,17 @@
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import me.cervinakuy.joineventspro.Game;
import org.bukkit.ChatColor;
import net.md_5.bungee.api.ChatColor;
import org.bukkit.configuration.InvalidConfigurationException;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.plugin.Plugin;

import static net.md_5.bungee.api.ChatColor.COLOR_CHAR;

public class Resource extends YamlConfiguration {

private final String name;
Expand Down Expand Up @@ -95,13 +99,8 @@ public void save() {
public String fetchString(String path) {
String string = super.getString(path);

if (string != null) {
string = ChatColor.translateAlternateColorCodes('&',
string.replace("%prefix%", Game.getPrefix() == null ? "" : Game.getPrefix()));
} else {
string = "String not found";
Toolkit.printToConsole(String.format("&7[&b&lJOINEVENTSPRO7] &cString with path %s was not found.", path));
}
string = translateHexColorCodes(string);
//string.replace("%prefix%", Game.getPrefix() == null ? "" : Game.getPrefix());

return string;
}
Expand All @@ -113,14 +112,28 @@ public List<String> getStringList(String path) {
if (originalList != null) {
List<String> colorizedList = new ArrayList<>();
for (String line : originalList) {
colorizedList.add(ChatColor.translateAlternateColorCodes('&', line));
colorizedList.add(translateHexColorCodes(line));
}
return colorizedList;
}

return originalList;

}
public String translateHexColorCodes(String message)
{
Pattern pattern = Pattern.compile("<#[a-fA-F0-9]{6}>");
Matcher matcher = pattern.matcher(message);

while (matcher.find()) {
String color = message.substring(matcher.start(), matcher.end());
message = message.replace(color, ChatColor.of(color) + "");
matcher = pattern.matcher(message);
}
System.out.println(matcher);
System.out.println(message);
return ChatColor.translateAlternateColorCodes('&', message);
}

public String getName() { return name; }

Expand Down