Reapply "Merge branch 'dev/main' into dev/prism/weapons"

This reverts commit 636ad97.

.github/workflows/optimize_assets.yml

@@ -36,7 +36,7 @@ jobs:
         uses: fregante/setup-git-user@v2
 
       - name: Setup Git User
-        run: git config --global user.name "Automated Carver Device(tm)"
+        run: git config --global user.name "Automated Carver Device(tm)" ; git config --global user.email "[email protected]"
 
       - name: Verify Changed files
         uses: tj-actions/verify-changed-files@v20
@@ -49,9 +49,11 @@ jobs:
 
       - name: Create Pull Request
         if: steps.verify-changed-files.outputs.files_changed == 'true'
-        uses: peter-evans/create-pull-request@v5.0.2
+        uses: peter-evans/create-pull-request@v6
         with:
           title: Optimized Assets
           commit-message: optimized assets
           body: Assets were automatically optimized.
+          author: CarverBot <[email protected]>
+          committer: CarverBot <[email protected]>
           token: ${{ secrets.OPTIMIZATION_TOKEN }}

.github/workflows/push_notify.yml

@@ -2,7 +2,7 @@ name: Notify Discord on Push
 
 on:
   push: #Trigger On Push
-    branches: [ "dev/main" ]
+    branches: [ "dev/**" ]
 
 jobs:
   notify-discord:

.gitignore

@@ -25,8 +25,6 @@ bin/
 .gradle
 custom.gradle
 
-docs/
-
 # Forge
 run/
 hs_err_pid*
@@ -37,3 +35,6 @@ src/main/generated/*
 # System
 *Thumbs.db
 *.ini
+
+# Certs
+cert/*

README.md

@@ -88,9 +88,5 @@ Java models use a fork of **Turbo Model Thingy** (**TMT**):
 - The original author: [@GaryCXJk](https://github.com/GaryCXJk)
 - Licensed from: [Flan's Mod Team](https://github.com/FlansMods/FlansMod)
 
-OBJ based models use our proprietary **AMT** library, included in `client.util.amt` in this mod's source code.  
-Some code and assets are automatically generated through [ModWorks](https://github.com/Team-Immersive-Intelligence/ModworksProcessor), our annotation processor.  
-If you wish to use these libraries in your project, message [@Pabilo8](https://github.com/Pabilo8/).
-
 #### Please report any bugs you find in the ['Issues' tab](https://github.com/Team-Immersive-Intelligence/ImmersiveIntelligence/issues). Please don't do that on Curseforge / DM ^^.  
 #### Feel free to join the mod's [Discord Server](https://discord.gg/teMfm3R) to have a chat with the devs and community.

build.gradle

@@ -12,11 +12,18 @@ buildscript {
             name = "sonatype"
             url = "https://oss.sonatype.org/content/repositories/snapshots/"
         }
+        maven {
+            name = "iiMavenReleases"
+            url = uri("https://maven.iiteam.net/releases")
+        }
+
     }
     dependencies {
         classpath("com.anatawa12.forge:ForgeGradle:2.3-1.0.+") {
             changing = true
         }
+
+        classpath('xyz.vdeltagabriel:GradleUtils:2.1.0')
     }
 }
 
@@ -26,15 +33,6 @@ apply from: rootProject.file('gradle/boilerplate.gradle')
 //--- Dependencies
 
 repositories {
-    maven { // JEI & Tinkers
-        name 'DVS1 Maven FS'
-        url 'https://dvs1.progwml6.com/files/maven'
-    }
-}
-
-dependencies {
-    // at runtime, use the full JEI jar
-    runtimeOnly "mezz.jei:jei_1.12.2:4.16.1.301"
 }
 
 

custom.gradle.template

@@ -1,5 +1,3 @@
-// Here you can put yout uuid and username so you can play minecraft as yourself which can be userful
-// when testing skins or other player specific mechanics/features
 runClient {
-    args = ["--uuid", "your uuid", "--username", "your username"]
+    args = ['--username', '', '--uuid', '']
 }

gradle.properties

@@ -19,7 +19,7 @@ modForge=1.12.2-14.23.5.2847
 modMappings=snapshot_20171003
 
 #Project Data
-modVersion=0.3.1-dev2
+modVersion=0.3.1-dev3
 modGroup=pl.pabilo8
 modName=immersiveintelligence
 
@@ -40,11 +40,18 @@ modASMPath=pl/pabilo8/immersiveintelligence/common/asm/**
 modASMClass=pl.pabilo8.immersiveintelligence.common.asm.IILoadingPlugin
 
 # Jar Signing
+ii_enableSigning=true
 keyStore=
 keyStoreAlias=
 keyStorePass=
 keyStoreKeyPass=
-signSHA1=
+timestampUrl=
+keyStoreData=
+
+# II Maven
+ii_authToIIMaven=false
+iiMavenReleasesUsername=
+iiMavenReleasesPassword
 
 # Gradlephant Banner
 ii_gradlephantTitle=A mod brought to you by Team II

gradle/boilerplate.gradle

@@ -2,6 +2,7 @@
 
 apply plugin: "net.minecraftforge.gradle.forge"
 apply plugin: 'idea'
+apply plugin: 'gradleutils'
 
 //--- Script Utilties
 project.getOr = {String envProp, projectProp -> System.getenv(envProp) ?: projectProp}
@@ -154,11 +155,6 @@ processResources {
     exclude '**/.DS_Store'
 }
 
-tasks.build.doLast(){
-    if(ii_printSourceSets.toBoolean())
-        logger.log(LogLevel.WARN, 'Build Location: '+file("./build/libs/").getPath())
-}
-
 //--- Core Jar Generation
 // Create a core jar, sign it and place it inside the main jar
 if(ii_generateCoreJar=='true')
@@ -167,6 +163,20 @@ if(ii_generateCoreJar=='true')
 //--- IE Addon
 apply from: rootProject.file('gradle/ieaddon.gradle')
 
+if(ii_enableSigning.asBoolean())
+    apply from: rootProject.file('gradle/codesign.gradle')
+
+tasks.build.doLast(){
+    if(ii_printSourceSets.toBoolean())
+        logger.log(LogLevel.WARN, 'Build Location: '+file("./build/libs/").getPath())
+}
+
+if(ii_enableSigning.asBoolean()) {
+    tasks.build.finalizedBy() {
+        signMainJar
+    }
+}
+
 //--- Help Function
 tasks.register('modSetupDocs') {
     group = "Help"

gradle/codesign.gradle

@@ -0,0 +1,74 @@
+apply plugin: 'signing'
+
+if(ii_generateCoreJar=='true')
+{
+    tasks.register('signCoreJar') {
+        group 'signing'
+
+        onlyIf {
+            hasKeyStore()
+        }
+
+        outputs.upToDateWhen {false}
+
+        dependsOn reobfCoreJar
+
+        doLast {
+            def signdir  = new File("$buildDir/libs")
+            signdir.mkdirs()
+            ant.signjar(
+                    destDir: "${signdir.absolutePath}",
+                    jar: 'build/libs/*-core.jar',
+                    alias:getOr("SIGNING_KEY_ALIAS", project.keyStoreAlias),
+                    storetype:"jks",
+                    keystore:"${getOr("SIGNING_KEY_STORE_PATH", project.keyStore)}",
+                    storepass:getOr("SIGNING_STORE_PASSWORD", project.keyStorePass),
+                    keypass:getOr("SIGNING_KEY_PASSWORD", project.keyStoreKeyPass),
+                    preservelastmodified:"true"
+                    //verbose:true
+            )
+        }
+    }
+
+    tasks.coreJar.finalizedBy() {
+        signCoreJar
+    }
+}
+
+tasks.register('signMainJar') {
+    group 'signing'
+    onlyIf {
+        hasKeyStore()
+    }
+
+    outputs.upToDateWhen {false}
+
+    dependsOn reobfJar
+
+    doLast {
+        def signdir  = new File("$buildDir/libs")
+        signdir.mkdirs()
+        ant.signjar(
+                destDir: "${signdir.absolutePath}",
+                jar: 'build/libs/*.jar',
+                alias:getOr("SIGNING_KEY_ALIAS", project.keyStoreAlias),
+                storetype:"jks",
+                keystore:"${getOr("SIGNING_KEY_STORE_PATH", project.keyStore)}",
+                storepass:getOr("SIGNING_STORE_PASSWORD", project.keyStorePass),
+                keypass:getOr("SIGNING_KEY_PASSWORD", project.keyStoreKeyPass),
+                preservelastmodified:"true"
+                //tsaurl:getOr("SIGNING_TIMESTAMP_URL", project.timestampUrl)
+        )
+    }
+}
+
+boolean hasKeyStore()
+{
+    if (!ii_enableSigning.asBoolean()) return false
+    def keystore = getOr("SIGNING_KEY_STORE_PATH", project.keyStore)
+    if (keystore instanceof File) {
+        return ((File)keystore).exists()
+    } else {
+        return !((String)keystore).isEmpty()
+    }
+}

gradle/corejar.gradle

@@ -20,35 +20,6 @@ tasks.register('coreJar', Jar) {
     group = 'build'
 }
 
-tasks.register('signCoreJar', SignJar) {
-    onlyIf { // Skip the task if our secret data isn't available
-        hasKeyStore()
-    }
-    dependsOn reobfCoreJar
-
-    keyStore = getOr("SIGNING_KEY_STORE_PATH", project.keyStore)
-    alias = getOr("SIGNING_KEY_ALIAS", project.keyStoreAlias)
-    storePass = getOr("SIGNING_STORE_PASSWORD", project.keyStorePass)
-    keyPass = getOr("SIGNING_KEY_PASSWORD", project.keyStoreKeyPass)
-    inputFile = coreJar.archivePath
-    outputFile = coreJar.archivePath
-}
-
-tasks.register('signMainJar', SignJar) {
-    onlyIf { // Skip the task if our secret data isn't available
-        hasKeyStore()
-    }
-    dependsOn reobfJar
-
-    keyStore = getOr("SIGNING_KEY_STORE_PATH",project.keyStore)
-    alias = getOr("SIGNING_KEY_ALIAS",project.keyStoreAlias)
-    storePass = getOr("SIGNING_STORE_PASSWORD",project.keyStorePass)
-    keyPass = getOr("SIGNING_KEY_PASSWORD",project.keyStoreKeyPass)
-    inputFile = jar.archivePath
-    outputFile = jar.archivePath
-}
-build.dependsOn signMainJar
-jar.dependsOn signCoreJar
 def libPrefix = 'META-INF/libraries'
 
 jar {
@@ -64,9 +35,4 @@ jar {
         include '*' // Due to the way Gradle's copy tasks work, we need this line for the JAR to get added
         into libPrefix
     }
-}
-
-boolean hasKeyStore()
-{
-    return !(getOr("SIGNING_KEY_STORE_PATH", project.keyStore).isEmpty())
 }

gradle/ieaddon.gradle

@@ -1,6 +1,9 @@
 dependencies {
     // compile against the JEI API but do not include it at runtime
-    compileOnly "mezz.jei:jei_1.12.2:4.16.1.301:api"
+    provided "mezz.jei:jei_1.12.2:4.16.1.301:api"
+
+    // use jei at runtime
+    runtimeOnly "mezz.jei:jei_1.12.2:4.16.1.301"
 
     deobfCompile "team.chisel.ctm:CTM:MC1.12.2-1.0.2.31"
     deobfCompile "blusunrize:ImmersiveEngineering:0.12-92-+"
@@ -9,23 +12,37 @@ dependencies {
     deobfCompile "com.mod-buildcraft:buildcraft:7.99.12"
 
     //Lighting mod formerly called Albedo
-    implementation "com.elytradev:mirage:2.0.3-rc3-SNAPSHOT"
+    provided "com.elytradev:mirage:2.0.3-rc3-SNAPSHOT"
 //    compileOnly 'com.azanor:Baubles:1.12-1.5.2'
-    compileOnly "curse.maven:baubles-227083:2518667"
+    provided "curse.maven:baubles-227083:2518667"
 
-    implementation "org.squiddev:cc-tweaked-1.12.2:1.89.2"
-    implementation "li.cil.oc:OpenComputers:MC1.12.2-1.7.5.221"
+    provided "org.squiddev:cc-tweaked-1.12.2:1.89.2"
+    provided "li.cil.oc:OpenComputers:MC1.12.2-1.7.5.221"
 
     //Download from curse maven
-    implementation "curse.maven:tough-as-nails-246391:2710969"
-    implementation "curse.maven:terrafirmacraft-302973:3645502"
-    implementation "curse.maven:immersive-petroleum-268250:3382321"
-    compileOnly "curse.maven:immersive-posts-314645:2951672"
-    compileOnly "curse.maven:immersive-technology-359407:3658279"
-    implementation "curse.maven:mysticalmechanics-300742:3006392"
+    provided "curse.maven:tough-as-nails-246391:2710969"
+    provided "curse.maven:terrafirmacraft-302973:3645502"
+    deobfCompile "curse.maven:immersive-petroleum-268250:3382321"
+    deobfCompile "curse.maven:immersive-posts-314645:2951672"
+    deobfCompile "curse.maven:immersive-technology-359407:3658279"
+    provided "curse.maven:mysticalmechanics-300742:3006392"
 }
 
 repositories {
+    maven {
+        name = "iiMavenReleases"
+        url = uri("https://maven.iiteam.net/releases")
+        if (ii_authToIIMaven.asBoolean()) {
+            credentials {
+                username project.iiMavenReleasesUsername
+                password project.iiMavenReleasesPassword
+            }
+            authentication {
+                basic(BasicAuthentication)
+            }
+        }
+    }
+
     maven { // JEI & Tinkers
         name 'DVS1 Maven FS'
         url 'https://dvs1.progwml6.com/files/maven'

gradle/modworks.gradle

@@ -18,8 +18,8 @@ repositories {
 }
 
 dependencies {
-    annotationProcessor 'com.github.Team-Immersive-Intelligence:ModworksProcessor:1.1.2'
-    compileOnly 'com.github.Team-Immersive-Intelligence:ModworksProcessor:1.1.2'
+    annotationProcessor 'pl.pabilo8:modworks-processor:1.1.2'
+    compileOnly 'pl.pabilo8:modworks-processor:1.1.2'
 }
 
 compileJava {

gradle/tools/opti.sh

@@ -18,6 +18,7 @@ processAudio () {
       mv $1.tmp $1
     else
       echo "Cannot convert file, output is empty."
+      rm $1.tmp
       return;
     fi
 }

src/main/java/pl/pabilo8/immersiveintelligence/ImmersiveIntelligence.java

@@ -111,8 +111,10 @@ public void serverStarting(FMLServerStartingEvent event)
 
 	//If anyone wants to acquire a righteously certified loicense:tm:, ask @Pabilo8, it is probable he can grant you one
 	private static final String[] alternativeCerts = {
-			"4e1045a33d925770c5393a384c1a60f63f8f50e5", //Gabriel
-			"0f6c85efeabec62835f1fb26ff0ad1ae6f1af9cb" //Automated Carver Device(tm)
+			"011e706a5b5f954d1a99bcded5c51c3cc104d915", // Gabriel
+			"068e23a5c5552d79ac66ece9dcaed54cfb74a992", // Automated Carver Device(tm)
+			"312cffade27b8eeb91fca5f5ae219495ebc86ab1", // Avalon
+			"6644e1691cd979e50755e3f86aa72a702ecd69d1", // Prism
 	};
 
 	@Mod.EventHandler