aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--build.gradle36
-rw-r--r--gradle.properties7
-rw-r--r--src/main/java/eu/olli/cowmoonication/Cowmoonication.java8
-rw-r--r--src/main/java/eu/olli/cowmoonication/command/MooCommand.java4
-rw-r--r--src/main/java/eu/olli/cowmoonication/config/MooGuiConfig.java2
-rw-r--r--src/main/java/eu/olli/cowmoonication/listener/ChatListener.java2
-rw-r--r--src/main/resources/mcmod.info4
-rw-r--r--update_template.json10
8 files changed, 51 insertions, 22 deletions
diff --git a/build.gradle b/build.gradle
index bfecd62..904befd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,24 +20,27 @@ plugins {
id "net.minecraftforge.gradle.forge" version "2.0.2"
}
*/
-version = "1.8.9-0.4.0"
-group= "eu.olli.cowmoonication" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
-archivesBaseName = "Cowmoonication"
+version = "${mc_version}-${mod_version}"
+group = project.group_package // http://maven.apache.org/guides/mini/guide-naming-conventions.html
+archivesBaseName = project.mod_name
sourceCompatibility = 1.8
targetCompatibility = 1.8
compileJava.options.encoding = 'UTF-8'
minecraft {
- version = "1.8.9-11.15.1.1722"
+ version = "${mc_version}-${forge_version}"
runDir = "run"
+
+ replace "@VERSION@": project.version, "@MODNAME@": project.archivesBaseName, "@MODID@": project.archivesBaseName.toLowerCase(), "@PACKAGE@": project.group_package
+ replaceIn "${mod_name}.java"
// the mappings can be changed at any time, and must be in the following format.
// snapshot_YYYYMMDD snapshot are built nightly.
// stable_# stables are built at the discretion of the MCP team.
- // Use non-default mappings at your own risk. they may not allways work.
+ // Use non-default mappings at your own risk. they may not always work.
// simply re-run your setup task after changing the mappings to update your workspace.
- mappings = "stable_20"
+ mappings = project.mappings_version
// makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
}
@@ -65,22 +68,31 @@ dependencies {
}
-processResources
-{
+processResources {
// this will ensure that this task is redone when the versions change.
inputs.property "version", project.version
inputs.property "mcversion", project.minecraft.version
- // replace stuff in mcmod.info, nothing else
+ // replace stuff in mcmod.info, but nothing else
from(sourceSets.main.resources.srcDirs) {
include 'mcmod.info'
- // replace version and mcversion
- expand 'version':project.version, 'mcversion':project.minecraft.version
+ // replace version, mcversion, modname and modid
+ expand 'version':project.version, 'mcversion':project.minecraft.version, 'modname':project.archivesBaseName, 'modid':project.archivesBaseName.toLowerCase()
}
- // copy everything else, thats not the mcmod.info
+ // copy everything else, that's not the mcmod.info
from(sourceSets.main.resources.srcDirs) {
exclude 'mcmod.info'
}
}
+
+import org.apache.tools.ant.filters.FixCrLfFilter
+// update versions in update.json
+copy {
+ from file('update_template.json')
+ into projectDir
+ rename { 'update.json' }
+ expand(mcversion: project.minecraft.version, version: project.version)
+ filter(FixCrLfFilter)
+}
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 0000000..cf7a2eb
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,7 @@
+mod_name=Cowmoonication
+group_package=eu.olli.cowmoonication
+mod_version=0.4.0
+
+mc_version=1.8.9
+forge_version=11.15.1.2318-1.8.9
+mappings_version=stable_22
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!");
}
}
}
diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
index 581572b..f833024 100644
--- a/src/main/resources/mcmod.info
+++ b/src/main/resources/mcmod.info
@@ -1,6 +1,6 @@
[{
- "modid": "cowmoonication",
- "name": "Cowmoonication",
+ "modid": "${modid}",
+ "name": "${modname}",
"description": "Adding various things related to communication.",
"version": "${version}",
"mcversion": "${mcversion}",
diff --git a/update_template.json b/update_template.json
new file mode 100644
index 0000000..4435a6d
--- /dev/null
+++ b/update_template.json
@@ -0,0 +1,10 @@
+{
+ "homepage": "https://github.com/cow-mc/Cowmoonication/",
+ "${mcversion}": {
+ "${version}": "https://github.com/cow-mc/Cowmoonication/blob/master/CHANGELOG.md"
+ },
+ "promos": {
+ "${mcversion}-latest": "${version}",
+ "${mcversion}-recommended": "${version}"
+ }
+}
generated by cgit (git 2.46.0) at 2025-04-08 20:51:19 +0000