modid to lowercase

DoubleDoorDevelopment · Apr 23, 2017 · 0923e2f · 0923e2f
1 parent ba98675
commit 0923e2f
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 16 deletions.
diff --git 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
@@ -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 <number here>\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
@@ -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
@@ -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 → src/main/resources/assets/mtrm/mtrm.dtd b/src/main/resources/assets/mtrm/MTRM.dtd → 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
@@ -29,7 +29,7 @@
   ~
   -->
 
-<!DOCTYPE MTRM SYSTEM "MTRM.dtd">
+<!DOCTYPE MTRM SYSTEM "mtrm.dtd">
 <!-- Vanilla specs - 13 sept 2016 - Dries007 -->
 <MTRM version="1" name="Vanilla" protocol="1.0">
     <modifier name="Any damage" out="item">.anyDamage()</modifier>
@@ -53,10 +53,10 @@
         <slot type="item" stacksizeAllowed="false"/>.displayName=<string/>;
     </function>
     <function name="Add tooltip" weight="250">
-        <slot type="ingredient"/>.addTooltip(<string/>);
+        <slot type="item"/>.addTooltip(<string/>);
     </function>
     <function name="Add shift tooltip" weight="250">
-        <slot type="ingredient"/>.addShiftTooltip(<string/>);
+        <slot type="item"/>.addShiftTooltip(<string/>);
     </function>
 
     <!-- Ore dictionary. Weight 500 -->

diff --git 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": "",