Merge branch 'master' into master

GTNewHorizons · Jan 2, 2024 · 431b341 · 431b341
2 parents 54e0125 + 8b1dfba
commit 431b341
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 22 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,4 +1,4 @@
-//version: 1702141377
+//version: 1704135167
 /*
  DO NOT CHANGE THIS FILE!
  Also, you may replace this file at any time if there is an update available.
@@ -31,8 +31,7 @@ buildscript {
         maven {
             // GTNH RetroFuturaGradle and ASM Fork
             name "GTNH Maven"
-            url "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
-            allowInsecureProtocol = true
+            url "https://nexus.gtnewhorizons.com/repository/public/"
         }
         mavenLocal()
     }
@@ -49,7 +48,7 @@ plugins {
     id 'org.ajoberstar.grgit' version '4.1.1' // 4.1.1 is the last jvm8 supporting version, unused, available for addon.gradle
     id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
     id 'com.palantir.git-version' version '3.0.0' apply false
-    id 'de.undercouch.download' version '5.4.0'
+    id 'de.undercouch.download' version '5.5.0'
     id 'com.github.gmazzo.buildconfig' version '3.1.0' apply false // Unused, available for addon.gradle
     id 'com.diffplug.spotless' version '6.13.0' apply false // 6.13.0 is the last jvm8 supporting version
     id 'com.modrinth.minotaur' version '2.+' apply false
@@ -118,7 +117,7 @@ propertyDefaultIfUnset("forceEnableMixins", false)
 propertyDefaultIfUnset("channel", "stable")
 propertyDefaultIfUnset("mappingsVersion", "12")
 propertyDefaultIfUnset("usesMavenPublishing", true)
-propertyDefaultIfUnset("mavenPublishUrl", "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases")
+propertyDefaultIfUnset("mavenPublishUrl", "https://nexus.gtnewhorizons.com/repository/releases/")
 propertyDefaultIfUnset("modrinthProjectId", "")
 propertyDefaultIfUnset("modrinthRelations", "")
 propertyDefaultIfUnset("curseForgeProjectId", "")
@@ -573,13 +572,15 @@ afterEvaluate {
 
 repositories {
     maven {
-        name 'Overmind forge repo mirror'
-        url 'https://gregtech.overminddl1.com/'
+        name = "GTNH Maven"
+        url = "https://nexus.gtnewhorizons.com/repository/public/"
+        // Links for convenience:
+        // Simple HTML browsing: https://nexus.gtnewhorizons.com/service/rest/repository/browse/releases/
+        // Rich web UI browsing: https://nexus.gtnewhorizons.com/#browse/browse:releases
     }
     maven {
-        name = "GTNH Maven"
-        url = "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
-        allowInsecureProtocol = true
+        name 'Overmind forge repo mirror'
+        url 'https://gregtech.overminddl1.com/'
     }
     maven {
         name 'sonatype'
@@ -960,8 +961,7 @@ if (usesShadowedDependencies.toBoolean()) {
     configurations.runtimeElements.outgoing.artifact(tasks.named("shadowJar", ShadowJar))
     configurations.apiElements.outgoing.artifact(tasks.named("shadowJar", ShadowJar))
     tasks.named("jar", Jar) {
-        enabled = false
-        finalizedBy(tasks.shadowJar)
+        archiveClassifier.set('dev-preshadow')
     }
     tasks.named("reobfJar", ReobfuscatedJar) {
         inputJar.set(tasks.named("shadowJar", ShadowJar).flatMap({it.archiveFile}))
@@ -970,11 +970,6 @@ if (usesShadowedDependencies.toBoolean()) {
     javaComponent.withVariantsFromConfiguration(configurations.shadowRuntimeElements) {
         skip()
     }
-    for (runTask in ["runClient", "runServer", "runClient17", "runServer17"]) {
-        tasks.named(runTask).configure {
-            dependsOn("shadowJar")
-        }
-    }
 }
 ext.publishableDevJar = usesShadowedDependencies.toBoolean() ? tasks.shadowJar : tasks.jar
 ext.publishableObfJar = tasks.reobfJar
@@ -1178,7 +1173,7 @@ publishing {
         if (usesMavenPublishing.toBoolean() && System.getenv("MAVEN_USER") != null) {
             maven {
                 url = mavenPublishUrl
-                allowInsecureProtocol = mavenPublishUrl.startsWith("http://") // Mostly for the GTNH maven
+                allowInsecureProtocol = mavenPublishUrl.startsWith("http://")
                 credentials {
                     username = System.getenv("MAVEN_USER") ?: "NONE"
                     password = System.getenv("MAVEN_PASSWORD") ?: "NONE"

diff --git a/dependencies.gradle b/dependencies.gradle
@@ -1,7 +1,7 @@
 // Add your dependencies here
 
 dependencies {
-    api("com.github.GTNewHorizons:GT5-Unofficial:5.09.45.13:dev")
+    api("com.github.GTNewHorizons:GT5-Unofficial:5.09.45.15:dev")
     api("com.github.GTNewHorizons:Yamcl:0.5.86:dev")
     api("com.github.GTNewHorizons:Baubles:1.0.3:dev")
 
@@ -10,13 +10,13 @@ dependencies {
     compileOnly("com.github.GTNewHorizons:GalacticGregGT5:1.0.10:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.2.9:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:TecTech:5.3.23:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:bartworks:0.9.2:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:bartworks:0.9.3:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:Mantle:0.3.7:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.10.13-GTNH:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:WitcheryExtras:1.1.14:dev") { transitive = false }
     compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false }
     compileOnly("curse.maven:witchery-69673:2234410") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:GTplusplus:1.11.3:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:GTplusplus:1.11.9:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:Chisel:2.13.0-GTNH:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:Botania:1.10.3-GTNH:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:BloodMagic:1.4.3:dev") { transitive = false }

diff --git a/src/main/java/com/dreammaster/recipes/RecipeRemover.java b/src/main/java/com/dreammaster/recipes/RecipeRemover.java
@@ -905,6 +905,7 @@ public static void run() {
         removeRecipeByOutputDelayed(getModItem("EnderIO", "itemItemConduit", 1, 0, missing));
         removeRecipeByOutputDelayed(getModItem("EnderIO", "itemBasicFilterUpgrade", 1, 0, missing));
         removeRecipeByOutputDelayed(getModItem("EnderIO", "itemBasicFilterUpgrade", 1, 1, missing));
+        removeRecipeByOutputDelayed(getModItem("EnderIO", "itemLimitedItemFilter", 1, 0, missing));
         removeRecipeByOutputDelayed(getModItem("EnderIO", "itemExistingItemFilter", 1, 0, missing));
         removeRecipeByOutputDelayed(getModItem("EnderIO", "itemModItemFilter", 1, 0, missing));
         removeRecipeByOutputDelayed(getModItem("EnderIO", "itemBigFilterUpgrade", 1, 0, missing));

diff --git a/src/main/java/com/dreammaster/scripts/ScriptChisel.java b/src/main/java/com/dreammaster/scripts/ScriptChisel.java
@@ -4,8 +4,10 @@
 import static gregtech.api.enums.Mods.Botania;
 import static gregtech.api.enums.Mods.Chisel;
 import static gregtech.api.enums.Mods.EnderIO;
+import static gregtech.api.enums.Mods.GalacticraftAmunRa;
 import static gregtech.api.enums.Mods.GalacticraftCore;
 import static gregtech.api.enums.Mods.GregTech;
+import static gregtech.api.enums.Mods.IndustrialCraft2;
 import static gregtech.api.enums.Mods.IronChests;
 import static gregtech.api.enums.Mods.Minecraft;
 import static gregtech.api.enums.Mods.Natura;
@@ -42,7 +44,9 @@ public List<String> getDependencies() {
                 Botania.ID,
                 Chisel.ID,
                 EnderIO.ID,
+                GalacticraftAmunRa.ID,
                 GalacticraftCore.ID,
+                IndustrialCraft2.ID,
                 IronChests.ID,
                 Natura.ID,
                 Railcraft.ID,
@@ -284,6 +288,16 @@ public void loadRecipes() {
         ChiselHelper.addVariationFromStack(
                 "basalts",
                 getModItem(ProjectRedExploration.ID, "projectred.exploration.stone", 1, 4, missing));
+        ChiselHelper.addVariationFromStack("basalts", getModItem(IndustrialCraft2.ID, "blockBasalt", 1, 0, missing));
+        ChiselHelper.addVariationFromStack(
+                "basalts",
+                getModItem(GalacticraftAmunRa.ID, "tile.baseBlockRock", 1, 0, missing));
+        ChiselHelper.addVariationFromStack(
+                "basalts",
+                getModItem(GalacticraftAmunRa.ID, "tile.baseBlockRock", 1, 1, missing));
+        ChiselHelper.addVariationFromStack(
+                "basalts",
+                getModItem(GalacticraftAmunRa.ID, "tile.baseBlockRock", 1, 7, missing));
         ChiselHelper.addGroup("redgranite");
         ChiselHelper.addVariationFromStack(
                 "redgranite",

diff --git a/src/main/java/com/dreammaster/scripts/ScriptEnderIO.java b/src/main/java/com/dreammaster/scripts/ScriptEnderIO.java
@@ -1716,6 +1716,12 @@ public void loadRecipes() {
                         getModItem(EnderIO.ID, "itemFrankenSkull", 1, 1, missing))
                 .itemOutputs(getModItem(EnderIO.ID, "itemBasicFilterUpgrade", 1, 1, missing)).duration(15 * SECONDS)
                 .eut(64).addTo(assemblerRecipes);
+        GT_Values.RA.stdBuilder()
+                .itemInputs(
+                        getModItem(EnderIO.ID, "itemBasicFilterUpgrade", 1, 1, missing),
+                        getModItem(ProjectRedIntegration.ID, "projectred.integration.gate", 1, 26, missing))
+                .itemOutputs(getModItem(EnderIO.ID, "itemLimitedItemFilter", 1, 0, missing)).duration(15 * SECONDS)
+                .eut(120).addTo(assemblerRecipes);
         GT_Values.RA.stdBuilder()
                 .itemInputs(
                         getModItem(EnderIO.ID, "itemBasicFilterUpgrade", 2, 1, missing),
@@ -1731,7 +1737,7 @@ public void loadRecipes() {
         GT_Values.RA.stdBuilder()
                 .itemInputs(
                         getModItem(EnderIO.ID, "itemBasicFilterUpgrade", 1, 1, missing),
-                        getModItem(ProjectRedIntegration.ID, "projectred.integration.gate", 1, 26, missing))
+                        getModItem(ProjectRedIntegration.ID, "projectred.integration.gate", 1, 20, missing))
                 .itemOutputs(getModItem(EnderIO.ID, "itemExistingItemFilter", 1, 0, missing)).duration(15 * SECONDS)
                 .eut(120).addTo(assemblerRecipes);
         GT_Values.RA.stdBuilder()