Skip to content
This repository was archived by the owner on May 26, 2024. It is now read-only.

Commit 13b2b3f

Browse files
authored
Fix findRecipe for Elemental Duplicator (#704)
* Remove outdated script * updateBuildScript * Update GT * Remove unused methods * Fix findRecipe for Elemental Duplicator
1 parent a0c24b2 commit 13b2b3f

File tree

8 files changed

+30
-289
lines changed

8 files changed

+30
-289
lines changed

.github/scripts/test-no-error-reports.sh

-45
This file was deleted.

build.gradle

+23-41
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//version: 1689409577
1+
//version: 1690104383
22
/*
33
DO NOT CHANGE THIS FILE!
44
Also, you may replace this file at any time if there is an update available.
@@ -69,7 +69,7 @@ plugins {
6969
id 'com.diffplug.spotless' version '6.13.0' apply false // 6.13.0 is the last jvm8 supporting version
7070
id 'com.modrinth.minotaur' version '2.+' apply false
7171
id 'com.matthewprenger.cursegradle' version '1.4.0' apply false
72-
id 'com.gtnewhorizons.retrofuturagradle' version '1.3.19'
72+
id 'com.gtnewhorizons.retrofuturagradle' version '1.3.21'
7373
}
7474

7575
print("You might want to check out './gradlew :faq' if your build fails.\n")
@@ -575,13 +575,28 @@ repositories {
575575
}
576576
}
577577
if (includeWellKnownRepositories.toBoolean()) {
578-
maven {
579-
name "CurseMaven"
580-
url "https://cursemaven.com"
581-
content {
578+
exclusiveContent {
579+
forRepository {
580+
maven {
581+
name "CurseMaven"
582+
url "https://cursemaven.com"
583+
}
584+
}
585+
filter {
582586
includeGroup "curse.maven"
583587
}
584588
}
589+
exclusiveContent {
590+
forRepository {
591+
maven {
592+
name = "Modrinth"
593+
url = "https://api.modrinth.com/maven"
594+
}
595+
}
596+
filter {
597+
includeGroup "maven.modrinth"
598+
}
599+
}
585600
maven {
586601
name = "ic2"
587602
url = "https://maven.ic2.player.to/"
@@ -623,7 +638,7 @@ dependencies {
623638
}
624639
}
625640
if (usesMixins.toBoolean()) {
626-
implementation(mixinProviderSpec)
641+
implementation(modUtils.enableMixins(mixinProviderSpec))
627642
} else if (forceEnableMixins.toBoolean()) {
628643
runtimeOnlyNonPublishable(mixinProviderSpec)
629644
}
@@ -677,9 +692,6 @@ if (file('dependencies.gradle.kts').exists()) {
677692
}
678693

679694
def mixingConfigRefMap = 'mixins.' + modId + '.refmap.json'
680-
def mixinTmpDir = buildDir.path + File.separator + 'tmp' + File.separator + 'mixins'
681-
def refMap = "${mixinTmpDir}" + File.separator + mixingConfigRefMap
682-
def mixinSrg = "${mixinTmpDir}" + File.separator + "mixins.srg"
683695

684696
tasks.register('generateAssets') {
685697
group = "GTNH Buildscript"
@@ -711,46 +723,17 @@ tasks.register('generateAssets') {
711723
}
712724

713725
if (usesMixins.toBoolean()) {
714-
tasks.named("reobfJar", ReobfuscatedJar).configure {
715-
extraSrgFiles.from(mixinSrg)
716-
}
717-
718726
tasks.named("processResources").configure {
719727
dependsOn("generateAssets")
720728
}
721729

722730
tasks.named("compileJava", JavaCompile).configure {
723-
doFirst {
724-
new File(mixinTmpDir).mkdirs()
725-
}
726731
options.compilerArgs += [
727-
"-AreobfSrgFile=${tasks.reobfJar.srg.get().asFile}",
728-
"-AoutSrgFile=${mixinSrg}",
729-
"-AoutRefMapFile=${refMap}",
730732
// Elan: from what I understand they are just some linter configs so you get some warning on how to properly code
731733
"-XDenableSunApiLintControl",
732734
"-XDignore.symbol.file"
733735
]
734736
}
735-
736-
pluginManager.withPlugin('org.jetbrains.kotlin.kapt') {
737-
kapt {
738-
correctErrorTypes = true
739-
javacOptions {
740-
option("-AreobfSrgFile=${tasks.reobfJar.srg.get().asFile}")
741-
option("-AoutSrgFile=$mixinSrg")
742-
option("-AoutRefMapFile=$refMap")
743-
}
744-
}
745-
tasks.configureEach { task ->
746-
if (task.name == "kaptKotlin") {
747-
task.doFirst {
748-
new File(mixinTmpDir).mkdirs()
749-
}
750-
}
751-
}
752-
}
753-
754737
}
755738

756739
tasks.named("processResources", ProcessResources).configure {
@@ -768,7 +751,6 @@ tasks.named("processResources", ProcessResources).configure {
768751
}
769752

770753
if (usesMixins.toBoolean()) {
771-
from refMap
772754
dependsOn("compileJava", "compileScala")
773755
}
774756
}
@@ -1311,7 +1293,7 @@ def addCurseForgeRelation(String type, String name) {
13111293

13121294
// Updating
13131295

1314-
def buildscriptGradleVersion = "8.1.1"
1296+
def buildscriptGradleVersion = "8.2.1"
13151297

13161298
tasks.named('wrapper', Wrapper).configure {
13171299
gradleVersion = buildscriptGradleVersion

dependencies.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dependencies {
22

3-
api('com.github.GTNewHorizons:GT5-Unofficial:5.09.43.139:dev')
3+
api('com.github.GTNewHorizons:GT5-Unofficial:5.09.43.142:dev')
44
api("com.github.GTNewHorizons:bartworks:0.7.30:dev")
55

66
implementation('curse.maven:cofh-core-69162:2388751')

gradle/wrapper/gradle-wrapper.jar

468 Bytes
Binary file not shown.
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
44
networkTimeout=10000
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

gradlew

+4-3
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,6 @@ done
8585
APP_BASE_NAME=${0##*/}
8686
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
8787

88-
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
89-
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
90-
9188
# Use the maximum available, or set MAX_FD != -1 to use that value.
9289
MAX_FD=maximum
9390

@@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then
197194
done
198195
fi
199196

197+
198+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
199+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
200+
200201
# Collect all arguments for the java command;
201202
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
202203
# shell script including quotes and variable substitutions, so put them in

0 commit comments

Comments
 (0)