mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-20 20:22:35 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
00c214ee5d | ||
|
|
e497b9505a | ||
|
|
b5ac446e55 | ||
|
|
c00e1b39da | ||
|
|
6e6e806476 | ||
|
|
ef877e2f7d | ||
|
|
669aee5ba6 | ||
|
|
ef468097d0 | ||
|
|
22f2eebbd3 | ||
|
|
f658e9ec57 | ||
|
|
ddf93bc425 | ||
|
|
503361d6d1 |
No files matched your search
@@ -1,33 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
|
|
||||||
RUNDIR="run"
|
|
||||||
CRASH="crash-reports"
|
|
||||||
SERVERLOG="server.log"
|
|
||||||
|
|
||||||
if [[ -d $RUNDIR/$CRASH ]]; then
|
|
||||||
echo "Crash reports detected:"
|
|
||||||
cat $RUNDIR/$CRASH/crash*.txt
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
if grep --quiet "Fatal errors were detected" $SERVERLOG; then
|
|
||||||
echo "Fatal errors detected:"
|
|
||||||
cat server.log
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
if grep --quiet "The state engine was in incorrect state ERRORED and forced into state SERVER_STOPPED" $SERVERLOG; then
|
|
||||||
echo "Server force stopped:"
|
|
||||||
cat server.log
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
if ! grep --quiet -Po '.+Done \(.+\)\! For help, type "help" or "\?"' $SERVERLOG; then
|
|
||||||
echo "Server didn't finish startup:"
|
|
||||||
cat server.log
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "No crash reports detected"
|
|
||||||
exit 0
|
|
||||||
|
|
||||||
+7
-1
@@ -26,7 +26,13 @@ whitelist.json
|
|||||||
*.iml
|
*.iml
|
||||||
*.ipr
|
*.ipr
|
||||||
*.iws
|
*.iws
|
||||||
src/main/resources/mixins.*.json
|
src/main/resources/mixins.*([!.]).json
|
||||||
*.bat
|
*.bat
|
||||||
*.DS_Store
|
*.DS_Store
|
||||||
!gradlew.bat
|
!gradlew.bat
|
||||||
|
.factorypath
|
||||||
|
addon.local.gradle
|
||||||
|
addon.local.gradle.kts
|
||||||
|
addon.late.local.gradle
|
||||||
|
addon.late.local.gradle.kts
|
||||||
|
layout.json
|
||||||
+197
-83
@@ -1,4 +1,4 @@
|
|||||||
//version: 1684218858
|
//version: 1697697256
|
||||||
/*
|
/*
|
||||||
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.14'
|
id 'com.gtnewhorizons.retrofuturagradle' version '1.3.24'
|
||||||
}
|
}
|
||||||
|
|
||||||
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")
|
||||||
@@ -89,6 +89,23 @@ def out = services.get(StyledTextOutputFactory).create('an-output')
|
|||||||
def projectJavaVersion = JavaLanguageVersion.of(8)
|
def projectJavaVersion = JavaLanguageVersion.of(8)
|
||||||
|
|
||||||
boolean disableSpotless = project.hasProperty("disableSpotless") ? project.disableSpotless.toBoolean() : false
|
boolean disableSpotless = project.hasProperty("disableSpotless") ? project.disableSpotless.toBoolean() : false
|
||||||
|
boolean disableCheckstyle = project.hasProperty("disableCheckstyle") ? project.disableCheckstyle.toBoolean() : false
|
||||||
|
|
||||||
|
final String CHECKSTYLE_CONFIG = """
|
||||||
|
<!DOCTYPE module PUBLIC
|
||||||
|
"-//Puppy Crawl//DTD Check Configuration 1.3//EN"
|
||||||
|
"http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
|
||||||
|
<module name="Checker">
|
||||||
|
<module name="TreeWalker">
|
||||||
|
<!-- Use CHECKSTYLE:OFF and CHECKSTYLE:ON comments to suppress checkstyle lints in a block -->
|
||||||
|
<module name="SuppressionCommentFilter"/>
|
||||||
|
<module name="AvoidStarImport">
|
||||||
|
<!-- Allow static wildcard imports for cases like Opcodes and LWJGL classes, these don't get created accidentally by the IDE -->
|
||||||
|
<property name="allowStaticMemberImports" value="true"/>
|
||||||
|
</module>
|
||||||
|
</module>
|
||||||
|
</module>
|
||||||
|
"""
|
||||||
|
|
||||||
checkPropertyExists("modName")
|
checkPropertyExists("modName")
|
||||||
checkPropertyExists("modId")
|
checkPropertyExists("modId")
|
||||||
@@ -115,6 +132,8 @@ propertyDefaultIfUnset("usesMixinDebug", project.usesMixins)
|
|||||||
propertyDefaultIfUnset("forceEnableMixins", false)
|
propertyDefaultIfUnset("forceEnableMixins", false)
|
||||||
propertyDefaultIfUnset("channel", "stable")
|
propertyDefaultIfUnset("channel", "stable")
|
||||||
propertyDefaultIfUnset("mappingsVersion", "12")
|
propertyDefaultIfUnset("mappingsVersion", "12")
|
||||||
|
propertyDefaultIfUnset("usesMavenPublishing", true)
|
||||||
|
propertyDefaultIfUnset("mavenPublishUrl", "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases")
|
||||||
propertyDefaultIfUnset("modrinthProjectId", "")
|
propertyDefaultIfUnset("modrinthProjectId", "")
|
||||||
propertyDefaultIfUnset("modrinthRelations", "")
|
propertyDefaultIfUnset("modrinthRelations", "")
|
||||||
propertyDefaultIfUnset("curseForgeProjectId", "")
|
propertyDefaultIfUnset("curseForgeProjectId", "")
|
||||||
@@ -138,6 +157,17 @@ if (!disableSpotless) {
|
|||||||
apply from: Blowdryer.file('spotless.gradle')
|
apply from: Blowdryer.file('spotless.gradle')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!disableCheckstyle) {
|
||||||
|
apply plugin: 'checkstyle'
|
||||||
|
tasks.named("checkstylePatchedMc") { enabled = false }
|
||||||
|
tasks.named("checkstyleMcLauncher") { enabled = false }
|
||||||
|
tasks.named("checkstyleIdeVirtualMain") { enabled = false }
|
||||||
|
tasks.named("checkstyleInjectedTags") { enabled = false }
|
||||||
|
checkstyle {
|
||||||
|
config = resources.text.fromString(CHECKSTYLE_CONFIG)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
String javaSourceDir = "src/main/java/"
|
String javaSourceDir = "src/main/java/"
|
||||||
String scalaSourceDir = "src/main/scala/"
|
String scalaSourceDir = "src/main/scala/"
|
||||||
String kotlinSourceDir = "src/main/kotlin/"
|
String kotlinSourceDir = "src/main/kotlin/"
|
||||||
@@ -357,7 +387,27 @@ catch (Exception ignored) {
|
|||||||
String identifiedVersion
|
String identifiedVersion
|
||||||
String versionOverride = System.getenv("VERSION") ?: null
|
String versionOverride = System.getenv("VERSION") ?: null
|
||||||
try {
|
try {
|
||||||
identifiedVersion = versionOverride == null ? gitVersion() : versionOverride
|
// 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) {
|
||||||
|
def gitDetails = versionDetails()
|
||||||
|
def isDirty = gitVersion().endsWith(".dirty") // No public API for this, isCleanTag has a different meaning
|
||||||
|
String branchName = gitDetails.branchName ?: (System.getenv('GIT_BRANCH') ?: 'git')
|
||||||
|
if (branchName.startsWith('origin/')) {
|
||||||
|
branchName = branchName.minus('origin/')
|
||||||
|
}
|
||||||
|
branchName = branchName.replaceAll("[^a-zA-Z0-9-]+", "-") // sanitize branch names for semver
|
||||||
|
identifiedVersion = gitDetails.lastTag ?: '${gitDetails.gitHash}'
|
||||||
|
if (gitDetails.commitDistance > 0) {
|
||||||
|
identifiedVersion += "-${branchName}.${gitDetails.commitDistance}+${gitDetails.gitHash}"
|
||||||
|
if (isDirty) {
|
||||||
|
identifiedVersion += "-dirty"
|
||||||
|
}
|
||||||
|
} else if (isDirty) {
|
||||||
|
identifiedVersion += "-${branchName}+${gitDetails.gitHash}-dirty"
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
identifiedVersion = versionOverride
|
||||||
|
}
|
||||||
}
|
}
|
||||||
catch (Exception ignored) {
|
catch (Exception ignored) {
|
||||||
out.style(Style.Failure).text(
|
out.style(Style.Failure).text(
|
||||||
@@ -379,9 +429,13 @@ if (identifiedVersion == versionOverride) {
|
|||||||
|
|
||||||
group = "com.github.GTNewHorizons"
|
group = "com.github.GTNewHorizons"
|
||||||
if (project.hasProperty("customArchiveBaseName") && customArchiveBaseName) {
|
if (project.hasProperty("customArchiveBaseName") && customArchiveBaseName) {
|
||||||
archivesBaseName = customArchiveBaseName
|
base {
|
||||||
|
archivesName = customArchiveBaseName
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
archivesBaseName = modId
|
base {
|
||||||
|
archivesName = modId
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -465,10 +519,19 @@ sourceSets {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (file('addon.gradle').exists()) {
|
if (file('addon.gradle.kts').exists()) {
|
||||||
|
apply from: 'addon.gradle.kts'
|
||||||
|
} else if (file('addon.gradle').exists()) {
|
||||||
apply from: 'addon.gradle'
|
apply from: 'addon.gradle'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// File for local tweaks not commited to Git
|
||||||
|
if (file('addon.local.gradle.kts').exists()) {
|
||||||
|
apply from: 'addon.local.gradle.kts'
|
||||||
|
} else if (file('addon.local.gradle').exists()) {
|
||||||
|
apply from: 'addon.local.gradle'
|
||||||
|
}
|
||||||
|
|
||||||
// Allow unsafe repos but warn
|
// Allow unsafe repos but warn
|
||||||
repositories.configureEach { repo ->
|
repositories.configureEach { repo ->
|
||||||
if (repo instanceof org.gradle.api.artifacts.repositories.UrlArtifactRepository) {
|
if (repo instanceof org.gradle.api.artifacts.repositories.UrlArtifactRepository) {
|
||||||
@@ -479,7 +542,14 @@ repositories.configureEach { repo ->
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
apply from: 'repositories.gradle'
|
if (file('repositories.gradle.kts').exists()) {
|
||||||
|
apply from: 'repositories.gradle.kts'
|
||||||
|
} else if (file('repositories.gradle').exists()) {
|
||||||
|
apply from: 'repositories.gradle'
|
||||||
|
} else {
|
||||||
|
logger.error("Neither repositories.gradle.kts nor repositories.gradle was found, make sure you extracted the full ExampleMod template.")
|
||||||
|
throw new RuntimeException("Missing repositories.gradle[.kts]")
|
||||||
|
}
|
||||||
|
|
||||||
configurations {
|
configurations {
|
||||||
runtimeClasspath.extendsFrom(runtimeOnlyNonPublishable)
|
runtimeClasspath.extendsFrom(runtimeOnlyNonPublishable)
|
||||||
@@ -520,9 +590,6 @@ repositories {
|
|||||||
maven {
|
maven {
|
||||||
name 'Overmind forge repo mirror'
|
name 'Overmind forge repo mirror'
|
||||||
url 'https://gregtech.overminddl1.com/'
|
url 'https://gregtech.overminddl1.com/'
|
||||||
mavenContent {
|
|
||||||
excludeGroup("net.minecraftforge") // missing the `universal` artefact
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
maven {
|
maven {
|
||||||
name = "GTNH Maven"
|
name = "GTNH Maven"
|
||||||
@@ -537,24 +604,34 @@ 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 = getURL("https://maven.ic2.player.to/", "https://maven2.ic2.player.to/")
|
||||||
metadataSources {
|
content {
|
||||||
mavenPom()
|
includeGroup "net.industrial-craft"
|
||||||
artifact()
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
maven {
|
|
||||||
name = "ic2-mirror"
|
|
||||||
url = "https://maven2.ic2.player.to/"
|
|
||||||
metadataSources {
|
metadataSources {
|
||||||
mavenPom()
|
mavenPom()
|
||||||
artifact()
|
artifact()
|
||||||
@@ -574,6 +651,8 @@ def mixinProviderSpecNoClassifer = "${mixinProviderGroup}:${mixinProviderModule}
|
|||||||
def mixinProviderSpec = "${mixinProviderSpecNoClassifer}:dev"
|
def mixinProviderSpec = "${mixinProviderSpecNoClassifer}:dev"
|
||||||
ext.mixinProviderSpec = mixinProviderSpec
|
ext.mixinProviderSpec = mixinProviderSpec
|
||||||
|
|
||||||
|
def mixingConfigRefMap = 'mixins.' + modId + '.refmap.json'
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
if (usesMixins.toBoolean()) {
|
if (usesMixins.toBoolean()) {
|
||||||
annotationProcessor('org.ow2.asm:asm-debug-all:5.0.3')
|
annotationProcessor('org.ow2.asm:asm-debug-all:5.0.3')
|
||||||
@@ -585,7 +664,7 @@ dependencies {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (usesMixins.toBoolean()) {
|
if (usesMixins.toBoolean()) {
|
||||||
implementation(mixinProviderSpec)
|
implementation(modUtils.enableMixins(mixinProviderSpec, mixingConfigRefMap))
|
||||||
} else if (forceEnableMixins.toBoolean()) {
|
} else if (forceEnableMixins.toBoolean()) {
|
||||||
runtimeOnlyNonPublishable(mixinProviderSpec)
|
runtimeOnlyNonPublishable(mixinProviderSpec)
|
||||||
}
|
}
|
||||||
@@ -611,12 +690,32 @@ configurations.all {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
apply from: 'dependencies.gradle'
|
dependencies {
|
||||||
|
constraints {
|
||||||
|
def minGtnhLibVersion = "0.0.13"
|
||||||
|
implementation("com.github.GTNewHorizons:GTNHLib:${minGtnhLibVersion}") {
|
||||||
|
because("fixes duplicate mod errors in java 17 configurations using old gtnhlib")
|
||||||
|
}
|
||||||
|
runtimeOnly("com.github.GTNewHorizons:GTNHLib:${minGtnhLibVersion}") {
|
||||||
|
because("fixes duplicate mod errors in java 17 configurations using old gtnhlib")
|
||||||
|
}
|
||||||
|
devOnlyNonPublishable("com.github.GTNewHorizons:GTNHLib:${minGtnhLibVersion}") {
|
||||||
|
because("fixes duplicate mod errors in java 17 configurations using old gtnhlib")
|
||||||
|
}
|
||||||
|
runtimeOnlyNonPublishable("com.github.GTNewHorizons:GTNHLib:${minGtnhLibVersion}") {
|
||||||
|
because("fixes duplicate mod errors in java 17 configurations using old gtnhlib")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
def mixingConfigRefMap = 'mixins.' + modId + '.refmap.json'
|
if (file('dependencies.gradle.kts').exists()) {
|
||||||
def mixinTmpDir = buildDir.path + File.separator + 'tmp' + File.separator + 'mixins'
|
apply from: 'dependencies.gradle.kts'
|
||||||
def refMap = "${mixinTmpDir}" + File.separator + mixingConfigRefMap
|
} else if (file('dependencies.gradle').exists()) {
|
||||||
def mixinSrg = "${mixinTmpDir}" + File.separator + "mixins.srg"
|
apply from: 'dependencies.gradle'
|
||||||
|
} else {
|
||||||
|
logger.error("Neither dependencies.gradle.kts nor dependencies.gradle was found, make sure you extracted the full ExampleMod template.")
|
||||||
|
throw new RuntimeException("Missing dependencies.gradle[.kts]")
|
||||||
|
}
|
||||||
|
|
||||||
tasks.register('generateAssets') {
|
tasks.register('generateAssets') {
|
||||||
group = "GTNH Buildscript"
|
group = "GTNH Buildscript"
|
||||||
@@ -648,46 +747,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 {
|
||||||
@@ -705,7 +775,6 @@ tasks.named("processResources", ProcessResources).configure {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (usesMixins.toBoolean()) {
|
if (usesMixins.toBoolean()) {
|
||||||
from refMap
|
|
||||||
dependsOn("compileJava", "compileScala")
|
dependsOn("compileJava", "compileScala")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -724,23 +793,14 @@ ext.java17PatchDependenciesCfg = configurations.create("java17PatchDependencies"
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
def lwjgl3ifyVersion = '1.3.5'
|
def lwjgl3ifyVersion = '1.5.1'
|
||||||
def asmVersion = '9.4'
|
|
||||||
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.2.13')
|
java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.3.17')
|
||||||
}
|
}
|
||||||
|
|
||||||
java17PatchDependencies('net.minecraft:launchwrapper:1.15') {transitive = false}
|
|
||||||
java17PatchDependencies("org.ow2.asm:asm:${asmVersion}")
|
|
||||||
java17PatchDependencies("org.ow2.asm:asm-commons:${asmVersion}")
|
|
||||||
java17PatchDependencies("org.ow2.asm:asm-tree:${asmVersion}")
|
|
||||||
java17PatchDependencies("org.ow2.asm:asm-analysis:${asmVersion}")
|
|
||||||
java17PatchDependencies("org.ow2.asm:asm-util:${asmVersion}")
|
|
||||||
java17PatchDependencies('org.ow2.asm:asm-deprecated:7.1')
|
|
||||||
java17PatchDependencies("org.apache.commons:commons-lang3:3.12.0")
|
|
||||||
java17PatchDependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}:forgePatches") {transitive = false}
|
java17PatchDependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}:forgePatches") {transitive = false}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -979,6 +1039,9 @@ idea {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
runConfigurations {
|
runConfigurations {
|
||||||
|
"0. Build and Test"(Gradle) {
|
||||||
|
taskNames = ["build"]
|
||||||
|
}
|
||||||
"1. Run Client"(Gradle) {
|
"1. Run Client"(Gradle) {
|
||||||
taskNames = ["runClient"]
|
taskNames = ["runClient"]
|
||||||
}
|
}
|
||||||
@@ -1098,6 +1161,14 @@ tasks.named("processIdeaSettings").configure {
|
|||||||
dependsOn("injectTags")
|
dependsOn("injectTags")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
tasks.named("ideVirtualMainClasses").configure {
|
||||||
|
// Make IntelliJ "Build project" build the mod jars
|
||||||
|
dependsOn("jar", "reobfJar")
|
||||||
|
if (!disableSpotless) {
|
||||||
|
dependsOn("spotlessCheck")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// workaround variable hiding in pom processing
|
// workaround variable hiding in pom processing
|
||||||
def projectConfigs = project.configurations
|
def projectConfigs = project.configurations
|
||||||
|
|
||||||
@@ -1118,12 +1189,14 @@ publishing {
|
|||||||
}
|
}
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
maven {
|
if (usesMavenPublishing.toBoolean()) {
|
||||||
url = "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases"
|
maven {
|
||||||
allowInsecureProtocol = true
|
url = mavenPublishUrl
|
||||||
credentials {
|
allowInsecureProtocol = mavenPublishUrl.startsWith("http://") // Mostly for the GTNH maven
|
||||||
username = System.getenv("MAVEN_USER") ?: "NONE"
|
credentials {
|
||||||
password = System.getenv("MAVEN_PASSWORD") ?: "NONE"
|
username = System.getenv("MAVEN_USER") ?: "NONE"
|
||||||
|
password = System.getenv("MAVEN_PASSWORD") ?: "NONE"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1238,7 +1311,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
|
||||||
@@ -1276,12 +1349,14 @@ tasks.register('faq') {
|
|||||||
description = 'Prints frequently asked questions about building a project'
|
description = 'Prints frequently asked questions about building a project'
|
||||||
|
|
||||||
doLast {
|
doLast {
|
||||||
print("If your build fails to fetch dependencies, they might have been deleted and replaced by newer " +
|
print("If your build fails to fetch dependencies, run './gradlew updateDependencies'. " +
|
||||||
"versions.\nCheck if the versions you try to fetch are still on the distributing sites.\n" +
|
"Or you can manually check if the versions are still on the distributing sites - " +
|
||||||
"The links can be found in repositories.gradle and build.gradle:repositories, " +
|
"the links can be found in repositories.gradle and build.gradle:repositories, " +
|
||||||
"not build.gradle:buildscript.repositories - this one is for gradle plugin metadata.\n\n" +
|
"but not build.gradle:buildscript.repositories - those ones are for gradle plugin metadata.\n\n" +
|
||||||
"If your build fails to recognize the syntax of new Java versions, enable Jabel in your " +
|
"If your build fails to recognize the syntax of new Java versions, enable Jabel in your " +
|
||||||
"gradle.properties. See how it's done in GTNH ExampleMod/gradle.properties.")
|
"gradle.properties. See how it's done in GTNH ExampleMod/gradle.properties. " +
|
||||||
|
"However, keep in mind that Jabel enables only syntax features, but not APIs that were introduced in " +
|
||||||
|
"Java 9 or later.")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1342,8 +1417,14 @@ boolean isNewBuildScriptVersionAvailable() {
|
|||||||
|
|
||||||
String currentBuildScript = getFile("build.gradle").getText()
|
String currentBuildScript = getFile("build.gradle").getText()
|
||||||
String currentBuildScriptHash = getVersionHash(currentBuildScript)
|
String currentBuildScriptHash = getVersionHash(currentBuildScript)
|
||||||
String availableBuildScript = availableBuildScriptUrl().newInputStream(parameters).getText()
|
String availableBuildScriptHash
|
||||||
String availableBuildScriptHash = getVersionHash(availableBuildScript)
|
try {
|
||||||
|
String availableBuildScript = availableBuildScriptUrl().newInputStream(parameters).getText()
|
||||||
|
availableBuildScriptHash = getVersionHash(availableBuildScript)
|
||||||
|
} catch (IOException e) {
|
||||||
|
logger.warn("Could not check for buildscript update availability: {}", e.message)
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
boolean isUpToDate = currentBuildScriptHash.empty || availableBuildScriptHash.empty || currentBuildScriptHash == availableBuildScriptHash
|
boolean isUpToDate = currentBuildScriptHash.empty || availableBuildScriptHash.empty || currentBuildScriptHash == availableBuildScriptHash
|
||||||
return !isUpToDate
|
return !isUpToDate
|
||||||
@@ -1508,3 +1589,36 @@ def getSecondaryArtifacts() {
|
|||||||
if (apiPackage) secondaryArtifacts += [apiJar]
|
if (apiPackage) secondaryArtifacts += [apiJar]
|
||||||
return secondaryArtifacts
|
return secondaryArtifacts
|
||||||
}
|
}
|
||||||
|
|
||||||
|
def getURL(String main, String fallback) {
|
||||||
|
return pingURL(main, 10000) ? main : fallback
|
||||||
|
}
|
||||||
|
|
||||||
|
// credit: https://stackoverflow.com/a/3584332
|
||||||
|
def pingURL(String url, int timeout) {
|
||||||
|
url = url.replaceFirst("^https", "http") // Otherwise an exception may be thrown on invalid SSL certificates.
|
||||||
|
try {
|
||||||
|
HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection()
|
||||||
|
connection.setConnectTimeout(timeout)
|
||||||
|
connection.setReadTimeout(timeout)
|
||||||
|
connection.setRequestMethod("HEAD")
|
||||||
|
int responseCode = connection.getResponseCode()
|
||||||
|
return 200 <= responseCode && responseCode <= 399
|
||||||
|
} catch (IOException ignored) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// For easier scripting of things that require variables defined earlier in the buildscript
|
||||||
|
if (file('addon.late.gradle.kts').exists()) {
|
||||||
|
apply from: 'addon.late.gradle.kts'
|
||||||
|
} else if (file('addon.late.gradle').exists()) {
|
||||||
|
apply from: 'addon.late.gradle'
|
||||||
|
}
|
||||||
|
|
||||||
|
// File for local tweaks not commited to Git
|
||||||
|
if (file('addon.late.local.gradle.kts').exists()) {
|
||||||
|
apply from: 'addon.late.local.gradle.kts'
|
||||||
|
} else if (file('addon.late.local.gradle').exists()) {
|
||||||
|
apply from: 'addon.late.local.gradle'
|
||||||
|
}
|
||||||
+5
-5
@@ -1,12 +1,12 @@
|
|||||||
// Add your dependencies here
|
// Add your dependencies here
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation('com.github.GTNewHorizons:GTNHLib:0.0.10:dev')
|
api('com.github.GTNewHorizons:ForestryMC:4.6.14:dev')
|
||||||
compile('com.github.GTNewHorizons:ForestryMC:4.5.6:dev')
|
implementation('com.github.GTNewHorizons:GTNHLib:0.0.13:dev')
|
||||||
compile('com.github.GTNewHorizons:NotEnoughItems:2.3.21-GTNH:dev')
|
|
||||||
|
|
||||||
compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.28:api')
|
devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.4.5-GTNH:dev')
|
||||||
|
|
||||||
|
compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.36: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:cofh-lib-220333:2388748')
|
compileOnly("curse.maven:extrabiomesxl-60041:2273301")
|
||||||
}
|
}
|
||||||
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
|
||||||
|
|||||||
@@ -1,26 +1,4 @@
|
|||||||
// Add any additional repositories for your dependencies here
|
// Add any additional repositories for your dependencies here
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
maven {
|
|
||||||
name 'GTNH Maven'
|
|
||||||
url 'http://jenkins.usrv.eu:8081/nexus/content/groups/public/'
|
|
||||||
allowInsecureProtocol
|
|
||||||
}
|
|
||||||
maven {
|
|
||||||
name 'ic2'
|
|
||||||
url 'http://maven.ic2.player.to/'
|
|
||||||
metadataSources {
|
|
||||||
mavenPom()
|
|
||||||
artifact()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
maven {
|
|
||||||
url 'https://cursemaven.com'
|
|
||||||
content {
|
|
||||||
includeGroup 'curse.maven'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
maven {
|
|
||||||
url 'https://jitpack.io'
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -88,7 +88,7 @@ public class ItemInsulatedTube extends Item {
|
|||||||
|
|
||||||
enum Material {
|
enum Material {
|
||||||
|
|
||||||
Copper(0xe3b78e, "cooper"),
|
Copper(0xe3b78e, "copper"),
|
||||||
Tin(0xe1eef4, "tin"),
|
Tin(0xe1eef4, "tin"),
|
||||||
Bronze(0xddc276, "bronze"),
|
Bronze(0xddc276, "bronze"),
|
||||||
Iron(0xd8d8d8, "iron");
|
Iron(0xd8d8d8, "iron");
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ public class Mods {
|
|||||||
public static Mod forestry;
|
public static Mod forestry;
|
||||||
public static Mod ic2;
|
public static Mod ic2;
|
||||||
public static Mod botania;
|
public static Mod botania;
|
||||||
|
public static Mod extraBiomes;
|
||||||
|
|
||||||
private static Item findItem(String modId, String name) {
|
private static Item findItem(String modId, String name) {
|
||||||
Item stack = GameRegistry.findItem(modId, name);
|
Item stack = GameRegistry.findItem(modId, name);
|
||||||
@@ -41,6 +42,7 @@ public class Mods {
|
|||||||
Mods.forestry = new Mod("Forestry");
|
Mods.forestry = new Mod("Forestry");
|
||||||
Mods.ic2 = new Mod("IC2");
|
Mods.ic2 = new Mod("IC2");
|
||||||
Mods.botania = new Mod("Botania");
|
Mods.botania = new Mod("Botania");
|
||||||
|
Mods.extraBiomes = new Mod("ExtrabiomesXL");
|
||||||
}
|
}
|
||||||
|
|
||||||
public static class Mod {
|
public static class Mod {
|
||||||
|
|||||||
@@ -54,7 +54,7 @@ public class PageBreeder extends ControlPage<DatabaseTab> {
|
|||||||
this,
|
this,
|
||||||
155.0f,
|
155.0f,
|
||||||
I18N.localise(
|
I18N.localise(
|
||||||
"binniecore.gui.database.species.secretCount",
|
"binniecore.gui.database.species.secretsCount",
|
||||||
system.discoveredSecretCount,
|
system.discoveredSecretCount,
|
||||||
system.totalSecretCount));
|
system.totalSecretCount));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ 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;
|
||||||
@@ -30,6 +31,8 @@ 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.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;
|
||||||
|
|
||||||
@@ -76,6 +79,8 @@ public class GuiCraftGUI extends GuiContainer {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void drawScreen(int mouseX, int mouseY, float par3) {
|
public void drawScreen(int mouseX, int mouseY, float par3) {
|
||||||
|
NEIHook.preDraw();
|
||||||
|
|
||||||
window.setMousePosition(mouseX - (int) window.getPosition().x(), mouseY - (int) window.getPosition().y());
|
window.setMousePosition(mouseX - (int) window.getPosition().x(), mouseY - (int) window.getPosition().y());
|
||||||
drawDefaultBackground();
|
drawDefaultBackground();
|
||||||
|
|
||||||
@@ -89,6 +94,9 @@ public class GuiCraftGUI extends GuiContainer {
|
|||||||
window.render();
|
window.render();
|
||||||
|
|
||||||
RenderHelper.enableGUIStandardItemLighting();
|
RenderHelper.enableGUIStandardItemLighting();
|
||||||
|
|
||||||
|
NEIHook.renderObjects(window, mouseX, mouseY);
|
||||||
|
|
||||||
GL11.glPushMatrix();
|
GL11.glPushMatrix();
|
||||||
GL11.glEnable(32826); // GL_RESCALE_NORMAL_EXT
|
GL11.glEnable(32826); // GL_RESCALE_NORMAL_EXT
|
||||||
OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240.0f, 240.0f);
|
OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240.0f, 240.0f);
|
||||||
@@ -111,6 +119,8 @@ public class GuiCraftGUI extends GuiContainer {
|
|||||||
window.getTooltip(tooltip);
|
window.getTooltip(tooltip);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
NEIHook.renderToolTips(mouseX, mouseY);
|
||||||
|
|
||||||
if (tooltip.exists()) {
|
if (tooltip.exists()) {
|
||||||
renderTooltip(new IPoint(mouseX, mouseY), tooltip);
|
renderTooltip(new IPoint(mouseX, mouseY), tooltip);
|
||||||
}
|
}
|
||||||
@@ -219,6 +229,8 @@ public class GuiCraftGUI extends GuiContainer {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void mouseClicked(int x, int y, int button) {
|
protected void mouseClicked(int x, int y, int button) {
|
||||||
|
NEIHook.mouseClicked(x, y, button);
|
||||||
|
|
||||||
IWidget origin = window;
|
IWidget origin = window;
|
||||||
if (window.getMousedOverWidget() != null) {
|
if (window.getMousedOverWidget() != null) {
|
||||||
origin = window.getMousedOverWidget();
|
origin = window.getMousedOverWidget();
|
||||||
@@ -228,6 +240,8 @@ public class GuiCraftGUI extends GuiContainer {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void keyTyped(char c, int key) {
|
protected void keyTyped(char c, int key) {
|
||||||
|
NEIHook.lastKeyTyped(key, c);
|
||||||
|
|
||||||
if (key == 1 || (key == mc.gameSettings.keyBindInventory.getKeyCode() && window.getFocusedWidget() == null)) {
|
if (key == 1 || (key == mc.gameSettings.keyBindInventory.getKeyCode() && window.getFocusedWidget() == null)) {
|
||||||
mc.thePlayer.closeScreen();
|
mc.thePlayer.closeScreen();
|
||||||
}
|
}
|
||||||
@@ -241,6 +255,7 @@ public class GuiCraftGUI extends GuiContainer {
|
|||||||
if (button != -1) {
|
if (button != -1) {
|
||||||
window.callEvent(new EventMouse.Up(origin, x, y, button));
|
window.callEvent(new EventMouse.Up(origin, x, y, button));
|
||||||
}
|
}
|
||||||
|
NEIHook.mouseUp(x, y, button);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -250,6 +265,8 @@ public class GuiCraftGUI extends GuiContainer {
|
|||||||
if (dWheel != 0) {
|
if (dWheel != 0) {
|
||||||
window.callEvent(new EventMouse.Wheel(window, dWheel));
|
window.callEvent(new EventMouse.Wheel(window, dWheel));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
NEIHook.handleMouseWheel();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -506,4 +523,9 @@ public class GuiCraftGUI extends GuiContainer {
|
|||||||
GL11.glDisable(GL11.GL_BLEND);
|
GL11.glDisable(GL11.GL_BLEND);
|
||||||
GL11.glEnable(GL11.GL_TEXTURE_2D);
|
GL11.glEnable(GL11.GL_TEXTURE_2D);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public ItemStack getStackUnderMouse(int x, int y) {
|
||||||
|
return window.calculateMousedOverWidgets().stream().filter(widget -> widget instanceof ControlSlot).findFirst()
|
||||||
|
.map(w -> ((ControlSlot) w).slot).map(Slot::getStack).orElse(null);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -16,24 +16,40 @@ public class BeeModifierLogic {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public float getModifier(EnumBeeModifier modifier, float currentModifier) {
|
public float getModifier(EnumBeeModifier modifier, float currentModifier) {
|
||||||
if (!modifiers.containsKey(modifier)) {
|
if (modifier == EnumBeeModifier.PRODUCTION) {
|
||||||
return 1.0f;
|
if (!modifiers.containsKey(modifier)) {
|
||||||
}
|
return 0.0f;
|
||||||
|
}
|
||||||
Float[] values = modifiers.get(modifier);
|
Float[] values = modifiers.get(modifier);
|
||||||
float mult = values[0];
|
float offset = values[0], max = values[1];
|
||||||
float max = values[1];
|
if (offset < 0) {// negative modifiers should always apply
|
||||||
if (max >= 1.0f) {
|
return offset;
|
||||||
if (max <= currentModifier) {
|
}
|
||||||
|
if (currentModifier >= max) {// don't decrease modifiers already over the max, just skip increasing it
|
||||||
|
return 0.0f;
|
||||||
|
}
|
||||||
|
return Math.min(offset, max - currentModifier);
|
||||||
|
} else {
|
||||||
|
if (!modifiers.containsKey(modifier)) {
|
||||||
return 1.0f;
|
return 1.0f;
|
||||||
}
|
}
|
||||||
return Math.min(max / currentModifier, mult);
|
|
||||||
|
Float[] values = modifiers.get(modifier);
|
||||||
|
float mult = values[0];
|
||||||
|
float max = values[1];
|
||||||
|
if (max >= 1.0f) {
|
||||||
|
if (max <= currentModifier) {
|
||||||
|
return 1.0f;
|
||||||
|
}
|
||||||
|
return Math.min(max / currentModifier, mult);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (max >= currentModifier) {
|
||||||
|
return 1.0f;
|
||||||
|
}
|
||||||
|
return Math.max(max / currentModifier, mult);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (max >= currentModifier) {
|
|
||||||
return 1.0f;
|
|
||||||
}
|
|
||||||
return Math.max(max / currentModifier, mult);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean getModifier(EnumBeeBooleanModifier modifier) {
|
public boolean getModifier(EnumBeeBooleanModifier modifier) {
|
||||||
|
|||||||
@@ -1,8 +1,15 @@
|
|||||||
package binnie.core.genetics;
|
package binnie.core.genetics;
|
||||||
|
|
||||||
|
import binnie.core.util.I18N;
|
||||||
|
|
||||||
public enum EnumBeeBooleanModifier {
|
public enum EnumBeeBooleanModifier {
|
||||||
|
|
||||||
SEALED,
|
SEALED,
|
||||||
SELF_LIGHTED,
|
SELF_LIGHTED,
|
||||||
SUNLIGHT_STIMULATED,
|
SUNLIGHT_STIMULATED,
|
||||||
HELLISH
|
HELLISH;
|
||||||
|
|
||||||
|
public String getName() {
|
||||||
|
return I18N.localise("binniecore.beebooleanmodifier." + name().toLowerCase());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -122,7 +122,7 @@ public class TransferRequest {
|
|||||||
|| ((IInventorySlots) destination).getSlot(slot) == null
|
|| ((IInventorySlots) destination).getSlot(slot) == null
|
||||||
|| !((IInventorySlots) destination).getSlot(slot).isRecipe()) {
|
|| !((IInventorySlots) destination).getSlot(slot).isRecipe()) {
|
||||||
if (destination.getStackInSlot(slot) != null) {
|
if (destination.getStackInSlot(slot) != null) {
|
||||||
if (item.isStackable()) {
|
if (item.isStackable() && destination.getInventoryStackLimit() > 1) {
|
||||||
ItemStack merged = destination.getStackInSlot(slot).copy();
|
ItemStack merged = destination.getStackInSlot(slot).copy();
|
||||||
ItemStack[] newStacks = mergeStacks(item.copy(), merged.copy());
|
ItemStack[] newStacks = mergeStacks(item.copy(), merged.copy());
|
||||||
item = newStacks[0];
|
item = newStacks[0];
|
||||||
@@ -149,7 +149,16 @@ public class TransferRequest {
|
|||||||
if (destination.getStackInSlot(slot) == null) {
|
if (destination.getStackInSlot(slot) == null) {
|
||||||
insertedSlots.add(new TransferSlot(slot, destination));
|
insertedSlots.add(new TransferSlot(slot, destination));
|
||||||
if (doAdd) {
|
if (doAdd) {
|
||||||
destination.setInventorySlotContents(slot, item.copy());
|
ItemStack movedStack = item.copy();
|
||||||
|
if (movedStack.stackSize > destination.getInventoryStackLimit()) {
|
||||||
|
movedStack.stackSize = destination.getInventoryStackLimit();
|
||||||
|
}
|
||||||
|
item.stackSize -= movedStack.stackSize;
|
||||||
|
destination.setInventorySlotContents(slot, movedStack);
|
||||||
|
if (item.stackSize <= 0) {
|
||||||
|
item = null;
|
||||||
|
}
|
||||||
|
return item;
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,49 @@
|
|||||||
|
package binnie.core.nei;
|
||||||
|
|
||||||
|
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
|
import binnie.core.craftgui.minecraft.GuiCraftGUI;
|
||||||
|
import codechicken.nei.guihook.IContainerObjectHandler;
|
||||||
|
import cpw.mods.fml.common.Optional;
|
||||||
|
|
||||||
|
@Optional.Interface(
|
||||||
|
iface = "codechicken.nei.guihook.IContainerObjectHandler",
|
||||||
|
modid = "NotEnoughItems",
|
||||||
|
striprefs = true)
|
||||||
|
public final class ContainerObjectHandler implements IContainerObjectHandler {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void guiTick(GuiContainer gui) {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void refresh(GuiContainer gui) {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void load(GuiContainer gui) {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ItemStack getStackUnderMouse(GuiContainer gui, int mousex, int mousey) {
|
||||||
|
if (gui instanceof GuiCraftGUI) {
|
||||||
|
return ((GuiCraftGUI) gui).getStackUnderMouse(mousex, mousey);
|
||||||
|
} else {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean objectUnderMouse(GuiContainer gui, int mousex, int mousey) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean shouldShowTooltip(GuiContainer gui) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,107 @@
|
|||||||
|
package binnie.core.nei;
|
||||||
|
|
||||||
|
import org.lwjgl.opengl.GL11;
|
||||||
|
|
||||||
|
import binnie.core.craftgui.minecraft.Window;
|
||||||
|
import codechicken.nei.guihook.GuiContainerManager;
|
||||||
|
import cpw.mods.fml.common.Loader;
|
||||||
|
import cpw.mods.fml.common.Optional;
|
||||||
|
import cpw.mods.fml.relauncher.Side;
|
||||||
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
|
|
||||||
|
@SideOnly(Side.CLIENT)
|
||||||
|
public final class NEIHook {
|
||||||
|
|
||||||
|
public static boolean enabled = false;
|
||||||
|
|
||||||
|
static {
|
||||||
|
if (Loader.isModLoaded("NotEnoughItems")) {
|
||||||
|
enabled = true;
|
||||||
|
addHandler();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Optional.Method(modid = "NotEnoughItems")
|
||||||
|
private static void addHandler() {
|
||||||
|
GuiContainerManager.addObjectHandler(new ContainerObjectHandler());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Optional.Method(modid = "NotEnoughItems")
|
||||||
|
private static GuiContainerManager getManager() {
|
||||||
|
return GuiContainerManager.getManager();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Optional.Method(modid = "NotEnoughItems")
|
||||||
|
private static void preDrawImpl() {
|
||||||
|
GuiContainerManager manager = getManager();
|
||||||
|
if (manager != null) manager.preDraw();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void preDraw() {
|
||||||
|
if (enabled) preDrawImpl();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Optional.Method(modid = "NotEnoughItems")
|
||||||
|
private static void renderObjectsImpl(Window window, int mouseX, int mouseY) {
|
||||||
|
GL11.glPushMatrix();
|
||||||
|
GL11.glTranslatef(window.x(), window.y(), 0.0f);
|
||||||
|
GuiContainerManager manager = getManager();
|
||||||
|
if (manager != null) manager.renderObjects(mouseX, mouseY);
|
||||||
|
GL11.glTranslatef(-window.x(), -window.y(), 0.0f);
|
||||||
|
GL11.glPopMatrix();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void renderObjects(Window window, int mouseX, int mouseY) {
|
||||||
|
if (enabled) renderObjectsImpl(window, mouseX, mouseY);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Optional.Method(modid = "NotEnoughItems")
|
||||||
|
private static void renderToolTipsImpl(int mouseX, int mouseY) {
|
||||||
|
GuiContainerManager manager = getManager();
|
||||||
|
if (manager != null) manager.renderToolTips(mouseX, mouseY);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void renderToolTips(int mouseX, int mouseY) {
|
||||||
|
if (enabled) renderToolTipsImpl(mouseX, mouseY);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Optional.Method(modid = "NotEnoughItems")
|
||||||
|
private static void mouseClickedImpl(int x, int y, int button) {
|
||||||
|
GuiContainerManager manager = getManager();
|
||||||
|
if (manager != null) manager.mouseClicked(x, y, button);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void mouseClicked(int x, int y, int button) {
|
||||||
|
if (enabled) mouseClickedImpl(x, y, button);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Optional.Method(modid = "NotEnoughItems")
|
||||||
|
private static void lastKeyTypedImpl(int k, char c) {
|
||||||
|
GuiContainerManager manager = getManager();
|
||||||
|
if (manager != null) manager.lastKeyTyped(k, c);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void lastKeyTyped(int k, char c) {
|
||||||
|
if (enabled) lastKeyTypedImpl(k, c);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Optional.Method(modid = "NotEnoughItems")
|
||||||
|
private static void handleMouseWheelImpl() {
|
||||||
|
GuiContainerManager manager = getManager();
|
||||||
|
if (manager != null) manager.handleMouseWheel();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void handleMouseWheel() {
|
||||||
|
if (enabled) handleMouseWheelImpl();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Optional.Method(modid = "NotEnoughItems")
|
||||||
|
private static void mouseUpImpl(int mouseX, int mouseY, int button) {
|
||||||
|
GuiContainerManager manager = getManager();
|
||||||
|
if (manager != null) manager.mouseUp(mouseX, mouseY, button);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void mouseUp(int mouseX, int mouseY, int button) {
|
||||||
|
if (enabled) mouseUpImpl(mouseX, mouseY, button);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2,7 +2,11 @@ package binnie.core.nei;
|
|||||||
|
|
||||||
import net.minecraft.block.Block;
|
import net.minecraft.block.Block;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraftforge.fluids.*;
|
import net.minecraftforge.fluids.Fluid;
|
||||||
|
import net.minecraftforge.fluids.FluidContainerRegistry;
|
||||||
|
import net.minecraftforge.fluids.FluidStack;
|
||||||
|
import net.minecraftforge.fluids.IFluidBlock;
|
||||||
|
import net.minecraftforge.fluids.IFluidContainerItem;
|
||||||
|
|
||||||
public class NEIUtils {
|
public class NEIUtils {
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package binnie.core.nei;
|
package binnie.core.nei;
|
||||||
|
|
||||||
import java.awt.*;
|
import java.awt.Point;
|
||||||
|
import java.awt.Rectangle;
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
package binnie.core.nei;
|
package binnie.core.nei;
|
||||||
|
|
||||||
import java.awt.*;
|
import java.awt.Rectangle;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package binnie.core.nei;
|
package binnie.core.nei;
|
||||||
|
|
||||||
import java.awt.*;
|
import java.awt.Point;
|
||||||
|
import java.awt.Rectangle;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ public class ComponentBeeModifier extends MachineComponent implements IBeeModifi
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public float getProductionModifier(IBeeGenome genome, float currentModifier) {
|
public float getProductionModifier(IBeeGenome genome, float currentModifier) {
|
||||||
return 1.0f;
|
return 0.0f;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -36,17 +36,17 @@ public enum EnumHiveFrame implements IHiveFrame, IBeeModifier {
|
|||||||
|
|
||||||
public static void init() {
|
public static void init() {
|
||||||
EnumHiveFrame.Cocoa.logic.setModifier(EnumBeeModifier.LIFESPAN, 0.75f, 0.25f);
|
EnumHiveFrame.Cocoa.logic.setModifier(EnumBeeModifier.LIFESPAN, 0.75f, 0.25f);
|
||||||
EnumHiveFrame.Cocoa.logic.setModifier(EnumBeeModifier.PRODUCTION, 1.5f, 5.0f);
|
EnumHiveFrame.Cocoa.logic.setModifier(EnumBeeModifier.PRODUCTION, 0.5f, 2.0f);// was 1.5x lim 5.0x
|
||||||
EnumHiveFrame.Cage.logic.setModifier(EnumBeeModifier.TERRITORY, 0.5f, 0.1f);
|
EnumHiveFrame.Cage.logic.setModifier(EnumBeeModifier.TERRITORY, 0.5f, 0.1f);
|
||||||
EnumHiveFrame.Cage.logic.setModifier(EnumBeeModifier.LIFESPAN, 0.75f, 0.5f);
|
EnumHiveFrame.Cage.logic.setModifier(EnumBeeModifier.LIFESPAN, 0.75f, 0.5f);
|
||||||
EnumHiveFrame.Cage.logic.setModifier(EnumBeeModifier.PRODUCTION, 0.75f, 0.5f);
|
EnumHiveFrame.Cage.logic.setModifier(EnumBeeModifier.PRODUCTION, -0.25f, 0.0f);// was 0.75x lim 0.5x
|
||||||
EnumHiveFrame.Soul.logic.setModifier(EnumBeeModifier.MUTATION, 1.5f, 5.0f);
|
EnumHiveFrame.Soul.logic.setModifier(EnumBeeModifier.MUTATION, 1.5f, 5.0f);
|
||||||
EnumHiveFrame.Soul.logic.setModifier(EnumBeeModifier.LIFESPAN, 0.75f, 0.5f);
|
EnumHiveFrame.Soul.logic.setModifier(EnumBeeModifier.LIFESPAN, 0.75f, 0.5f);
|
||||||
EnumHiveFrame.Soul.logic.setModifier(EnumBeeModifier.PRODUCTION, 0.25f, 0.1f);
|
EnumHiveFrame.Soul.logic.setModifier(EnumBeeModifier.PRODUCTION, -0.75f, 0.0f);// was 0.25x lim 0.1x
|
||||||
EnumHiveFrame.Soul.setMaxDamage(80);
|
EnumHiveFrame.Soul.setMaxDamage(80);
|
||||||
EnumHiveFrame.Clay.logic.setModifier(EnumBeeModifier.LIFESPAN, 1.5f, 5.0f);
|
EnumHiveFrame.Clay.logic.setModifier(EnumBeeModifier.LIFESPAN, 1.5f, 5.0f);
|
||||||
EnumHiveFrame.Clay.logic.setModifier(EnumBeeModifier.MUTATION, 0.5f, 0.2f);
|
EnumHiveFrame.Clay.logic.setModifier(EnumBeeModifier.MUTATION, 0.5f, 0.2f);
|
||||||
EnumHiveFrame.Clay.logic.setModifier(EnumBeeModifier.PRODUCTION, 0.75f, 0.2f);
|
EnumHiveFrame.Clay.logic.setModifier(EnumBeeModifier.PRODUCTION, -0.25f, 0.0f);// was 0.75x lim 0.2x
|
||||||
EnumHiveFrame.Debug.logic.setModifier(EnumBeeModifier.LIFESPAN, 1.0E-4f, 1.0E-4f);
|
EnumHiveFrame.Debug.logic.setModifier(EnumBeeModifier.LIFESPAN, 1.0E-4f, 1.0E-4f);
|
||||||
|
|
||||||
GameRegistry.addRecipe(
|
GameRegistry.addRecipe(
|
||||||
|
|||||||
@@ -152,7 +152,7 @@ public class TileExtraBeeAlveary extends TileEntityMachine implements IAlvearyCo
|
|||||||
@Override
|
@Override
|
||||||
public float getProductionModifier(IBeeGenome genome, float currentModifier) {
|
public float getProductionModifier(IBeeGenome genome, float currentModifier) {
|
||||||
if (getBeeModifier() == null) {
|
if (getBeeModifier() == null) {
|
||||||
return 1.0f;
|
return 0.0f;
|
||||||
}
|
}
|
||||||
return getBeeModifier().getProductionModifier(genome, currentModifier);
|
return getBeeModifier().getProductionModifier(genome, currentModifier);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ import binnie.extrabees.apiary.machine.mutator.MutatorAlvearyPackage;
|
|||||||
import binnie.extrabees.apiary.machine.rainShield.RainShieldAlvearyPackage;
|
import binnie.extrabees.apiary.machine.rainShield.RainShieldAlvearyPackage;
|
||||||
import binnie.extrabees.apiary.machine.stimulator.StimulatorAlvearyPackage;
|
import binnie.extrabees.apiary.machine.stimulator.StimulatorAlvearyPackage;
|
||||||
import binnie.extrabees.apiary.machine.transmission.TransmissionAlvearyPackage;
|
import binnie.extrabees.apiary.machine.transmission.TransmissionAlvearyPackage;
|
||||||
|
import binnie.extrabees.apiary.machine.unlighting.UnlightingAlvearyPackage;
|
||||||
|
|
||||||
public enum AlvearyMachine implements IMachineType {
|
public enum AlvearyMachine implements IMachineType {
|
||||||
|
|
||||||
@@ -27,7 +28,8 @@ public enum AlvearyMachine implements IMachineType {
|
|||||||
Lighting(LightingAlvearyPackage.class),
|
Lighting(LightingAlvearyPackage.class),
|
||||||
Stimulator(StimulatorAlvearyPackage.class),
|
Stimulator(StimulatorAlvearyPackage.class),
|
||||||
Hatchery(HatcheryAlvearyPackage.class),
|
Hatchery(HatcheryAlvearyPackage.class),
|
||||||
Transmission(TransmissionAlvearyPackage.class);
|
Transmission(TransmissionAlvearyPackage.class),
|
||||||
|
Unlighting(UnlightingAlvearyPackage.class);
|
||||||
|
|
||||||
protected Class<? extends MachinePackage> cls;
|
protected Class<? extends MachinePackage> cls;
|
||||||
|
|
||||||
|
|||||||
@@ -72,7 +72,7 @@ public class FrameComponentModifier extends ComponentBeeModifier implements IBee
|
|||||||
public float getProductionModifier(IBeeGenome genome, float currentModifier) {
|
public float getProductionModifier(IBeeGenome genome, float currentModifier) {
|
||||||
IHiveFrame frame = getHiveFrame();
|
IHiveFrame frame = getHiveFrame();
|
||||||
if (frame == null) {
|
if (frame == null) {
|
||||||
return 1.0f;
|
return 0.0f;
|
||||||
}
|
}
|
||||||
return frame.getBeeModifier().getProductionModifier(genome, currentModifier);
|
return frame.getBeeModifier().getProductionModifier(genome, currentModifier);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,15 +20,17 @@ public enum CircuitType implements IBeeModifier {
|
|||||||
Territory(2, 10);
|
Territory(2, 10);
|
||||||
|
|
||||||
static {
|
static {
|
||||||
CircuitType.LowVoltage.logic.setModifier(EnumBeeModifier.PRODUCTION, 1.5f, 5.0f);
|
CircuitType.LowVoltage.logic.setModifier(EnumBeeModifier.PRODUCTION, 0.5f, 5.0f);
|
||||||
CircuitType.HighVoltage.logic.setModifier(EnumBeeModifier.PRODUCTION, 2.5f, 10.0f);
|
CircuitType.HighVoltage.logic.setModifier(EnumBeeModifier.PRODUCTION, 1.5f, 10.0f);
|
||||||
CircuitType.Plant.logic.setModifier(EnumBeeModifier.FLOWERING, 1.5f, 5.0f);
|
CircuitType.Plant.logic.setModifier(EnumBeeModifier.FLOWERING, 1.5f, 5.0f);
|
||||||
CircuitType.Death.logic.setModifier(EnumBeeModifier.LIFESPAN, 0.8f, 0.2f);
|
CircuitType.Death.logic.setModifier(EnumBeeModifier.LIFESPAN, 0.8f, 0.2f);
|
||||||
CircuitType.Life.logic.setModifier(EnumBeeModifier.LIFESPAN, 1.5f, 5.0f);
|
CircuitType.Life.logic.setModifier(EnumBeeModifier.LIFESPAN, 1.5f, 5.0f);
|
||||||
CircuitType.Nether.logic.setModifier(EnumBeeBooleanModifier.HELLISH);
|
CircuitType.Nether.logic.setModifier(EnumBeeBooleanModifier.HELLISH);
|
||||||
CircuitType.Mutation.logic.setModifier(EnumBeeModifier.MUTATION, 1.5f, 5.0f);
|
CircuitType.Mutation.logic.setModifier(EnumBeeModifier.MUTATION, 1.5f, 5.0f);
|
||||||
CircuitType.Inhibitor.logic.setModifier(EnumBeeModifier.TERRITORY, 0.4f, 0.1f);
|
CircuitType.Inhibitor.logic.setModifier(EnumBeeModifier.TERRITORY, 0.4f, 0.1f);
|
||||||
CircuitType.Inhibitor.logic.setModifier(EnumBeeModifier.PRODUCTION, 0.9f, 0.5f);
|
CircuitType.Inhibitor.logic.setModifier(EnumBeeModifier.PRODUCTION, -0.1f, 0.0f);// was 0.9x, now -0.1. limit
|
||||||
|
// was 0.5x, now it's 0, but
|
||||||
|
// currently ignored
|
||||||
CircuitType.Territory.logic.setModifier(EnumBeeModifier.TERRITORY, 1.5f, 5.0f);
|
CircuitType.Territory.logic.setModifier(EnumBeeModifier.TERRITORY, 1.5f, 5.0f);
|
||||||
for (CircuitType type : values()) {
|
for (CircuitType type : values()) {
|
||||||
type.logic.setModifier(EnumBeeModifier.GENETIC_DECAY, 1.5f, 10.0f);
|
type.logic.setModifier(EnumBeeModifier.GENETIC_DECAY, 1.5f, 10.0f);
|
||||||
@@ -48,18 +50,34 @@ public enum CircuitType implements IBeeModifier {
|
|||||||
|
|
||||||
public void createCircuit(ICircuitLayout layout) {
|
public void createCircuit(ICircuitLayout layout) {
|
||||||
StimulatorCircuit circuit = new StimulatorCircuit(this, layout);
|
StimulatorCircuit circuit = new StimulatorCircuit(this, layout);
|
||||||
for (EnumBeeModifier modifier : EnumBeeModifier.values()) {
|
for (EnumBeeBooleanModifier modifier : EnumBeeBooleanModifier.values()) {
|
||||||
float mod = logic.getModifier(modifier, 1.0f);
|
if (logic.getModifier(modifier)) {
|
||||||
if (mod == 1.0f) {
|
circuit.addTooltipString("Enables " + modifier.getName());
|
||||||
continue;
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
if (mod > 1.0f) {
|
for (EnumBeeModifier modifier : EnumBeeModifier.values()) {
|
||||||
int increase = (int) ((mod - 1.0f) * 100.0f);
|
if (modifier == EnumBeeModifier.PRODUCTION) {
|
||||||
circuit.addTooltipString("Increases " + modifier.getName() + " by " + increase + "%");
|
float mod = logic.getModifier(modifier, 0.0f);
|
||||||
|
if (mod == 0.0f) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (mod > 0.0f) {
|
||||||
|
circuit.addTooltipString("Increases " + modifier.getName() + " by +" + mod);
|
||||||
|
} else {
|
||||||
|
circuit.addTooltipString("Increases " + modifier.getName() + " by " + mod);
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
int decrease = (int) ((1.0f - mod) * 100.0f);
|
float mod = logic.getModifier(modifier, 1.0f);
|
||||||
circuit.addTooltipString("Decreases " + modifier.getName() + " by " + decrease + "%");
|
if (mod == 1.0f) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (mod > 1.0f) {
|
||||||
|
int increase = (int) ((mod - 1.0f) * 100.0f);
|
||||||
|
circuit.addTooltipString("Increases " + modifier.getName() + " by " + increase + "%");
|
||||||
|
} else {
|
||||||
|
int decrease = (int) ((1.0f - mod) * 100.0f);
|
||||||
|
circuit.addTooltipString("Decreases " + modifier.getName() + " by " + decrease + "%");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+7
-1
@@ -18,7 +18,13 @@ public class StimulatorAlvearyPackage extends AlvearyMachine.AlvearyPackage impl
|
|||||||
@Override
|
@Override
|
||||||
public void createMachine(Machine machine) {
|
public void createMachine(Machine machine) {
|
||||||
new ComponentExtraBeeGUI(machine, ExtraBeeGUID.AlvearyStimulator);
|
new ComponentExtraBeeGUI(machine, ExtraBeeGUID.AlvearyStimulator);
|
||||||
ComponentInventorySlots inventory = new ComponentInventorySlots(machine);
|
ComponentInventorySlots inventory = new ComponentInventorySlots(machine) {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getInventoryStackLimit() {
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
};
|
||||||
inventory.addSlot(AlvearyStimulator.SLOT_CIRCUIT, "circuit");
|
inventory.addSlot(AlvearyStimulator.SLOT_CIRCUIT, "circuit");
|
||||||
inventory.getSlot(AlvearyStimulator.SLOT_CIRCUIT).setValidator(new CircuitSlotValidator());
|
inventory.getSlot(AlvearyStimulator.SLOT_CIRCUIT).setValidator(new CircuitSlotValidator());
|
||||||
new ComponentPowerReceptor(machine);
|
new ComponentPowerReceptor(machine);
|
||||||
|
|||||||
+3
-2
@@ -100,13 +100,14 @@ public class StimulatorModifierComponent extends ComponentBeeModifier implements
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public float getProductionModifier(IBeeGenome genome, float currentModifier) {
|
public float getProductionModifier(IBeeGenome genome, float currentModifier) {
|
||||||
float mod = 1.0f;
|
float mod = 0.0f;// production modifiers are now additive, and the "base" value of 1 comes in forestry's
|
||||||
|
// Bee.java and BeeKeepingMode.java
|
||||||
if (!powered) {
|
if (!powered) {
|
||||||
return mod;
|
return mod;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (IBeeModifier beeMod : modifiers) {
|
for (IBeeModifier beeMod : modifiers) {
|
||||||
mod *= beeMod.getProductionModifier(genome, mod);
|
mod += beeMod.getProductionModifier(genome, mod);
|
||||||
}
|
}
|
||||||
return mod;
|
return mod;
|
||||||
}
|
}
|
||||||
|
|||||||
+18
@@ -0,0 +1,18 @@
|
|||||||
|
package binnie.extrabees.apiary.machine.unlighting;
|
||||||
|
|
||||||
|
import binnie.core.craftgui.minecraft.IMachineInformation;
|
||||||
|
import binnie.core.machines.Machine;
|
||||||
|
import binnie.extrabees.apiary.machine.AlvearyMachine;
|
||||||
|
import binnie.extrabees.core.ExtraBeeTexture;
|
||||||
|
|
||||||
|
public class UnlightingAlvearyPackage extends AlvearyMachine.AlvearyPackage implements IMachineInformation {
|
||||||
|
|
||||||
|
public UnlightingAlvearyPackage() {
|
||||||
|
super("unlighting", ExtraBeeTexture.AlvearyUnlighting.getTexture(), false);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void createMachine(Machine machine) {
|
||||||
|
new UnlightingComponentModifier(machine);
|
||||||
|
}
|
||||||
|
}
|
||||||
+18
@@ -0,0 +1,18 @@
|
|||||||
|
package binnie.extrabees.apiary.machine.unlighting;
|
||||||
|
|
||||||
|
import binnie.core.machines.Machine;
|
||||||
|
import binnie.extrabees.apiary.ComponentBeeModifier;
|
||||||
|
import forestry.api.apiculture.IBeeListener;
|
||||||
|
import forestry.api.apiculture.IBeeModifier;
|
||||||
|
|
||||||
|
public class UnlightingComponentModifier extends ComponentBeeModifier implements IBeeModifier, IBeeListener {
|
||||||
|
|
||||||
|
public UnlightingComponentModifier(Machine machine) {
|
||||||
|
super(machine);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isSelfUnlighted() {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -12,6 +12,7 @@ public enum ExtraBeeTexture implements IBinnieTexture {
|
|||||||
AlvearyNovaBlock(ResourceType.Tile, "alveary/AlvearyNovaBlock"),
|
AlvearyNovaBlock(ResourceType.Tile, "alveary/AlvearyNovaBlock"),
|
||||||
AlvearyFrame(ResourceType.Tile, "alveary/AlvearyFrame"),
|
AlvearyFrame(ResourceType.Tile, "alveary/AlvearyFrame"),
|
||||||
AlvearyLighting(ResourceType.Tile, "alveary/AlvearyLighting"),
|
AlvearyLighting(ResourceType.Tile, "alveary/AlvearyLighting"),
|
||||||
|
AlvearyUnlighting(ResourceType.Tile, "alveary/AlvearyUnlighting"),
|
||||||
AlvearyRainShield(ResourceType.Tile, "alveary/AlvearyRainShield"),
|
AlvearyRainShield(ResourceType.Tile, "alveary/AlvearyRainShield"),
|
||||||
AlvearyStimulator(ResourceType.Tile, "alveary/AlvearyStimulator"),
|
AlvearyStimulator(ResourceType.Tile, "alveary/AlvearyStimulator"),
|
||||||
AlvearyHatchery(ResourceType.Tile, "alveary/AlvearyHatchery"),
|
AlvearyHatchery(ResourceType.Tile, "alveary/AlvearyHatchery"),
|
||||||
|
|||||||
@@ -4,7 +4,9 @@ import java.util.ArrayList;
|
|||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import binnie.extrabees.genetics.requirements.*;
|
import binnie.extrabees.genetics.requirements.DummyMutationCondition;
|
||||||
|
import binnie.extrabees.genetics.requirements.IMutationRequirement;
|
||||||
|
import binnie.extrabees.genetics.requirements.RequirementPerson;
|
||||||
import forestry.api.apiculture.BeeManager;
|
import forestry.api.apiculture.BeeManager;
|
||||||
import forestry.api.apiculture.IAlleleBeeSpecies;
|
import forestry.api.apiculture.IAlleleBeeSpecies;
|
||||||
import forestry.api.apiculture.IBeeGenome;
|
import forestry.api.apiculture.IBeeGenome;
|
||||||
|
|||||||
@@ -8,13 +8,12 @@ import net.minecraft.item.ItemBlock;
|
|||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.util.IIcon;
|
import net.minecraft.util.IIcon;
|
||||||
|
|
||||||
import com.google.common.base.Optional;
|
|
||||||
|
|
||||||
import binnie.core.Mods;
|
import binnie.core.Mods;
|
||||||
import binnie.core.block.TileEntityMetadata;
|
import binnie.core.block.TileEntityMetadata;
|
||||||
import binnie.core.util.I18N;
|
import binnie.core.util.I18N;
|
||||||
import binnie.extratrees.ExtraTrees;
|
import binnie.extratrees.ExtraTrees;
|
||||||
import binnie.extratrees.api.CarpentryManager;
|
import binnie.extratrees.api.CarpentryManager;
|
||||||
|
import extrabiomes.api.Stuff;
|
||||||
|
|
||||||
public class PlankType {
|
public class PlankType {
|
||||||
|
|
||||||
@@ -267,13 +266,10 @@ public class PlankType {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ItemStack getStack() {
|
public ItemStack getStack() {
|
||||||
try {
|
if (!Mods.extraBiomes.active()) {
|
||||||
Class clss = Class.forName("extrabiomes.api.Stuff");
|
|
||||||
Block block = (Block) ((Optional) clss.getField("planks").get(null)).get();
|
|
||||||
return new ItemStack(block, 1, ordinal());
|
|
||||||
} catch (Exception e) {
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
return Stuff.planks.transform(block -> new ItemStack(block, 1, ordinal())).orNull();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import net.minecraft.init.Blocks;
|
|||||||
import net.minecraft.item.Item;
|
import net.minecraft.item.Item;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
|
import binnie.core.Mods;
|
||||||
import binnie.core.block.TileEntityMetadata;
|
import binnie.core.block.TileEntityMetadata;
|
||||||
import binnie.extratrees.ExtraTrees;
|
import binnie.extratrees.ExtraTrees;
|
||||||
import binnie.extratrees.api.CarpentryManager;
|
import binnie.extratrees.api.CarpentryManager;
|
||||||
@@ -17,6 +18,8 @@ import binnie.extratrees.block.decor.FenceType;
|
|||||||
|
|
||||||
public class WoodManager {
|
public class WoodManager {
|
||||||
|
|
||||||
|
private static List<IPlankType> allPlankTypes;
|
||||||
|
|
||||||
public static IPlankType getPlankType(int index) {
|
public static IPlankType getPlankType(int index) {
|
||||||
IDesignMaterial wood = CarpentryManager.carpentryInterface.getWoodMaterial(index);
|
IDesignMaterial wood = CarpentryManager.carpentryInterface.getWoodMaterial(index);
|
||||||
if (wood instanceof IPlankType) {
|
if (wood instanceof IPlankType) {
|
||||||
@@ -97,16 +100,18 @@ public class WoodManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static List<IPlankType> getAllPlankTypes() {
|
public static List<IPlankType> getAllPlankTypes() {
|
||||||
|
if (allPlankTypes != null) {
|
||||||
|
return allPlankTypes;
|
||||||
|
}
|
||||||
|
|
||||||
List<IPlankType> list = new ArrayList<>();
|
List<IPlankType> list = new ArrayList<>();
|
||||||
Collections.addAll(list, PlankType.ExtraTreePlanks.values());
|
Collections.addAll(list, PlankType.ExtraTreePlanks.values());
|
||||||
Collections.addAll(list, PlankType.ForestryPlanks.values());
|
Collections.addAll(list, PlankType.ForestryPlanks.values());
|
||||||
for (IPlankType type : PlankType.ExtraBiomesPlank.values()) {
|
if (Mods.extraBiomes.active()) {
|
||||||
if (type.getStack() != null) {
|
Collections.addAll(list, PlankType.ExtraBiomesPlank.values());
|
||||||
list.add(type);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Collections.addAll(list, PlankType.VanillaPlanks.values());
|
Collections.addAll(list, PlankType.VanillaPlanks.values());
|
||||||
|
allPlankTypes = list;
|
||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -29,19 +29,18 @@ public class Lumbermill {
|
|||||||
public static Map<ItemStack, ItemStack> recipes = new HashMap<>();
|
public static Map<ItemStack, ItemStack> recipes = new HashMap<>();
|
||||||
|
|
||||||
public static ItemStack getPlankProduct(ItemStack item) {
|
public static ItemStack getPlankProduct(ItemStack item) {
|
||||||
ItemStack stack = null;
|
|
||||||
if (Lumbermill.recipes.isEmpty()) {
|
if (Lumbermill.recipes.isEmpty()) {
|
||||||
calculateLumbermillProducts();
|
calculateLumbermillProducts();
|
||||||
}
|
}
|
||||||
|
|
||||||
for (Map.Entry<ItemStack, ItemStack> entry : Lumbermill.recipes.entrySet()) {
|
for (Map.Entry<ItemStack, ItemStack> entry : Lumbermill.recipes.entrySet()) {
|
||||||
if (entry.getKey().isItemEqual(item)) {
|
if (entry.getKey().isItemEqual(item)) {
|
||||||
stack = entry.getValue().copy();
|
ItemStack stack = entry.getValue().copy();
|
||||||
break;
|
stack.stackSize = 6;
|
||||||
|
return stack;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
stack.stackSize = 6;
|
return null;
|
||||||
return stack;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void calculateLumbermillProducts() {
|
public static void calculateLumbermillProducts() {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
package binnie.extratrees.nei;
|
package binnie.extratrees.nei;
|
||||||
|
|
||||||
import java.awt.*;
|
import java.awt.Rectangle;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
package binnie.genetics.nei;
|
package binnie.genetics.nei;
|
||||||
|
|
||||||
import java.awt.*;
|
import java.awt.Rectangle;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
package binnie.genetics.nei;
|
package binnie.genetics.nei;
|
||||||
|
|
||||||
import java.awt.*;
|
import java.awt.Rectangle;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
package binnie.genetics.nei;
|
package binnie.genetics.nei;
|
||||||
|
|
||||||
import java.awt.*;
|
import java.awt.Rectangle;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
package binnie.genetics.nei;
|
package binnie.genetics.nei;
|
||||||
|
|
||||||
import java.awt.*;
|
import java.awt.Rectangle;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
package binnie.genetics.nei;
|
package binnie.genetics.nei;
|
||||||
|
|
||||||
import java.awt.*;
|
import java.awt.Rectangle;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
|||||||
@@ -182,7 +182,12 @@ binniecore.beemodifier.mutation=Mutation
|
|||||||
binniecore.beemodifier.lifespan=Lifespan
|
binniecore.beemodifier.lifespan=Lifespan
|
||||||
binniecore.beemodifier.production=Production
|
binniecore.beemodifier.production=Production
|
||||||
binniecore.beemodifier.flowering=Flowering
|
binniecore.beemodifier.flowering=Flowering
|
||||||
binniecore.beemodifier.geneticdecay=Genetic Decay
|
binniecore.beemodifier.genetic_decay=Genetic Decay
|
||||||
|
|
||||||
|
binniecore.beebooleanmodifier.sealed=Rain Protection
|
||||||
|
binniecore.beebooleanmodifier.self_lighted=Self Lighting
|
||||||
|
binniecore.beebooleanmodifier.sunlight_stimulated=Sunlight Stimulation
|
||||||
|
binniecore.beebooleanmodifier.hellish=Hellish Emulation
|
||||||
|
|
||||||
binniecore.gui.breedingmessage.species=Species Discovered
|
binniecore.gui.breedingmessage.species=Species Discovered
|
||||||
binniecore.gui.breedingmessage.branch=Branch Discovered
|
binniecore.gui.breedingmessage.branch=Branch Discovered
|
||||||
|
|||||||
@@ -182,7 +182,7 @@ binniecore.beemodifier.mutation=Мутация
|
|||||||
binniecore.beemodifier.lifespan=Время жизни
|
binniecore.beemodifier.lifespan=Время жизни
|
||||||
binniecore.beemodifier.production=Продукция
|
binniecore.beemodifier.production=Продукция
|
||||||
binniecore.beemodifier.flowering=Цветы
|
binniecore.beemodifier.flowering=Цветы
|
||||||
binniecore.beemodifier.geneticdecay=Склонность к вырождению
|
binniecore.beemodifier.genetic_decay=Склонность к вырождению
|
||||||
|
|
||||||
binniecore.gui.breedingmessage.species=Видов обнаружено
|
binniecore.gui.breedingmessage.species=Видов обнаружено
|
||||||
binniecore.gui.breedingmessage.branch=Семейств обнаружено
|
binniecore.gui.breedingmessage.branch=Семейств обнаружено
|
||||||
|
|||||||
@@ -182,7 +182,7 @@ binniecore.beemodifier.mutation=变异
|
|||||||
binniecore.beemodifier.lifespan=寿命
|
binniecore.beemodifier.lifespan=寿命
|
||||||
binniecore.beemodifier.production=产物
|
binniecore.beemodifier.production=产物
|
||||||
binniecore.beemodifier.flowering=授粉速度
|
binniecore.beemodifier.flowering=授粉速度
|
||||||
binniecore.beemodifier.geneticdecay=基因衰变
|
binniecore.beemodifier.genetic_decay=基因衰变
|
||||||
|
|
||||||
binniecore.gui.breedingmessage.species=已发现品种
|
binniecore.gui.breedingmessage.species=已发现品种
|
||||||
binniecore.gui.breedingmessage.branch=已发现分支
|
binniecore.gui.breedingmessage.branch=已发现分支
|
||||||
|
|||||||
@@ -366,7 +366,7 @@ for.binnie.circuit.garden.damp.neutral=Garden (Damp, Neutral)
|
|||||||
for.binnie.circuit.garden.damp.alkaline=Garden (Damp, Alkaline)
|
for.binnie.circuit.garden.damp.alkaline=Garden (Damp, Alkaline)
|
||||||
|
|
||||||
botany.tube.name=Insulated Tube
|
botany.tube.name=Insulated Tube
|
||||||
botany.tube.cooper=Cooper
|
botany.tube.copper=Copper
|
||||||
botany.tube.tin=Tin
|
botany.tube.tin=Tin
|
||||||
botany.tube.bronze=Bronze
|
botany.tube.bronze=Bronze
|
||||||
botany.tube.iron=Iron
|
botany.tube.iron=Iron
|
||||||
|
|||||||
@@ -366,7 +366,7 @@ for.binnie.circuit.garden.damp.neutral=Сад (влажный, нейтраль
|
|||||||
for.binnie.circuit.garden.damp.alkaline=Сад (влажный, щелочной)
|
for.binnie.circuit.garden.damp.alkaline=Сад (влажный, щелочной)
|
||||||
|
|
||||||
botany.tube.name=изолирующая лампа
|
botany.tube.name=изолирующая лампа
|
||||||
botany.tube.cooper=Медная
|
botany.tube.copper=Медная
|
||||||
botany.tube.tin=Оловяная
|
botany.tube.tin=Оловяная
|
||||||
botany.tube.bronze=Бронзовая
|
botany.tube.bronze=Бронзовая
|
||||||
botany.tube.iron=Железная
|
botany.tube.iron=Железная
|
||||||
|
|||||||
@@ -364,7 +364,7 @@ for.binnie.circuit.garden.damp.neutral=花土(潮湿,中性)
|
|||||||
for.binnie.circuit.garden.damp.alkaline=花土(潮湿,碱性)
|
for.binnie.circuit.garden.damp.alkaline=花土(潮湿,碱性)
|
||||||
|
|
||||||
botany.tube.name=恒温管
|
botany.tube.name=恒温管
|
||||||
botany.tube.cooper=铜
|
botany.tube.copper=铜
|
||||||
botany.tube.tin=锡
|
botany.tube.tin=锡
|
||||||
botany.tube.bronze=青铜
|
botany.tube.bronze=青铜
|
||||||
botany.tube.iron=铁
|
botany.tube.iron=铁
|
||||||
|
|||||||
@@ -191,6 +191,9 @@ extrabees.machine.alveay.frame.tooltip=Hive Frames
|
|||||||
extrabees.machine.alveay.lighting=Alveary Lighting
|
extrabees.machine.alveay.lighting=Alveary Lighting
|
||||||
extrabees.machine.alveay.lighting.info=The Alveary Lighting tricks bees into thinking it is daylight at night time.
|
extrabees.machine.alveay.lighting.info=The Alveary Lighting tricks bees into thinking it is daylight at night time.
|
||||||
|
|
||||||
|
extrabees.machine.alveay.unlighting=Alveary Unlighting
|
||||||
|
extrabees.machine.alveay.unlighting.info=The Alveary Unlighting tricks bees into thinking it is night time during the day.
|
||||||
|
|
||||||
extrabees.machine.alveay.mutator=Mutator
|
extrabees.machine.alveay.mutator=Mutator
|
||||||
extrabees.machine.alveay.mutator.info=The Mutator uses certain items in order to encourage bee mutation.
|
extrabees.machine.alveay.mutator.info=The Mutator uses certain items in order to encourage bee mutation.
|
||||||
extrabees.machine.alveay.mutator.tooltip=Mutagenic Agents
|
extrabees.machine.alveay.mutator.tooltip=Mutagenic Agents
|
||||||
|
|||||||
Binary file not shown.
|
After Width: | Height: | Size: 9.5 KiB |
Reference in new issue
Block a user