Improved build process

- moved (most) project specific values into gradle.properties
- mod version, mod name, ... get updated in all relevant places automatically

4 files changed, 8 insertions, 8 deletions

diff --git a/src/main/java/eu/olli/cowmoonication/Cowmoonication.java b/src/main/java/eu/olli/cowmoonication/Cowmoonication.java
index 1175541..748883a 100644
--- a/src/main/java/eu/olli/cowmoonication/Cowmoonication.java
+++ b/src/main/java/eu/olli/cowmoonication/Cowmoonication.java
@@ -22,12 +22,12 @@ import java.io.File;
 
 @Mod(modid = Cowmoonication.MODID, name = Cowmoonication.MODNAME, version = Cowmoonication.VERSION,
         clientSideOnly = true,
-        guiFactory = "eu.olli." + Cowmoonication.MODID + ".config.MooGuiFactory",
+        guiFactory = "@PACKAGE@.config.MooGuiFactory",
         updateJSON = "https://raw.githubusercontent.com/cow-mc/Cowmoonication/master/update.json")
 public class Cowmoonication {
-    public static final String MODID = "cowmoonication";
-    public static final String VERSION = "1.8.9-0.4.0";
-    public static final String MODNAME = "Cowmoonication";
+    public static final String MODID = "@MODID@";
+    public static final String VERSION = "@VERSION@";
+    public static final String MODNAME = "@MODNAME@";
     private File modsDir;
     private MooConfig config;
     private Friends friends;
diff --git a/src/main/java/eu/olli/cowmoonication/command/MooCommand.java b/src/main/java/eu/olli/cowmoonication/command/MooCommand.java
index 81c8c15..2ddf7ce 100644
--- a/src/main/java/eu/olli/cowmoonication/command/MooCommand.java
+++ b/src/main/java/eu/olli/cowmoonication/command/MooCommand.java
@@ -228,11 +228,11 @@ public class MooCommand extends CommandBase {
 
     @Override
     public String getCommandUsage(ICommandSender sender) {
-        return "/moo help";
+        return "/" + getCommandName() + " help";
     }
 
     private void sendCommandUsage(ICommandSender sender) {
-        IChatComponent usage = new ChatComponentText("\u279C Cowmoonication commands:").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.GOLD).setBold(true))
+        IChatComponent usage = new ChatComponentText("\u279C " + Cowmoonication.MODNAME + " commands:").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.GOLD).setBold(true))
                 .appendSibling(createCmdHelpSection(1, "Friends"))
                 .appendSibling(createCmdHelpEntry("stalk", "Get info of player's status"))
                 .appendSibling(createCmdHelpEntry("add", "Add best friends"))
diff --git a/src/main/java/eu/olli/cowmoonication/config/MooGuiConfig.java b/src/main/java/eu/olli/cowmoonication/config/MooGuiConfig.java
index c8c68c1..4583dc9 100644
--- a/src/main/java/eu/olli/cowmoonication/config/MooGuiConfig.java
+++ b/src/main/java/eu/olli/cowmoonication/config/MooGuiConfig.java
@@ -14,7 +14,7 @@ public class MooGuiConfig extends GuiConfig {
                 Cowmoonication.MODID,
                 false,
                 false,
-                "Configuration for Cowmoonication");
+                "Configuration for " + Cowmoonication.MODNAME);
         titleLine2 = MooConfig.getConfig().getConfigFile().getAbsolutePath();
     }
 
diff --git a/src/main/java/eu/olli/cowmoonication/listener/ChatListener.java b/src/main/java/eu/olli/cowmoonication/listener/ChatListener.java
index 96f3a4a..cf0f794 100644
--- a/src/main/java/eu/olli/cowmoonication/listener/ChatListener.java
+++ b/src/main/java/eu/olli/cowmoonication/listener/ChatListener.java
@@ -73,7 +73,7 @@ public class ChatListener {
                 if (Utils.isValidUuid(moo)) {
                     MooConfig.moo = moo;
                     main.getConfig().syncFromFields();
-                    main.getChatHelper().sendMessage(EnumChatFormatting.GREEN, "Added updated API key in Cowmoonication config!");
+                    main.getChatHelper().sendMessage(EnumChatFormatting.GREEN, "Added updated API key in " + Cowmoonication.MODNAME + " config!");
                 }
             }
         }