mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-19 11:59:11 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
29814550bb | ||
|
|
15769b9ee9 | ||
|
|
1253271111 | ||
|
|
d18be7848d | ||
|
|
ef4dd3710a | ||
|
|
190693ad68 | ||
|
|
3dc2806b36 | ||
|
|
a609f5dce5 |
No files matched your search
+45
-45
@@ -1,4 +1,4 @@
|
|||||||
//version: 1697697256
|
//version: 1705357285
|
||||||
/*
|
/*
|
||||||
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.
|
||||||
@@ -28,27 +28,11 @@ import java.util.concurrent.TimeUnit
|
|||||||
|
|
||||||
buildscript {
|
buildscript {
|
||||||
repositories {
|
repositories {
|
||||||
mavenCentral()
|
|
||||||
|
|
||||||
maven {
|
|
||||||
name 'forge'
|
|
||||||
url 'https://maven.minecraftforge.net'
|
|
||||||
}
|
|
||||||
maven {
|
maven {
|
||||||
// GTNH RetroFuturaGradle and ASM Fork
|
// GTNH RetroFuturaGradle and ASM Fork
|
||||||
name "GTNH Maven"
|
name "GTNH Maven"
|
||||||
url "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
|
url "https://nexus.gtnewhorizons.com/repository/public/"
|
||||||
allowInsecureProtocol = true
|
|
||||||
}
|
}
|
||||||
maven {
|
|
||||||
name 'sonatype'
|
|
||||||
url 'https://oss.sonatype.org/content/repositories/snapshots/'
|
|
||||||
}
|
|
||||||
maven {
|
|
||||||
name 'Scala CI dependencies'
|
|
||||||
url 'https://repo1.maven.org/maven2/'
|
|
||||||
}
|
|
||||||
|
|
||||||
mavenLocal()
|
mavenLocal()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -64,12 +48,12 @@ plugins {
|
|||||||
id 'org.ajoberstar.grgit' version '4.1.1' // 4.1.1 is the last jvm8 supporting version, unused, available for addon.gradle
|
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.github.johnrengelman.shadow' version '8.1.1' apply false
|
||||||
id 'com.palantir.git-version' version '3.0.0' 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.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.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.24'
|
id 'com.gtnewhorizons.retrofuturagradle' version '1.3.27'
|
||||||
}
|
}
|
||||||
|
|
||||||
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")
|
||||||
@@ -133,11 +117,12 @@ propertyDefaultIfUnset("forceEnableMixins", false)
|
|||||||
propertyDefaultIfUnset("channel", "stable")
|
propertyDefaultIfUnset("channel", "stable")
|
||||||
propertyDefaultIfUnset("mappingsVersion", "12")
|
propertyDefaultIfUnset("mappingsVersion", "12")
|
||||||
propertyDefaultIfUnset("usesMavenPublishing", true)
|
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("modrinthProjectId", "")
|
||||||
propertyDefaultIfUnset("modrinthRelations", "")
|
propertyDefaultIfUnset("modrinthRelations", "")
|
||||||
propertyDefaultIfUnset("curseForgeProjectId", "")
|
propertyDefaultIfUnset("curseForgeProjectId", "")
|
||||||
propertyDefaultIfUnset("curseForgeRelations", "")
|
propertyDefaultIfUnset("curseForgeRelations", "")
|
||||||
|
propertyDefaultIfUnset("versionPattern", "")
|
||||||
propertyDefaultIfUnset("minimizeShadowedDependencies", true)
|
propertyDefaultIfUnset("minimizeShadowedDependencies", true)
|
||||||
propertyDefaultIfUnset("relocateShadowedDependencies", true)
|
propertyDefaultIfUnset("relocateShadowedDependencies", true)
|
||||||
// Deprecated properties (kept for backwards compat)
|
// Deprecated properties (kept for backwards compat)
|
||||||
@@ -302,7 +287,7 @@ if (apiPackage) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (accessTransformersFile) {
|
if (accessTransformersFile) {
|
||||||
for (atFile in accessTransformersFile.split(",")) {
|
for (atFile in accessTransformersFile.split(" ")) {
|
||||||
String targetFile = "src/main/resources/META-INF/" + atFile.trim()
|
String targetFile = "src/main/resources/META-INF/" + atFile.trim()
|
||||||
if (!getFile(targetFile).exists()) {
|
if (!getFile(targetFile).exists()) {
|
||||||
throw new GradleException("Could not resolve \"accessTransformersFile\"! Could not find " + targetFile)
|
throw new GradleException("Could not resolve \"accessTransformersFile\"! Could not find " + targetFile)
|
||||||
@@ -386,6 +371,7 @@ catch (Exception ignored) {
|
|||||||
// Pulls version first from the VERSION env and then git tag
|
// Pulls version first from the VERSION env and then git tag
|
||||||
String identifiedVersion
|
String identifiedVersion
|
||||||
String versionOverride = System.getenv("VERSION") ?: null
|
String versionOverride = System.getenv("VERSION") ?: null
|
||||||
|
boolean checkVersion = false
|
||||||
try {
|
try {
|
||||||
// Produce a version based on the tag, or for branches something like 0.2.2-configurable-maven-and-extras.38+43090270b6-dirty
|
// Produce a version based on the tag, or for branches something like 0.2.2-configurable-maven-and-extras.38+43090270b6-dirty
|
||||||
if (versionOverride == null) {
|
if (versionOverride == null) {
|
||||||
@@ -404,6 +390,8 @@ try {
|
|||||||
}
|
}
|
||||||
} else if (isDirty) {
|
} else if (isDirty) {
|
||||||
identifiedVersion += "-${branchName}+${gitDetails.gitHash}-dirty"
|
identifiedVersion += "-${branchName}+${gitDetails.gitHash}-dirty"
|
||||||
|
} else {
|
||||||
|
checkVersion = true
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
identifiedVersion = versionOverride
|
identifiedVersion = versionOverride
|
||||||
@@ -425,6 +413,8 @@ ext {
|
|||||||
|
|
||||||
if (identifiedVersion == versionOverride) {
|
if (identifiedVersion == versionOverride) {
|
||||||
out.style(Style.Failure).text('Override version to ').style(Style.Identifier).text(modVersion).style(Style.Failure).println('!\7')
|
out.style(Style.Failure).text('Override version to ').style(Style.Identifier).text(modVersion).style(Style.Failure).println('!\7')
|
||||||
|
} else if (checkVersion && versionPattern && !(identifiedVersion ==~ versionPattern)) {
|
||||||
|
throw new GradleException("Invalid version: '$identifiedVersion' does not match version pattern '$versionPattern'")
|
||||||
}
|
}
|
||||||
|
|
||||||
group = "com.github.GTNewHorizons"
|
group = "com.github.GTNewHorizons"
|
||||||
@@ -444,18 +434,31 @@ minecraft {
|
|||||||
for (f in replaceGradleTokenInFile.split(',')) {
|
for (f in replaceGradleTokenInFile.split(',')) {
|
||||||
tagReplacementFiles.add f
|
tagReplacementFiles.add f
|
||||||
}
|
}
|
||||||
|
out.style(Style.Info).text('replaceGradleTokenInFile is deprecated! Consider using generateGradleTokenClass.').println()
|
||||||
}
|
}
|
||||||
if (gradleTokenModId) {
|
if (gradleTokenModId) {
|
||||||
injectedTags.put gradleTokenModId, modId
|
if (replaceGradleTokenInFile) {
|
||||||
|
injectedTags.put gradleTokenModId, modId
|
||||||
|
} else {
|
||||||
|
out.style(Style.Failure).text('gradleTokenModId is deprecated! The field will no longer be generated.').println()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (gradleTokenModName) {
|
if (gradleTokenModName) {
|
||||||
injectedTags.put gradleTokenModName, modName
|
if (replaceGradleTokenInFile) {
|
||||||
|
injectedTags.put gradleTokenModName, modName
|
||||||
|
} else {
|
||||||
|
out.style(Style.Failure).text('gradleTokenModName is deprecated! The field will no longer be generated.').println()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (gradleTokenVersion) {
|
if (gradleTokenVersion) {
|
||||||
injectedTags.put gradleTokenVersion, modVersion
|
injectedTags.put gradleTokenVersion, modVersion
|
||||||
}
|
}
|
||||||
if (gradleTokenGroupName) {
|
if (gradleTokenGroupName) {
|
||||||
injectedTags.put gradleTokenGroupName, modGroup
|
if (replaceGradleTokenInFile) {
|
||||||
|
injectedTags.put gradleTokenGroupName, modGroup
|
||||||
|
} else {
|
||||||
|
out.style(Style.Failure).text('gradleTokenGroupName is deprecated! The field will no longer be generated.').println()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (enableGenericInjection.toBoolean()) {
|
if (enableGenericInjection.toBoolean()) {
|
||||||
injectMissingGenerics.set(true)
|
injectMissingGenerics.set(true)
|
||||||
@@ -588,13 +591,15 @@ afterEvaluate {
|
|||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
maven {
|
maven {
|
||||||
name 'Overmind forge repo mirror'
|
name = "GTNH Maven"
|
||||||
url 'https://gregtech.overminddl1.com/'
|
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 {
|
maven {
|
||||||
name = "GTNH Maven"
|
name 'Overmind forge repo mirror'
|
||||||
url = "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
|
url 'https://gregtech.overminddl1.com/'
|
||||||
allowInsecureProtocol = true
|
|
||||||
}
|
}
|
||||||
maven {
|
maven {
|
||||||
name 'sonatype'
|
name 'sonatype'
|
||||||
@@ -628,7 +633,7 @@ repositories {
|
|||||||
}
|
}
|
||||||
maven {
|
maven {
|
||||||
name = "ic2"
|
name = "ic2"
|
||||||
url = getURL("https://maven.ic2.player.to/", "https://maven2.ic2.player.to/")
|
url = getURL("https://maven2.ic2.player.to/", "https://maven.ic2.player.to/")
|
||||||
content {
|
content {
|
||||||
includeGroup "net.industrial-craft"
|
includeGroup "net.industrial-craft"
|
||||||
}
|
}
|
||||||
@@ -646,7 +651,7 @@ repositories {
|
|||||||
|
|
||||||
def mixinProviderGroup = "io.github.legacymoddingmc"
|
def mixinProviderGroup = "io.github.legacymoddingmc"
|
||||||
def mixinProviderModule = "unimixins"
|
def mixinProviderModule = "unimixins"
|
||||||
def mixinProviderVersion = "0.1.7.1"
|
def mixinProviderVersion = "0.1.13"
|
||||||
def mixinProviderSpecNoClassifer = "${mixinProviderGroup}:${mixinProviderModule}:${mixinProviderVersion}"
|
def mixinProviderSpecNoClassifer = "${mixinProviderGroup}:${mixinProviderModule}:${mixinProviderVersion}"
|
||||||
def mixinProviderSpec = "${mixinProviderSpecNoClassifer}:dev"
|
def mixinProviderSpec = "${mixinProviderSpecNoClassifer}:dev"
|
||||||
ext.mixinProviderSpec = mixinProviderSpec
|
ext.mixinProviderSpec = mixinProviderSpec
|
||||||
@@ -687,6 +692,8 @@ configurations.all {
|
|||||||
substitute module('com.github.GTNewHorizons:SpongePoweredMixin') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods")
|
substitute module('com.github.GTNewHorizons:SpongePoweredMixin') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods")
|
||||||
substitute module('com.github.GTNewHorizons:SpongeMixins') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods")
|
substitute module('com.github.GTNewHorizons:SpongeMixins') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods")
|
||||||
substitute module('io.github.legacymoddingmc:unimixins') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Our previous unimixins upload was missing the dev classifier")
|
substitute module('io.github.legacymoddingmc:unimixins') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Our previous unimixins upload was missing the dev classifier")
|
||||||
|
|
||||||
|
substitute module('org.scala-lang:scala-library:2.11.1') using module('org.scala-lang:scala-library:2.11.5') because('To allow mixing with Java 8 targets')
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -793,12 +800,12 @@ ext.java17PatchDependenciesCfg = configurations.create("java17PatchDependencies"
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
def lwjgl3ifyVersion = '1.5.1'
|
def lwjgl3ifyVersion = '1.5.7'
|
||||||
if (modId != 'lwjgl3ify') {
|
if (modId != 'lwjgl3ify') {
|
||||||
java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}")
|
java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}")
|
||||||
}
|
}
|
||||||
if (modId != 'hodgepodge') {
|
if (modId != 'hodgepodge') {
|
||||||
java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.3.17')
|
java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.4.4')
|
||||||
}
|
}
|
||||||
|
|
||||||
java17PatchDependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}:forgePatches") {transitive = false}
|
java17PatchDependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}:forgePatches") {transitive = false}
|
||||||
@@ -973,8 +980,7 @@ if (usesShadowedDependencies.toBoolean()) {
|
|||||||
configurations.runtimeElements.outgoing.artifact(tasks.named("shadowJar", ShadowJar))
|
configurations.runtimeElements.outgoing.artifact(tasks.named("shadowJar", ShadowJar))
|
||||||
configurations.apiElements.outgoing.artifact(tasks.named("shadowJar", ShadowJar))
|
configurations.apiElements.outgoing.artifact(tasks.named("shadowJar", ShadowJar))
|
||||||
tasks.named("jar", Jar) {
|
tasks.named("jar", Jar) {
|
||||||
enabled = false
|
archiveClassifier.set('dev-preshadow')
|
||||||
finalizedBy(tasks.shadowJar)
|
|
||||||
}
|
}
|
||||||
tasks.named("reobfJar", ReobfuscatedJar) {
|
tasks.named("reobfJar", ReobfuscatedJar) {
|
||||||
inputJar.set(tasks.named("shadowJar", ShadowJar).flatMap({it.archiveFile}))
|
inputJar.set(tasks.named("shadowJar", ShadowJar).flatMap({it.archiveFile}))
|
||||||
@@ -983,11 +989,6 @@ if (usesShadowedDependencies.toBoolean()) {
|
|||||||
javaComponent.withVariantsFromConfiguration(configurations.shadowRuntimeElements) {
|
javaComponent.withVariantsFromConfiguration(configurations.shadowRuntimeElements) {
|
||||||
skip()
|
skip()
|
||||||
}
|
}
|
||||||
for (runTask in ["runClient", "runServer", "runClient17", "runServer17"]) {
|
|
||||||
tasks.named(runTask).configure {
|
|
||||||
dependsOn("shadowJar")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
ext.publishableDevJar = usesShadowedDependencies.toBoolean() ? tasks.shadowJar : tasks.jar
|
ext.publishableDevJar = usesShadowedDependencies.toBoolean() ? tasks.shadowJar : tasks.jar
|
||||||
ext.publishableObfJar = tasks.reobfJar
|
ext.publishableObfJar = tasks.reobfJar
|
||||||
@@ -1187,12 +1188,11 @@ publishing {
|
|||||||
version = System.getenv("RELEASE_VERSION") ?: identifiedVersion
|
version = System.getenv("RELEASE_VERSION") ?: identifiedVersion
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
if (usesMavenPublishing.toBoolean()) {
|
if (usesMavenPublishing.toBoolean() && System.getenv("MAVEN_USER") != null) {
|
||||||
maven {
|
maven {
|
||||||
url = mavenPublishUrl
|
url = mavenPublishUrl
|
||||||
allowInsecureProtocol = mavenPublishUrl.startsWith("http://") // Mostly for the GTNH maven
|
allowInsecureProtocol = mavenPublishUrl.startsWith("http://")
|
||||||
credentials {
|
credentials {
|
||||||
username = System.getenv("MAVEN_USER") ?: "NONE"
|
username = System.getenv("MAVEN_USER") ?: "NONE"
|
||||||
password = System.getenv("MAVEN_PASSWORD") ?: "NONE"
|
password = System.getenv("MAVEN_PASSWORD") ?: "NONE"
|
||||||
@@ -1311,7 +1311,7 @@ def addCurseForgeRelation(String type, String name) {
|
|||||||
|
|
||||||
// Updating
|
// Updating
|
||||||
|
|
||||||
def buildscriptGradleVersion = "8.2.1"
|
def buildscriptGradleVersion = "8.5"
|
||||||
|
|
||||||
tasks.named('wrapper', Wrapper).configure {
|
tasks.named('wrapper', Wrapper).configure {
|
||||||
gradleVersion = buildscriptGradleVersion
|
gradleVersion = buildscriptGradleVersion
|
||||||
|
|||||||
+4
-4
@@ -1,12 +1,12 @@
|
|||||||
// Add your dependencies here
|
// Add your dependencies here
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
api('com.github.GTNewHorizons:ForestryMC:4.6.14:dev')
|
api('com.github.GTNewHorizons:ForestryMC:4.8.2:dev')
|
||||||
implementation('com.github.GTNewHorizons:GTNHLib:0.0.13:dev')
|
implementation('com.github.GTNewHorizons:GTNHLib:0.2.1:dev')
|
||||||
|
|
||||||
devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.4.5-GTNH:dev')
|
devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.5.4-GTNH:dev')
|
||||||
|
|
||||||
compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.36:api')
|
compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.39:api')
|
||||||
compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
|
compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
|
||||||
compileOnly("curse.maven:extrabiomesxl-60041:2273301")
|
compileOnly("curse.maven:extrabiomesxl-60041:2273301")
|
||||||
}
|
}
|
||||||
Vendored
BIN
Binary file not shown.
+2
-1
@@ -1,6 +1,7 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
|
||||||
networkTimeout=10000
|
networkTimeout=10000
|
||||||
|
validateDistributionUrl=true
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
@@ -83,7 +83,8 @@ done
|
|||||||
# This is normally unused
|
# This is normally unused
|
||||||
# shellcheck disable=SC2034
|
# shellcheck disable=SC2034
|
||||||
APP_BASE_NAME=${0##*/}
|
APP_BASE_NAME=${0##*/}
|
||||||
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
|
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
||||||
|
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
|
||||||
|
|
||||||
# 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
|
||||||
@@ -130,10 +131,13 @@ location of your Java installation."
|
|||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
JAVACMD=java
|
JAVACMD=java
|
||||||
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
if ! command -v java >/dev/null 2>&1
|
||||||
|
then
|
||||||
|
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||||
|
|
||||||
Please set the JAVA_HOME variable in your environment to match the
|
Please set the JAVA_HOME variable in your environment to match the
|
||||||
location of your Java installation."
|
location of your Java installation."
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Increase the maximum file descriptors if we can.
|
# Increase the maximum file descriptors if we can.
|
||||||
@@ -141,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
|||||||
case $MAX_FD in #(
|
case $MAX_FD in #(
|
||||||
max*)
|
max*)
|
||||||
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
|
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
|
||||||
# shellcheck disable=SC3045
|
# shellcheck disable=SC2039,SC3045
|
||||||
MAX_FD=$( ulimit -H -n ) ||
|
MAX_FD=$( ulimit -H -n ) ||
|
||||||
warn "Could not query maximum file descriptor limit"
|
warn "Could not query maximum file descriptor limit"
|
||||||
esac
|
esac
|
||||||
@@ -149,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
|||||||
'' | soft) :;; #(
|
'' | soft) :;; #(
|
||||||
*)
|
*)
|
||||||
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
|
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
|
||||||
# shellcheck disable=SC3045
|
# shellcheck disable=SC2039,SC3045
|
||||||
ulimit -n "$MAX_FD" ||
|
ulimit -n "$MAX_FD" ||
|
||||||
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
||||||
esac
|
esac
|
||||||
@@ -198,11 +202,11 @@ fi
|
|||||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
# 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"'
|
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, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
||||||
# shell script including quotes and variable substitutions, so put them in
|
# and any embedded shellness will be escaped.
|
||||||
# double quotes to make sure that they get re-expanded; and
|
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
|
||||||
# * put everything else in single quotes, so that it's not re-expanded.
|
# treated as '${Hostname}' itself on the command line.
|
||||||
|
|
||||||
set -- \
|
set -- \
|
||||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||||
|
|||||||
+4
-5
@@ -4,10 +4,9 @@ pluginManagement {
|
|||||||
maven {
|
maven {
|
||||||
// RetroFuturaGradle
|
// RetroFuturaGradle
|
||||||
name "GTNH Maven"
|
name "GTNH Maven"
|
||||||
url "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
|
url "https://nexus.gtnewhorizons.com/repository/public/"
|
||||||
allowInsecureProtocol = true
|
|
||||||
mavenContent {
|
mavenContent {
|
||||||
includeGroup("com.gtnewhorizons.retrofuturagradle")
|
includeGroupByRegex("com\\.gtnewhorizons\\..+")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
gradlePluginPortal()
|
gradlePluginPortal()
|
||||||
@@ -17,8 +16,8 @@ pluginManagement {
|
|||||||
}
|
}
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
id 'com.diffplug.blowdryerSetup' version '1.6.0'
|
id 'com.diffplug.blowdryerSetup' version '1.7.1'
|
||||||
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.4.0' // Provides java toolchains
|
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0' // Provides java toolchains
|
||||||
}
|
}
|
||||||
|
|
||||||
blowdryerSetup {
|
blowdryerSetup {
|
||||||
|
|||||||
@@ -92,6 +92,7 @@ public enum EnumFlowerColor implements IFlowerColor {
|
|||||||
YELLOW("yellow", 0xffff00),
|
YELLOW("yellow", 0xffff00),
|
||||||
YELLOW_GREEN("yellowGreen", 0x9acd32);
|
YELLOW_GREEN("yellowGreen", 0x9acd32);
|
||||||
|
|
||||||
|
private static final EnumFlowerColor[] ALL_VALUES = values();
|
||||||
private int color;
|
private int color;
|
||||||
private int colorDis;
|
private int colorDis;
|
||||||
private String name;
|
private String name;
|
||||||
@@ -2963,7 +2964,7 @@ public enum EnumFlowerColor implements IFlowerColor {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static EnumFlowerColor get(int i) {
|
public static EnumFlowerColor get(int i) {
|
||||||
return values()[Math.max(0, i) % values().length];
|
return ALL_VALUES[Math.max(0, i) % ALL_VALUES.length];
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -11,7 +11,6 @@ import net.minecraft.client.renderer.OpenGlHelper;
|
|||||||
import net.minecraft.client.renderer.RenderHelper;
|
import net.minecraft.client.renderer.RenderHelper;
|
||||||
import net.minecraft.client.renderer.Tessellator;
|
import net.minecraft.client.renderer.Tessellator;
|
||||||
import net.minecraft.entity.player.InventoryPlayer;
|
import net.minecraft.entity.player.InventoryPlayer;
|
||||||
import net.minecraft.inventory.Slot;
|
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.nbt.JsonToNBT;
|
import net.minecraft.nbt.JsonToNBT;
|
||||||
import net.minecraft.nbt.NBTException;
|
import net.minecraft.nbt.NBTException;
|
||||||
@@ -31,7 +30,7 @@ import binnie.core.craftgui.events.EventMouse;
|
|||||||
import binnie.core.craftgui.geometry.IArea;
|
import binnie.core.craftgui.geometry.IArea;
|
||||||
import binnie.core.craftgui.geometry.IBorder;
|
import binnie.core.craftgui.geometry.IBorder;
|
||||||
import binnie.core.craftgui.geometry.IPoint;
|
import binnie.core.craftgui.geometry.IPoint;
|
||||||
import binnie.core.craftgui.minecraft.control.ControlSlot;
|
import binnie.core.craftgui.minecraft.control.ControlSlotBase;
|
||||||
import binnie.core.nei.NEIHook;
|
import binnie.core.nei.NEIHook;
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import cpw.mods.fml.relauncher.Side;
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
@@ -117,12 +116,13 @@ public class GuiCraftGUI extends GuiContainer {
|
|||||||
} else {
|
} else {
|
||||||
tooltip.setType(Tooltip.Type.STANDARD);
|
tooltip.setType(Tooltip.Type.STANDARD);
|
||||||
window.getTooltip(tooltip);
|
window.getTooltip(tooltip);
|
||||||
|
NEIHook.renderToolTips(mouseX, mouseY);
|
||||||
}
|
}
|
||||||
|
|
||||||
NEIHook.renderToolTips(mouseX, mouseY);
|
|
||||||
|
|
||||||
if (tooltip.exists()) {
|
if (tooltip.exists()) {
|
||||||
renderTooltip(new IPoint(mouseX, mouseY), tooltip);
|
renderTooltip(new IPoint(mouseX, mouseY), tooltip);
|
||||||
|
} else {
|
||||||
|
NEIHook.renderToolTips(mouseX, mouseY);
|
||||||
}
|
}
|
||||||
zLevel = 0.0f;
|
zLevel = 0.0f;
|
||||||
GL11.glEnable(GL11.GL_LIGHTING);
|
GL11.glEnable(GL11.GL_LIGHTING);
|
||||||
@@ -525,7 +525,11 @@ public class GuiCraftGUI extends GuiContainer {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public ItemStack getStackUnderMouse(int x, int y) {
|
public ItemStack getStackUnderMouse(int x, int y) {
|
||||||
return window.calculateMousedOverWidgets().stream().filter(widget -> widget instanceof ControlSlot).findFirst()
|
for (IWidget widget : window.calculateMousedOverWidgets()) {
|
||||||
.map(w -> ((ControlSlot) w).slot).map(Slot::getStack).orElse(null);
|
if (widget instanceof ControlSlotBase && widget.isVisible()) {
|
||||||
|
return ((ControlSlotBase) widget).getItemStack();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -29,6 +29,7 @@ import binnie.core.craftgui.minecraft.control.ControlHelp;
|
|||||||
import binnie.core.craftgui.minecraft.control.ControlInfo;
|
import binnie.core.craftgui.minecraft.control.ControlInfo;
|
||||||
import binnie.core.craftgui.minecraft.control.ControlPowerSystem;
|
import binnie.core.craftgui.minecraft.control.ControlPowerSystem;
|
||||||
import binnie.core.craftgui.minecraft.control.ControlSlot;
|
import binnie.core.craftgui.minecraft.control.ControlSlot;
|
||||||
|
import binnie.core.craftgui.minecraft.control.ControlSlotBase;
|
||||||
import binnie.core.craftgui.minecraft.control.ControlUser;
|
import binnie.core.craftgui.minecraft.control.ControlUser;
|
||||||
import binnie.core.craftgui.minecraft.control.EnumHighlighting;
|
import binnie.core.craftgui.minecraft.control.EnumHighlighting;
|
||||||
import binnie.core.craftgui.renderer.Renderer;
|
import binnie.core.craftgui.renderer.Renderer;
|
||||||
@@ -40,6 +41,7 @@ import binnie.core.machines.Machine;
|
|||||||
import binnie.core.machines.inventory.IInventoryMachine;
|
import binnie.core.machines.inventory.IInventoryMachine;
|
||||||
import binnie.core.machines.network.INetwork;
|
import binnie.core.machines.network.INetwork;
|
||||||
import binnie.core.machines.power.PowerSystem;
|
import binnie.core.machines.power.PowerSystem;
|
||||||
|
import binnie.core.nei.NEIHook;
|
||||||
import binnie.core.network.packet.MessageCraftGUI;
|
import binnie.core.network.packet.MessageCraftGUI;
|
||||||
import binnie.core.resource.BinnieResource;
|
import binnie.core.resource.BinnieResource;
|
||||||
import binnie.core.resource.ResourceType;
|
import binnie.core.resource.ResourceType;
|
||||||
@@ -118,6 +120,9 @@ public abstract class Window extends TopLevelWidget implements INetwork.RecieveG
|
|||||||
if (!widget.calculateIsMouseOver()) {
|
if (!widget.calculateIsMouseOver()) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
if (NEIHook.enabled && widget instanceof ControlSlotBase) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
if (widget instanceof ITooltip) {
|
if (widget instanceof ITooltip) {
|
||||||
((ITooltip) widget).getTooltip(tooltip);
|
((ITooltip) widget).getTooltip(tooltip);
|
||||||
if (tooltip.exists()) {
|
if (tooltip.exists()) {
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ import binnie.core.craftgui.geometry.IArea;
|
|||||||
import binnie.core.craftgui.geometry.IPoint;
|
import binnie.core.craftgui.geometry.IPoint;
|
||||||
import binnie.core.craftgui.minecraft.Window;
|
import binnie.core.craftgui.minecraft.Window;
|
||||||
import binnie.core.craftgui.resource.minecraft.CraftGUITexture;
|
import binnie.core.craftgui.resource.minecraft.CraftGUITexture;
|
||||||
|
import binnie.core.nei.NEIHook;
|
||||||
|
|
||||||
public abstract class ControlSlotBase extends Control implements ITooltip {
|
public abstract class ControlSlotBase extends Control implements ITooltip {
|
||||||
|
|
||||||
@@ -60,6 +61,7 @@ public abstract class ControlSlotBase extends Control implements ITooltip {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void getTooltip(Tooltip tooltip) {
|
public void getTooltip(Tooltip tooltip) {
|
||||||
|
if (NEIHook.enabled) return;
|
||||||
ItemStack item = getItemStack();
|
ItemStack item = getItemStack();
|
||||||
if (item == null) {
|
if (item == null) {
|
||||||
return;
|
return;
|
||||||
|
|||||||
Reference in new issue
Block a user