From 0923e2f40c7e8561b1771e4b8bc6adff13fcc8f5 Mon Sep 17 00:00:00 2001 From: Dries007 Date: Sun, 23 Apr 2017 13:28:41 +0200 Subject: [PATCH] modid to lowercase --- build.gradle | 4 ++-- src/main/java/net/doubledoordev/mtrm/Helper.java | 12 ++++++------ .../net/doubledoordev/mtrm/client/GuiFunction.java | 2 +- .../java/net/doubledoordev/mtrm/xml/XmlParser.java | 2 +- .../resources/assets/mtrm/{MTRM.dtd => mtrm.dtd} | 0 src/main/resources/assets/mtrm/vanilla.xml | 6 +++--- src/main/resources/mcmod.info | 6 +++--- 7 files changed, 16 insertions(+), 16 deletions(-) rename src/main/resources/assets/mtrm/{MTRM.dtd => mtrm.dtd} (100%) diff --git a/build.gradle b/build.gradle index e09870f..31c4516 100644 --- a/build.gradle +++ b/build.gradle @@ -54,7 +54,7 @@ sourceCompatibility = 1.7 archivesBaseName = 'MineTweakerRecipeMaker' def githuborg = 'DoubleDoorDevelopment' -def description = 'MineTweaker Recipe Maker' +def description = 'MineTweaker Recipe Maker v2' minecraft { mappings = "stable_26" @@ -67,7 +67,7 @@ if (System.getenv().BUILD_NUMBER != null) version += "." + System.getenv().BUILD processResources { from(sourceSets.main.resources.srcDirs) { include '**/*.info' - expand 'version':project.version, 'mcversion':project.minecraft.version, 'modid':project.archivesBaseName, 'githuborg':githuborg, 'description':description + expand 'version':project.version, 'mcversion':project.minecraft.version, 'name':project.archivesBaseName, 'githuborg':githuborg, 'description':description } from(sourceSets.main.resources.srcDirs) { diff --git a/src/main/java/net/doubledoordev/mtrm/Helper.java b/src/main/java/net/doubledoordev/mtrm/Helper.java index c5d8e2b..ba51525 100644 --- a/src/main/java/net/doubledoordev/mtrm/Helper.java +++ b/src/main/java/net/doubledoordev/mtrm/Helper.java @@ -54,11 +54,11 @@ @SuppressWarnings("WeakerAccess") public final class Helper { - public static final String MODID = "MTRM"; + public static final String MODID = "mtrm"; public static final String NAME = "MineTweakerRecipeMaker"; public static final DateFormat DATE_TIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z"); - public static final String DTD = "/assets/mtrm/MTRM.dtd"; + public static final String DTD = "/assets/mtrm/mtrm.dtd"; public static final FileFilter FILE_FILTER_XML = new FileFilter() { @@ -73,7 +73,7 @@ private Helper() {} public static File getScriptFile() throws IOException { - File file = new File("scripts/MineTweakerRecipeMaker/scripts/", "MTRM.zs"); + File file = new File("scripts/", "mtrm.zs"); Files.createParentDirs(file); if (!file.exists()) { @@ -85,15 +85,15 @@ public static File getScriptFile() throws IOException public static BufferedWriter writeHeader(BufferedWriter br, String name) throws IOException { - br.write("// File generated by MineTweakerRecipeMaker (MTRM) by DoubleDoorDevelopment\r\n"); - br.write("// This file is automatically managed by MTRM.\r\n"); + br.write("// File generated by MineTweakerRecipeMaker (mtrm) by DoubleDoorDevelopment\r\n"); + br.write("// This file is automatically managed by mtrm.\r\n"); br.write("// Try not to touch it if you don't absolutely have to.\r\n"); br.write("// If you have too, leave the markers alone. They look like this:\r\n"); br.write("//\r\n"); br.write("// #MTRM MARKER \r\n"); br.write("//\r\n"); br.write("// ================================================================================\r\n"); - br.write("print(\"Loading the MineTweakerRecipeMaker (MTRM) script file.\");"); + br.write("print(\"Loading the MineTweakerRecipeMaker (mtrm) script file.\");"); br.write("// HERE BE DRAGONS\r\n\r\n"); return br; } diff --git a/src/main/java/net/doubledoordev/mtrm/client/GuiFunction.java b/src/main/java/net/doubledoordev/mtrm/client/GuiFunction.java index 0fe99a9..05143e2 100644 --- a/src/main/java/net/doubledoordev/mtrm/client/GuiFunction.java +++ b/src/main/java/net/doubledoordev/mtrm/client/GuiFunction.java @@ -88,7 +88,7 @@ public void updateScreen() { super.updateScreen(); StringBuilder sb = new StringBuilder(); - for (GuiElement obj : guiElements) sb.append(obj.save()).append(' '); + for (GuiElement obj : guiElements) sb.append(obj.save()); currentText = sb.toString(); } diff --git a/src/main/java/net/doubledoordev/mtrm/xml/XmlParser.java b/src/main/java/net/doubledoordev/mtrm/xml/XmlParser.java index 41a530a..017c378 100644 --- a/src/main/java/net/doubledoordev/mtrm/xml/XmlParser.java +++ b/src/main/java/net/doubledoordev/mtrm/xml/XmlParser.java @@ -81,7 +81,7 @@ public final class XmlParser public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException { InputSource is = null; - if (systemId.contains("MTRM.dtd")) + if (systemId.contains("mtrm.dtd")) { InputStream iss = MineTweakerRecipeMaker.class.getResourceAsStream(Helper.DTD); is = new InputSource(iss); diff --git a/src/main/resources/assets/mtrm/MTRM.dtd b/src/main/resources/assets/mtrm/mtrm.dtd similarity index 100% rename from src/main/resources/assets/mtrm/MTRM.dtd rename to src/main/resources/assets/mtrm/mtrm.dtd diff --git a/src/main/resources/assets/mtrm/vanilla.xml b/src/main/resources/assets/mtrm/vanilla.xml index dd9fd23..850979e 100644 --- a/src/main/resources/assets/mtrm/vanilla.xml +++ b/src/main/resources/assets/mtrm/vanilla.xml @@ -29,7 +29,7 @@ ~ --> - + .anyDamage() @@ -53,10 +53,10 @@ .displayName=; - .addTooltip(); + .addTooltip(); - .addShiftTooltip(); + .addShiftTooltip(); diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index cbfa202..c010ed3 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -1,12 +1,12 @@ { "modListVersion": 2, "modList": [{ - "modid": "${modid}", - "name": "${modid}", + "modid": "mtrm", + "name": "${name}", "description": "${description}", "version": "${version}", "mcversion": "${mcversion}", - "url": "https://github.com/${githuborg}/${modid}", + "url": "https://github.com/${githuborg}/${name}", "updateUrl": "", "authorList": [ "Dries007", "Doubledoor team" ], "credits": "",