Skip to content

Commit 2b661de

Browse files
committed
Changed config symbols for color codes from '§' to '&'.
1 parent edc3478 commit 2b661de

File tree

4 files changed

+33
-9
lines changed

4 files changed

+33
-9
lines changed

src/main/java/me/kekschen/redworldspawn/RedWorldSpawn.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,29 @@
22

33
import com.onarandombox.MultiverseCore.MultiverseCore;
44
import me.kekschen.redworldspawn.commands.WSpawnCommand;
5+
import me.kekschen.redworldspawn.utils.ConfigMessages;
56
import org.bukkit.Bukkit;
67
import org.bukkit.plugin.java.JavaPlugin;
78

89
public final class RedWorldSpawn extends JavaPlugin {
9-
public static String PREFIX = "§7[§4Red§rWorldSpawn§7]: §r";
1010

1111
@Override
1212
public void onLoad() {
1313
saveDefaultConfig();
14-
PREFIX = getConfig().getString("prefix");
1514
}
1615

1716
@Override
1817
public void onEnable() {
1918
MultiverseCore mv = (MultiverseCore) Bukkit.getServer().getPluginManager().getPlugin("Multiverse-Core");
2019

20+
ConfigMessages.readPrefix(this);
21+
2122
Bukkit.getPluginCommand("wspawn").setExecutor(new WSpawnCommand(this, mv));
2223
}
2324

2425
@Override
2526
public void onDisable() {
2627
// Plugin shutdown logic
2728
}
29+
2830
}

src/main/java/me/kekschen/redworldspawn/commands/WSpawnCommand.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.onarandombox.MultiverseCore.MultiverseCore;
44
import me.kekschen.redworldspawn.RedWorldSpawn;
5+
import me.kekschen.redworldspawn.utils.ConfigMessages;
56
import org.bukkit.Location;
67
import org.bukkit.command.Command;
78
import org.bukkit.command.CommandExecutor;
@@ -22,19 +23,19 @@ public WSpawnCommand(RedWorldSpawn plugin, MultiverseCore multiverseCore) {
2223
@Override
2324
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
2425
if(sender instanceof ConsoleCommandSender) {
25-
sender.sendMessage(RedWorldSpawn.PREFIX + plugin.getConfig().getString("messages.onlyPlayer"));
26+
sender.sendMessage(ConfigMessages.PREFIX + ConfigMessages.getMessage(plugin, "onlyPlayer"));
2627
return true;
2728
}
2829
if(!sender.hasPermission("rwm.redworldspawn.use")) {
29-
sender.sendMessage(RedWorldSpawn.PREFIX + plugin.getConfig().getString("messages.noPermission"));
30+
sender.sendMessage(ConfigMessages.PREFIX + ConfigMessages.getMessage(plugin, "noPermission"));
3031
return true;
3132
}
3233

3334
Player player = (Player) sender;
3435
Location spawn = multiverseCore.getMVWorldManager().getMVWorld(player.getWorld()).getSpawnLocation();
3536
player.teleport(spawn);
3637

37-
sender.sendMessage(RedWorldSpawn.PREFIX + plugin.getConfig().getString("messages.teleported"));
38+
sender.sendMessage(ConfigMessages.PREFIX + ConfigMessages.getMessage(plugin, "teleported"));
3839

3940
return true;
4041
}
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
package me.kekschen.redworldspawn.utils;
2+
3+
import me.kekschen.redworldspawn.RedWorldSpawn;
4+
import org.bukkit.ChatColor;
5+
import org.bukkit.plugin.Plugin;
6+
7+
public class ConfigMessages {
8+
public static String PREFIX = "&7[&cRedWorldSpawn&7] &r";
9+
10+
public static void readPrefix(Plugin plugin) {
11+
String prefix = plugin.getConfig().getString("prefix");
12+
if(prefix == null) return;
13+
PREFIX = ChatColor.translateAlternateColorCodes('&', prefix);
14+
}
15+
16+
public static String getMessage(Plugin plugin, String key) {
17+
String text = plugin.getConfig().getString("messages." + key);
18+
if(text == null) return "";
19+
return ChatColor.translateAlternateColorCodes('&', text);
20+
}
21+
}

src/main/resources/config.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
prefix: "§8[§aRed§fWorldSpawn§8]§f: "
1+
prefix: "&8[&aRed&fWorldSpawn&8]&f: "
22
messages:
3-
noPermission: "§cDu hast &4keine Berechtigung §cfür diesen Befehl."
4-
onlyPlayer: "§cDieser Befehl darf §4nur Ingame §causgeführt werden."
5-
teleported: "Du hast dich §2zum lokalen Weltspawn §f(in der Welt, in der du dich befandest) teleportiert."
3+
noPermission: "&cDu hast &4keine Berechtigung &cfür diesen Befehl."
4+
onlyPlayer: "&cDieser Befehl darf &4nur Ingame &causgeführt werden."
5+
teleported: "Du hast dich &2zum lokalen Weltspawn &f(in der Welt, in der du dich befandest) teleportiert."

0 commit comments

Comments
 (0)