From 5cf1d2e6745d5a2801be0867d49aa14e5efa2283 Mon Sep 17 00:00:00 2001
From: Johannes <hycrafthd@live.de>
Date: Thu, 7 Nov 2019 18:59:07 +0100
Subject: [PATCH] Update buildscript and resource data to 1.14.4 (#1292)

* Update gradlew wrapper

* Update buildscript to 1.14

* Fix wrong plugin path

* Replace mcmod.info with new mods.toml

* Add pack mcmeta

* Move logo to main folder because forge 1.14.4 cannot load logo files with a path

* Fix version number is wrong

* Add jei

* Add manifest data (Used for version replacement)
---
 build.gradle                                  |  75 ++++++++++++------
 gradle/wrapper/gradle-wrapper.jar             | Bin 54706 -> 54708 bytes
 gradle/wrapper/gradle-wrapper.properties      |   3 +-
 src/main/resources/META-INF/mods.toml         |  27 +++++++
 .../actuallyadditions/textures => }/logo.png  | Bin
 src/main/resources/mcmod.info                 |  19 -----
 src/main/resources/pack.mcmeta                |   6 ++
 7 files changed, 83 insertions(+), 47 deletions(-)
 create mode 100644 src/main/resources/META-INF/mods.toml
 rename src/main/resources/{assets/actuallyadditions/textures => }/logo.png (100%)
 delete mode 100644 src/main/resources/mcmod.info
 create mode 100644 src/main/resources/pack.mcmeta

diff --git a/build.gradle b/build.gradle
index d0a1802f7..2c6e86b1c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,14 +7,15 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
+        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true
     }
 }
 
-apply plugin: 'net.minecraftforge.gradle.forge'
+apply plugin: 'net.minecraftforge.gradle'
+apply plugin: 'eclipse'
 apply plugin: 'idea'
 
-version = "1.12.2-r150"
+version = "1.14.4-r151"
 group = "de.ellpeck.actuallyadditions"
 archivesBaseName = "ActuallyAdditions"
 
@@ -23,12 +24,34 @@ if(hasProperty('buildnumber')){
 }
 
 minecraft {
-    version = "1.12.2-14.23.5.2836"
-    runDir = "run"
-    mappings = "stable_39"
-	makeObfSourceJar = false
-    replaceIn "ActuallyAdditions.java"
-    replace "@VERSION@", project.version.toString()
+    mappings channel: "snapshot", version: "20191107-1.14.3"
+	runs {
+        client = {
+            workingDirectory project.file("run/client").canonicalPath
+            mods {
+                actuallyadditions {
+                    source sourceSets.main
+				}
+			}
+        }
+        server = {
+            workingDirectory project.file("run/server").canonicalPath
+            mods {
+                actuallyadditions {
+                    source sourceSets.main
+				}
+			}
+        }
+        data = {
+            workingDirectory project.file("run/data").canonicalPath
+            args "--mod", "actuallyadditions", "--all", "--output", "\"" + file("src/generated/resources").toString() + "\"", "--validate", "--existing", "\"" + sourceSets.main.resources.srcDirs[0] + "\""
+            mods {
+                actuallyadditions {
+                    source sourceSets.main
+				}
+			}
+        }
+    }
 }
 
 repositories {
@@ -44,34 +67,34 @@ repositories {
 }
 
 dependencies {
-	deobfCompile "mezz.jei:jei_1.12.2:+"
-	deobfCompile "mcp.mobius.waila:Hwyla:1.8+"
-    deobfCompile ("org.cyclops.commoncapabilities:CommonCapabilities:1.12.2-+")
+	minecraft "net.minecraftforge:forge:1.14.4-28.1.86"
+	compileOnly fg.deobf("mezz.jei:jei-1.14.4:6.0.0.24:api")
+  	runtimeOnly fg.deobf("mezz.jei:jei-1.14.4:6.0.0.24")
+	//deobfCompile "mcp.mobius.waila:Hwyla:1.8+"
+    //deobfCompile ("org.cyclops.commoncapabilities:CommonCapabilities:1.12.2-+")
 }
 
-processResources {
-    inputs.property "version", project.version
-    inputs.property "mcversion", project.minecraft.version
-
-    from(sourceSets.main.resources.srcDirs) {
-        include 'mcmod.info'
-
-        expand 'version': project.version, 'mcversion': project.minecraft.version
-    }
-
-    from(sourceSets.main.resources.srcDirs) {
-        exclude 'mcmod.info'
-    }
+def normalManifest = {
+	attributes(
+		"Built-On": "1.14.4",
+		"Implementation-Title": "ActuallyAdditions",
+    	"Implementation-Version": project.version,
+        "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
+	)
 }
 
 jar {
-
+	exclude(".cache")
+   	manifest normalManifest
 }
 
 task deobfJar(type: Jar) {
     from sourceSets.main.output
     from sourceSets.main.java
     classifier = 'dev'
+    
+    exclude(".cache")
+   	manifest normalManifest
 }
 
 task apiJar(type: Jar) {
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index a7d517fd6fd6234731c92dfdd3552bfc99c9a03a..7a3265ee94c0ab25cf079ac8ccdf87f41d455d42 100644
GIT binary patch
delta 759
zcmYk4T}V@57{|~1X!Ar<k4~2!7vl0`9nsc>X*HOmsI?)CJ`^kZHjL81i=d03(FYY)
zx<4XXB1Lxw<*17;QfqVO=H}PDD6hN`B`Ecx+j{pp#RG@){C>~>dEaw5uYVxr<3LJB
z^|qSMMVGzPRxdB*ueGhVF{wix^xFcdlH`!E7C4ZdDtX*#vTI<a#UM#i7Qaz6YC>bM
ze0>&Af(@(}3&DMC2!_!bwv5+>MqD1%$iz@onF}{l@r7f(E`h!=8P9YwGC~?1OxrLG
zp~LiY`v!duS!sFaIyvb_UZTQ<F&8~96y?a+5!!1`mO5NDXQ3>tU{8gj=kJ%ic2)3z
z5p@+A7!E1$eOD>1lB;5oEvwp^EvVuR6V!1l-F1p}-#PVY8P`a03$(jS@M}UrY2DT_
zwJzCAN6MTL)nS#6o)W4#e2kUiL--8QIShtPutaKDCN4!htQG!<jrHMA<UCoLu@cG0
z+2&%jPiPdq2}i#P@d*cAX%*#sQzq{yI1yDTa7(DC(fzCkU!$k#;ca+h7SzV<tN{07
z7x@MYvFmiw%X7QY;Vr?983k`ARa(6-ROJH`{!MCRXcy>dFF=GR?o6qa`(j;n>o7D`
zOR{eh-9AOEb9`DQW7npBK7EJ`-AT;$&1m$uCrNtPdlNGnO}!E-y)TRJt6+XcrLumm
z90HxQDmA^~XvU*iD=D9#kDKvx*2<Q!Bi=~Ahar#H#P|E-D*J|L{2Fxy@IFvf?r}59
ek#Zzimihm7NLvqR-o_CS&qa9W%60Z&0{#PNOb#0W

delta 791
zcmYk4T}YEr7{}lDQD1d!b3>=|Raj|;zB0?eT)D9dqtVi=MruSKq!nUGLI#GA2v#U+
z{;By<L|$|w1jYm*L1j~GA5L@DjW<E)O%R3DO&6V=DeZ*=|NrxQ&U4QDJjXMh@NPU|
zpgigERQG+`Q|krkq32htC=AFG9;-J|I`{Pyw!DW`f>7g3PFWxQBct4RCYFsJUv0{e
zAP6n3H}}Kt%Y`(r6{lgCw}_j#D`lc#ULje8=r^EBlrh7sON!dTg(GB1j;T~!TsTg{
zsWF#=_X`JTGi%4G7LU>wW7I*Fy&FY-9iE$XYIf@O*KOkPYMz7{QwG)-6*A{-hq5pf
z(xKQKpPysqu-cr4N358kBpxP}aA+xs!J@Kwm|e!<=`s!9+2e?Z4;&o6b*RzuQ6a69
z**sJ`jr<CQRk~d}7ZwELp#MBoy7-1B|4G_g&*cYyB?*_f%n#T}(}?260z3&QVlzAe
zt2m0Efy?4P)C6x)pc${*a`8EMjIQ0`@^8chS4gJ07H)e(hsb@8$$V^vN~x=jNgHaH
z6v}RAvJh9=HJD;n)4`LfJ97A69SqBKwv&ejI}338lMZjfviJjY;U?1ea!|8;g3|j@
z+HXgQ@r`9!WK&&fpp0iMScHL<3evl|taGb**~F3fW^D~~STT~x4p3<61uvWSQqSrs
zRPc)1+*Jo%A4BI@A^KKXM<=0;u#Qejyx{NY_>OKs6RD@~Gf>T1(HGRg6OqMPgd;Zy
kUQBrRpl(fVioWLP6HaHN(6eRyKN6<Cp=+&JviYLHf6B}eVgLXD

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 93eea80cf..949819d28 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Sat Jul 01 10:16:13 EDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
new file mode 100644
index 000000000..2f1282c19
--- /dev/null
+++ b/src/main/resources/META-INF/mods.toml
@@ -0,0 +1,27 @@
+modLoader="javafml"
+loaderVersion="[28,)"
+issueTrackerURL="http://github.com/Ellpeck/ActuallyAdditions/issues"
+displayURL="http://github.com/Ellpeck/ActuallyAdditions"
+logoFile="logo.png"
+credits="Author: Ellpeck; Textures and Models: BootyToast, GlenthorLP, canitzp"
+authors="Ellpeck"
+
+[[mods]]
+	modId="actuallyadditions"
+	version="${file.jarVersion}"
+	displayName="Actually Additions"
+	description="Do you want Automation? Wireless Transport? Better Machines? A cup o' Coffee? Chests? Better Hoppers? Leaf Blowers? Faster Growth? Plants? Well, Actually Additions has all that and a lot more!"
+	
+	[[dependencies.actuallyadditions]]
+	    modId="forge"
+	    mandatory=true
+	    versionRange="[28.1.86,)"
+	    ordering="NONE"
+	    side="BOTH"
+	
+	[[dependencies.actuallyadditions]]
+	    modId="minecraft"
+	    mandatory=true
+	    versionRange="[1.14.4]"
+	    ordering="NONE"
+	    side="BOTH"
\ No newline at end of file
diff --git a/src/main/resources/assets/actuallyadditions/textures/logo.png b/src/main/resources/logo.png
similarity index 100%
rename from src/main/resources/assets/actuallyadditions/textures/logo.png
rename to src/main/resources/logo.png
diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
deleted file mode 100644
index fc2d9f429..000000000
--- a/src/main/resources/mcmod.info
+++ /dev/null
@@ -1,19 +0,0 @@
-[
-{
-  "modid": "actuallyadditions",
-  "name": "Actually Additions",
-  "description": "Do you want Automation? Wireless Transport? Better Machines? A cup o' Coffee? Chests? Better Hoppers? Leaf Blowers? Faster Growth? Plants? Well, Actually Additions has all that and a lot more!",
-  "version": "${version}",
-  "mcversion": "${mcversion}",
-  "url": "http://github.com/Ellpeck/ActuallyAdditions",
-  "updateUrl": "",
-  "authorList": [ "Ellpeck" ],
-  "credits": "Author: Ellpeck; Textures and Models: BootyToast, GlenthorLP, canitzp",
-  "logoFile": "assets/actuallyadditions/textures/logo.png",
-  "screenshots": [
-  ],
-  "parent":"",
-  "dependencies": [
-  ]
-}
-]
\ No newline at end of file
diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta
new file mode 100644
index 000000000..6dd61a737
--- /dev/null
+++ b/src/main/resources/pack.mcmeta
@@ -0,0 +1,6 @@
+{
+    "pack": {
+        "description": "Actually Additions",
+        "pack_format": 4
+    }
+}
\ No newline at end of file