From 34c854469021a677ee19fd77563496385788ee03 Mon Sep 17 00:00:00 2001 From: Model 3 Date: Wed, 8 Aug 2018 23:26:12 -0700 Subject: [PATCH] Replace ${git.commit.id.abbrev} with unknown (#118) * Replace ${git.commit.id.abbrev} with unknown * Use actual unknown command message --- TotalFreedomMod.iml | 9 ++++++--- .../me/totalfreedom/totalfreedommod/TotalFreedomMod.java | 3 ++- .../blocking/command/CommandBlockerEntry.java | 3 ++- .../totalfreedommod/command/Command_overlord.java | 4 ++-- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/TotalFreedomMod.iml b/TotalFreedomMod.iml index 5da31b97..60ae851c 100644 --- a/TotalFreedomMod.iml +++ b/TotalFreedomMod.iml @@ -11,6 +11,9 @@ + + + @@ -34,6 +37,9 @@ + + + @@ -41,8 +47,6 @@ - - @@ -68,7 +72,6 @@ - \ No newline at end of file diff --git a/src/main/java/me/totalfreedom/totalfreedommod/TotalFreedomMod.java b/src/main/java/me/totalfreedom/totalfreedommod/TotalFreedomMod.java index 35e4e046..5a77a565 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/TotalFreedomMod.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/TotalFreedomMod.java @@ -310,7 +310,8 @@ public class TotalFreedomMod extends AeroPlugin version = props.getProperty("buildVersion", pluginVersion); number = props.getProperty("buildNumber", "1"); date = props.getProperty("buildDate", "unknown"); - head = props.getProperty("buildHead", "unknown"); + // Need to do this or it will display ${git.commit.id.abbrev} + head = props.getProperty("buildHead", "unknown").replace("${git.commit.id.abbrev}", "unknown"); } catch (Exception ex) { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/blocking/command/CommandBlockerEntry.java b/src/main/java/me/totalfreedom/totalfreedommod/blocking/command/CommandBlockerEntry.java index 73fea2e6..7729639a 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/blocking/command/CommandBlockerEntry.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/blocking/command/CommandBlockerEntry.java @@ -6,6 +6,7 @@ import me.totalfreedom.totalfreedommod.util.FUtil; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import org.spigotmc.SpigotConfig; public class CommandBlockerEntry { @@ -45,7 +46,7 @@ public class CommandBlockerEntry } if (action == CommandBlockerAction.BLOCK_UNKNOWN) { - FUtil.playerMsg(sender, "Unknown command. Type \"/help\" for help.", ChatColor.RESET); + sender.sendMessage(SpigotConfig.unknownCommandMessage); return; } FUtil.playerMsg(sender, FUtil.colorize(message)); diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_overlord.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_overlord.java index 3bd1cc88..3beee1d1 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_overlord.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_overlord.java @@ -7,10 +7,10 @@ import me.totalfreedom.totalfreedommod.rank.Rank; import net.pravian.aero.util.Ips; import org.apache.commons.lang3.StringUtils; import org.bukkit.Bukkit; -import org.bukkit.ChatColor; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import org.spigotmc.SpigotConfig; @CommandPermissions(level = Rank.IMPOSTOR, source = SourceType.ONLY_IN_GAME) @CommandParameters(description = "Overlord - control this server in-game", usage = "access", aliases = "ov") @@ -32,7 +32,7 @@ public class Command_overlord extends FreedomCommand } catch (Exception ignored) { - msg(ChatColor.WHITE + "Unknown command. Type \"/help\" for help."); + sender.sendMessage(SpigotConfig.unknownCommandMessage); return true; } }