From 83bc6fb5b8016dbd60116b27629d3b7b8d058d9d Mon Sep 17 00:00:00 2001
From: Vasco Lavos <vazkii@hotmail.com>
Date: Sun, 4 Aug 2019 03:09:08 +0100
Subject: [PATCH] Loose ends

---
 build.bat                                      | 2 +-
 build.gradle                                   | 8 ++++----
 build.properties                               | 4 ++--
 src/main/java/vazkii/neat/Neat.java            | 2 --
 src/main/resources/META-INF/mods.toml          | 2 +-
 src/main/resources/assets/neat/lang/en_US.json | 3 +++
 src/main/resources/assets/neat/lang/en_US.lang | 1 -
 7 files changed, 11 insertions(+), 11 deletions(-)
 create mode 100644 src/main/resources/assets/neat/lang/en_US.json
 delete mode 100644 src/main/resources/assets/neat/lang/en_US.lang

diff --git a/build.bat b/build.bat
index da5229c..355c102 100644
--- a/build.bat
+++ b/build.bat
@@ -1,2 +1,2 @@
-sh gradlew
+gradlew.bat
 pause
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index b8c5a44..1beddd0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -77,15 +77,15 @@ dependencies {
 processResources {
     // replace stuff in mcmod.info, nothing else
     from(sourceSets.main.resources.srcDirs) {
-        include 'mcmod.info'
+        include 'META-INF/mods.toml'
 
         // replace version and mcversion
-        expand 'version': project.version, 'mcversion': config.mc_version
+        expand 'version': project.version
     }
 
-    // copy everything else, thats not the mcmod.info
+    // copy everything else, thats not the mods.toml
     from(sourceSets.main.resources.srcDirs) {
-        exclude 'mcmod.info', '**/psd/**'
+        exclude 'META-INF/mods.toml', '**/psd/**'
     }
 }
 
diff --git a/build.properties b/build.properties
index 957bcce..7889a4f 100644
--- a/build.properties
+++ b/build.properties
@@ -1,5 +1,5 @@
 #
-#Sun Aug 04 02:48:00 BST 2019
+#Sun Aug 04 03:07:15 BST 2019
 mod_name=Neat
 forge_version=28.0.40
 mapping_version=20190719-1.14.3
@@ -7,5 +7,5 @@ mapping_channel=snapshot
 mod_id=neat
 version=1.5
 dir_output=../Build Output/Neat/
+build_number=17
 mc_version=1.14.4
-build_number=44
diff --git a/src/main/java/vazkii/neat/Neat.java b/src/main/java/vazkii/neat/Neat.java
index f7be843..445ffce 100644
--- a/src/main/java/vazkii/neat/Neat.java
+++ b/src/main/java/vazkii/neat/Neat.java
@@ -18,8 +18,6 @@ public Neat() {
 	public void setup(FMLClientSetupEvent event) {
 		NeatConfig.load();
 
-		System.out.println("Neat.setup");
-
 		MinecraftForge.EVENT_BUS.register(new ToggleKeybind());
 		MinecraftForge.EVENT_BUS.register(new HealthBarRenderer());
 	}
diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
index de141df..a10d1af 100644
--- a/src/main/resources/META-INF/mods.toml
+++ b/src/main/resources/META-INF/mods.toml
@@ -5,7 +5,7 @@ issueTrackerURL="https://github.com/Vazkii/Neat"
 [[mods]]
 modId="neat"
 displayName="Neat"
-version="GRADLE:VERSION-GRADLE:BUILD"
+version="${version}"
 authors="Vazkii"
 description='''
 Minimalistic Functional Unit Plates for the modern Minecrafter
diff --git a/src/main/resources/assets/neat/lang/en_US.json b/src/main/resources/assets/neat/lang/en_US.json
new file mode 100644
index 0000000..80b7d7e
--- /dev/null
+++ b/src/main/resources/assets/neat/lang/en_US.json
@@ -0,0 +1,3 @@
+{
+  "neat.keybind.toggle": "Toggle Health Bars"
+}
diff --git a/src/main/resources/assets/neat/lang/en_US.lang b/src/main/resources/assets/neat/lang/en_US.lang
deleted file mode 100644
index 1fdbbf8..0000000
--- a/src/main/resources/assets/neat/lang/en_US.lang
+++ /dev/null
@@ -1 +0,0 @@
-neat.keybind.toggle=Toggle Health Bars
\ No newline at end of file