1.14: Config skel ported (experimental), JEI integration ported (experimental, also addresses issue #38).

1.14/build.gradle

@@ -19,20 +19,25 @@ version = "${version_engineersdecor}"
 group = "wile.engineersdecor"
 archivesBaseName = "engineersdecor-${version_minecraft}"
 
-// def signing = { ->
-//   def sp = new Properties()
-//   if(file("signing.properties").exists()) file("signing.properties").withInputStream { sp.load(it) }
-//   return sp
-// }()
+def signing = { ->
+  def sp = new Properties()
+  if(file("signing.properties").exists()) file("signing.properties").withInputStream { sp.load(it) }
+  return sp
+}()
 
-// def git_version = { ->
-//   def stdout = new ByteArrayOutputStream()
-//   exec {
-//     commandLine 'git', 'log', '-1', '--format=%h'
-//     standardOutput = stdout
-//   }
-//   return stdout.toString().trim()
-// }()
+def git_version = { ->
+  def stdout = new ByteArrayOutputStream()
+  exec {
+    commandLine 'git', 'log', '-1', '--format=%h'
+    standardOutput = stdout
+  }
+  return stdout.toString().trim()
+}()
+
+repositories {
+  maven { name = "Progwml6 maven"; url = "https://dvs1.progwml6.com/files/maven/" } // JEI files
+  maven { name = "ModMaven"; url = "modmaven.k-4u.nl" } // JEI files, fallback
+}
 
 minecraft {
   mappings channel: 'snapshot', version: "${version_fml_mappings}"
@@ -63,6 +68,8 @@ minecraft {
 
 dependencies {
   minecraft "net.minecraftforge:forge:${version_forge_minecraft}"
+  compileOnly fg.deobf("mezz.jei:jei-${version_minecraft}:${version_jei}:api")
+  runtimeOnly fg.deobf("mezz.jei:jei-${version_minecraft}:${version_jei}")
 }
 
 jar {
@@ -80,19 +87,9 @@ jar {
 }
 
 def reobfFile = file("$buildDir/reobfJar/output.jar")
-def reobfArtifact = artifacts.add('default', reobfFile) {
-  type 'jar'
-  builtBy 'reobfJar'
-}
+def reobfArtifact = artifacts.add('default', reobfFile) { type 'jar'; builtBy 'reobfJar'; }
+
 publishing {
-  publications {
-    mavenJava(MavenPublication) {
-      artifact reobfArtifact
-    }
-  }
-  repositories {
-    maven {
-      url "file:///${project.projectDir}/mcmodsrepo"
-    }
-  }
+  publications { mavenJava(MavenPublication) { artifact reobfArtifact } }
+  repositories { maven { url "file:///${project.projectDir}/mcmodsrepo" } }
 }

1.14/gradle.properties

@@ -4,7 +4,8 @@ org.gradle.jvmargs=-Xmx8G
 version_minecraft=1.14.3
 version_forge_minecraft=1.14.3-27.0.25
 version_fml_mappings=20190621-1.14.2
-version_engineersdecor=1.0.9-b3
+version_jei=6.0.0.7
+version_engineersdecor=1.0.9-b4
 #
 # jar signing data loaded from signing.properties in the project root.
 #

1.14/meta/update.json

@@ -1,6 +1,7 @@
 {
   "homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/",
   "1.14.3": {
+    "1.0.9-b4": "[E] Experimental: Config skel ported (!not all options have effect yet).\n[E] Experimental: JEI integration for opt-outs and crafting table ported (also addresses issue #38).",
     "1.0.9-b3": "[F] Additional item drop fixes when blocks are destroyed (issue #39).",
     "1.0.9-b2": "[U] Updated to Forge 1.14.3-27.0.25/20190621-1.14.2.\n[F] Fixed recipe collision of Metal Rung Ladder (issue #37, thx ProsperCraft for reporting).\n[F] Fixed opening crafting table, furni, dropper server crash issue #35 (thx ProsperCraft also here).\n[F] Fixed missing pole/support item drops (issue #36, ProsperCraft).",
     "1.0.9-b1": "[U] Updated to MC1.14.3, Forge 1.14.3-27.0.17/20190621-1.14.2.\n[A] Added Small Mineral Smelter.",
@@ -13,6 +14,6 @@
   },
   "promos": {
     "1.14.3-recommended": "",
-    "1.14.3-latest": "1.0.9-b3"
+    "1.14.3-latest": "1.0.9-b4"
   }
 }

1.14/readme.md

@@ -10,6 +10,10 @@ Mod sources for Minecraft version 1.14.3.
 ----
 ## Version history
 
+    - v1.0.9-b4 [E] Experimental: Config skel ported (!not all options have effect yet).
+                [E] Experimental: JEI integration for opt-outs and crafting table ported
+                    (also addresses issue #38).
+
     - v1.0.9-b3 [F] Additional item drop fixes when blocks are destroyed (issue #39).
 
     - v1.0.9-b2 [U] Updated to Forge 1.14.3-27.0.25/20190621-1.14.2.