Merge branch '1.11.2' of https://github.com/TechReborn/TechReborn into 1.11.2
399
build.gradle
|
@ -1,26 +1,26 @@
|
||||||
buildscript {
|
buildscript {
|
||||||
repositories {
|
repositories {
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
maven {
|
|
||||||
name = "forge"
|
|
||||||
url = "http://files.minecraftforge.net/maven"
|
|
||||||
}
|
|
||||||
maven {
|
|
||||||
name = "sonatype"
|
|
||||||
url = "https://oss.sonatype.org/content/repositories/snapshots/"
|
|
||||||
}
|
|
||||||
maven {
|
maven {
|
||||||
name = "Modmuss50"
|
name = "forge"
|
||||||
url = "http://maven.modmuss50.me/"
|
url = "http://files.minecraftforge.net/maven"
|
||||||
}
|
}
|
||||||
maven {
|
maven {
|
||||||
url "https://plugins.gradle.org/m2/"
|
name = "sonatype"
|
||||||
}
|
url = "https://oss.sonatype.org/content/repositories/snapshots/"
|
||||||
}
|
}
|
||||||
dependencies {
|
maven {
|
||||||
classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT'
|
name = "Modmuss50"
|
||||||
classpath "gradle.plugin.net.minecrell:licenser:0.2.1"
|
url = "http://maven.modmuss50.me/"
|
||||||
}
|
}
|
||||||
|
maven {
|
||||||
|
url "https://plugins.gradle.org/m2/"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
dependencies {
|
||||||
|
classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT'
|
||||||
|
classpath "gradle.plugin.net.minecrell:licenser:0.2.1"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
apply plugin: 'net.minecraftforge.gradle.forge'
|
apply plugin: 'net.minecraftforge.gradle.forge'
|
||||||
|
@ -34,76 +34,77 @@ targetCompatibility = 1.8
|
||||||
|
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
maven {
|
maven {
|
||||||
name = "Modmuss50"
|
name = "Modmuss50"
|
||||||
url = "http://maven.modmuss50.me/"
|
url = "http://maven.modmuss50.me/"
|
||||||
}
|
}
|
||||||
maven {
|
maven {
|
||||||
name "TiC"
|
name "TiC"
|
||||||
url "http://dvs1.progwml6.com/files/maven"
|
url "http://dvs1.progwml6.com/files/maven"
|
||||||
}
|
}
|
||||||
maven {
|
maven {
|
||||||
name = "Amadornes"
|
name = "Amadornes"
|
||||||
url "http://maven.amadornes.com/"
|
url "http://maven.amadornes.com/"
|
||||||
}
|
}
|
||||||
ivy {
|
ivy {
|
||||||
name "CraftTweaker"
|
name "CraftTweaker"
|
||||||
artifactPattern "https://addons-origin.cursecdn.com/files/2392/421/[module]-[revision](-[classifier]).[ext]"
|
artifactPattern "https://addons-origin.cursecdn.com/files/2392/421/[module]-[revision](-[classifier]).[ext]"
|
||||||
}
|
}
|
||||||
maven {
|
maven {
|
||||||
url 'http://maven.epoxide.xyz'
|
url 'http://maven.epoxide.xyz'
|
||||||
}
|
}
|
||||||
maven {
|
maven {
|
||||||
url "http://maven.tterrag.com/"
|
url "http://maven.tterrag.com/"
|
||||||
}
|
}
|
||||||
maven {
|
maven {
|
||||||
name = "ic2"
|
name = "ic2"
|
||||||
url = "http://maven.ic2.player.to/"
|
url = "http://maven.ic2.player.to/"
|
||||||
}
|
}
|
||||||
|
|
||||||
maven {// HWYLA
|
maven {
|
||||||
name "TehNut"
|
// HWYLA
|
||||||
url "http://tehnut.info/maven/"
|
name "TehNut"
|
||||||
}
|
url "http://tehnut.info/maven/"
|
||||||
maven {
|
}
|
||||||
|
maven {
|
||||||
name 'CB Repo'
|
name 'CB Repo'
|
||||||
url "http://chickenbones.net/maven/"
|
url "http://chickenbones.net/maven/"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
configurations {
|
configurations {
|
||||||
shade
|
shade
|
||||||
compile.extendsFrom shade
|
compile.extendsFrom shade
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
version = "2.1.11"
|
version = "2.2.0"
|
||||||
|
|
||||||
def ENV = System.getenv()
|
def ENV = System.getenv()
|
||||||
if (ENV.BUILD_NUMBER) {
|
if (ENV.BUILD_NUMBER) {
|
||||||
version = version + "." + "${System.getenv().BUILD_NUMBER}"
|
version = version + "." + "${System.getenv().BUILD_NUMBER}"
|
||||||
}
|
}
|
||||||
|
|
||||||
minecraft {
|
minecraft {
|
||||||
version = "1.11.2-13.20.0.2255"
|
version = "1.11.2-13.20.0.2255"
|
||||||
mappings = "snapshot_20161220"
|
mappings = "snapshot_20161220"
|
||||||
replace "@MODVERSION@", project.version
|
replace "@MODVERSION@", project.version
|
||||||
// makeObfSourceJar = false
|
// makeObfSourceJar = false
|
||||||
useDepAts = true
|
useDepAts = true
|
||||||
runDir = "run"
|
runDir = "run"
|
||||||
}
|
}
|
||||||
|
|
||||||
license {
|
license {
|
||||||
header file('HEADER')
|
header file('HEADER')
|
||||||
include '**/*.java'
|
include '**/*.java'
|
||||||
ignoreFailures = true //Stops the build from failing if a file does not have a license header
|
ignoreFailures = true //Stops the build from failing if a file does not have a license header
|
||||||
}
|
}
|
||||||
|
|
||||||
group = 'TechReborn'
|
group = 'TechReborn'
|
||||||
|
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
deobfCompile ('RebornCore:RebornCore-1.11.2:+:universal'){
|
deobfCompile('RebornCore:RebornCore-1.11.2:+:universal') {
|
||||||
transitive = false
|
transitive = false
|
||||||
}
|
}
|
||||||
deobfCompile "mezz.jei:jei_1.11.2:+"
|
deobfCompile "mezz.jei:jei_1.11.2:+"
|
||||||
|
@ -115,13 +116,13 @@ dependencies {
|
||||||
//deobfCompile "slimeknights.mantle:Mantle:1.10.2-1.0.0.jenkins170"
|
//deobfCompile "slimeknights.mantle:Mantle:1.10.2-1.0.0.jenkins170"
|
||||||
deobfCompile "mcjty.theoneprobe:TheOneProbe:1.11-1.3.3-46"
|
deobfCompile "mcjty.theoneprobe:TheOneProbe:1.11-1.3.3-46"
|
||||||
compile "CraftTweaker:CraftTweaker:1.11.2-3.0.24"
|
compile "CraftTweaker:CraftTweaker:1.11.2-3.0.24"
|
||||||
compile ("codechicken:CodeChickenLib:1.11.2-+:deobf"){
|
compile("codechicken:CodeChickenLib:1.11.2-+:deobf") {
|
||||||
transitive = false
|
transitive = false
|
||||||
}
|
}
|
||||||
compile ("codechicken:NotEnoughItems:1.11.2-+:deobf"){
|
compile("codechicken:NotEnoughItems:1.11.2-+:deobf") {
|
||||||
transitive = false
|
transitive = false
|
||||||
}
|
}
|
||||||
compile ("codechicken:ForgeMultipart:1.11.2-+:deobf"){
|
compile("codechicken:ForgeMultipart:1.11.2-+:deobf") {
|
||||||
transitive = false
|
transitive = false
|
||||||
}
|
}
|
||||||
compileOnly 'net.industrial-craft:industrialcraft-2:2.6.129-ex110'
|
compileOnly 'net.industrial-craft:industrialcraft-2:2.6.129-ex110'
|
||||||
|
@ -129,58 +130,58 @@ dependencies {
|
||||||
|
|
||||||
|
|
||||||
processResources
|
processResources
|
||||||
{
|
{
|
||||||
// this will ensure that this task is redone when the versions change.
|
// this will ensure that this task is redone when the versions change.
|
||||||
inputs.property "version", project.version
|
inputs.property "version", project.version
|
||||||
inputs.property "mcversion", project.minecraft.version
|
inputs.property "mcversion", project.minecraft.version
|
||||||
|
|
||||||
// replace stuff in mcmod.info, nothing else
|
// replace stuff in mcmod.info, nothing else
|
||||||
from(sourceSets.main.resources.srcDirs) {
|
from(sourceSets.main.resources.srcDirs) {
|
||||||
include 'mcmod.info'
|
include 'mcmod.info'
|
||||||
|
|
||||||
// replace version and mcversion
|
// replace version and mcversion
|
||||||
expand 'version':project.version, 'mcversion':project.minecraft.version
|
expand 'version': project.version, 'mcversion': project.minecraft.version
|
||||||
}
|
}
|
||||||
|
|
||||||
// copy everything else, thats not the mcmod.info
|
// copy everything else, thats not the mcmod.info
|
||||||
from(sourceSets.main.resources.srcDirs) {
|
from(sourceSets.main.resources.srcDirs) {
|
||||||
exclude 'mcmod.info'
|
exclude 'mcmod.info'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
task deobfJar(type: Jar) {
|
task deobfJar(type: Jar) {
|
||||||
from sourceSets.main.output
|
from sourceSets.main.output
|
||||||
exclude "**/*.psd"
|
exclude "**/*.psd"
|
||||||
classifier = 'dev'
|
classifier = 'dev'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
jar {
|
jar {
|
||||||
exclude "**/*.psd"
|
exclude "**/*.psd"
|
||||||
classifier = 'universal'
|
classifier = 'universal'
|
||||||
// configurations.shade.each { dep ->
|
// configurations.shade.each { dep ->
|
||||||
// from(project.zipTree(dep)){
|
// from(project.zipTree(dep)){
|
||||||
// include 'ic2/api/'
|
// include 'ic2/api/'
|
||||||
// include 'forestry/api/fuels/'
|
// include 'forestry/api/fuels/'
|
||||||
// exclude 'META-INF', 'META-INF/**', '**/*.java'
|
// exclude 'META-INF', 'META-INF/**', '**/*.java'
|
||||||
// }
|
// }
|
||||||
// }
|
// }
|
||||||
}
|
}
|
||||||
|
|
||||||
task apiJar(type: Jar) {
|
task apiJar(type: Jar) {
|
||||||
from sourceSets.main.allSource
|
from sourceSets.main.allSource
|
||||||
from sourceSets.main.output
|
from sourceSets.main.output
|
||||||
include 'techreborn/api/**/*'
|
include 'techreborn/api/**/*'
|
||||||
|
|
||||||
classifier = "api"
|
classifier = "api"
|
||||||
}
|
}
|
||||||
|
|
||||||
apiJar.mustRunAfter deobfJar
|
apiJar.mustRunAfter deobfJar
|
||||||
|
|
||||||
artifacts {
|
artifacts {
|
||||||
archives deobfJar
|
archives deobfJar
|
||||||
archives apiJar
|
archives apiJar
|
||||||
}
|
}
|
||||||
|
|
||||||
build.dependsOn deobfJar, apiJar
|
build.dependsOn deobfJar, apiJar
|
||||||
|
@ -188,105 +189,102 @@ build.dependsOn deobfJar, apiJar
|
||||||
|
|
||||||
|
|
||||||
uploadArchives {
|
uploadArchives {
|
||||||
repositories {
|
repositories {
|
||||||
mavenDeployer {
|
mavenDeployer {
|
||||||
//This is used when the build is done on a slave node
|
//This is used when the build is done on a slave node
|
||||||
if (project.hasProperty('mavenPass'))
|
if (project.hasProperty('mavenPass')) {
|
||||||
{
|
println 'Uploading to remote Maven Repo'
|
||||||
println 'Uploading to remote Maven Repo'
|
repository(url: "http://mavenupload.modmuss50.me/") {
|
||||||
repository(url: "http://mavenupload.modmuss50.me/") {
|
authentication(userName: "buildslave", password: project.getProperty('mavenPass'))
|
||||||
authentication(userName: "buildslave", password: project.getProperty('mavenPass'))
|
}
|
||||||
}
|
} else {
|
||||||
}
|
//this is when the build is executed on the master node
|
||||||
else
|
println 'Uploading to local Maven Repo'
|
||||||
{
|
repository(url: "file:///var/www/maven/")
|
||||||
//this is when the build is executed on the master node
|
}
|
||||||
println 'Uploading to local Maven Repo'
|
pom {
|
||||||
repository(url: "file:///var/www/maven/")
|
groupId = "TechReborn"
|
||||||
}
|
version = project.version
|
||||||
pom {
|
artifactId = project.archivesBaseName
|
||||||
groupId = "TechReborn"
|
project {
|
||||||
version = project.version
|
name project.archivesBaseName
|
||||||
artifactId = project.archivesBaseName
|
packaging 'jar'
|
||||||
project {
|
description 'TechReborn'
|
||||||
name project.archivesBaseName
|
url 'https://github.com/TechReborn/TechReborn'
|
||||||
packaging 'jar'
|
scm {
|
||||||
description 'TechReborn'
|
url 'https://github.com/TechReborn/TechReborn'
|
||||||
url 'https://github.com/TechReborn/TechReborn'
|
connection 'scm:git:git@github.com:TechReborn/TechReborn.git'
|
||||||
scm {
|
developerConnection 'scm:git:git@github.com:TechReborn/TechReborn.git'
|
||||||
url 'https://github.com/TechReborn/TechReborn'
|
}
|
||||||
connection 'scm:git:git@github.com:TechReborn/TechReborn.git'
|
issueManagement {
|
||||||
developerConnection 'scm:git:git@github.com:TechReborn/TechReborn.git'
|
system 'github'
|
||||||
}
|
url 'https://github.com/TechReborn/TechReborn/issues'
|
||||||
issueManagement {
|
}
|
||||||
system 'github'
|
licenses {
|
||||||
url 'https://github.com/TechReborn/TechReborn/issues'
|
license {
|
||||||
}
|
name 'License'
|
||||||
licenses {
|
url 'https://raw.githubusercontent.com/TechReborn/TechReborn/master/LICENSE.md'
|
||||||
license {
|
distribution 'repo'
|
||||||
name 'License'
|
}
|
||||||
url 'https://raw.githubusercontent.com/TechReborn/TechReborn/master/LICENSE.md'
|
}
|
||||||
distribution 'repo'
|
developers {
|
||||||
}
|
developer {
|
||||||
}
|
id 'modmuss50'
|
||||||
developers {
|
name 'modmuss50'
|
||||||
developer {
|
roles {role 'developer'}
|
||||||
id 'modmuss50'
|
}
|
||||||
name 'modmuss50'
|
developer {
|
||||||
roles { role 'developer' }
|
id 'Gigabit101'
|
||||||
}
|
name 'Gigabit101'
|
||||||
developer {
|
roles {role 'developer'}
|
||||||
id 'Gigabit101'
|
}
|
||||||
name 'Gigabit101'
|
}
|
||||||
roles { role 'developer' }
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
task wrapper(type: Wrapper) {
|
task wrapper(type: Wrapper) {
|
||||||
//To update the wrapper change the version bellow then run: gradle wrapper
|
//To update the wrapper change the version bellow then run: gradle wrapper
|
||||||
gradleVersion = '2.13'
|
gradleVersion = '2.13'
|
||||||
}
|
}
|
||||||
|
|
||||||
//Thanks Matthew from #ForgeGradle https://gist.github.com/matthewprenger/108265e3efc83181bd2cc2d2fc31a853
|
//Thanks Matthew from #ForgeGradle https://gist.github.com/matthewprenger/108265e3efc83181bd2cc2d2fc31a853
|
||||||
task updateMappings(dependsOn: sourceJar) {
|
task updateMappings(dependsOn: sourceJar) {
|
||||||
|
|
||||||
def remapped = file('src_remapped/main/java')
|
def remapped = file('src_remapped/main/java')
|
||||||
def methods = file('methods.csv')
|
def methods = file('methods.csv')
|
||||||
def fields = file('fields.csv')
|
def fields = file('fields.csv')
|
||||||
|
|
||||||
doLast {
|
doLast {
|
||||||
|
|
||||||
Map<String, String> map = new HashMap<>()
|
Map<String, String> map = new HashMap<>()
|
||||||
methods.eachLine {line ->
|
methods.eachLine {line ->
|
||||||
String[] pts = line.split(",")
|
String[] pts = line.split(",")
|
||||||
map.put(pts[0], pts[1])
|
map.put(pts[0], pts[1])
|
||||||
}
|
}
|
||||||
fields.eachLine {line ->
|
fields.eachLine {line ->
|
||||||
String[] pts = line.split(",")
|
String[] pts = line.split(",")
|
||||||
map.put(pts[0], pts[1])
|
map.put(pts[0], pts[1])
|
||||||
}
|
}
|
||||||
|
|
||||||
copy {
|
copy {
|
||||||
from zipTree(sourceJar.archivePath)
|
from zipTree(sourceJar.archivePath)
|
||||||
into remapped
|
into remapped
|
||||||
include '**/*.java'
|
include '**/*.java'
|
||||||
|
|
||||||
filter { javaLine ->
|
filter {javaLine ->
|
||||||
map.entrySet().each { entry ->
|
map.entrySet().each {entry ->
|
||||||
javaLine = javaLine.replace(entry.getKey(), entry.getValue())
|
javaLine = javaLine.replace(entry.getKey(), entry.getValue())
|
||||||
}
|
}
|
||||||
return javaLine
|
return javaLine
|
||||||
}
|
}
|
||||||
|
|
||||||
includeEmptyDirs = false
|
includeEmptyDirs = false
|
||||||
eachFile { println "Processing: $it.name" }
|
eachFile {println "Processing: $it.name"}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -310,33 +308,34 @@ build.dependsOn signJar
|
||||||
|
|
||||||
apply from: 'https://github.com/FabricMC/fabric-docs/raw/master/gradle/ideconfig.gradle'
|
apply from: 'https://github.com/FabricMC/fabric-docs/raw/master/gradle/ideconfig.gradle'
|
||||||
|
|
||||||
import org.apache.commons.io.FileUtils;
|
import groovy.util.XmlSlurper
|
||||||
import groovy.util.XmlSlurper;
|
import org.apache.commons.io.FileUtils
|
||||||
import java.io.File;
|
|
||||||
|
|
||||||
task curseTools {
|
task curseTools {
|
||||||
doLast {
|
doLast {
|
||||||
def cacheFiles = new File(".gradle/curseTools")
|
def cacheFiles = new File(".gradle/curseTools")
|
||||||
if (!cacheFiles.exists()) cacheFiles.mkdirs()
|
if (!cacheFiles.exists()) {
|
||||||
|
cacheFiles.mkdirs()
|
||||||
|
}
|
||||||
|
|
||||||
def mavenMetadata = new File(cacheFiles, "maven-metadata.xml")
|
def mavenMetadata = new File(cacheFiles, "maven-metadata.xml")
|
||||||
|
|
||||||
logger.lifecycle(":downloading curseTools metadata")
|
logger.lifecycle(":downloading curseTools metadata")
|
||||||
FileUtils.copyURLToFile(new URL("http://maven.modmuss50.me/CurseTools/CurseTools/maven-metadata.xml"), mavenMetadata)
|
FileUtils.copyURLToFile(new URL("http://maven.modmuss50.me/CurseTools/CurseTools/maven-metadata.xml"), mavenMetadata)
|
||||||
|
|
||||||
def metadata = new XmlSlurper().parseText(FileUtils.readFileToString(mavenMetadata))
|
def metadata = new XmlSlurper().parseText(FileUtils.readFileToString(mavenMetadata))
|
||||||
def curseToolsVersion = metadata.versioning.release
|
def curseToolsVersion = metadata.versioning.release
|
||||||
|
|
||||||
def curseTools = new File(cacheFiles, "${curseToolsVersion}.jar")
|
def curseTools = new File(cacheFiles, "${curseToolsVersion}.jar")
|
||||||
|
|
||||||
logger.lifecycle(":downloading CurseTools")
|
logger.lifecycle(":downloading CurseTools")
|
||||||
FileUtils.copyURLToFile(new URL("http://maven.modmuss50.me/CurseTools/CurseTools/${curseToolsVersion}/CurseTools-${curseToolsVersion}.jar"), curseTools)
|
FileUtils.copyURLToFile(new URL("http://maven.modmuss50.me/CurseTools/CurseTools/${curseToolsVersion}/CurseTools-${curseToolsVersion}.jar"), curseTools)
|
||||||
|
|
||||||
logger.lifecycle(":launching CurseTools")
|
logger.lifecycle(":launching CurseTools")
|
||||||
ant.java(jar: curseTools.getAbsolutePath(), fork: true, spawn: false) {
|
ant.java(jar: curseTools.getAbsolutePath(), fork: true, spawn: false) {
|
||||||
arg(value: jar.archivePath.getAbsolutePath())
|
arg(value: jar.archivePath.getAbsolutePath())
|
||||||
arg(value: deobfJar.archivePath.getAbsolutePath())
|
arg(value: deobfJar.archivePath.getAbsolutePath())
|
||||||
arg(value: apiJar.archivePath.getAbsolutePath())
|
arg(value: apiJar.archivePath.getAbsolutePath())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -254,7 +254,7 @@ public class ConfigTechReborn {
|
||||||
AesuMaxStorage = config.get(CATEGORY_POWER, "AESU Max Storage", 30, "Set the max Storage for the AESU")
|
AesuMaxStorage = config.get(CATEGORY_POWER, "AESU Max Storage", 30, "Set the max Storage for the AESU")
|
||||||
.getInt();
|
.getInt();
|
||||||
|
|
||||||
pumpExtractEU = config.get(CATEGORY_POWER, "Pump extract eu", 20, "How mutch eu should the pump use to extract the fluid")
|
pumpExtractEU = config.get(CATEGORY_POWER, "Pump extract eu", 20, "How much eu should the pump use to extract the fluid")
|
||||||
.getInt();
|
.getInt();
|
||||||
|
|
||||||
//Transformers
|
//Transformers
|
||||||
|
@ -332,13 +332,13 @@ public class ConfigTechReborn {
|
||||||
ThermalGeneratorCharge = config.get(CATEGORY_POWER, "ThermalGenerator MaxCharge", 1000000,
|
ThermalGeneratorCharge = config.get(CATEGORY_POWER, "ThermalGenerator MaxCharge", 1000000,
|
||||||
"Set the max charge for the ThermalGenerator").getInt();
|
"Set the max charge for the ThermalGenerator").getInt();
|
||||||
|
|
||||||
AverageEuOutTickTime = config.get(CATEGORY_POWER, "config.techreborn.AverageEuOutTickTime", 100,
|
AverageEuOutTickTime = config.get(CATEGORY_POWER, "Average EU-out Tick Time", 100,
|
||||||
"config.techreborn.AverageEuOutTickTime.tooltip").getInt();
|
"Set the average EU-out tick time").getInt();
|
||||||
|
|
||||||
LesuStoragePerBlock = config.get(CATEGORY_POWER, "LESU Storage Block Amount", 1000000,
|
LesuStoragePerBlock = config.get(CATEGORY_POWER, "LESU Storage Block Amount", 1000000,
|
||||||
"The Amount of energy storage added per Storage block").getInt();
|
"The Amount of energy storage added per Storage block").getInt();
|
||||||
|
|
||||||
BaseLesuOutput = config.get(CATEGORY_POWER, "LESU base output", 16, "The output of the LESU befor upgrades")
|
BaseLesuOutput = config.get(CATEGORY_POWER, "LESU base output", 16, "The output of the LESU before upgrades")
|
||||||
.getInt();
|
.getInt();
|
||||||
|
|
||||||
ExtraOutputPerLesuBlock = config.get(CATEGORY_POWER, "Extra output on Storage Blocks", 8, "").getInt();
|
ExtraOutputPerLesuBlock = config.get(CATEGORY_POWER, "Extra output on Storage Blocks", 8, "").getInt();
|
||||||
|
@ -435,7 +435,7 @@ public class ConfigTechReborn {
|
||||||
.getBoolean(true);
|
.getBoolean(true);
|
||||||
|
|
||||||
REMOVE_DUPLICATES = config
|
REMOVE_DUPLICATES = config
|
||||||
.get(CATEGORY_CRAFTING, "Remove Duplicates when IC2 is installed", false, "This atempts to fully intergrate TR with ic2 recipes (Beta)")
|
.get(CATEGORY_CRAFTING, "Remove Duplicates when IC2 is installed", false, "This attempts to fully integrate TR with ic2 recipes (Beta)")
|
||||||
.getBoolean(false);
|
.getBoolean(false);
|
||||||
|
|
||||||
disableRailcraftSteelNuggetRecipe = config.get(CATEGORY_CRAFTING, "Disable Railcraft's Steel nugget recipe", false, "When true TechReborn will remove Railcrafts Iron Nugget to steel nuggert recipe.").getBoolean(false);
|
disableRailcraftSteelNuggetRecipe = config.get(CATEGORY_CRAFTING, "Disable Railcraft's Steel nugget recipe", false, "When true TechReborn will remove Railcrafts Iron Nugget to steel nuggert recipe.").getBoolean(false);
|
||||||
|
@ -592,13 +592,13 @@ public class ConfigTechReborn {
|
||||||
.getBoolean(true);
|
.getBoolean(true);
|
||||||
|
|
||||||
// Integration
|
// Integration
|
||||||
AllowBOPRecipes = config.get(CATEGORY_INTEGRATION, "Allow Bop Recipes", true, "Add BOP suport")
|
AllowBOPRecipes = config.get(CATEGORY_INTEGRATION, "Allow Bop Recipes", true, "Add BOP support")
|
||||||
.getBoolean(true);
|
.getBoolean(true);
|
||||||
|
|
||||||
AllowForestryRecipes = config.get(CATEGORY_INTEGRATION, "Allow Forestry Recipes", true, "Add Forestry suport")
|
AllowForestryRecipes = config.get(CATEGORY_INTEGRATION, "Allow Forestry Recipes", true, "Add Forestry support")
|
||||||
.getBoolean(true);
|
.getBoolean(true);
|
||||||
|
|
||||||
AllowNaturaRecipes = config.get(CATEGORY_INTEGRATION, "Allow Natura Recipes", true, "Add Natura suport")
|
AllowNaturaRecipes = config.get(CATEGORY_INTEGRATION, "Allow Natura Recipes", true, "Add Natura support")
|
||||||
.getBoolean(true);
|
.getBoolean(true);
|
||||||
|
|
||||||
if (config.hasChanged()) {
|
if (config.hasChanged()) {
|
||||||
|
|
|
@ -107,7 +107,7 @@ public class TileMatterFabricator extends TilePowerAcceptor
|
||||||
if (!super.world.isRemote) {
|
if (!super.world.isRemote) {
|
||||||
for (int i = 0; i < 6; i++) {
|
for (int i = 0; i < 6; i++) {
|
||||||
final ItemStack stack = this.inventory.getStackInSlot(i);
|
final ItemStack stack = this.inventory.getStackInSlot(i);
|
||||||
if (!stack.isEmpty()) {
|
if (!stack.isEmpty() && spaceForOutput()) {
|
||||||
final int amp = this.getValue(stack);
|
final int amp = this.getValue(stack);
|
||||||
if (amp != 0 && this.canUseEnergy(85)) {
|
if (amp != 0 && this.canUseEnergy(85)) {
|
||||||
this.useEnergy(85);
|
this.useEnergy(85);
|
||||||
|
|
|
@ -19,18 +19,48 @@
|
||||||
"fluid": "fluidcalciumcarbonate"
|
"fluid": "fluidcalciumcarbonate"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"techreborn.carbon": {
|
||||||
|
"model": "forge:fluid",
|
||||||
|
"custom": {
|
||||||
|
"fluid": "fluidcarbon"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"techreborn.carbonfiber": {
|
||||||
|
"model": "forge:fluid",
|
||||||
|
"custom": {
|
||||||
|
"fluid": "fluidcarbonfiber"
|
||||||
|
}
|
||||||
|
},
|
||||||
"techreborn.chlorite": {
|
"techreborn.chlorite": {
|
||||||
"model": "forge:fluid",
|
"model": "forge:fluid",
|
||||||
"custom": {
|
"custom": {
|
||||||
"fluid": "fluidchlorite"
|
"fluid": "fluidchlorite"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"techreborn.compressedair": {
|
||||||
|
"model": "forge:fluid",
|
||||||
|
"custom": {
|
||||||
|
"fluid": "fluidcompressedair"
|
||||||
|
}
|
||||||
|
},
|
||||||
"techreborn.deuterium": {
|
"techreborn.deuterium": {
|
||||||
"model": "forge:fluid",
|
"model": "forge:fluid",
|
||||||
"custom": {
|
"custom": {
|
||||||
"fluid": "fluiddeuterium"
|
"fluid": "fluiddeuterium"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"techreborn.diesel": {
|
||||||
|
"model": "forge:fluid",
|
||||||
|
"custom": {
|
||||||
|
"fluid": "fluiddiesel"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"techreborn.electrolyzedwater": {
|
||||||
|
"model": "forge:fluid",
|
||||||
|
"custom": {
|
||||||
|
"fluid": "fluidelectrolyzedwater"
|
||||||
|
}
|
||||||
|
},
|
||||||
"techreborn.glyceryl": {
|
"techreborn.glyceryl": {
|
||||||
"model": "forge:fluid",
|
"model": "forge:fluid",
|
||||||
"custom": {
|
"custom": {
|
||||||
|
@ -79,12 +109,24 @@
|
||||||
"fluid": "fluidmethane"
|
"fluid": "fluidmethane"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"techreborn.nitrocarbon": {
|
||||||
|
"model": "forge:fluid",
|
||||||
|
"custom": {
|
||||||
|
"fluid": "fluidnitrocarbon"
|
||||||
|
}
|
||||||
|
},
|
||||||
"techreborn.nitrocoalfuel": {
|
"techreborn.nitrocoalfuel": {
|
||||||
"model": "forge:fluid",
|
"model": "forge:fluid",
|
||||||
"custom": {
|
"custom": {
|
||||||
"fluid": "fluidnitrocoalfuel"
|
"fluid": "fluidnitrocoalfuel"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"techreborn.nitrodiesel": {
|
||||||
|
"model": "forge:fluid",
|
||||||
|
"custom": {
|
||||||
|
"fluid": "fluidnitrodiesel"
|
||||||
|
}
|
||||||
|
},
|
||||||
"techreborn.nitrofuel": {
|
"techreborn.nitrofuel": {
|
||||||
"model": "forge:fluid",
|
"model": "forge:fluid",
|
||||||
"custom": {
|
"custom": {
|
||||||
|
@ -103,6 +145,12 @@
|
||||||
"fluid": "fluidnitrogendioxide"
|
"fluid": "fluidnitrogendioxide"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"techreborn.oil": {
|
||||||
|
"model": "forge:fluid",
|
||||||
|
"custom": {
|
||||||
|
"fluid": "fluidoil"
|
||||||
|
}
|
||||||
|
},
|
||||||
"techreborn.potassium": {
|
"techreborn.potassium": {
|
||||||
"model": "forge:fluid",
|
"model": "forge:fluid",
|
||||||
"custom": {
|
"custom": {
|
||||||
|
@ -127,6 +175,24 @@
|
||||||
"fluid": "fluidsodiumpersulfate"
|
"fluid": "fluidsodiumpersulfate"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"techreborn.sodiumsulfide": {
|
||||||
|
"model": "forge:fluid",
|
||||||
|
"custom": {
|
||||||
|
"fluid": "fluidsodiumsulfide"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"techreborn.sulfur": {
|
||||||
|
"model": "forge:fluid",
|
||||||
|
"custom": {
|
||||||
|
"fluid": "fluidsulfur"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"techreborn.sulfuricacid": {
|
||||||
|
"model": "forge:fluid",
|
||||||
|
"custom": {
|
||||||
|
"fluid": "fluidsulfuricacid"
|
||||||
|
}
|
||||||
|
},
|
||||||
"techreborn.tritium": {
|
"techreborn.tritium": {
|
||||||
"model": "forge:fluid",
|
"model": "forge:fluid",
|
||||||
"custom": {
|
"custom": {
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{
|
{
|
||||||
"forge_marker": 1,
|
"forge_marker": 1,
|
||||||
"defaults": {
|
"defaults": {
|
||||||
"model": "builtin/generated",
|
"model": "builtin/generated",
|
||||||
|
|
|
@ -972,8 +972,9 @@ death.attack.shock=%s was electrocuted
|
||||||
|
|
||||||
|
|
||||||
#Entitys
|
#Entitys
|
||||||
entity.techreborn.nuke.name=Nuke
|
entity.nuke.name=Nuke
|
||||||
|
|
||||||
|
#Tooltips
|
||||||
tooltip.wip=WIP Coming Soon
|
tooltip.wip=WIP Coming Soon
|
||||||
tooltip.upBroken=Upgrades DO NOT function!
|
tooltip.upBroken=Upgrades DO NOT function!
|
||||||
tooltip.ingredient=Currently only a crafting ingredient
|
tooltip.ingredient=Currently only a crafting ingredient
|
||||||
|
|
After Width: | Height: | Size: 4.2 KiB |
|
@ -0,0 +1,5 @@
|
||||||
|
{
|
||||||
|
"animation":{
|
||||||
|
"frametime":2
|
||||||
|
}
|
||||||
|
}
|
After Width: | Height: | Size: 2.4 KiB |
|
@ -0,0 +1,5 @@
|
||||||
|
{
|
||||||
|
"animation":{
|
||||||
|
"frametime":2
|
||||||
|
}
|
||||||
|
}
|
After Width: | Height: | Size: 104 B |
|
@ -0,0 +1,5 @@
|
||||||
|
{
|
||||||
|
"animation":{
|
||||||
|
"frametime":2
|
||||||
|
}
|
||||||
|
}
|
After Width: | Height: | Size: 2.4 KiB |
|
@ -0,0 +1,5 @@
|
||||||
|
{
|
||||||
|
"animation":{
|
||||||
|
"frametime":2
|
||||||
|
}
|
||||||
|
}
|
After Width: | Height: | Size: 5.4 KiB |
|
@ -0,0 +1,5 @@
|
||||||
|
{
|
||||||
|
"animation":{
|
||||||
|
"frametime":2
|
||||||
|
}
|
||||||
|
}
|
After Width: | Height: | Size: 3.7 KiB |
|
@ -0,0 +1,5 @@
|
||||||
|
{
|
||||||
|
"animation":{
|
||||||
|
"frametime":2
|
||||||
|
}
|
||||||
|
}
|
After Width: | Height: | Size: 6.9 KiB |
|
@ -0,0 +1,5 @@
|
||||||
|
{
|
||||||
|
"animation":{
|
||||||
|
"frametime":2
|
||||||
|
}
|
||||||
|
}
|
Before Width: | Height: | Size: 4.2 KiB After Width: | Height: | Size: 537 B |
After Width: | Height: | Size: 2.8 KiB |
|
@ -0,0 +1,5 @@
|
||||||
|
{
|
||||||
|
"animation":{
|
||||||
|
"frametime":2
|
||||||
|
}
|
||||||
|
}
|
After Width: | Height: | Size: 2.5 KiB |
|
@ -0,0 +1,5 @@
|
||||||
|
{
|
||||||
|
"animation":{
|
||||||
|
"frametime":1
|
||||||
|
}
|
||||||
|
}
|
After Width: | Height: | Size: 1.8 KiB |
|
@ -0,0 +1,5 @@
|
||||||
|
{
|
||||||
|
"animation":{
|
||||||
|
"frametime":2
|
||||||
|
}
|
||||||
|
}
|
Before Width: | Height: | Size: 25 KiB After Width: | Height: | Size: 14 KiB |
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 666 B |
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 681 B |
Before Width: | Height: | Size: 610 B After Width: | Height: | Size: 653 B |