mirror of
https://github.com/GTNewHorizons/NotEnoughItems.git
synced 2026-10-26 14:24:07 +00:00
Fix recipe tooltip crash with BetterQuesting (#409)
* updateBuildScript * Fix recipe tooltip crash with BetterQuesting
This commit is contained in:
1 parent
8569431e1d
commit
4f23d21d37
5 files changed
+29
-45
No files matched your search
+23
-41
@@ -1,4 +1,4 @@
|
|||||||
//version: 1689409577
|
//version: 1690104383
|
||||||
/*
|
/*
|
||||||
DO NOT CHANGE THIS FILE!
|
DO NOT CHANGE THIS FILE!
|
||||||
Also, you may replace this file at any time if there is an update available.
|
Also, you may replace this file at any time if there is an update available.
|
||||||
@@ -69,7 +69,7 @@ plugins {
|
|||||||
id 'com.diffplug.spotless' version '6.13.0' apply false // 6.13.0 is the last jvm8 supporting version
|
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
|
id 'com.modrinth.minotaur' version '2.+' apply false
|
||||||
id 'com.matthewprenger.cursegradle' version '1.4.0' apply false
|
id 'com.matthewprenger.cursegradle' version '1.4.0' apply false
|
||||||
id 'com.gtnewhorizons.retrofuturagradle' version '1.3.19'
|
id 'com.gtnewhorizons.retrofuturagradle' version '1.3.21'
|
||||||
}
|
}
|
||||||
|
|
||||||
print("You might want to check out './gradlew :faq' if your build fails.\n")
|
print("You might want to check out './gradlew :faq' if your build fails.\n")
|
||||||
@@ -575,13 +575,28 @@ repositories {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (includeWellKnownRepositories.toBoolean()) {
|
if (includeWellKnownRepositories.toBoolean()) {
|
||||||
maven {
|
exclusiveContent {
|
||||||
name "CurseMaven"
|
forRepository {
|
||||||
url "https://cursemaven.com"
|
maven {
|
||||||
content {
|
name "CurseMaven"
|
||||||
|
url "https://cursemaven.com"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
filter {
|
||||||
includeGroup "curse.maven"
|
includeGroup "curse.maven"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
exclusiveContent {
|
||||||
|
forRepository {
|
||||||
|
maven {
|
||||||
|
name = "Modrinth"
|
||||||
|
url = "https://api.modrinth.com/maven"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
filter {
|
||||||
|
includeGroup "maven.modrinth"
|
||||||
|
}
|
||||||
|
}
|
||||||
maven {
|
maven {
|
||||||
name = "ic2"
|
name = "ic2"
|
||||||
url = "https://maven.ic2.player.to/"
|
url = "https://maven.ic2.player.to/"
|
||||||
@@ -623,7 +638,7 @@ dependencies {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (usesMixins.toBoolean()) {
|
if (usesMixins.toBoolean()) {
|
||||||
implementation(mixinProviderSpec)
|
implementation(modUtils.enableMixins(mixinProviderSpec))
|
||||||
} else if (forceEnableMixins.toBoolean()) {
|
} else if (forceEnableMixins.toBoolean()) {
|
||||||
runtimeOnlyNonPublishable(mixinProviderSpec)
|
runtimeOnlyNonPublishable(mixinProviderSpec)
|
||||||
}
|
}
|
||||||
@@ -677,9 +692,6 @@ if (file('dependencies.gradle.kts').exists()) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
def mixingConfigRefMap = 'mixins.' + modId + '.refmap.json'
|
def mixingConfigRefMap = 'mixins.' + modId + '.refmap.json'
|
||||||
def mixinTmpDir = buildDir.path + File.separator + 'tmp' + File.separator + 'mixins'
|
|
||||||
def refMap = "${mixinTmpDir}" + File.separator + mixingConfigRefMap
|
|
||||||
def mixinSrg = "${mixinTmpDir}" + File.separator + "mixins.srg"
|
|
||||||
|
|
||||||
tasks.register('generateAssets') {
|
tasks.register('generateAssets') {
|
||||||
group = "GTNH Buildscript"
|
group = "GTNH Buildscript"
|
||||||
@@ -711,46 +723,17 @@ tasks.register('generateAssets') {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (usesMixins.toBoolean()) {
|
if (usesMixins.toBoolean()) {
|
||||||
tasks.named("reobfJar", ReobfuscatedJar).configure {
|
|
||||||
extraSrgFiles.from(mixinSrg)
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.named("processResources").configure {
|
tasks.named("processResources").configure {
|
||||||
dependsOn("generateAssets")
|
dependsOn("generateAssets")
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.named("compileJava", JavaCompile).configure {
|
tasks.named("compileJava", JavaCompile).configure {
|
||||||
doFirst {
|
|
||||||
new File(mixinTmpDir).mkdirs()
|
|
||||||
}
|
|
||||||
options.compilerArgs += [
|
options.compilerArgs += [
|
||||||
"-AreobfSrgFile=${tasks.reobfJar.srg.get().asFile}",
|
|
||||||
"-AoutSrgFile=${mixinSrg}",
|
|
||||||
"-AoutRefMapFile=${refMap}",
|
|
||||||
// Elan: from what I understand they are just some linter configs so you get some warning on how to properly code
|
// Elan: from what I understand they are just some linter configs so you get some warning on how to properly code
|
||||||
"-XDenableSunApiLintControl",
|
"-XDenableSunApiLintControl",
|
||||||
"-XDignore.symbol.file"
|
"-XDignore.symbol.file"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
pluginManager.withPlugin('org.jetbrains.kotlin.kapt') {
|
|
||||||
kapt {
|
|
||||||
correctErrorTypes = true
|
|
||||||
javacOptions {
|
|
||||||
option("-AreobfSrgFile=${tasks.reobfJar.srg.get().asFile}")
|
|
||||||
option("-AoutSrgFile=$mixinSrg")
|
|
||||||
option("-AoutRefMapFile=$refMap")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
tasks.configureEach { task ->
|
|
||||||
if (task.name == "kaptKotlin") {
|
|
||||||
task.doFirst {
|
|
||||||
new File(mixinTmpDir).mkdirs()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.named("processResources", ProcessResources).configure {
|
tasks.named("processResources", ProcessResources).configure {
|
||||||
@@ -768,7 +751,6 @@ tasks.named("processResources", ProcessResources).configure {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (usesMixins.toBoolean()) {
|
if (usesMixins.toBoolean()) {
|
||||||
from refMap
|
|
||||||
dependsOn("compileJava", "compileScala")
|
dependsOn("compileJava", "compileScala")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1311,7 +1293,7 @@ def addCurseForgeRelation(String type, String name) {
|
|||||||
|
|
||||||
// Updating
|
// Updating
|
||||||
|
|
||||||
def buildscriptGradleVersion = "8.1.1"
|
def buildscriptGradleVersion = "8.2.1"
|
||||||
|
|
||||||
tasks.named('wrapper', Wrapper).configure {
|
tasks.named('wrapper', Wrapper).configure {
|
||||||
gradleVersion = buildscriptGradleVersion
|
gradleVersion = buildscriptGradleVersion
|
||||||
|
|||||||
Vendored
BIN
Binary file not shown.
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
|
||||||
networkTimeout=10000
|
networkTimeout=10000
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
@@ -85,9 +85,6 @@ done
|
|||||||
APP_BASE_NAME=${0##*/}
|
APP_BASE_NAME=${0##*/}
|
||||||
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
|
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
|
||||||
|
|
||||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
|
||||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
|
||||||
|
|
||||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||||
MAX_FD=maximum
|
MAX_FD=maximum
|
||||||
|
|
||||||
@@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then
|
|||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||||
|
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||||
|
|
||||||
# Collect all arguments for the java command;
|
# Collect all arguments for the java command;
|
||||||
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
|
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
|
||||||
# shell script including quotes and variable substitutions, so put them in
|
# shell script including quotes and variable substitutions, so put them in
|
||||||
|
|||||||
@@ -673,6 +673,7 @@ public abstract class GuiRecipe<H extends IRecipeHandler> extends GuiContainer i
|
|||||||
for (int i = page * recipesPerPage; i < handler.numRecipes() && i < (page + 1) * recipesPerPage; i++) {
|
for (int i = page * recipesPerPage; i < handler.numRecipes() && i < (page + 1) * recipesPerPage; i++) {
|
||||||
handler.drawForeground(i);
|
handler.drawForeground(i);
|
||||||
if (drawItemPresence && (isMouseOverOverlayButton(i - page * recipesPerPage) || limitToOneRecipe)
|
if (drawItemPresence && (isMouseOverOverlayButton(i - page * recipesPerPage) || limitToOneRecipe)
|
||||||
|
&& firstGui != null
|
||||||
&& firstGui.inventorySlots != null) {
|
&& firstGui.inventorySlots != null) {
|
||||||
List<PositionedStack> ingredients = handler.getIngredientStacks(i);
|
List<PositionedStack> ingredients = handler.getIngredientStacks(i);
|
||||||
if (itemPresenceCacheRecipe != i || itemPresenceCacheSlots == null
|
if (itemPresenceCacheRecipe != i || itemPresenceCacheSlots == null
|
||||||
|
|||||||
Reference in new issue
Block a user