Update build script and CI

GTNewHorizons · Nov 30, 2021 · 27bb7b2 · 27bb7b2
1 parent b9af0ef
commit 27bb7b2
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 65 deletions.
diff --git a/.github/workflows/release-latest.yml b/.github/workflows/release-latest.yml
diff --git a/build.gradle b/build.gradle
@@ -1,4 +1,4 @@
-//version: 4f3d1b46cf51f9d4ded5379b5d817a2a6f6b302d
+//version: ffe7b130f98fdfa1ac7c6ba4bd34722a55ab28d4
 /*
 DO NOT CHANGE THIS FILE!
 
@@ -62,6 +62,10 @@ idea {
     }
 }
 
+if(JavaVersion.current() != JavaVersion.VERSION_1_8) {
+    throw new GradleException("This project requires Java 8, but it's running on " + JavaVersion.current())
+}
+
 checkPropertyExists("modName")
 checkPropertyExists("modId")
 checkPropertyExists("modGroup")
@@ -153,7 +157,12 @@ configurations.all {
 // Fix Jenkins' Git: chmod a file should not be detected as a change and append a '.dirty' to the version
 'git config core.fileMode false'.execute()
 // Pulls version from git tag
-version = minecraftVersion + "-" + gitVersion()
+try {
+    version = minecraftVersion + "-" + gitVersion()
+}
+catch (Exception e) {
+    throw new IllegalStateException("This mod must be version controlled by Git AND the repository must provide at least one tag!");
+}
 group = modGroup
 archivesBaseName = modId
 
@@ -225,14 +234,13 @@ dependencies {
 
 apply from: 'dependencies.gradle'
 
-def mixinConfigJson = "mixins." + modId + ".json"
 def mixingConfigRefMap = "mixins." + modId + ".refmap.json"
 def refMap = "${tasks.compileJava.temporaryDir}" + File.separator + mixingConfigRefMap
 def mixinSrg = "${tasks.reobf.temporaryDir}" + File.separator + "mixins.srg"
 
 task generateAssets {
     if(usesMixins.toBoolean()) {
-        new File(projectDir.toString() + "/src/main/resources/", mixinConfigJson).text = """{
+        new File(projectDir.toString() + "/src/main/resources/", "mixins." + modId + ".json").text = """{
   "required": true,
   "minVersion": "0.7.11",
   "package": "${modGroup}.${mixinsPackage}",
@@ -351,6 +359,10 @@ processResources
                         "modName": modName
             }
 
+            if(usesMixins.toBoolean()) {
+                from refMap
+            }
+
             // copy everything else, thats not the mcmod.info
             from(sourceSets.main.resources.srcDirs) {
                 exclude 'mcmod.info'
@@ -374,7 +386,7 @@ def getManifestAttributes() {
     if(usesMixins.toBoolean()) {
         manifestAttributes += [
                 "TweakClass" : "org.spongepowered.asm.launch.MixinTweaker",
-                "MixinConfigs" : mixinConfigJson,
+                "MixinConfigs" : "mixins." + modId + ".json",
                 "ForceLoadAsMod" : containsMixinsAndOrCoreModOnly.toBoolean() == false
         ]
     }
@@ -448,22 +460,6 @@ artifacts {
     }
 }
 
-// Crude handler to append custom maven repositories to maven dependency
-install{
-    repositories{
-        mavenInstaller{
-            pom.withXml {
-                def repositoriesNode = asNode().appendNode("repositories")
-                project.repositories.each { repository ->
-                    def repositoryNode = repositoriesNode.appendNode("repository")
-                    repositoryNode.appendNode("name", repository.name)
-                    repositoryNode.appendNode("url", repository.properties.get("url"))
-                }
-            }
-        }
-    }
-}
-
 // Updating
 task updateBuildScript {
     doLast {