mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-15 17:45:08 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d46289b0e1 | ||
|
|
07152aaee0 | ||
|
|
86da15ac65 | ||
|
|
979957a4c0 | ||
|
|
13634ef7c8 |
No files matched your search
@@ -1,9 +0,0 @@
|
||||
directory="run/crash-reports"
|
||||
if [ -d $directory ]; then
|
||||
echo "Crash reports detected:"
|
||||
cat $directory/*
|
||||
exit 1
|
||||
else
|
||||
echo "No crash reports detected"
|
||||
exit 0
|
||||
fi
|
||||
@@ -0,0 +1,33 @@
|
||||
#!/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
|
||||
|
||||
@@ -14,32 +14,32 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
with:
|
||||
with:
|
||||
fetch-depth: 0
|
||||
|
||||
|
||||
- name: Set up JDK 8
|
||||
uses: actions/setup-java@v2
|
||||
with:
|
||||
java-version: '8'
|
||||
distribution: 'adopt'
|
||||
cache: gradle
|
||||
|
||||
|
||||
- name: Grant execute permission for gradlew
|
||||
run: chmod +x gradlew
|
||||
|
||||
- name: Setup the workspace
|
||||
run: ./gradlew setupDecompWorkspace
|
||||
|
||||
run: ./gradlew setupCIWorkspace
|
||||
|
||||
- name: Build the mod
|
||||
run: ./gradlew build
|
||||
|
||||
- name: Run server for 1 minute
|
||||
- name: Run server for 1.5 minutes
|
||||
run: |
|
||||
mkdir run
|
||||
echo "eula=true" > run/eula.txt
|
||||
timeout 60 ./gradlew runServer || true
|
||||
echo "eula=true" > run/eula.txt
|
||||
timeout 90 ./gradlew runServer 2>&1 | tee -a server.log || true
|
||||
|
||||
- name: Test no crashes happend
|
||||
- name: Test no errors reported during server run
|
||||
run: |
|
||||
chmod +x .github/scripts/test-no-crash-reports.sh
|
||||
.github/scripts/test-no-crash-reports.sh
|
||||
chmod +x .github/scripts/test-no-error-reports.sh
|
||||
.github/scripts/test-no-error-reports.sh
|
||||
+74
-64
@@ -1,11 +1,14 @@
|
||||
//version: 1643844119
|
||||
//version: 1644612407
|
||||
/*
|
||||
DO NOT CHANGE THIS FILE!
|
||||
|
||||
Also, you may replace this file at any time if there is an update available.
|
||||
Please check https://github.com/GTNewHorizons/ExampleMod1.7.10/blob/main/build.gradle for updates.
|
||||
*/
|
||||
*/
|
||||
|
||||
import org.gradle.internal.logging.text.StyledTextOutput
|
||||
import org.gradle.internal.logging.text.StyledTextOutputFactory
|
||||
import org.gradle.internal.logging.text.StyledTextOutput.Style
|
||||
|
||||
import com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocation
|
||||
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
|
||||
@@ -15,20 +18,20 @@ import java.util.concurrent.TimeUnit
|
||||
buildscript {
|
||||
repositories {
|
||||
maven {
|
||||
name = "forge"
|
||||
url = "https://maven.minecraftforge.net"
|
||||
name 'forge'
|
||||
url 'https://maven.minecraftforge.net'
|
||||
}
|
||||
maven {
|
||||
name = "sonatype"
|
||||
url = "https://oss.sonatype.org/content/repositories/snapshots/"
|
||||
name 'sonatype'
|
||||
url 'https://oss.sonatype.org/content/repositories/snapshots/'
|
||||
}
|
||||
maven {
|
||||
name = "Scala CI dependencies"
|
||||
url = "https://repo1.maven.org/maven2/"
|
||||
name 'Scala CI dependencies'
|
||||
url 'https://repo1.maven.org/maven2/'
|
||||
}
|
||||
maven {
|
||||
name = "jitpack"
|
||||
url = "https://jitpack.io"
|
||||
name 'jitpack'
|
||||
url 'https://jitpack.io'
|
||||
}
|
||||
}
|
||||
dependencies {
|
||||
@@ -37,21 +40,26 @@ buildscript {
|
||||
}
|
||||
|
||||
plugins {
|
||||
id 'java-library'
|
||||
id 'idea'
|
||||
id 'eclipse'
|
||||
id 'scala'
|
||||
id('org.jetbrains.kotlin.jvm') version ('1.6.10') apply false
|
||||
id('org.ajoberstar.grgit') version('4.1.1')
|
||||
id('com.github.johnrengelman.shadow') version('4.0.4')
|
||||
id('com.palantir.git-version') version('0.13.0') apply false
|
||||
id('de.undercouch.download') version('5.0.1')
|
||||
id('maven-publish')
|
||||
id 'maven-publish'
|
||||
id 'org.jetbrains.kotlin.jvm' version '1.5.30' apply false
|
||||
id 'org.jetbrains.kotlin.kapt' version '1.5.30' apply false
|
||||
id 'org.ajoberstar.grgit' version '4.1.1'
|
||||
id 'com.github.johnrengelman.shadow' version '4.0.4'
|
||||
id 'com.palantir.git-version' version '0.13.0' apply false
|
||||
id 'de.undercouch.download' version '5.0.1'
|
||||
id 'com.github.gmazzo.buildconfig' version '3.0.3' apply false
|
||||
}
|
||||
|
||||
if (project.file('.git/HEAD').isFile()) {
|
||||
apply plugin: 'com.palantir.git-version'
|
||||
}
|
||||
|
||||
def out = services.get(StyledTextOutputFactory).create('an-output')
|
||||
|
||||
apply plugin: 'forge'
|
||||
|
||||
def projectJavaVersion = JavaLanguageVersion.of(8)
|
||||
@@ -168,7 +176,7 @@ try {
|
||||
'git config core.fileMode false'.execute()
|
||||
}
|
||||
catch (Exception e) {
|
||||
logger.error("\u001B[31mgit isn't installed at all\u001B[0m")
|
||||
out.style(Style.Failure).println("git isn't installed at all")
|
||||
}
|
||||
|
||||
// Pulls version first from the VERSION env and then git tag
|
||||
@@ -178,18 +186,21 @@ try {
|
||||
identifiedVersion = versionOverride == null ? gitVersion() : versionOverride
|
||||
}
|
||||
catch (Exception e) {
|
||||
logger.error("\n\u001B[1;31mThis mod must be version controlled by Git AND the repository must provide at least one tag,\n" +
|
||||
"or the VERSION override must be set! \u001B[32m(Don't download from GitHub using the ZIP option, instead\n" +
|
||||
"clone the repository, see\u001B[33m https://gtnh.miraheze.org/wiki/Development \u001B[32mfor details.)\u001B[0m\n");
|
||||
out.style(Style.Failure).text(
|
||||
'This mod must be version controlled by Git AND the repository must provide at least one tag,\n' +
|
||||
'or the VERSION override must be set! ').style(Style.SuccessHeader).text('(Do NOT download from GitHub using the ZIP option, instead\n' +
|
||||
'clone the repository, see ').style(Style.Info).text('https://gtnh.miraheze.org/wiki/Development').style(Style.SuccessHeader).println(' for details.)'
|
||||
)
|
||||
versionOverride = 'NO-GIT-TAG-SET'
|
||||
identifiedVersion = versionOverride
|
||||
}
|
||||
version = minecraftVersion + '-' + identifiedVersion
|
||||
String modVersion = identifiedVersion
|
||||
ext {
|
||||
modVersion = identifiedVersion
|
||||
}
|
||||
|
||||
if( identifiedVersion.equals(versionOverride) ) {
|
||||
logger.error('\u001B[31m\u001B[7mWe hope you know what you\'re doing using\u001B[0m\u001B[1;34m ' + modVersion + '\u001B[0m\n');
|
||||
logger.error('\7\u001B[31mGoing to blindly try to use\u001B[1;34m ' + modVersion + '\u001B[0m\u001B[31m, this probably won\'t work the way you expect!!\u001B[0m\n');
|
||||
out.style(Style.Failure).text('Override version to ').style(Style.Identifier).text(modVersion).style(Style.Failure).println('!\7')
|
||||
}
|
||||
|
||||
group = modGroup
|
||||
@@ -200,7 +211,6 @@ else {
|
||||
archivesBaseName = modId
|
||||
}
|
||||
|
||||
|
||||
def arguments = []
|
||||
def jvmArguments = []
|
||||
|
||||
@@ -214,8 +224,8 @@ if(usesMixins.toBoolean()) {
|
||||
}
|
||||
|
||||
minecraft {
|
||||
version = minecraftVersion + "-" + forgeVersion + "-" + minecraftVersion
|
||||
runDir = "run"
|
||||
version = minecraftVersion + '-' + forgeVersion + '-' + minecraftVersion
|
||||
runDir = 'run'
|
||||
|
||||
if (replaceGradleTokenInFile) {
|
||||
replaceIn replaceGradleTokenInFile
|
||||
@@ -248,8 +258,8 @@ minecraft {
|
||||
}
|
||||
}
|
||||
|
||||
if(file("addon.gradle").exists()) {
|
||||
apply from: "addon.gradle"
|
||||
if(file('addon.gradle').exists()) {
|
||||
apply from: 'addon.gradle'
|
||||
}
|
||||
|
||||
apply from: 'repositories.gradle'
|
||||
@@ -262,42 +272,42 @@ configurations {
|
||||
|
||||
repositories {
|
||||
maven {
|
||||
name = "Overmind forge repo mirror"
|
||||
url = "https://gregtech.overminddl1.com/"
|
||||
name 'Overmind forge repo mirror'
|
||||
url 'https://gregtech.overminddl1.com/'
|
||||
}
|
||||
if(usesMixins.toBoolean()) {
|
||||
maven {
|
||||
name = "sponge"
|
||||
url = "https://repo.spongepowered.org/repository/maven-public"
|
||||
name 'sponge'
|
||||
url 'https://repo.spongepowered.org/repository/maven-public'
|
||||
}
|
||||
maven {
|
||||
url = "https://jitpack.io"
|
||||
url 'https://jitpack.io'
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
if(usesMixins.toBoolean()) {
|
||||
annotationProcessor("org.ow2.asm:asm-debug-all:5.0.3")
|
||||
annotationProcessor("com.google.guava:guava:24.1.1-jre")
|
||||
annotationProcessor("com.google.code.gson:gson:2.8.6")
|
||||
annotationProcessor("org.spongepowered:mixin:0.8-SNAPSHOT")
|
||||
annotationProcessor('org.ow2.asm:asm-debug-all:5.0.3')
|
||||
annotationProcessor('com.google.guava:guava:24.1.1-jre')
|
||||
annotationProcessor('com.google.code.gson:gson:2.8.6')
|
||||
annotationProcessor('org.spongepowered:mixin:0.8-SNAPSHOT')
|
||||
// using 0.8 to workaround a issue in 0.7 which fails mixin application
|
||||
compile("com.github.GTNewHorizons:SpongePoweredMixin:0.7.12-GTNH") {
|
||||
compile('com.github.GTNewHorizons:SpongePoweredMixin:0.7.12-GTNH') {
|
||||
// Mixin includes a lot of dependencies that are too up-to-date
|
||||
exclude module: "launchwrapper"
|
||||
exclude module: "guava"
|
||||
exclude module: "gson"
|
||||
exclude module: "commons-io"
|
||||
exclude module: "log4j-core"
|
||||
exclude module: 'launchwrapper'
|
||||
exclude module: 'guava'
|
||||
exclude module: 'gson'
|
||||
exclude module: 'commons-io'
|
||||
exclude module: 'log4j-core'
|
||||
}
|
||||
compile("com.github.GTNewHorizons:SpongeMixins:1.5.0")
|
||||
compile('com.github.GTNewHorizons:SpongeMixins:1.5.0')
|
||||
}
|
||||
}
|
||||
|
||||
apply from: 'dependencies.gradle'
|
||||
|
||||
def mixingConfigRefMap = "mixins." + modId + ".refmap.json"
|
||||
def mixingConfigRefMap = 'mixins.' + modId + '.refmap.json'
|
||||
def refMap = "${tasks.compileJava.temporaryDir}" + File.separator + mixingConfigRefMap
|
||||
def mixinSrg = "${tasks.reobf.temporaryDir}" + File.separator + "mixins.srg"
|
||||
|
||||
@@ -401,17 +411,16 @@ tasks.withType(JavaExec).configureEach {
|
||||
)
|
||||
}
|
||||
|
||||
processResources
|
||||
{
|
||||
processResources {
|
||||
// this will ensure that this task is redone when the versions change.
|
||||
inputs.property "version", project.version
|
||||
inputs.property "mcversion", project.minecraft.version
|
||||
|
||||
|
||||
// replace stuff in mcmod.info, nothing else
|
||||
from(sourceSets.main.resources.srcDirs) {
|
||||
include 'mcmod.info'
|
||||
|
||||
// replace version and mcversion
|
||||
// replace modVersion and minecraftVersion
|
||||
expand "minecraftVersion": project.minecraft.version,
|
||||
"modVersion": modVersion,
|
||||
"modId": modId,
|
||||
@@ -422,7 +431,7 @@ processResources
|
||||
from refMap
|
||||
}
|
||||
|
||||
// copy everything else, thats not the mcmod.info
|
||||
// copy everything else that's not the mcmod.info
|
||||
from(sourceSets.main.resources.srcDirs) {
|
||||
exclude 'mcmod.info'
|
||||
}
|
||||
@@ -533,14 +542,12 @@ artifacts {
|
||||
}
|
||||
}
|
||||
|
||||
// The gradle metadata includes all of the additional deps that we disabled from POM generation (including forgeBin with no groupID),
|
||||
// The gradle metadata includes all of the additional deps that we disabled from POM generation (including forgeBin with no groupID),
|
||||
// and isn't strictly needed with the POM so just disable it.
|
||||
tasks.withType(GenerateModuleMetadata) {
|
||||
enabled = false
|
||||
}
|
||||
|
||||
|
||||
// publishing
|
||||
publishing {
|
||||
publications {
|
||||
maven(MavenPublication) {
|
||||
@@ -560,14 +567,17 @@ publishing {
|
||||
artifactId = System.getenv("ARTIFACT_ID") ?: project.name
|
||||
// Using the identified version, not project.version as it has the prepended 1.7.10
|
||||
version = System.getenv("RELEASE_VERSION") ?: identifiedVersion
|
||||
|
||||
// Remove all non GTNH deps here.
|
||||
// Original intention was to remove an invalid forgeBin being generated without a groupId (mandatory), but
|
||||
// it also removes all of the MC deps
|
||||
|
||||
// remove extra garbage from who knows where
|
||||
pom.withXml {
|
||||
def badPomGroup = ['net.minecraft', 'com.google.code.findbugs', 'org.ow2.asm', 'com.typesafe.akka', 'com.typesafe', 'org.scala-lang',
|
||||
'org.scala-lang.plugins', 'net.sf.jopt-simple', 'lzma', 'com.mojang', 'org.apache.commons', 'org.apache.httpcomponents',
|
||||
'commons-logging', 'java3d', 'net.sf.trove4j', 'com.ibm.icu', 'com.paulscode', 'io.netty', 'com.google.guava',
|
||||
'commons-io', 'commons-codec', 'net.java.jinput', 'net.java.jutils', 'com.google.code.gson', 'org.apache.logging.log4j',
|
||||
'org.lwjgl.lwjgl', 'tv.twitch', 'org.jetbrains.kotlin', '']
|
||||
Node pomNode = asNode()
|
||||
pomNode.dependencies.'*'.findAll() {
|
||||
it.groupId.text() != 'com.github.GTNewHorizons'
|
||||
badPomGroup.contains(it.groupId.text())
|
||||
}.each() {
|
||||
it.parent().remove(it)
|
||||
}
|
||||
@@ -599,7 +609,7 @@ if (isNewBuildScriptVersionAvailable(projectDir.toString())) {
|
||||
if (autoUpdateBuildScript.toBoolean()) {
|
||||
performBuildScriptUpdate(projectDir.toString())
|
||||
} else {
|
||||
println("Build script update available! Run 'gradle updateBuildScript'")
|
||||
out.style(Style.SuccessHeader).println("Build script update available! Run 'gradle updateBuildScript'")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -611,7 +621,7 @@ boolean performBuildScriptUpdate(String projectDir) {
|
||||
if (isNewBuildScriptVersionAvailable(projectDir)) {
|
||||
def buildscriptFile = getFile("build.gradle")
|
||||
availableBuildScriptUrl().withInputStream { i -> buildscriptFile.withOutputStream { it << i } }
|
||||
print("Build script updated. Please REIMPORT the project or RESTART your IDE!")
|
||||
out.style(Style.Success).print("Build script updated. Please REIMPORT the project or RESTART your IDE!")
|
||||
return true
|
||||
}
|
||||
return false
|
||||
@@ -673,26 +683,26 @@ def deobf(String sourceURL) {
|
||||
}
|
||||
}
|
||||
|
||||
// The method above is to be prefered. Use this method if the filename is not at the end of the URL.
|
||||
// The method above is to be preferred. Use this method if the filename is not at the end of the URL.
|
||||
def deobf(String sourceURL, String fileName) {
|
||||
String cacheDir = System.getProperty("user.home") + "/.gradle/caches/"
|
||||
String bon2Dir = cacheDir + "forge_gradle/deobf"
|
||||
String bon2File = bon2Dir + "/BON2-2.5.0.jar"
|
||||
String obfFile = cacheDir + "modules-2/files-2.1/" + fileName + ".jar"
|
||||
String deobfFile = cacheDir + "modules-2/files-2.1/" + fileName + "-deobf.jar"
|
||||
|
||||
|
||||
if(file(deobfFile).exists()) {
|
||||
return files(deobfFile)
|
||||
}
|
||||
|
||||
download {
|
||||
download.run {
|
||||
src 'https://github.com/GTNewHorizons/BON2/releases/download/2.5.0/BON2-2.5.0.CUSTOM-all.jar'
|
||||
dest bon2File
|
||||
quiet true
|
||||
overwrite false
|
||||
}
|
||||
|
||||
download {
|
||||
download.run {
|
||||
src sourceURL
|
||||
dest obfFile
|
||||
quiet true
|
||||
|
||||
+19
-46
@@ -1,51 +1,24 @@
|
||||
// Add your dependencies here
|
||||
|
||||
dependencies {
|
||||
compile("com.github.GTNewHorizons:CodeChickenLib:1.1.5.3:dev")
|
||||
compile("com.github.GTNewHorizons:CodeChickenCore:1.1.3:dev")
|
||||
compile("com.github.GTNewHorizons:EnderCore:0.2.6:dev")
|
||||
compile("com.github.GTNewHorizons:ForestryMC:4.4.5:dev")
|
||||
compile("com.github.GTNewHorizons:NotEnoughItems:2.2.5-GTNH:dev")
|
||||
compile("curse.maven:cofh-lib-220333:2388748")
|
||||
compile("com.github.GTNewHorizons:BuildCraft:7.1.26:dev")
|
||||
shadowImplementation("cglib:cglib-nodep:3.3.0")
|
||||
compile('com.github.GTNewHorizons:EnderCore:0.2.6:dev')
|
||||
compile('com.github.GTNewHorizons:ForestryMC:4.4.5:dev')
|
||||
compile('com.github.GTNewHorizons:NotEnoughItems:2.2.7-GTNH:dev')
|
||||
compile('com.github.GTNewHorizons:BuildCraft:7.1.27:dev')
|
||||
compile('curse.maven:cofh-lib-220333:2388748') // https://www.curseforge.com/minecraft/mc-mods/cofh-lib/files/2388748
|
||||
shadowImplementation('cglib:cglib-nodep:3.3.0')
|
||||
|
||||
compileOnly("com.github.GTNewHorizons:waila:1.5.18:api") {
|
||||
transitive = false
|
||||
}
|
||||
compileOnly("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-75-GTNH:api") {
|
||||
transitive = false
|
||||
}
|
||||
compileOnly("com.github.GTNewHorizons:Baubles:1.0.1.14:dev") {
|
||||
transitive = false
|
||||
}
|
||||
compileOnly("com.github.GTNewHorizons:Railcraft:9.13.5:api") {
|
||||
transitive = false
|
||||
}
|
||||
compileOnly("com.github.GTNewHorizons:StorageDrawers:1.11.11-GTNH:api") {
|
||||
transitive = false
|
||||
}
|
||||
compileOnly("com.github.GTNewHorizons:Chisel:2.10.8-GTNH:dev") {
|
||||
transitive = false
|
||||
}
|
||||
compileOnly("com.github.GTNewHorizons:OpenComputers:1.7.5.21-GTNH:api") {
|
||||
transitive = false
|
||||
}
|
||||
|
||||
compileOnly("curse.maven:minefactory-reloaded-66672:2366150") {
|
||||
transitive = false
|
||||
}
|
||||
compileOnly("curse.maven:computercraft-67504:2269339") { // https://www.curseforge.com/minecraft/mc-mods/computercraft/files/2269339
|
||||
transitive = false
|
||||
}
|
||||
compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") {
|
||||
transitive = false
|
||||
}
|
||||
compileOnly("curse.maven:mekanism-268560:2475797") { // https://www.curseforge.com/minecraft/mc-mods/mekanism/files/2475797
|
||||
transitive = false
|
||||
}
|
||||
compileOnly("curse.maven:ee3-65509:2305023") { // https://www.curseforge.com/minecraft/mc-mods/ee3/files/2305023
|
||||
transitive = false
|
||||
}
|
||||
compileOnly files("dependencies/immibis-microblocks-59.1.2.jar")
|
||||
compileOnly('com.github.GTNewHorizons:waila:1.5.19:api') {transitive = false}
|
||||
compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-76-GTNH:api') {transitive = false}
|
||||
compileOnly('com.github.GTNewHorizons:Baubles:1.0.1.14:dev') {transitive = false}
|
||||
compileOnly('com.github.GTNewHorizons:Railcraft:9.13.6:api') {transitive = false}
|
||||
compileOnly('com.github.GTNewHorizons:StorageDrawers:1.11.13-GTNH:api') {transitive = false}
|
||||
compileOnly('com.github.GTNewHorizons:Chisel:2.10.8-GTNH:dev') {transitive = false}
|
||||
compileOnly('com.github.GTNewHorizons:OpenComputers:1.7.5.23-GTNH:api') {transitive = false}
|
||||
compileOnly('curse.maven:minefactory-reloaded-66672:2366150') // https://www.curseforge.com/minecraft/mc-mods/minefactory-reloaded/files/2366150
|
||||
compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev')
|
||||
compileOnly('curse.maven:ee3-65509:2305023') // https://www.curseforge.com/minecraft/mc-mods/ee3/files/2305023
|
||||
compileOnly(deobf('https://media.forgecdn.net/files/2269/339/ComputerCraft1.75.jar')) // https://www.curseforge.com/minecraft/mc-mods/computercraft/files/2269339
|
||||
compileOnly(deobf('https://s3.amazonaws.com/aidancbrady/mekanism/281-recommended/Mekanism-1.7.10-9.1.0.281.jar')) // https://aidancbrady.com/mekanism/download/
|
||||
compileOnly(deobf('https://immibis.com/mcmoddl/files/immibis-microblocks-59.1.2.jar'))
|
||||
}
|
||||
BIN
Binary file not shown.
+9
-13
@@ -2,29 +2,25 @@
|
||||
|
||||
repositories {
|
||||
maven {
|
||||
name = "GTNH Maven"
|
||||
url = "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
|
||||
name 'GTNH Maven'
|
||||
url 'http://jenkins.usrv.eu:8081/nexus/content/groups/public/'
|
||||
allowInsecureProtocol
|
||||
}
|
||||
maven {
|
||||
name = "ic2"
|
||||
url = "http://maven.ic2.player.to/"
|
||||
name 'ic2'
|
||||
url 'http://maven.ic2.player.to/'
|
||||
metadataSources {
|
||||
mavenPom()
|
||||
artifact()
|
||||
}
|
||||
}
|
||||
maven {
|
||||
name "OpenComputers Repo"
|
||||
url = "http://maven.cil.li/"
|
||||
metadataSources {
|
||||
mavenPom()
|
||||
artifact()
|
||||
url 'https://cursemaven.com'
|
||||
content {
|
||||
includeGroup 'curse.maven'
|
||||
}
|
||||
}
|
||||
maven {
|
||||
url "https://cursemaven.com"
|
||||
}
|
||||
maven {
|
||||
url = "https://jitpack.io"
|
||||
url = 'https://jitpack.io'
|
||||
}
|
||||
}
|
||||
@@ -386,6 +386,13 @@ public final class Config {
|
||||
public static int poweredSpawnerLevelOnePowerPerTickRF = 160;
|
||||
public static int poweredSpawnerLevelTwoPowerPerTickRF = 500;
|
||||
public static int poweredSpawnerLevelThreePowerPerTickRF = 1500;
|
||||
public static int poweredSpawnerLevelFourPowerPerTickRF = 4500;
|
||||
public static int poweredSpawnerLevelFivePowerPerTickRF = 2000;
|
||||
public static int poweredSpawnerLevelSixPowerPerTickRF = 1000;
|
||||
public static int poweredSpawnerLevelSevenPowerPerTickRF = 500;
|
||||
public static int poweredSpawnerLevelEightPowerPerTickRF = 160;
|
||||
public static int poweredSpawnerLevelNinePowerPerTickRF = 500;
|
||||
public static int poweredSpawnerLevelTenPowerPerTickRF = 1500;
|
||||
public static int poweredSpawnerMaxPlayerDistance = 0;
|
||||
public static int poweredSpawnerDespawnTimeSeconds = 120;
|
||||
public static int poweredSpawnerSpawnCount = 4;
|
||||
@@ -439,6 +446,13 @@ public final class Config {
|
||||
public static int soulBinderLevelOnePowerPerTickRF = 500;
|
||||
public static int soulBinderLevelTwoPowerPerTickRF = 1000;
|
||||
public static int soulBinderLevelThreePowerPerTickRF = 2000;
|
||||
public static int soulBinderLevelFourPowerPerTickRF = 4000;
|
||||
public static int soulBinderLevelFivePowerPerTickRF = 8000;
|
||||
public static int soulBinderLevelSixPowerPerTickRF = 16000;
|
||||
public static int soulBinderLevelSevenPowerPerTickRF = 32000;
|
||||
public static int soulBinderLevelEightPowerPerTickRF = 500;
|
||||
public static int soulBinderLevelNinePowerPerTickRF = 1000;
|
||||
public static int soulBinderLevelTenPowerPerTickRF = 2000;
|
||||
public static int soulBinderBrokenSpawnerRF = 2500000;
|
||||
public static int soulBinderBrokenSpawnerLevels = 15;
|
||||
public static int soulBinderReanimationRF = 100000;
|
||||
@@ -463,6 +477,13 @@ public final class Config {
|
||||
public static int sliceAndSpliceLevelOnePowerPerTickRF = 80;
|
||||
public static int sliceAndSpliceLevelTwoPowerPerTickRF = 160;
|
||||
public static int sliceAndSpliceLevelThreePowerPerTickRF = 320;
|
||||
public static int sliceAndSpliceLevelFourPowerPerTickRF = 640;
|
||||
public static int sliceAndSpliceLevelFivePowerPerTickRF = 1280;
|
||||
public static int sliceAndSpliceLevelSixPowerPerTickRF = 2560;
|
||||
public static int sliceAndSpliceLevelSevenPowerPerTickRF = 5120;
|
||||
public static int sliceAndSpliceLevelEightPowerPerTickRF = 80;
|
||||
public static int sliceAndSpliceLevelNinePowerPerTickRF = 160;
|
||||
public static int sliceAndSpliceLevelTenPowerPerTickRF = 320;
|
||||
|
||||
public static boolean soulBinderRequiresEndermanSkull = true;
|
||||
|
||||
@@ -1231,6 +1252,27 @@ public final class Config {
|
||||
poweredSpawnerLevelThreePowerPerTickRF = config.get(sectionSpawner.name, "poweredSpawnerLevelThreePowerPerTickRF",
|
||||
poweredSpawnerLevelThreePowerPerTickRF,
|
||||
"RF per tick for a level 3 spawner").getInt(poweredSpawnerLevelThreePowerPerTickRF);
|
||||
poweredSpawnerLevelFourPowerPerTickRF = config.get(sectionSpawner.name, "poweredSpawnerLevelFourPowerPerTickRF",
|
||||
poweredSpawnerLevelFourPowerPerTickRF,
|
||||
"RF per tick for a level 4 spawner").getInt(poweredSpawnerLevelFourPowerPerTickRF);
|
||||
poweredSpawnerLevelFivePowerPerTickRF = config.get(sectionSpawner.name, "poweredSpawnerLevelFivePowerPerTickRF",
|
||||
poweredSpawnerLevelFivePowerPerTickRF,
|
||||
"RF per tick for a level 5 spawner").getInt(poweredSpawnerLevelFivePowerPerTickRF);
|
||||
poweredSpawnerLevelSixPowerPerTickRF = config.get(sectionSpawner.name, "poweredSpawnerLevelSixPowerPerTickRF",
|
||||
poweredSpawnerLevelSixPowerPerTickRF,
|
||||
"RF per tick for a level 6 spawner").getInt(poweredSpawnerLevelSixPowerPerTickRF);
|
||||
poweredSpawnerLevelSevenPowerPerTickRF = config.get(sectionSpawner.name, "poweredSpawnerLevelSevenPowerPerTickRF",
|
||||
poweredSpawnerLevelSevenPowerPerTickRF,
|
||||
"RF per tick for a level 7 spawner").getInt(poweredSpawnerLevelSevenPowerPerTickRF);
|
||||
poweredSpawnerLevelEightPowerPerTickRF = config.get(sectionSpawner.name, "poweredSpawnerLevelEightPowerPerTickRF",
|
||||
poweredSpawnerLevelEightPowerPerTickRF,
|
||||
"RF per tick for a level 1 spawner").getInt(poweredSpawnerLevelEightPowerPerTickRF);
|
||||
poweredSpawnerLevelNinePowerPerTickRF = config.get(sectionSpawner.name, "poweredSpawnerLevelNinePowerPerTickRF",
|
||||
poweredSpawnerLevelNinePowerPerTickRF,
|
||||
"RF per tick for a level 2 spawner").getInt(poweredSpawnerLevelNinePowerPerTickRF);
|
||||
poweredSpawnerLevelTenPowerPerTickRF = config.get(sectionSpawner.name, "poweredSpawnerLevelTenPowerPerTickRF",
|
||||
poweredSpawnerLevelTenPowerPerTickRF,
|
||||
"RF per tick for a level 3 spawner").getInt(poweredSpawnerLevelTenPowerPerTickRF);
|
||||
poweredSpawnerMaxPlayerDistance = config.get(sectionSpawner.name, "poweredSpawnerMaxPlayerDistance", poweredSpawnerMaxPlayerDistance,
|
||||
"Max distance of the closest player for the spawner to be active. A zero value will remove the player check").getInt(poweredSpawnerMaxPlayerDistance);
|
||||
poweredSpawnerDespawnTimeSeconds = config.get(sectionSpawner.name, "poweredSpawnerDespawnTimeSeconds" , poweredSpawnerDespawnTimeSeconds,
|
||||
@@ -1303,9 +1345,23 @@ public final class Config {
|
||||
soulBinderLevelOnePowerPerTickRF = config.get(sectionSoulBinder.name, "soulBinderLevelOnePowerPerTickRF", soulBinderLevelOnePowerPerTickRF,
|
||||
"The number of RF/t consumed by an unupgraded soul binder.").getInt(soulBinderLevelOnePowerPerTickRF);
|
||||
soulBinderLevelTwoPowerPerTickRF = config.get(sectionSoulBinder.name, "soulBinderLevelTwoPowerPerTickRF", soulBinderLevelTwoPowerPerTickRF,
|
||||
"The number of RF/t consumed by a soul binder with a double layer capacitor upgrade.").getInt(soulBinderLevelTwoPowerPerTickRF);
|
||||
"The number of RF/t consumed by a soul binder with a double layer capacitor or a endergetic capacitor upgrade.").getInt(soulBinderLevelTwoPowerPerTickRF);
|
||||
soulBinderLevelThreePowerPerTickRF = config.get(sectionSoulBinder.name, "soulBinderLevelThreePowerPerTickRF", soulBinderLevelThreePowerPerTickRF,
|
||||
"The number of RF/t consumed by a soul binder with an octadic capacitor upgrade.").getInt(soulBinderLevelThreePowerPerTickRF);
|
||||
"The number of RF/t consumed by a soul binder with an octadic capacitor or a endergised upgrade.").getInt(soulBinderLevelThreePowerPerTickRF);
|
||||
soulBinderLevelFourPowerPerTickRF = config.get(sectionSoulBinder.name, "soulBinderLevelFourPowerPerTickRF", soulBinderLevelFourPowerPerTickRF,
|
||||
"The number of RF/t consumed by a soul binder with an crystalline capacitor upgrade.").getInt(soulBinderLevelFourPowerPerTickRF);
|
||||
soulBinderLevelFivePowerPerTickRF = config.get(sectionSoulBinder.name, "soulBinderLevelFivePowerPerTickRF", soulBinderLevelFivePowerPerTickRF,
|
||||
"The number of RF/t consumed by a soul binder with an melodic capacitor upgrade.").getInt(soulBinderLevelFivePowerPerTickRF);
|
||||
soulBinderLevelSixPowerPerTickRF = config.get(sectionSoulBinder.name, "soulBinderLevelSixPowerPerTickRF", soulBinderLevelSixPowerPerTickRF,
|
||||
"The number of RF/t consumed by a soul binder with an stellar capacitor upgrade.").getInt(soulBinderLevelSixPowerPerTickRF);
|
||||
soulBinderLevelSevenPowerPerTickRF = config.get(sectionSoulBinder.name, "soulBinderLevelSevenPowerPerTickRF", soulBinderLevelSevenPowerPerTickRF,
|
||||
"The number of RF/t consumed by a soul binder with an totemic capacitor upgrade.").getInt(soulBinderLevelSevenPowerPerTickRF);
|
||||
soulBinderLevelEightPowerPerTickRF = config.get(sectionSoulBinder.name, "soulBinderLevelEightPowerPerTickRF", soulBinderLevelEightPowerPerTickRF,
|
||||
"The number of RF/t consumed by a soul binder with an silver capacitor upgrade.").getInt(soulBinderLevelEightPowerPerTickRF);
|
||||
soulBinderLevelNinePowerPerTickRF = config.get(sectionSoulBinder.name, "soulBinderLevelNinePowerPerTickRF", soulBinderLevelNinePowerPerTickRF,
|
||||
"The number of RF/t consumed by a soul binder with an endergetic capacitor upgrade.").getInt(soulBinderLevelNinePowerPerTickRF);
|
||||
soulBinderLevelTenPowerPerTickRF = config.get(sectionSoulBinder.name, "soulBinderLevelTenPowerPerTickRF", soulBinderLevelTenPowerPerTickRF,
|
||||
"The number of RF/t consumed by a soul binder with an endergised capacitor upgrade.").getInt(soulBinderLevelTenPowerPerTickRF);
|
||||
soulBinderBrokenSpawnerRF = config.get(sectionSoulBinder.name, "soulBinderBrokenSpawnerRF", soulBinderBrokenSpawnerRF,
|
||||
"The number of RF required to change the type of a broken spawner.").getInt(soulBinderBrokenSpawnerRF);
|
||||
soulBinderReanimationRF = config.get(sectionSoulBinder.name, "soulBinderReanimationRF", soulBinderReanimationRF,
|
||||
@@ -1341,6 +1397,21 @@ public final class Config {
|
||||
"The number of RF/t consumed by a Slice'N'Splice with a double layer capacitor upgrade.").getInt(sliceAndSpliceLevelTwoPowerPerTickRF);
|
||||
sliceAndSpliceLevelThreePowerPerTickRF = config.get(sectionPower.name, "sliceAndSpliceLevelThreePowerPerTickRF", sliceAndSpliceLevelThreePowerPerTickRF,
|
||||
"The number of RF/t consumed by a Slice'N'Splice with an octadic capacitor upgrade.").getInt(sliceAndSpliceLevelThreePowerPerTickRF);
|
||||
sliceAndSpliceLevelFourPowerPerTickRF = config.get(sectionPower.name, "sliceAndSpliceLevelFourPowerPerTickRF", sliceAndSpliceLevelFourPowerPerTickRF,
|
||||
"The number of RF/t consumed by a Slice'N'Splice with an crystalline capacitor upgrade.").getInt(sliceAndSpliceLevelFourPowerPerTickRF);
|
||||
sliceAndSpliceLevelFivePowerPerTickRF = config.get(sectionPower.name, "sliceAndSpliceLevelFivePowerPerTickRF", sliceAndSpliceLevelFivePowerPerTickRF,
|
||||
"The number of RF/t consumed by a Slice'N'Splice with an melodic capacitor upgrade.").getInt(sliceAndSpliceLevelFivePowerPerTickRF);
|
||||
sliceAndSpliceLevelSixPowerPerTickRF = config.get(sectionPower.name, "sliceAndSpliceLevelSixPowerPerTickRF", sliceAndSpliceLevelSixPowerPerTickRF,
|
||||
"The number of RF/t consumed by a Slice'N'Splice with an stellar capacitor upgrade.").getInt(sliceAndSpliceLevelSixPowerPerTickRF);
|
||||
sliceAndSpliceLevelSevenPowerPerTickRF = config.get(sectionPower.name, "sliceAndSpliceLevelSevenPowerPerTickRF", sliceAndSpliceLevelSevenPowerPerTickRF,
|
||||
"The number of RF/t consumed by a Slice'N'Splice with an totemic capacitor upgrade.").getInt(sliceAndSpliceLevelSevenPowerPerTickRF);
|
||||
sliceAndSpliceLevelEightPowerPerTickRF = config.get(sectionPower.name, "sliceAndSpliceLevelEightPowerPerTickRF", sliceAndSpliceLevelEightPowerPerTickRF,
|
||||
"The number of RF/t consumed by a Slice'N'Splice with an silver capacitor upgrade.").getInt(sliceAndSpliceLevelEightPowerPerTickRF);
|
||||
sliceAndSpliceLevelNinePowerPerTickRF = config.get(sectionPower.name, "sliceAndSpliceLevelNinePowerPerTickRF", sliceAndSpliceLevelNinePowerPerTickRF,
|
||||
"The number of RF/t consumed by a Slice'N'Splice with an endergetic capacitor upgrade.").getInt(sliceAndSpliceLevelNinePowerPerTickRF);
|
||||
sliceAndSpliceLevelTenPowerPerTickRF = config.get(sectionPower.name, "sliceAndSpliceLevelTenPowerPerTickRF", sliceAndSpliceLevelTenPowerPerTickRF,
|
||||
"The number of RF/t consumed by a Slice'N'Splice with an endergised capacitor upgrade.").getInt(sliceAndSpliceLevelTenPowerPerTickRF);
|
||||
|
||||
|
||||
attractorRangeLevelOne = config.get(sectionAttractor.name, "attractorRangeLevelOne", attractorRangeLevelOne,
|
||||
"The range of the mob attractor with no upgrades").getInt(attractorRangeLevelOne);
|
||||
|
||||
@@ -1,8 +1,5 @@
|
||||
package crazypants.enderio.machine.farm;
|
||||
|
||||
import java.util.Iterator;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.init.Items;
|
||||
@@ -38,7 +35,9 @@ public final class FarmersRegistry {
|
||||
addIC2();
|
||||
addThaumcraft();
|
||||
addFlowers();
|
||||
ForestryFarmer.init();
|
||||
if (Loader.isModLoaded("Forestry")) {
|
||||
ForestryFarmer.init();
|
||||
}
|
||||
|
||||
FarmersCommune.joinCommune(new StemFarmer(Blocks.reeds, new ItemStack(Items.reeds)));
|
||||
FarmersCommune.joinCommune(new StemFarmer(Blocks.cactus, new ItemStack(Blocks.cactus)));
|
||||
|
||||
@@ -92,16 +92,20 @@ public class TileAttractor extends AbstractPowerConsumerEntity implements IRange
|
||||
|
||||
@Override
|
||||
public void onCapacitorTypeChange() {
|
||||
switch (getCapacitorType()) {
|
||||
case ACTIVATED_CAPACITOR:
|
||||
switch (getCapacitor().getTier()) {
|
||||
case 2:
|
||||
range = Config.attractorRangeLevelTwo;
|
||||
powerPerTick = Config.attractorPowerPerTickLevelTwo;
|
||||
break;
|
||||
case ENDER_CAPACITOR:
|
||||
case 3:
|
||||
case 4:
|
||||
case 5:
|
||||
case 6:
|
||||
case 7:
|
||||
range = Config.attractorRangeLevelThree;
|
||||
powerPerTick = Config.attractorPowerPerTickLevelThree;
|
||||
break;
|
||||
case BASIC_CAPACITOR:
|
||||
case 1:
|
||||
default:
|
||||
range = Config.attractorRangeLevelOne;
|
||||
powerPerTick = Config.attractorPowerPerTickLevelOne;
|
||||
|
||||
@@ -70,16 +70,20 @@ public class TileAversionObelisk extends AbstractPowerConsumerEntity implements
|
||||
|
||||
@Override
|
||||
public void onCapacitorTypeChange() {
|
||||
switch (getCapacitorType()) {
|
||||
case BASIC_CAPACITOR:
|
||||
switch (getCapacitor().getTier()) {
|
||||
case 1:
|
||||
range = Config.spawnGuardRangeLevelOne;
|
||||
powerPerTick = Config.spawnGuardPowerPerTickLevelOne;
|
||||
break;
|
||||
case ACTIVATED_CAPACITOR:
|
||||
case 2:
|
||||
range = Config.spawnGuardRangeLevelTwo;
|
||||
powerPerTick = Config.spawnGuardPowerPerTickLevelTwo;
|
||||
break;
|
||||
case ENDER_CAPACITOR:
|
||||
case 3:
|
||||
case 4:
|
||||
case 5:
|
||||
case 6:
|
||||
case 7:
|
||||
range = Config.spawnGuardRangeLevelThree;
|
||||
powerPerTick = Config.spawnGuardPowerPerTickLevelThree;
|
||||
break;
|
||||
|
||||
@@ -39,6 +39,48 @@ public class TileSliceAndSplice extends AbstractPoweredTaskEntity {
|
||||
Capacitors.ENDER_CAPACITOR.capacitor.getMaxEnergyStored(),
|
||||
POWER_PER_TICK_THREE);
|
||||
|
||||
public static final int POWER_PER_TICK_FOUR = Config.sliceAndSpliceLevelFourPowerPerTickRF;
|
||||
private static final BasicCapacitor CAP_FOUR = new BasicCapacitor(0,
|
||||
POWER_PER_TICK_FOUR * 2,
|
||||
Capacitors.CRYSTALLINE_CAPACITOR.capacitor.getMaxEnergyStored(),
|
||||
POWER_PER_TICK_FOUR);
|
||||
|
||||
public static final int POWER_PER_TICK_FIVE = Config.sliceAndSpliceLevelFivePowerPerTickRF;
|
||||
private static final BasicCapacitor CAP_FIVE = new BasicCapacitor(0,
|
||||
POWER_PER_TICK_FIVE * 2,
|
||||
Capacitors.ENDER_CAPACITOR.capacitor.getMaxEnergyStored(),
|
||||
POWER_PER_TICK_FIVE);
|
||||
|
||||
public static final int POWER_PER_TICK_SIX = Config.sliceAndSpliceLevelSixPowerPerTickRF;
|
||||
private static final BasicCapacitor CAP_SIX = new BasicCapacitor(0,
|
||||
POWER_PER_TICK_SIX * 2,
|
||||
Capacitors.STELLAR_CAPACITOR.capacitor.getMaxEnergyStored(),
|
||||
POWER_PER_TICK_SIX);
|
||||
|
||||
public static final int POWER_PER_TICK_SEVEN = Config.sliceAndSpliceLevelSevenPowerPerTickRF;
|
||||
private static final BasicCapacitor CAP_SEVEN = new BasicCapacitor(0,
|
||||
POWER_PER_TICK_SEVEN * 2,
|
||||
Capacitors.TOTEMIC_CAPACITOR.capacitor.getMaxEnergyStored(),
|
||||
POWER_PER_TICK_SEVEN);
|
||||
|
||||
public static final int POWER_PER_TICK_EIGHT = Config.sliceAndSpliceLevelEightPowerPerTickRF;
|
||||
private static final BasicCapacitor CAP_EIGHT = new BasicCapacitor(0,
|
||||
POWER_PER_TICK_EIGHT * 2,
|
||||
Capacitors.SILVER_CAPACITOR.capacitor.getMaxEnergyStored(),
|
||||
POWER_PER_TICK_EIGHT);
|
||||
|
||||
public static final int POWER_PER_TICK_NINE = Config.sliceAndSpliceLevelNinePowerPerTickRF;
|
||||
private static final BasicCapacitor CAP_NINE = new BasicCapacitor(0,
|
||||
POWER_PER_TICK_NINE * 2,
|
||||
Capacitors.ENDERGETIC_CAPACITOR.capacitor.getMaxEnergyStored(),
|
||||
POWER_PER_TICK_NINE);
|
||||
|
||||
public static final int POWER_PER_TICK_TEN = Config.sliceAndSpliceLevelTenPowerPerTickRF;
|
||||
private static final BasicCapacitor CAP_TEN = new BasicCapacitor(0,
|
||||
POWER_PER_TICK_TEN * 2,
|
||||
Capacitors.ENDERGISED_CAPACITOR.capacitor.getMaxEnergyStored(),
|
||||
POWER_PER_TICK_TEN);
|
||||
|
||||
private final int axeIndex = 6;
|
||||
private final int shearsIndex = 7;
|
||||
private EntityLivingBase fakePlayer;
|
||||
@@ -67,6 +109,27 @@ public class TileSliceAndSplice extends AbstractPoweredTaskEntity {
|
||||
setCapacitor(CAP_TWO);
|
||||
break;
|
||||
case ENDER_CAPACITOR:
|
||||
setCapacitor(CAP_THREE);
|
||||
break;
|
||||
case CRYSTALLINE_CAPACITOR:
|
||||
setCapacitor(CAP_FOUR);
|
||||
break;
|
||||
case MELODIC_CAPACITOR:
|
||||
setCapacitor(CAP_FIVE);
|
||||
break;
|
||||
case STELLAR_CAPACITOR:
|
||||
setCapacitor(CAP_SIX);
|
||||
break;
|
||||
case TOTEMIC_CAPACITOR:
|
||||
setCapacitor(CAP_SEVEN);
|
||||
break;
|
||||
case SILVER_CAPACITOR:
|
||||
setCapacitor(CAP_ONE);
|
||||
break;
|
||||
case ENDERGETIC_CAPACITOR:
|
||||
setCapacitor(CAP_TWO);
|
||||
break;
|
||||
case ENDERGISED_CAPACITOR:
|
||||
setCapacitor(CAP_THREE);
|
||||
break;
|
||||
default:
|
||||
|
||||
@@ -43,6 +43,35 @@ public class TileSoulBinder extends AbstractPoweredTaskEntity implements IHaveEx
|
||||
private static final BasicCapacitor CAP_THREE = new BasicCapacitor(0,POWER_PER_TICK_THREE * 2,
|
||||
Capacitors.ENDER_CAPACITOR.capacitor.getMaxEnergyStored(), POWER_PER_TICK_THREE);
|
||||
|
||||
public static final int POWER_PER_TICK_FOUR = Config.soulBinderLevelFourPowerPerTickRF;
|
||||
private static final BasicCapacitor CAP_FOUR = new BasicCapacitor(0,POWER_PER_TICK_FOUR * 2,
|
||||
Capacitors.CRYSTALLINE_CAPACITOR.capacitor.getMaxEnergyStored(), POWER_PER_TICK_FOUR);
|
||||
|
||||
public static final int POWER_PER_TICK_FIVE = Config.soulBinderLevelFivePowerPerTickRF;
|
||||
private static final BasicCapacitor CAP_FIVE = new BasicCapacitor(0,POWER_PER_TICK_FIVE * 2,
|
||||
Capacitors.MELODIC_CAPACITOR.capacitor.getMaxEnergyStored(), POWER_PER_TICK_FIVE);
|
||||
|
||||
public static final int POWER_PER_TICK_SIX = Config.soulBinderLevelSixPowerPerTickRF;
|
||||
private static final BasicCapacitor CAP_SIX = new BasicCapacitor(0,POWER_PER_TICK_SIX * 2,
|
||||
Capacitors.STELLAR_CAPACITOR.capacitor.getMaxEnergyStored(), POWER_PER_TICK_SIX);
|
||||
|
||||
public static final int POWER_PER_TICK_SEVEN = Config.soulBinderLevelSevenPowerPerTickRF;
|
||||
private static final BasicCapacitor CAP_SEVEN = new BasicCapacitor(0,POWER_PER_TICK_SEVEN * 2,
|
||||
Capacitors.TOTEMIC_CAPACITOR.capacitor.getMaxEnergyStored(), POWER_PER_TICK_SEVEN);
|
||||
|
||||
public static final int POWER_PER_TICK_EIGHT = Config.soulBinderLevelEightPowerPerTickRF;
|
||||
private static final BasicCapacitor CAP_EIGHT = new BasicCapacitor(0,POWER_PER_TICK_EIGHT * 2,
|
||||
Capacitors.SILVER_CAPACITOR.capacitor.getMaxEnergyStored(), POWER_PER_TICK_EIGHT);
|
||||
|
||||
public static final int POWER_PER_TICK_NINE = Config.soulBinderLevelNinePowerPerTickRF;
|
||||
private static final BasicCapacitor CAP_NINE = new BasicCapacitor(0,POWER_PER_TICK_NINE * 2,
|
||||
Capacitors.ENDERGETIC_CAPACITOR.capacitor.getMaxEnergyStored(), POWER_PER_TICK_NINE);
|
||||
|
||||
public static final int POWER_PER_TICK_TEN = Config.soulBinderLevelTenPowerPerTickRF;
|
||||
private static final BasicCapacitor CAP_TEN = new BasicCapacitor(0,POWER_PER_TICK_TEN * 2,
|
||||
Capacitors.ENDERGISED_CAPACITOR.capacitor.getMaxEnergyStored(), POWER_PER_TICK_TEN);
|
||||
|
||||
|
||||
private final ExperienceContainer xpCont = new ExperienceContainer(XpUtil.getExperienceForLevel(Config.soulBinderMaxXpLevel));
|
||||
|
||||
public TileSoulBinder() {
|
||||
@@ -170,18 +199,25 @@ public class TileSoulBinder extends AbstractPoweredTaskEntity implements IHaveEx
|
||||
setCapacitor(CAP_THREE);
|
||||
break;
|
||||
case CRYSTALLINE_CAPACITOR:
|
||||
break;
|
||||
case ENDERGETIC_CAPACITOR:
|
||||
break;
|
||||
case ENDERGISED_CAPACITOR:
|
||||
setCapacitor(CAP_FOUR);
|
||||
break;
|
||||
case MELODIC_CAPACITOR:
|
||||
break;
|
||||
case SILVER_CAPACITOR:
|
||||
setCapacitor(CAP_FIVE);
|
||||
break;
|
||||
case STELLAR_CAPACITOR:
|
||||
setCapacitor(CAP_SIX);
|
||||
break;
|
||||
case TOTEMIC_CAPACITOR:
|
||||
setCapacitor(CAP_SEVEN);
|
||||
break;
|
||||
case SILVER_CAPACITOR:
|
||||
setCapacitor(CAP_EIGHT);
|
||||
break;
|
||||
case ENDERGETIC_CAPACITOR:
|
||||
setCapacitor(CAP_NINE);
|
||||
break;
|
||||
case ENDERGISED_CAPACITOR:
|
||||
setCapacitor(CAP_TEN);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
|
||||
@@ -25,7 +25,8 @@ public class TilePoweredSpawner extends AbstractPoweredTaskEntity {
|
||||
public static final int MAX_SPAWN_DELAY_BASE = Config.poweredSpawnerMaxDelayTicks;
|
||||
|
||||
public static final int POWER_PER_TICK_ONE = Config.poweredSpawnerLevelOnePowerPerTickRF;
|
||||
private static final BasicCapacitor CAP_ONE = new BasicCapacitor(0, (int) (POWER_PER_TICK_ONE * 1.25), Capacitors.BASIC_CAPACITOR.capacitor.getMaxEnergyStored());
|
||||
private static final BasicCapacitor CAP_ONE = new BasicCapacitor(0, (int) (POWER_PER_TICK_ONE * 1.25),
|
||||
Capacitors.BASIC_CAPACITOR.capacitor.getMaxEnergyStored());
|
||||
|
||||
public static final int POWER_PER_TICK_TWO = Config.poweredSpawnerLevelTwoPowerPerTickRF;
|
||||
private static final BasicCapacitor CAP_TWO = new BasicCapacitor(0,(int) (POWER_PER_TICK_TWO * 1.25),
|
||||
@@ -35,6 +36,34 @@ public class TilePoweredSpawner extends AbstractPoweredTaskEntity {
|
||||
private static final BasicCapacitor CAP_THREE = new BasicCapacitor(0,(int) (POWER_PER_TICK_THREE * 1.25),
|
||||
Capacitors.ENDER_CAPACITOR.capacitor.getMaxEnergyStored());
|
||||
|
||||
public static final int POWER_PER_TICK_FOUR = Config.poweredSpawnerLevelFourPowerPerTickRF;
|
||||
private static final BasicCapacitor CAP_FOUR = new BasicCapacitor(0,(int) (POWER_PER_TICK_FOUR * 1.25),
|
||||
Capacitors.CRYSTALLINE_CAPACITOR.capacitor.getMaxEnergyStored());
|
||||
|
||||
public static final int POWER_PER_TICK_FIVE = Config.poweredSpawnerLevelFivePowerPerTickRF;
|
||||
private static final BasicCapacitor CAP_FIVE = new BasicCapacitor(0,(int) (POWER_PER_TICK_FIVE * 1.25),
|
||||
Capacitors.MELODIC_CAPACITOR.capacitor.getMaxEnergyStored());
|
||||
|
||||
public static final int POWER_PER_TICK_SIX = Config.poweredSpawnerLevelSixPowerPerTickRF;
|
||||
private static final BasicCapacitor CAP_SIX = new BasicCapacitor(0,(int) (POWER_PER_TICK_SIX * 1.25),
|
||||
Capacitors.STELLAR_CAPACITOR.capacitor.getMaxEnergyStored());
|
||||
|
||||
public static final int POWER_PER_TICK_SEVEN = Config.poweredSpawnerLevelSevenPowerPerTickRF;
|
||||
private static final BasicCapacitor CAP_SEVEN = new BasicCapacitor(0,(int) (POWER_PER_TICK_SEVEN * 1.25),
|
||||
Capacitors.TOTEMIC_CAPACITOR.capacitor.getMaxEnergyStored());
|
||||
|
||||
public static final int POWER_PER_TICK_EIGHT = Config.poweredSpawnerLevelEightPowerPerTickRF;
|
||||
private static final BasicCapacitor CAP_EIGHT = new BasicCapacitor(0,(int) (POWER_PER_TICK_EIGHT * 1.25),
|
||||
Capacitors.SILVER_CAPACITOR.capacitor.getMaxEnergyStored());
|
||||
|
||||
public static final int POWER_PER_TICK_NINE = Config.poweredSpawnerLevelNinePowerPerTickRF;
|
||||
private static final BasicCapacitor CAP_NINE = new BasicCapacitor(0,(int) (POWER_PER_TICK_NINE * 1.25),
|
||||
Capacitors.ENDERGETIC_CAPACITOR.capacitor.getMaxEnergyStored());
|
||||
|
||||
public static final int POWER_PER_TICK_TEN = Config.poweredSpawnerLevelTenPowerPerTickRF;
|
||||
private static final BasicCapacitor CAP_TEN = new BasicCapacitor(0,(int) (POWER_PER_TICK_TEN * 1.25),
|
||||
Capacitors.ENDERGISED_CAPACITOR.capacitor.getMaxEnergyStored());
|
||||
|
||||
public static final int MIN_PLAYER_DISTANCE = Config.poweredSpawnerMaxPlayerDistance;
|
||||
public static final boolean USE_VANILLA_SPAWN_CHECKS = Config.poweredSpawnerUseVanillaSpawChecks;
|
||||
|
||||
@@ -99,6 +128,34 @@ public class TilePoweredSpawner extends AbstractPoweredTaskEntity {
|
||||
refCap = CAP_THREE;
|
||||
basePowerUse = POWER_PER_TICK_THREE;
|
||||
break;
|
||||
case CRYSTALLINE_CAPACITOR:
|
||||
refCap = CAP_FOUR;
|
||||
basePowerUse = POWER_PER_TICK_FOUR;
|
||||
break;
|
||||
case MELODIC_CAPACITOR:
|
||||
refCap = CAP_FIVE;
|
||||
basePowerUse = POWER_PER_TICK_FIVE;
|
||||
break;
|
||||
case STELLAR_CAPACITOR:
|
||||
refCap = CAP_SIX;
|
||||
basePowerUse = POWER_PER_TICK_SIX;
|
||||
break;
|
||||
case TOTEMIC_CAPACITOR:
|
||||
refCap = CAP_SEVEN;
|
||||
basePowerUse = POWER_PER_TICK_SEVEN;
|
||||
break;
|
||||
case SILVER_CAPACITOR:
|
||||
refCap = CAP_EIGHT;
|
||||
basePowerUse = POWER_PER_TICK_EIGHT;
|
||||
break;
|
||||
case ENDERGETIC_CAPACITOR:
|
||||
refCap = CAP_NINE;
|
||||
basePowerUse = POWER_PER_TICK_NINE;
|
||||
break;
|
||||
case ENDERGISED_CAPACITOR:
|
||||
refCap = CAP_TEN;
|
||||
basePowerUse = POWER_PER_TICK_TEN;
|
||||
break;
|
||||
}
|
||||
double multiplier = PoweredSpawnerConfig.getInstance().getCostMultiplierFor(getEntityName());
|
||||
setCapacitor(new BasicCapacitor((int) (refCap.getMaxEnergyExtracted() * multiplier), refCap.getMaxEnergyStored()));
|
||||
@@ -211,11 +268,7 @@ public class TilePoweredSpawner extends AbstractPoweredTaskEntity {
|
||||
} else {
|
||||
ticksDelay = TilePoweredSpawner.MAX_SPAWN_DELAY_BASE - ((TilePoweredSpawner.MAX_SPAWN_DELAY_BASE - TilePoweredSpawner.MIN_SPAWN_DELAY_BASE) / 2);
|
||||
}
|
||||
if(getCapacitorType().ordinal() == 1) {
|
||||
ticksDelay /= 2;
|
||||
} else if(getCapacitorType().ordinal() == 2) {
|
||||
ticksDelay /= 4;
|
||||
}
|
||||
ticksDelay >>= Math.min(3, getCapacitor().getTier() - 1);
|
||||
int powerPerTick = getPowerUsePerTick();
|
||||
res.setRequiredEnergy(powerPerTick * ticksDelay);
|
||||
return res;
|
||||
|
||||
@@ -27,14 +27,14 @@ public class EnderIOCrashCallable implements ICrashCallable {
|
||||
|
||||
for (ModContainer modContainer : ModAPIManager.INSTANCE.getAPIList()) {
|
||||
if ("appliedenergistics2|API".equals(modContainer.getModId())) {
|
||||
if ("rv1".equals(modContainer.getVersion())) {
|
||||
if ("rv1".equals(modContainer.getVersion()) || "rv2".equals(modContainer.getVersion())) {
|
||||
result.add(" * An unsupportted old AE2 API is installed (" + modContainer.getVersion() + " from "
|
||||
+ modContainer.getSource().getName() + ").");
|
||||
result.add(" Ender IO was build against API version rv2 and will NOT work with older versions.");
|
||||
} else if (!"rv2".equals(modContainer.getVersion())) {
|
||||
result.add(" Ender IO was build against API version rv3 and will NOT work with older versions.");
|
||||
} else if (!"rv3".equals(modContainer.getVersion())) {
|
||||
result.add(" * An unknown AE2 API is installed (" + modContainer.getVersion() + " from "
|
||||
+ modContainer.getSource().getName() + ").");
|
||||
result.add(" Ender IO was build against API version rv2 and may or may not work with a newer version.");
|
||||
result.add(" Ender IO was build against API version rv3 and may or may not work with a newer version.");
|
||||
}
|
||||
} else if ("CoFHAPI|energy".equals(modContainer.getModId())) {
|
||||
if ("1.7.10R1.0.0".equals(modContainer.getVersion()) || "1.7.10R1.0.1".equals(modContainer.getVersion())) {
|
||||
|
||||
@@ -991,7 +991,7 @@ enderio.darksteel.upgrade.solar_one.name=Солнечная батарея I
|
||||
enderio.darksteel.upgrade.solar_one.tooltip.detailed.line1=Генерирует энергию от солнечных лучей.
|
||||
|
||||
enderio.darksteel.upgrade.solar_two.name=Солнечная батарея II
|
||||
enderio.darksteel.upgrade.solar_two.tooltip.detailed.line1==Генерирует энергию от солнечных лучей.
|
||||
enderio.darksteel.upgrade.solar_two.tooltip.detailed.line1=Генерирует энергию от солнечных лучей.
|
||||
|
||||
enderio.darksteel.upgrade.solar_three.name=Солнечная батарея III
|
||||
enderio.darksteel.upgrade.solar_three.tooltip.detailed.line1=Генерирует энергию от солнечных лучей.
|
||||
|
||||
Reference in new issue
Block a user