From 4f0506ec8b930f2c1ea9e58c6c3d9d0f35a673eb Mon Sep 17 00:00:00 2001
From: wizjany <wizjany@gmail.com>
Date: Tue, 12 Mar 2019 17:30:45 -0400
Subject: [PATCH] Fix versions in toml. Use internalversion (with git hash).

---
 worldedit-forge/build.gradle                          | 11 +++++------
 worldedit-forge/src/main/resources/META-INF/mods.toml |  4 ++--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/worldedit-forge/build.gradle b/worldedit-forge/build.gradle
index e9dff30ae..6666d74c4 100644
--- a/worldedit-forge/build.gradle
+++ b/worldedit-forge/build.gradle
@@ -56,21 +56,20 @@ project.archivesBaseName = "${project.archivesBaseName}-mc${minecraftVersion}"
 
 processResources {
     // this will ensure that this task is redone when the versions change.
-    inputs.property 'version', project.version
-    inputs.property 'mcversion', minecraftVersion
-    inputs.property 'internalVersion', internalVersion
+    inputs.property 'version', project.internalVersion
+    inputs.property 'forgeVersion', forgeVersion
 
     // replace stuff in mcmod.info, nothing else
     from(sourceSets.main.resources.srcDirs) {
-        include 'META_INF/mods.toml'
+        include 'META-INF/mods.toml'
 
         // replace version and mcversion
-        expand 'version':project.version, 'mcversion': minecraftVersion, 'internalVersion': internalVersion
+        expand 'version': project.internalVersion, 'forgeVersion': forgeVersion
     }
 
     // copy everything else except the mcmod.info
     from(sourceSets.main.resources.srcDirs) {
-        exclude 'META_INF/mods.toml'
+        exclude 'META-INF/mods.toml'
     }
 }
 
diff --git a/worldedit-forge/src/main/resources/META-INF/mods.toml b/worldedit-forge/src/main/resources/META-INF/mods.toml
index c89f9c261..07b5ff1a0 100644
--- a/worldedit-forge/src/main/resources/META-INF/mods.toml
+++ b/worldedit-forge/src/main/resources/META-INF/mods.toml
@@ -3,7 +3,7 @@ modLoader="javafml"
 # A version range to match for said mod loader - for regular FML @Mod it will be the minecraft version (without the 1.)
 loaderVersion="[24,)"
 # A URL to refer people to when problems occur with this mod
-issueTrackerURL="https://discord.gg/YKbmj7V"
+issueTrackerURL="https://discord.gg/enginehub"
 # A URL for the "homepage" for this mod, displayed in the mod UI
 displayURL="http://wiki.sk89q.com/wiki/WorldEdit/"
 # A file name (in the root of the mod JAR) containing a logo for display
@@ -25,7 +25,7 @@ WorldEdit is an easy-to-use in-game world editor for Minecraft, supporting both
 [[dependencies.worldedit]]
     modId="forge"
     mandatory=true
-    versionRange="[${forge_version},)"
+    versionRange="[${forgeVersion},)"
     ordering="NONE"
     side="BOTH"
 [[dependencies.worldedit]]