aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Robertz <dream-master@gmx.net>2022-07-13 13:22:15 +0700
committerGitHub <noreply@github.com>2022-07-13 13:22:15 +0700
commit4816f56b03394d3f430d7baecf107daaf131902f (patch)
tree201fe0ee46688b86778fc326f750bb0f2e282b75
parent06b3d6a41d9aec66944657290f7bc0cb79395084 (diff)
parenta390c4301c8aac0f5c67fd6137e6319a62f0169f (diff)
downloadGT5-Unofficial-4816f56b03394d3f430d7baecf107daaf131902f.tar.gz
GT5-Unofficial-4816f56b03394d3f430d7baecf107daaf131902f.tar.bz2
GT5-Unofficial-4816f56b03394d3f430d7baecf107daaf131902f.zip
Merge pull request #20 from GTNewHorizons/dissolution-3
Increase output limit for Dissolution Tank NEI
-rw-r--r--build.gradle233
-rw-r--r--dependencies.gradle52
-rw-r--r--repositories.gradle44
-rw-r--r--src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java213
-rw-r--r--src/main/java/com/elisis/gtnhlanth/Tags.java19
-rw-r--r--src/main/java/com/elisis/gtnhlanth/client/ClientProxy.java12
-rw-r--r--src/main/java/com/elisis/gtnhlanth/common/CommonProxy.java35
-rw-r--r--src/main/java/com/elisis/gtnhlanth/common/register/BotWerkstoffMaterialPool.java290
-rw-r--r--src/main/java/com/elisis/gtnhlanth/common/register/LanthItemList.java20
-rw-r--r--src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java1282
-rw-r--r--src/main/java/com/elisis/gtnhlanth/common/tileentity/Digester.java323
-rw-r--r--src/main/java/com/elisis/gtnhlanth/common/tileentity/DissolutionTank.java433
-rw-r--r--src/main/java/com/elisis/gtnhlanth/loader/BotRecipes.java933
-rw-r--r--src/main/java/com/elisis/gtnhlanth/loader/MetaTileEntity_Loader.java4
-rw-r--r--src/main/java/com/elisis/gtnhlanth/loader/RecipeAdder.java222
-rw-r--r--src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java2161
-rw-r--r--src/main/java/com/elisis/gtnhlanth/loader/ZPMRubberChanges.java550
-rw-r--r--src/main/java/com/elisis/gtnhlanth/util/DescTextLocalization.java11
-rw-r--r--src/main/java/com/elisis/gtnhlanth/xmod/nei/DigesterHandler.java25
-rw-r--r--src/main/java/com/elisis/gtnhlanth/xmod/nei/DisstankHandler.java25
-rw-r--r--src/main/java/com/elisis/gtnhlanth/xmod/nei/IMC.java3
-rw-r--r--src/main/java/com/elisis/gtnhlanth/xmod/nei/NEI_Config.java38
22 files changed, 3641 insertions, 3287 deletions
diff --git a/build.gradle b/build.gradle
index 656f439f7a..5073008f95 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,4 +1,4 @@
-//version: 1644894948
+//version: 1656760732
/*
DO NOT CHANGE THIS FILE!
@@ -12,7 +12,12 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
import org.gradle.internal.logging.text.StyledTextOutput.Style
import org.gradle.internal.logging.text.StyledTextOutputFactory
+import java.nio.file.Files
+import java.nio.file.Paths
import java.util.concurrent.TimeUnit
+import java.util.zip.ZipEntry
+import java.util.zip.ZipInputStream
+import java.util.zip.ZipOutputStream
buildscript {
repositories {
@@ -44,13 +49,15 @@ plugins {
id 'eclipse'
id 'scala'
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.jetbrains.kotlin.jvm' version '1.5.30' apply false
+ id 'org.jetbrains.kotlin.kapt' version '1.5.30' apply false
+ id 'com.google.devtools.ksp' version '1.5.30-1.0.0' 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 '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
+ id 'com.github.gmazzo.buildconfig' version '3.0.3' apply false
+ id "com.diffplug.spotless" version "6.7.2"
}
if (project.file('.git/HEAD').isFile()) {
@@ -77,6 +84,37 @@ idea {
}
}
+// Spotless autoformatter
+// See https://github.com/diffplug/spotless/tree/main/plugin-gradle
+// Can be locally toggled via spotless:off/spotless:on comments
+spotless {
+ encoding 'UTF-8'
+
+ format 'misc', {
+ target '.gitignore'
+
+ trimTrailingWhitespace()
+ indentWithSpaces(4)
+ endWithNewline()
+ }
+ java {
+ toggleOffOn()
+ importOrder()
+ removeUnusedImports()
+ palantirJavaFormat('1.1.0') // last version supporting jvm 8
+ }
+ kotlin {
+ toggleOffOn()
+ ktfmt('0.39')
+ }
+ groovyGradle {
+ toggleOffOn()
+ importOrder()
+ target '*.gradle'
+ greclipse('4.19.0') // last version supporting jvm 8
+ }
+}
+
if(JavaVersion.current() != JavaVersion.VERSION_1_8) {
throw new GradleException("This project requires Java 8, but it's running on " + JavaVersion.current())
}
@@ -103,6 +141,11 @@ checkPropertyExists("usesShadowedDependencies")
checkPropertyExists("developmentEnvironmentUserName")
boolean noPublishedSources = project.findProperty("noPublishedSources") ? project.noPublishedSources.toBoolean() : false
+boolean usesMixinDebug = project.findProperty('usesMixinDebug') ?: project.usesMixins.toBoolean()
+boolean forceEnableMixins = project.findProperty('forceEnableMixins') ? project.forceEnableMixins.toBoolean() : false
+String channel = project.findProperty('channel') ? project.channel : 'stable'
+String mappingsVersion = project.findProperty('mappingsVersion') ? project.mappingsVersion : '12'
+String remoteMappings = project.findProperty('remoteMappings') ? project.remoteMappings : 'https://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/'
String javaSourceDir = "src/main/java/"
String scalaSourceDir = "src/main/scala/"
@@ -213,11 +256,11 @@ else {
def arguments = []
def jvmArguments = []
-if (usesMixins.toBoolean()) {
+if (usesMixins.toBoolean() || forceEnableMixins) {
arguments += [
"--tweakClass org.spongepowered.asm.launch.MixinTweaker"
]
- if (!project.hasProperty(usesMixinDebug) || usesMixinDebug.toBoolean()) {
+ if (usesMixinDebug.toBoolean()) {
jvmArguments += [
"-Dmixin.debug.countInjections=true",
"-Dmixin.debug.verbose=true",
@@ -278,7 +321,7 @@ repositories {
name 'Overmind forge repo mirror'
url 'https://gregtech.overminddl1.com/'
}
- if(usesMixins.toBoolean()) {
+ if(usesMixins.toBoolean() || forceEnableMixins) {
maven {
name 'sponge'
url 'https://repo.spongepowered.org/repository/maven-public'
@@ -295,6 +338,8 @@ dependencies {
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')
+ }
+ if(usesMixins.toBoolean() || forceEnableMixins) {
// using 0.8 to workaround a issue in 0.7 which fails mixin application
compile('com.github.GTNewHorizons:SpongePoweredMixin:0.7.12-GTNH') {
// Mixin includes a lot of dependencies that are too up-to-date
@@ -567,7 +612,7 @@ publishing {
artifact source: shadowJar, classifier: ""
}
if(!noPublishedSources) {
- artifact source: sourcesJar, classifier: "src"
+ artifact source: sourcesJar, classifier: "sources"
}
artifact source: usesShadowedDependencies.toBoolean() ? shadowDevJar : devJar, classifier: "dev"
if (apiPackage) {
@@ -667,7 +712,103 @@ configure(updateBuildScript) {
description = 'Updates the build script to the latest version'
}
-// Deobfuscation
+// Parameter Deobfuscation
+
+task deobfParams {
+ doLast {
+
+ String mcpDir = "$project.gradle.gradleUserHomeDir/caches/minecraft/de/oceanlabs/mcp/mcp_$channel/$mappingsVersion"
+ String mcpZIP = "$mcpDir/mcp_$channel-$mappingsVersion-${minecraftVersion}.zip"
+ String paramsCSV = "$mcpDir/params.csv"
+
+ download.run {
+ src "https://maven.minecraftforge.net/de/oceanlabs/mcp/mcp_$channel/$mappingsVersion-$minecraftVersion/mcp_$channel-$mappingsVersion-${minecraftVersion}.zip"
+ dest mcpZIP
+ overwrite false
+ }
+
+ if(!file(paramsCSV).exists()) {
+ println("Extracting MCP archive ...")
+ unzip(mcpZIP, mcpDir)
+ }
+
+ println("Parsing params.csv ...")
+ Map<String, String> params = new HashMap<>()
+ Files.lines(Paths.get(paramsCSV)).forEach{line ->
+ String[] cells = line.split(",")
+ if(cells.length > 2 && cells[0].matches("p_i?\\d+_\\d+_")) {
+ params.put(cells[0], cells[1])
+ }
+ }
+
+ out.style(Style.Success).println("Modified ${replaceParams(file("$projectDir/src/main/java"), params)} files!")
+ out.style(Style.Failure).println("Don't forget to verify that the code still works as before!\n It could be broken due to duplicate variables existing now\n or parameters taking priority over other variables.")
+ }
+}
+
+static int replaceParams(File file, Map<String, String> params) {
+ int fileCount = 0
+
+ if(file.isDirectory()) {
+ for(File f : file.listFiles()) {
+ fileCount += replaceParams(f, params)
+ }
+ return fileCount
+ }
+ println("Visiting ${file.getName()} ...")
+ try {
+ String content = new String(Files.readAllBytes(file.toPath()))
+ int hash = content.hashCode()
+ params.forEach{key, value ->
+ content = content.replaceAll(key, value)
+ }
+ if(hash != content.hashCode()) {
+ Files.write(file.toPath(), content.getBytes("UTF-8"))
+ return 1
+ }
+ } catch(Exception e) {
+ e.printStackTrace()
+ }
+ return 0
+}
+
+// Credit: bitsnaps (https://gist.github.com/bitsnaps/00947f2dce66f4bbdabc67d7e7b33681)
+static unzip(String zipFileName, String outputDir) {
+ byte[] buffer = new byte[16384]
+ ZipInputStream zis = new ZipInputStream(new FileInputStream(zipFileName))
+ ZipEntry zipEntry = zis.getNextEntry()
+ while (zipEntry != null) {
+ File newFile = new File(outputDir + File.separator, zipEntry.name)
+ if (zipEntry.isDirectory()) {
+ if (!newFile.isDirectory() && !newFile.mkdirs()) {
+ throw new IOException("Failed to create directory $newFile")
+ }
+ } else {
+ // fix for Windows-created archives
+ File parent = newFile.parentFile
+ if (!parent.isDirectory() && !parent.mkdirs()) {
+ throw new IOException("Failed to create directory $parent")
+ }
+ // write file content
+ FileOutputStream fos = new FileOutputStream(newFile)
+ int len = 0
+ while ((len = zis.read(buffer)) > 0) {
+ fos.write(buffer, 0, len)
+ }
+ fos.close()
+ }
+ zipEntry = zis.getNextEntry()
+ }
+ zis.closeEntry()
+ zis.close()
+}
+
+configure(deobfParams) {
+ group = 'forgegradle'
+ description = 'Rename all obfuscated parameter names inherited from Minecraft classes'
+}
+
+// Dependency Deobfuscation
def deobf(String sourceURL) {
try {
@@ -680,7 +821,7 @@ def deobf(String sourceURL) {
fileName = fileName.substring(lastSlash + 1)
}
//get rid of extension:
- if(fileName.endsWith(".jar")) {
+ if(fileName.endsWith(".jar") || fileName.endsWith(".litemod")) {
fileName = fileName.substring(0, fileName.lastIndexOf("."))
}
@@ -692,26 +833,40 @@ def deobf(String sourceURL) {
Collections.reverse(parts)
hostName = String.join(".", parts)
- return deobf(sourceURL, hostName + "/" + fileName)
+ return deobf(sourceURL, "$hostName/$fileName")
} catch(Exception e) {
- return deobf(sourceURL, "deobf/" + String.valueOf(sourceURL.hashCode()))
+ return deobf(sourceURL, "deobf/${sourceURL.hashCode()}")
}
}
// 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"
+def deobf(String sourceURL, String rawFileName) {
+ String bon2Version = "2.5.1"
+ String fileName = URLDecoder.decode(rawFileName, "UTF-8")
+ String cacheDir = "$project.gradle.gradleUserHomeDir/caches"
+ String bon2Dir = "$cacheDir/forge_gradle/deobf"
+ String bon2File = "$bon2Dir/BON2-${bon2Version}.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)
}
+ String mappingsVer
+ if(remoteMappings) {
+ String id = "${forgeVersion.split("\\.")[3]}-$minecraftVersion"
+ String mappingsZIP = "$cacheDir/forge_gradle/maven_downloader/de/oceanlabs/mcp/mcp_snapshot_nodoc/$id/mcp_snapshot_nodoc-${id}.zip"
+
+ zipMappings(mappingsZIP, remoteMappings, bon2Dir)
+
+ mappingsVer = "snapshot_$id"
+ } else {
+ mappingsVer = "${channel}_$mappingsVersion"
+ }
+
download.run {
- src 'https://github.com/GTNewHorizons/BON2/releases/download/2.5.0/BON2-2.5.0.CUSTOM-all.jar'
+ src "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases/com/github/parker8283/BON2/$bon2Version-CUSTOM/BON2-$bon2Version-CUSTOM-all.jar"
dest bon2File
quiet true
overwrite false
@@ -725,14 +880,48 @@ def deobf(String sourceURL, String fileName) {
}
exec {
- commandLine 'java', '-jar', bon2File, '--inputJar', obfFile, '--outputJar', deobfFile, '--mcVer', '1.7.10', '--mappingsVer', 'stable_12', '--notch'
+ commandLine 'java', '-jar', bon2File, '--inputJar', obfFile, '--outputJar', deobfFile, '--mcVer', minecraftVersion, '--mappingsVer', mappingsVer, '--notch'
workingDir bon2Dir
- standardOutput = new ByteArrayOutputStream()
+ standardOutput = new FileOutputStream("${deobfFile}.log")
}
return files(deobfFile)
}
+def zipMappings(String zipPath, String url, String bon2Dir) {
+ File zipFile = new File(zipPath)
+ if(zipFile.exists()) {
+ return
+ }
+
+ String fieldsCache = "$bon2Dir/data/fields.csv"
+ String methodsCache = "$bon2Dir/data/methods.csv"
+
+ download.run {
+ src "${url}fields.csv"
+ dest fieldsCache
+ quiet true
+ }
+ download.run {
+ src "${url}methods.csv"
+ dest methodsCache
+ quiet true
+ }
+
+ zipFile.getParentFile().mkdirs()
+ ZipOutputStream zos = new ZipOutputStream(new FileOutputStream(zipFile))
+
+ zos.putNextEntry(new ZipEntry("fields.csv"))
+ Files.copy(Paths.get(fieldsCache), zos)
+ zos.closeEntry()
+
+ zos.putNextEntry(new ZipEntry("methods.csv"))
+ Files.copy(Paths.get(methodsCache), zos)
+ zos.closeEntry()
+
+ zos.close()
+}
+
// Helper methods
def checkPropertyExists(String propertyName) {
diff --git a/dependencies.gradle b/dependencies.gradle
index 8b9aa29518..2e91d093ad 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -1,39 +1,39 @@
// Add your dependencies here
dependencies {
- compile('com.github.GTNewHorizons:GT5-Unofficial:5.09.40.41:dev')
+ compile('com.github.GTNewHorizons:GT5-Unofficial:5.09.40.41:dev')
compile('com.github.GTNewHorizons:NewHorizonsCoreMod:1.9.21:dev')
- compile('com.github.GTNewHorizons:StructureLib:1.0.16:dev')
- compile('com.github.GTNewHorizons:GTplusplus:1.7.30:dev')
- compile('com.github.GTNewHorizons:GoodGenerator:0.4.1:dev')
- compile('com.github.GTNewHorizons:TecTech:5.0.6:dev')
- compile('com.github.GTNewHorizons:ForestryMC:4.4.6:dev')
- compile('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-79-GTNH:dev')
- compile('com.github.GTNewHorizons:bartworks:0.5.42:dev')
- compile('com.github.GTNewHorizons:BuildCraft:7.1.27:dev')
- compile('com.github.GTNewHorizons:NotEnoughItems:2.2.8-GTNH:dev')
-
- compile('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
-
- compileOnly('com.github.GTNewHorizons:EnderCore:0.2.6:dev') {transitive=false}
- compileOnly('com.github.GTNewHorizons:AppleCore:3.1.9:dev') {transitive = false}
- compileOnly('com.github.GTNewHorizons:Railcraft:9.13.6:dev') {transitive = false}
- compileOnly('com.github.GTNewHorizons:EnderIO:2.3.1.31:dev') {transitive=false}
- compileOnly('com.github.GTNewHorizons:ExtraCells2:2.5.9:dev') {transitive=false}
-
- compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') {transitive=false}
+ compile('com.github.GTNewHorizons:StructureLib:1.0.16:dev')
+ compile('com.github.GTNewHorizons:GTplusplus:1.7.30:dev')
+ compile('com.github.GTNewHorizons:GoodGenerator:0.4.1:dev')
+ compile('com.github.GTNewHorizons:TecTech:5.0.6:dev')
+ compile('com.github.GTNewHorizons:ForestryMC:4.4.6:dev')
+ compile('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-79-GTNH:dev')
+ compile('com.github.GTNewHorizons:bartworks:0.5.42:dev')
+ compile('com.github.GTNewHorizons:BuildCraft:7.1.27:dev')
+ compile('com.github.GTNewHorizons:NotEnoughItems:2.2.8-GTNH:dev')
+
+ compile('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
+
+ compileOnly('com.github.GTNewHorizons:EnderCore:0.2.6:dev') {transitive=false}
+ compileOnly('com.github.GTNewHorizons:AppleCore:3.1.9:dev') {transitive = false}
+ compileOnly('com.github.GTNewHorizons:Railcraft:9.13.6:dev') {transitive = false}
+ compileOnly('com.github.GTNewHorizons:EnderIO:2.3.1.31:dev') {transitive=false}
+ compileOnly('com.github.GTNewHorizons:ExtraCells2:2.5.9:dev') {transitive=false}
+
+ compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') {transitive=false}
//compile('com.github.GTNewHorizons:GalacticGregGT5:1.0.7:dev')
//compile('com.github.GTNewHorizons:TecTech:5.0.6:dev')
//compile('com.github.GTNewHorizons:Galacticraft:3.0.40-GTNH:dev')
- //compileOnly('com.github.GTNewHorizons:Avaritia:1.25)
+ //compileOnly('com.github.GTNewHorizons:Avaritia:1.25)
//compile files('ThaumicTinkerer-1.7.10-2.5-4-dev.jar')
- //compile files('Botdustries-1.7.10-1.0.1.jar')
+ //compile files('Botdustries-1.7.10-1.0.1.jar')
- //runtime('com.github.GTNewHorizons:Baubles:1.0.1.14:dev')
- //runtime('com.github.GTNewHorizons:Yamcl:0.5.82:dev')
- runtime('curse.maven:cofh-core-69162:2388751') //for GT++
- runtime('curse.maven:advsolar-362768:2885953') //for GT++
+ //runtime('com.github.GTNewHorizons:Baubles:1.0.1.14:dev')
+ //runtime('com.github.GTNewHorizons:Yamcl:0.5.82:dev')
+ runtime('curse.maven:cofh-core-69162:2388751') //for GT++
+ runtime('curse.maven:advsolar-362768:2885953') //for GT++
}
diff --git a/repositories.gradle b/repositories.gradle
index 1dc4c3cb4c..911d3c94a5 100644
--- a/repositories.gradle
+++ b/repositories.gradle
@@ -1,26 +1,26 @@
// Add any additional repositories for your dependencies here
repositories {
- maven {
- name 'GTNH Maven'
- url 'http://jenkins.usrv.eu:8081/nexus/content/groups/public/'
- allowInsecureProtocol
- }
- maven {
- name 'ic2'
- url 'https://maven.ic2.player.to/'
- metadataSources {
- mavenPom()
- artifact()
- }
- }
- maven {
- url 'https://cursemaven.com'
- content {
- includeGroup 'curse.maven'
- }
- }
- maven {
- url 'https://jitpack.io'
- }
+ maven {
+ name 'GTNH Maven'
+ url 'http://jenkins.usrv.eu:8081/nexus/content/groups/public/'
+ allowInsecureProtocol
+ }
+ maven {
+ name 'ic2'
+ url 'https://maven.ic2.player.to/'
+ metadataSources {
+ mavenPom()
+ artifact()
+ }
+ }
+ maven {
+ url 'https://cursemaven.com'
+ content {
+ includeGroup 'curse.maven'
+ }
+ }
+ maven {
+ url 'https://jitpack.io'
+ }
}
diff --git a/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java b/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java
index e15c3bcf33..f7837c68e6 100644
--- a/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java
+++ b/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java
@@ -1,108 +1,105 @@
-package com.elisis.gtnhlanth;
-
-import java.util.Arrays;
-import java.util.logging.Logger;
-
-import com.elisis.gtnhlanth.common.CommonProxy;
-import com.elisis.gtnhlanth.common.register.BotWerkstoffMaterialPool;
-import com.elisis.gtnhlanth.common.register.LanthItemList;
-import com.elisis.gtnhlanth.common.register.WerkstoffMaterialPool;
-import com.elisis.gtnhlanth.loader.BotRecipes;
-import com.elisis.gtnhlanth.loader.RecipeLoader;
-import com.elisis.gtnhlanth.loader.ZPMRubberChanges;
-import com.elisis.gtnhlanth.xmod.nei.IMC;
-import com.github.bartimaeusnek.bartworks.API.WerkstoffAdderRegistry;
-import com.github.bartimaeusnek.bartworks.system.material.Werkstoff;
-
-import cpw.mods.fml.common.Mod;
-import cpw.mods.fml.common.Mod.EventHandler;
-import cpw.mods.fml.common.SidedProxy;
-import cpw.mods.fml.common.event.FMLInitializationEvent;
-import cpw.mods.fml.common.event.FMLLoadCompleteEvent;
-import cpw.mods.fml.common.event.FMLPostInitializationEvent;
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import cpw.mods.fml.common.event.FMLServerAboutToStartEvent;
-import cpw.mods.fml.common.event.FMLServerStartedEvent;
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_Log;
-import net.minecraftforge.oredict.OreDictionary;
-
-@Mod(modid = Tags.MODID, version = Tags.VERSION, name = Tags.MODNAME,
- dependencies = "required-after:IC2; " + "required-after:gregtech; "
- + "required-after:bartworks; "
- + "required-after:GoodGenerator; "
- + "before:miscutils; "
- + "required-after:dreamcraft; "
- )
-public class GTNHLanthanides {
-
- public static Logger LOG = Logger.getLogger("GTNH:Lanthanides");
-
- @Mod.Instance
- public static GTNHLanthanides instance;
-
- @SidedProxy(clientSide = "com.elisis.gtnhlanth.client.ClientProxy",serverSide = "com.elisis.gtnhlanth.common.CommonProxy")
- public static CommonProxy proxy;
-
- @EventHandler
- public static void preInit(FMLPreInitializationEvent e) {
- WerkstoffAdderRegistry.addWerkstoffAdder(new WerkstoffMaterialPool());
- WerkstoffAdderRegistry.addWerkstoffAdder(new BotWerkstoffMaterialPool());
- LanthItemList.register();
- GregTech_API.sAfterGTPostload.add(new ZPMRubberChanges());
- proxy.preInit(e);
- }
-
- @EventHandler
- public static void init(FMLInitializationEvent e) {
- proxy.init(e);
- WerkstoffMaterialPool.runInit();
- IMC.IMCSender();
- }
-
- @EventHandler
- public static void postInit(FMLPostInitializationEvent e) {
- RecipeLoader.loadGeneral();
- RecipeLoader.loadLanthanideRecipes();
- RecipeLoader.addRandomChemCrafting();
- BotRecipes.addGTRecipe();
- BotRecipes.addFuels();
- //RecipeLoader.loadZylonRecipes();
- proxy.postInit(e);
- //GT_Log.out.print(FluidRegistry.getFluid("Sodium Tungstate").getName());
-
- GT_Log.out.print(Arrays.toString(Werkstoff.werkstoffNameHashMap.keySet().toArray()));
- GT_Log.out.print(Arrays.toString(Werkstoff.werkstoffHashMap.keySet().toArray()));
-
- GT_Log.out.print("HMMM " + Arrays.toString(OreDictionary.getOreIDs(WerkstoffMaterialPool.DephosphatedSamariumConcentrate.get(OrePrefixes.dust, 1))));
-
-
- }
-
- @EventHandler
- public static void onModLoadingComplete(FMLLoadCompleteEvent e) {
- GT_Log.out.print("AAAAAAAAAAAAAA");
- //
- GT_Log.out.print("We are done loading");
- BotRecipes.removeRecipes();
-
- GT_Log.out.print("blah blah " + WerkstoffMaterialPool.PTMEGElastomer.hasGenerationFeature(OrePrefixes.ingot));
-
-
-
- }
-
- // This is horrifying and I'm sorry
- @EventHandler
- public static void onServerAboutToStart(FMLServerAboutToStartEvent e) {
- //RecipeLoader.removeCeriumSources();
- }
-
- @EventHandler
- public static void onServerStart(FMLServerStartedEvent e) {
- RecipeLoader.removeCeriumSources();
- }
-
-
-}
+package com.elisis.gtnhlanth;
+
+import com.elisis.gtnhlanth.common.CommonProxy;
+import com.elisis.gtnhlanth.common.register.BotWerkstoffMaterialPool;
+import com.elisis.gtnhlanth.common.register.LanthItemList;
+import com.elisis.gtnhlanth.common.register.WerkstoffMaterialPool;
+import com.elisis.gtnhlanth.loader.BotRecipes;
+import com.elisis.gtnhlanth.loader.RecipeLoader;
+import com.elisis.gtnhlanth.loader.ZPMRubberChanges;
+import com.elisis.gtnhlanth.xmod.nei.IMC;
+import com.github.bartimaeusnek.bartworks.API.WerkstoffAdderRegistry;
+import com.github.bartimaeusnek.bartworks.system.material.Werkstoff;
+import cpw.mods.fml.common.Mod;
+import cpw.mods.fml.common.Mod.EventHandler;
+import cpw.mods.fml.common.SidedProxy;
+import cpw.mods.fml.common.event.FMLInitializationEvent;
+import cpw.mods.fml.common.event.FMLLoadCompleteEvent;
+import cpw.mods.fml.common.event.FMLPostInitializationEvent;
+import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+import cpw.mods.fml.common.event.FMLServerAboutToStartEvent;
+import cpw.mods.fml.common.event.FMLServerStartedEvent;
+import gregtech.api.GregTech_API;
+import gregtech.api.enums.OrePrefixes;
+import gregtech.api.util.GT_Log;
+import java.util.Arrays;
+import java.util.logging.Logger;
+import net.minecraftforge.oredict.OreDictionary;
+
+@Mod(
+ modid = Tags.MODID,
+ version = Tags.VERSION,
+ name = Tags.MODNAME,
+ dependencies = "required-after:IC2; " + "required-after:gregtech; "
+ + "required-after:bartworks; "
+ + "required-after:GoodGenerator; "
+ + "before:miscutils; "
+ + "required-after:dreamcraft; ")
+public class GTNHLanthanides {
+
+ public static Logger LOG = Logger.getLogger("GTNH:Lanthanides");
+
+ @Mod.Instance
+ public static GTNHLanthanides instance;
+
+ @SidedProxy(
+ clientSide = "com.elisis.gtnhlanth.client.ClientProxy",
+ serverSide = "com.elisis.gtnhlanth.common.CommonProxy")
+ public static CommonProxy proxy;
+
+ @EventHandler
+ public static void preInit(FMLPreInitializationEvent e) {
+ WerkstoffAdderRegistry.addWerkstoffAdder(new WerkstoffMaterialPool());
+ WerkstoffAdderRegistry.addWerkstoffAdder(new BotWerkstoffMaterialPool());
+ LanthItemList.register();
+ GregTech_API.sAfterGTPostload.add(new ZPMRubberChanges());
+ proxy.preInit(e);
+ }
+
+ @EventHandler
+ public static void init(FMLInitializationEvent e) {
+ proxy.init(e);
+ WerkstoffMaterialPool.runInit();
+ IMC.IMCSender();
+ }
+
+ @EventHandler
+ public static void postInit(FMLPostInitializationEvent e) {
+ RecipeLoader.loadGeneral();
+ RecipeLoader.loadLanthanideRecipes();
+ RecipeLoader.addRandomChemCrafting();
+ BotRecipes.addGTRecipe();
+ BotRecipes.addFuels();
+ // RecipeLoader.loadZylonRecipes();
+ proxy.postInit(e);
+ // GT_Log.out.print(FluidRegistry.getFluid("Sodium Tungstate").getName());
+
+ GT_Log.out.print(Arrays.toString(Werkstoff.werkstoffNameHashMap.keySet().toArray()));
+ GT_Log.out.print(Arrays.toString(Werkstoff.werkstoffHashMap.keySet().toArray()));
+
+ GT_Log.out.print("HMMM "
+ + Arrays.toString(OreDictionary.getOreIDs(
+ WerkstoffMaterialPool.DephosphatedSamariumConcentrate.get(OrePrefixes.dust, 1))));
+ }
+
+ @EventHandler
+ public static void onModLoadingComplete(FMLLoadCompleteEvent e) {
+ GT_Log.out.print("AAAAAAAAAAAAAA");
+ //
+ GT_Log.out.print("We are done loading");
+ BotRecipes.removeRecipes();
+
+ GT_Log.out.print("blah blah " + WerkstoffMaterialPool.PTMEGElastomer.hasGenerationFeature(OrePrefixes.ingot));
+ }
+
+ // This is horrifying and I'm sorry
+ @EventHandler
+ public static void onServerAboutToStart(FMLServerAboutToStartEvent e) {
+ // RecipeLoader.removeCeriumSources();
+ }
+
+ @EventHandler
+ public static void onServerStart(FMLServerStartedEvent e) {
+ RecipeLoader.removeCeriumSources();
+ }
+}
diff --git a/src/main/java/com/elisis/gtnhlanth/Tags.java b/src/main/java/com/elisis/gtnhlanth/Tags.java
index bd71de9398..93666809ba 100644
--- a/src/main/java/com/elisis/gtnhlanth/Tags.java
+++ b/src/main/java/com/elisis/gtnhlanth/Tags.java
@@ -1,10 +1,9 @@
-package com.elisis.gtnhlanth;
-
-public class Tags {
-
- public static final String MODID = "GRADLETOKEN_MODID";
- public static final String MODNAME = "GRADLETOKEN_MODNAME";
- public static final String VERSION = "GRADLETOKEN_VERSION";
- public static final String GROUPNAME = "GRADLETOKEN_GROUPNAME";
-
-}
+package com.elisis.gtnhlanth;
+
+public class Tags {
+
+ public static final String MODID = "GRADLETOKEN_MODID";
+ public static final String MODNAME = "GRADLETOKEN_MODNAME";
+ public static final String VERSION = "GRADLETOKEN_VERSION";
+ public static final String GROUPNAME = "GRADLETOKEN_GROUPNAME";
+}
diff --git a/src/main/java/com/elisis/gtnhlanth/client/ClientProxy.java b/src/main/java/com/elisis/gtnhlanth/client/ClientProxy.java
index d663dcde51..db2f43e2c6 100644
--- a/src/main/java/com/elisis/gtnhlanth/client/ClientProxy.java
+++ b/src/main/java/com/elisis/gtnhlanth/client/ClientProxy.java
@@ -1,7 +1,5 @@
-package com.elisis.gtnhlanth.client;
-
-import com.elisis.gtnhlanth.common.CommonProxy;
-
-public class ClientProxy extends CommonProxy {
-
-}
+package com.elisis.gtnhlanth.client;
+
+import com.elisis.gtnhlanth.common.CommonProxy;
+
+public class ClientProxy extends CommonProxy {}
diff --git a/src/main/java/com/elisis/gtnhlanth/common/CommonProxy.java b/src/main/java/com/elisis/gtnhlanth/common/CommonProxy.java
index a1022cf699..6e77ba200f 100644
--- a/src/main/java/com/elisis/gtnhlanth/common/CommonProxy.java
+++ b/src/main/java/com/elisis/gtnhlanth/common/CommonProxy.java
@@ -1,21 +1,14 @@
-package com.elisis.gtnhlanth.common;
-
-import cpw.mods.fml.common.event.FMLInitializationEvent;
-import cpw.mods.fml.common.event.FMLPostInitializationEvent;
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-
-public class CommonProxy {
-
- public void preInit(FMLPreInitializationEvent e) {
-
- }
-
- public void init(FMLInitializationEvent e) {
-
- }
-
- public void postInit(FMLPostInitializationEvent e) {
-
- }
-
-}
+package com.elisis.gtnhlanth.common;
+
+import cpw.mods.fml.common.event.FMLInitializationEvent;
+import cpw.mods.fml.common.event.FMLPostInitializationEvent;
+import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+
+public class CommonProxy {
+
+ public void preInit(FMLPreInitializationEvent e) {}
+
+ public void init(FMLInitializationEvent e) {}
+
+ public void postInit(FMLPostInitializationEvent e) {}
+}
diff --git a/src/main/java/com/elisis/gtnhlanth/common/register/BotWerkstoffMaterialPool.java b/src/main/java/com/elisis/gtnhlanth/common/register/BotWerkstoffMaterialPool.java
index 73e6ec8607..f7c2569cbb 100644
--- a/src/main/java/com/elisis/gtnhlanth/common/register/BotWerkstoffMaterialPool.java
+++ b/src/main/java/com/elisis/gtnhlanth/common/register/BotWerkstoffMaterialPool.java
@@ -1,14 +1,12 @@
package com.elisis.gtnhlanth.common.register;
-import com.github.bartimaeusnek.bartworks.system.material.Werkstoff;
-import com.github.bartimaeusnek.bartworks.util.Pair;
-
-import static gregtech.api.enums.Materials.*;
-import static gregtech.api.enums.TextureSet.*;
-
import static com.github.bartimaeusnek.bartworks.system.material.Werkstoff.Types.*;
import static com.github.bartimaeusnek.bartworks.util.BW_Util.subscriptNumbers;
+import static gregtech.api.enums.Materials.*;
+import static gregtech.api.enums.TextureSet.*;
+import com.github.bartimaeusnek.bartworks.system.material.Werkstoff;
+import com.github.bartimaeusnek.bartworks.util.Pair;
/*
*
@@ -18,20 +16,19 @@ import static com.github.bartimaeusnek.bartworks.util.BW_Util.subscriptNumbers;
@SuppressWarnings("unchecked")
public class BotWerkstoffMaterialPool implements Runnable {
- public static final Werkstoff TungsticAcid = new Werkstoff(
- new short[]{0xf5, 0xf1, 0x16},
+ public static final Werkstoff TungsticAcid = new Werkstoff(
+ new short[] {0xf5, 0xf1, 0x16},
"Tungstic Acid",
new Werkstoff.Stats(),
COMPOUND,
new Werkstoff.GenerationFeatures().onlyDust().enforceUnification(),
29900,
SET_SHINY,
- new Pair<>(Hydrogen,2),
- new Pair<>(Tungsten,1),
- new Pair<>(Oxygen,4)
- );
+ new Pair<>(Hydrogen, 2),
+ new Pair<>(Tungsten, 1),
+ new Pair<>(Oxygen, 4));
public static final Werkstoff TungstenTrioxide = new Werkstoff(
- new short[]{0x0f,0x5,0x16},
+ new short[] {0x0f, 0x5, 0x16},
"Tungsten Trioxide",
new Werkstoff.Stats(),
COMPOUND,
@@ -39,384 +36,347 @@ public class BotWerkstoffMaterialPool implements Runnable {
29901,
SET_SHINY,
new Pair<>(Tungsten, 1),
- new Pair<>(Oxygen,3)
- );
-// public static final Werkstoff TungstenSteelOxide = new Werkstoff(
-// new short[]{0x1f,0x27,0x69},
-// "Tungstensteel Oxide",
-// new Werkstoff.Stats(),
-// COMPOUND,
-// new Werkstoff.GenerationFeatures().onlyDust(),
-// 29902,
-// SET_FINE,
-// new Pair<>(Tungsten, 1),
-// new Pair<>(Oxygen,3),
-// new Pair<>(Steel,1)
-// );
+ new Pair<>(Oxygen, 3));
+ // public static final Werkstoff TungstenSteelOxide = new Werkstoff(
+ // new short[]{0x1f,0x27,0x69},
+ // "Tungstensteel Oxide",
+ // new Werkstoff.Stats(),
+ // COMPOUND,
+ // new Werkstoff.GenerationFeatures().onlyDust(),
+ // 29902,
+ // SET_FINE,
+ // new Pair<>(Tungsten, 1),
+ // new Pair<>(Oxygen,3),
+ // new Pair<>(Steel,1)
+ // );
public static final Werkstoff AmmoniumNitrate = new Werkstoff(
- new short[]{0x81,0xcc,0x00},
+ new short[] {0x81, 0xcc, 0x00},
"Ammonium Nitrate",
new Werkstoff.Stats(),
COMPOUND,
new Werkstoff.GenerationFeatures().onlyDust(),
29903,
SET_FINE,
- new Pair<>(Nitrogen,1),
- new Pair<>(Hydrogen,4),
- new Pair<>(Nitrogen,1),
- new Pair<>(Oxygen,3)
- );
+ new Pair<>(Nitrogen, 1),
+ new Pair<>(Hydrogen, 4),
+ new Pair<>(Nitrogen, 1),
+ new Pair<>(Oxygen, 3));
public static final Werkstoff SodiumTungstate = new Werkstoff(
- new short[]{0xc, 0xed, 0xd7,0},
+ new short[] {0xc, 0xed, 0xd7, 0},
"Sodium Tungstate",
subscriptNumbers("Na2WO4"),
new Werkstoff.Stats(),
COMPOUND,
new Werkstoff.GenerationFeatures().disable().addCells(),
29904,
- SET_FINE
- );
+ SET_FINE);
public static final Werkstoff Phosgene = new Werkstoff(
- new short[]{0x15,0xa1,0x1a},
+ new short[] {0x15, 0xa1, 0x1a},
"Phosgene",
subscriptNumbers("COCl2"),
new Werkstoff.Stats(),
COMPOUND,
new Werkstoff.GenerationFeatures().disable().addCells(),
29905,
- SET_FINE
- );
+ SET_FINE);
public static final Werkstoff Ethylchloroformate = new Werkstoff(
- new short[]{0x0a,0xc2,0xcc},
+ new short[] {0x0a, 0xc2, 0xcc},
"Ethyl Chloroformate",
subscriptNumbers("C3H5ClO2"),
new Werkstoff.Stats(),
COMPOUND,
new Werkstoff.GenerationFeatures().disable().addCells(),
29906,
- SET_FINE
- );
+ SET_FINE);
public static final Werkstoff Ethylcarbamate = new Werkstoff(
- new short[]{0x0d,0xa9,0xb8},
+ new short[] {0x0d, 0xa9, 0xb8},
"Ethyl Carbamate",
subscriptNumbers("CH3CH2O2CNH2"),
new Werkstoff.Stats(),
COMPOUND,
new Werkstoff.GenerationFeatures().disable().addCells(),
29907,
- SET_FINE
- );
+ SET_FINE);
public static final Werkstoff EthylNnitrocarbamate = new Werkstoff(
- new short[]{0x0d,0x85,0xb8},
+ new short[] {0x0d, 0x85, 0xb8},
"Ethyl N-nitrocarbamate",
subscriptNumbers("C3H6N2O4"),
new Werkstoff.Stats(),
COMPOUND,
new Werkstoff.GenerationFeatures().disable().addCells(),
29908,
- SET_FINE
- );
+ SET_FINE);
public static final Werkstoff AmmoniumNnitrourethane = new Werkstoff(
- new short[]{0x0d,0x54,0xb8},
+ new short[] {0x0d, 0x54, 0xb8},
"Ammonium N-nitrourethane",
subscriptNumbers("C3H9N3O4"),
new Werkstoff.Stats(),
COMPOUND,
new Werkstoff.GenerationFeatures().disable().addCells(),
29909,
- SET_FINE
- );
+ SET_FINE);
public static final Werkstoff EthylDinitrocarbamate = new Werkstoff(
- new short[]{0x39,0x08,0xc2},
+ new short[] {0x39, 0x08, 0xc2},
"Ethyl Dinitrocarbamate",
subscriptNumbers("C3H5N3O6"),
new Werkstoff.Stats(),
COMPOUND,
new Werkstoff.GenerationFeatures().disable().addCells(),
29910,
- SET_FINE
- );
+ SET_FINE);
public static final Werkstoff DinitrogenPentoxide = new Werkstoff(
- new short[]{0xcf,0xeb,0x34},
+ new short[] {0xcf, 0xeb, 0x34},
"Dinitrogen Pentoxide",
subscriptNumbers("N2O5"),
new Werkstoff.Stats(),
COMPOUND,
new Werkstoff.GenerationFeatures().onlyDust(),
29911,
- SET_FINE
- );
+ SET_FINE);
public static final Werkstoff AmmoniumDinitramide = new Werkstoff(
- new short[]{0x8a,0x0f,0xd1},
+ new short[] {0x8a, 0x0f, 0xd1},
"Ammonium Dinitramide",
subscriptNumbers("H4N4O4"),
new Werkstoff.Stats(),
COMPOUND,
new Werkstoff.GenerationFeatures().disable().addCells(),
29912,
- SET_FINE
- );
+ SET_FINE);
public static final Werkstoff LMP103S = new Werkstoff(
- new short[]{0xbf,0x2f,0xc2},
+ new short[] {0xbf, 0x2f, 0xc2},
"LMP-103S",
new Werkstoff.Stats(),
COMPOUND,
new Werkstoff.GenerationFeatures().disable().addCells(),
29913,
- SET_FINE
- );
+ SET_FINE);
public static final Werkstoff OXylene = new Werkstoff(
- new short[]{0x88,0x94,0xa8},
+ new short[] {0x88, 0x94, 0xa8},
"O-Xylene",
subscriptNumbers("C8H10"),
new Werkstoff.Stats().setGas(true),
COMPOUND,
new Werkstoff.GenerationFeatures().disable().addCells(),
29915,
- SET_FINE
- );
+ SET_FINE);
public static final Werkstoff PhthalicAnhydride = new Werkstoff(
- new short[]{0x7c,0x99,0x42},
+ new short[] {0x7c, 0x99, 0x42},
"Phthalic Anhydride",
subscriptNumbers("C8H4O3"),
new Werkstoff.Stats(),
COMPOUND,
new Werkstoff.GenerationFeatures().onlyDust(),
29916,
- SET_METALLIC
- );
- public static final Werkstoff VanadiumPentoxide = new Werkstoff(
- new short[]{0x69,0x69,0x69},
+ SET_METALLIC);
+ public static final Werkstoff VanadiumPentoxide = new Werkstoff(
+ new short[] {0x69, 0x69, 0x69},
"Vanadium Pentoxide",
subscriptNumbers("V2O5"),
new Werkstoff.Stats(),
COMPOUND,
new Werkstoff.GenerationFeatures().onlyDust(),
29917,
- SET_METALLIC
- );
- public static final Werkstoff TertButylbenzene = new Werkstoff(
- new short[]{0,0,0},
+ SET_METALLIC);
+ public static final Werkstoff TertButylbenzene = new Werkstoff(
+ new short[] {0, 0, 0},
"Tert-Butylbenzene",
subscriptNumbers("C10H14"),
new Werkstoff.Stats(),
COMPOUND,
new Werkstoff.GenerationFeatures().disable().addCells(),
29918,
- SET_METALLIC
- );
- public static final Werkstoff TwoTertButylAnthraquinone = new Werkstoff(
- new short[]{0xcc,0x86,0x5a},
+ SET_METALLIC);
+ public static final Werkstoff TwoTertButylAnthraquinone = new Werkstoff(
+ new short[] {0xcc, 0x86, 0x5a},
"2-tert-butyl-anthraquinone",
subscriptNumbers("C18H16O2"),
new Werkstoff.Stats(),
COMPOUND,
new Werkstoff.GenerationFeatures().disable().addCells(),
29919,
- SET_METALLIC
- );
- public static final Werkstoff TwoTertButylAnthrahydroquinone = new Werkstoff(
- new short[]{0xad,0x53,0x1a},
+ SET_METALLIC);
+ public static final Werkstoff TwoTertButylAnthrahydroquinone = new Werkstoff(
+ new short[] {0xad, 0x53, 0x1a},
"2-tert-butyl-anthrahydroquinone",
subscriptNumbers("C18H17O2"),
new Werkstoff.Stats(),
COMPOUND,
new Werkstoff.GenerationFeatures().disable().addCells(),
29920,
- SET_METALLIC
- );
- public static final Werkstoff HydrogenPeroxide = new Werkstoff(
- new short[]{0xad,0x53,0x1a},
+ SET_METALLIC);
+ public static final Werkstoff HydrogenPeroxide = new Werkstoff(
+ new short[] {0xad, 0x53, 0x1a},
"Hydrogen Peroxide",
subscriptNumbers("H2O2"),
new Werkstoff.Stats(),
COMPOUND,
new Werkstoff.GenerationFeatures().disable().addCells().enforceUnification(),
29921,
- SET_METALLIC
- );
- public static final Werkstoff Hydrazine = new Werkstoff(
- new short[]{0xb5,0x07,0x07},
+ SET_METALLIC);
+ public static final Werkstoff Hydrazine = new Werkstoff(
+ new short[] {0xb5, 0x07, 0x07},
"hydrazine",
subscriptNumbers("N2H4"),
new Werkstoff.Stats(),
COMPOUND,
new Werkstoff.GenerationFeatures().disable().addCells(),
29922,
- SET_METALLIC
- );
- public static final Werkstoff DimethylSulfate = new Werkstoff(
- new short[]{0xff,0xfb,0x00},
+ SET_METALLIC);
+ public static final Werkstoff DimethylSulfate = new Werkstoff(
+ new short[] {0xff, 0xfb, 0x00},
"Dimethyl Sulfate",
subscriptNumbers("(CH3O)2SO2"),
new Werkstoff.Stats(),
COMPOUND,
new Werkstoff.GenerationFeatures().disable().addCells(),
29923,
- SET_METALLIC
- );
- public static final Werkstoff Monomethylhydrazine = new Werkstoff(
- new short[]{0xff,0x61,0x00},
+ SET_METALLIC);
+ public static final Werkstoff Monomethylhydrazine = new Werkstoff(
+ new short[] {0xff, 0x61, 0x00},
"Monomethylhydrazine",
subscriptNumbers("CH6N2"),
new Werkstoff.Stats(),
COMPOUND,
new Werkstoff.GenerationFeatures().disable().addCells(),
29924,
- SET_METALLIC
- );
- public static final Werkstoff Formaldehyde = new Werkstoff(
- new short[]{0x2e,0xd9,0x83},
+ SET_METALLIC);
+ public static final Werkstoff Formaldehyde = new Werkstoff(
+ new short[] {0x2e, 0xd9, 0x83},
"Formaldehyde",
subscriptNumbers("CH2O"),
new Werkstoff.Stats(),
COMPOUND,
new Werkstoff.GenerationFeatures().disable().addCells(),
29925,
- SET_METALLIC
- );
- public static final Werkstoff EthylAcetate = new Werkstoff(
- new short[]{0x0c,0xfb,0x32b},
+ SET_METALLIC);
+ public static final Werkstoff EthylAcetate = new Werkstoff(
+ new short[] {0x0c, 0xfb, 0x32b},
"Ethyl Acetate",
subscriptNumbers("C4H8O2"),
new Werkstoff.Stats(),
COMPOUND,
new Werkstoff.GenerationFeatures().disable().addCells(),
29926,
- SET_METALLIC
- );
- public static final Werkstoff Acetylhydrazine = new Werkstoff(
- new short[]{0xd1,0x5c,0x5c},
+ SET_METALLIC);
+ public static final Werkstoff Acetylhydrazine = new Werkstoff(
+ new short[] {0xd1, 0x5c, 0x5c},
"Acetylhydrazine",
subscriptNumbers("C2H6N2O"),
new Werkstoff.Stats(),
COMPOUND,
new Werkstoff.GenerationFeatures().disable().addCells(),
29927,
- SET_METALLIC
- );
- public static final Werkstoff UnsymmetricalDimethylhydrazine = new Werkstoff(
- new short[]{0x80,0x06,0x00},
+ SET_METALLIC);
+ public static final Werkstoff UnsymmetricalDimethylhydrazine = new Werkstoff(
+ new short[] {0x80, 0x06, 0x00},
"Unsymmetrical Dimethylhydrazine",
subscriptNumbers("H2NN(CH3)2"),
new Werkstoff.Stats(),
COMPOUND,
new Werkstoff.GenerationFeatures().disable().addCells(),
29928,
- SET_METALLIC
- );
- public static final Werkstoff MonomethylhydrazineFuelMix = new Werkstoff(
- new short[]{0x78,0xe3,0xa7},
+ SET_METALLIC);
+ public static final Werkstoff MonomethylhydrazineFuelMix = new Werkstoff(
+ new short[] {0x78, 0xe3, 0xa7},
"Monomethylhydrazine Fuel Mix",
new Werkstoff.Stats(),
COMPOUND,
new Werkstoff.GenerationFeatures().disable().addCells(),
29929,
- SET_METALLIC
- );
- public static final Werkstoff UnsymmetricalDimethylhydrazineFuelMix = new Werkstoff(
- new short[]{0xc8,0xff,0x00},
+ SET_METALLIC);
+ public static final Werkstoff UnsymmetricalDimethylhydrazineFuelMix = new Werkstoff(
+ new short[] {0xc8, 0xff, 0x00},
"Unsymmetrical Dimethylhydrazine Fuel Mix",
new Werkstoff.Stats(),
COMPOUND,
new Werkstoff.GenerationFeatures().disable().addCells(),
29930,
- SET_METALLIC
- );
- public static final Werkstoff Nitromethane = new Werkstoff(
- new short[]{0x87,0x7d,0x60},
+ SET_METALLIC);
+ public static final Werkstoff Nitromethane = new Werkstoff(
+ new short[] {0x87, 0x7d, 0x60},
"Nitromethane",
subscriptNumbers("CH3NO2"),
new Werkstoff.Stats(),
COMPOUND,
new Werkstoff.GenerationFeatures().disable().addCells(),
29914,
- SET_METALLIC
- );
- public static final Werkstoff BoronTrioxide = new Werkstoff(
- new short[]{0xe3,0xa6,0xd3},
+ SET_METALLIC);
+ public static final Werkstoff BoronTrioxide = new Werkstoff(
+ new short[] {0xe3, 0xa6, 0xd3},
"Boron Trioxide",
subscriptNumbers("B2O3"),
new Werkstoff.Stats(),
COMPOUND,
new Werkstoff.GenerationFeatures().onlyDust(),
29931,
- SET_METALLIC
- );
- public static final Werkstoff BoronTrifluoride = new Werkstoff(
- new short[]{0xd0,0xe0,0x3f},
+ SET_METALLIC);
+ public static final Werkstoff BoronTrifluoride = new Werkstoff(
+ new short[] {0xd0, 0xe0, 0x3f},
"Boron Trifluoride",
subscriptNumbers("BF3"),
new Werkstoff.Stats().setGas(true),
COMPOUND,
new Werkstoff.GenerationFeatures().disable().addCells(),
29932,
- SET_METALLIC
- );
- public static final Werkstoff NitroniumTetrafluoroborate = new Werkstoff(
- new short[]{0x57,0x69,0x2d},
+ SET_METALLIC);
+ public static final Werkstoff NitroniumTetrafluoroborate = new Werkstoff(
+ new short[] {0x57, 0x69, 0x2d},
"Nitronium Tetrafluoroborate",
subscriptNumbers("NO2BF4"),
new Werkstoff.Stats(),
COMPOUND,
new Werkstoff.GenerationFeatures().onlyDust(),
29933,
- SET_METALLIC
- );
- public static final Werkstoff Trinitramid = new Werkstoff(
- new short[]{0x28,0x2b,0x70},
+ SET_METALLIC);
+ public static final Werkstoff Trinitramid = new Werkstoff(
+ new short[] {0x28, 0x2b, 0x70},
"Trinitramid",
subscriptNumbers("N4O6"),
new Werkstoff.Stats().setGas(true),
COMPOUND,
new Werkstoff.GenerationFeatures().disable().addCells(),
29934,
- SET_METALLIC
- );
- public static final Werkstoff AmmoniaBoronfluorideSolution = new Werkstoff(
- new short[]{0x28,0x2b,0x70},
+ SET_METALLIC);
+ public static final Werkstoff AmmoniaBoronfluorideSolution = new Werkstoff(
+ new short[] {0x28, 0x2b, 0x70},
"Ammonia Boronfluoride Solution",
subscriptNumbers("NH4BF4"),
new Werkstoff.Stats(),
COMPOUND,
new Werkstoff.GenerationFeatures().disable().addCells(),
29935,
- SET_METALLIC
- );
- public static final Werkstoff SodiumTetrafluoroborate = new Werkstoff(
- new short[]{0xbe,0x6e,0xe0},
+ SET_METALLIC);
+ public static final Werkstoff SodiumTetrafluoroborate = new Werkstoff(
+ new short[] {0xbe, 0x6e, 0xe0},
"Sodium Tetrafluoroborate",
subscriptNumbers("NaBF4"),
new Werkstoff.Stats(),
COMPOUND,
new Werkstoff.GenerationFeatures().disable().addCells(),
29936,
- SET_METALLIC
- );
- public static final Werkstoff SodiumFluoride = new Werkstoff(
- new short[]{0x9f,0x70,0xe6},
+ SET_METALLIC);
+ public static final Werkstoff SodiumFluoride = new Werkstoff(
+ new short[] {0x9f, 0x70, 0xe6},
"Sodium Fluoride",
subscriptNumbers("NaF"),
new Werkstoff.Stats(),
COMPOUND,
new Werkstoff.GenerationFeatures().onlyDust(),
29937,
- SET_METALLIC
- );
- public static final Werkstoff Tetrafluoroborate = new Werkstoff(
- new short[]{0x6a,0x53,0x8c},
+ SET_METALLIC);
+ public static final Werkstoff Tetrafluoroborate = new Werkstoff(
+ new short[] {0x6a, 0x53, 0x8c},
"Tetrafluoroboric Acid",
subscriptNumbers("HBF4"),
new Werkstoff.Stats().setGas(true),
COMPOUND,
new Werkstoff.GenerationFeatures().disable().addCells(),
29938,
- SET_METALLIC
- );
- @Override
- public void run() {
- // TODO Auto-generated method stub
+ SET_METALLIC);
- }
+ @Override
+ public void run() {
+ // TODO Auto-generated method stub
+ }
}
diff --git a/src/main/java/com/elisis/gtnhlanth/common/register/LanthItemList.java b/src/main/java/com/elisis/gtnhlanth/common/register/LanthItemList.java
index 14f58394d6..abed46df99 100644
--- a/src/main/java/com/elisis/gtnhlanth/common/register/LanthItemList.java
+++ b/src/main/java/com/elisis/gtnhlanth/common/register/LanthItemList.java
@@ -2,21 +2,17 @@ package com.elisis.gtnhlanth.common.register;
import com.elisis.gtnhlanth.common.tileentity.Digester;
import com.elisis.gtnhlanth.common.tileentity.DissolutionTank;
-
import net.minecraft.item.ItemStack;
public final class LanthItemList {
-
- public static ItemStack DIGESTER;
- public static ItemStack DISSOLUTION_TANK;
- public static void register() {
-
- LanthItemList.DIGESTER = new Digester(10500, "Digester", "Digester").getStackForm(1L);
- LanthItemList.DISSOLUTION_TANK = new DissolutionTank(10501, "Dissolution Tank", "Dissolution Tank").getStackForm(1L);
-
- }
-
-
+ public static ItemStack DIGESTER;
+ public static ItemStack DISSOLUTION_TANK;
+
+ public static void register() {
+ LanthItemList.DIGESTER = new Digester(10500, "Digester", "Digester").getStackForm(1L);
+ LanthItemList.DISSOLUTION_TANK =
+ new DissolutionTank(10501, "Dissolution Tank", "Dissolution Tank").getStackForm(1L);
+ }
}
diff --git a/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java b/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java
index d12fb95510..d26cb932f5 100644
--- a/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java
+++ b/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java
@@ -2,16 +2,11 @@ package com.elisis.gtnhlanth.common.register;
import static com.github.bartimaeusnek.bartworks.util.BW_Util.subscriptNumbers;
-import java.util.Arrays;
-
import com.github.bartimaeusnek.bartworks.system.material.Werkstoff;
-import com.github.bartimaeusnek.bartworks.util.EnumUtils;
import com.github.bartimaeusnek.bartworks.util.Pair;
-
import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.enums.SubTag;
import gregtech.api.enums.TextureSet;
+import java.util.Arrays;
@SuppressWarnings({"unchecked"})
public class WerkstoffMaterialPool implements Runnable {
@@ -21,28 +16,31 @@ public class WerkstoffMaterialPool implements Runnable {
private static final int offsetID3 = 11_300;
/*
- * public static final Werkstoff __ = new Werkstoff(
- new short[] {_, _, _},
- "__",
- new Werkstoff.Stats(),
- Werkstoff.Types.MIXTURE,
- new Werkstoff.GenerationFeatures().disable(),
- offsetID_,
- TextureSet.SET_DULL
- );
- */
+ * public static final Werkstoff __ = new Werkstoff(
+ new short[] {_, _, _},
+ "__",
+ new Werkstoff.Stats(),
+ Werkstoff.Types.MIXTURE,
+ new Werkstoff.GenerationFeatures().disable(),
+ offsetID_,
+ TextureSet.SET_DULL
+ );
+ */
- //Misc.
+ // Misc.
public static final Werkstoff Hafnium = new Werkstoff(
new short[] {232, 224, 219},
"Hafnium",
subscriptNumbers("Hf"),
new Werkstoff.Stats(),
Werkstoff.Types.ELEMENT,
- new Werkstoff.GenerationFeatures().disable().onlyDust().addMetalItems().enforceUnification(), //Perhaps use hafnia liquid in elemental hafnium synthesis
+ new Werkstoff.GenerationFeatures()
+ .disable()
+ .onlyDust()
+ .addMetalItems()
+ .enforceUnification(), // Perhaps use hafnia liquid in elemental hafnium synthesis
offsetID,
- TextureSet.SET_DULL
- );
+ TextureSet.SET_DULL);
public static final Werkstoff LowPurityHafnium = new Werkstoff(
new short[] {240, 223, 208},
@@ -50,10 +48,11 @@ public class WerkstoffMaterialPool implements Runnable {
subscriptNumbers("??Hf??"),
new Werkstoff.Stats(),
Werkstoff.Types.COMPOUND,
- new Werkstoff.GenerationFeatures().disable().onlyDust(), //Perhaps use hafnia liquid in elemental hafnium synthesis
+ new Werkstoff.GenerationFeatures()
+ .disable()
+ .onlyDust(), // Perhaps use hafnia liquid in elemental hafnium synthesis
offsetID + 1,
- TextureSet.SET_DULL
- );
+ TextureSet.SET_DULL);
public static final Werkstoff Hafnia = new Werkstoff(
new short[] {247, 223, 203},
@@ -61,10 +60,11 @@ public class WerkstoffMaterialPool implements Runnable {
subscriptNumbers("HfO2"),
new Werkstoff.Stats(),
Werkstoff.Types.COMPOUND,
- new Werkstoff.GenerationFeatures().disable().onlyDust(), //Perhaps use hafnia liquid in elemental hafnium synthesis
+ new Werkstoff.GenerationFeatures()
+ .disable()
+ .onlyDust(), // Perhaps use hafnia liquid in elemental hafnium synthesis
offsetID + 2,
- TextureSet.SET_DULL
- );
+ TextureSet.SET_DULL);
public static final Werkstoff HafniumTetrachloride = new Werkstoff(
new short[] {238, 247, 249},
@@ -74,8 +74,7 @@ public class WerkstoffMaterialPool implements Runnable {
Werkstoff.Types.COMPOUND,
new Werkstoff.GenerationFeatures().disable().onlyDust(),
offsetID + 3,
- TextureSet.SET_DULL
- );
+ TextureSet.SET_DULL);
public static final Werkstoff HafniumTetrachlorideSolution = new Werkstoff(
new short[] {238, 247, 249},
@@ -85,8 +84,7 @@ public class WerkstoffMaterialPool implements Runnable {
Werkstoff.Types.COMPOUND,
new Werkstoff.GenerationFeatures().disable().addCells(),
offsetID + 4,
- TextureSet.SET_FLUID
- );
+ TextureSet.SET_FLUID);
public static final Werkstoff HafniumIodide = new Werkstoff(
new short[] {216, 60, 1},
@@ -96,43 +94,41 @@ public class WerkstoffMaterialPool implements Runnable {
Werkstoff.Types.COMPOUND,
new Werkstoff.GenerationFeatures().disable().onlyDust(),
offsetID + 5,
- TextureSet.SET_DULL
- );
+ TextureSet.SET_DULL);
public static final Werkstoff HafniumRunoff = new Werkstoff(
- new short[] {74, 65, 42}, //Literally the statistically ugliest colour
+ new short[] {74, 65, 42}, // Literally the statistically ugliest colour
"Hafnium Runoff",
subscriptNumbers("??????"),
new Werkstoff.Stats(),
Werkstoff.Types.COMPOUND,
new Werkstoff.GenerationFeatures().disable().onlyDust(),
offsetID + 6,
- TextureSet.SET_DULL
- );
+ TextureSet.SET_DULL);
public static final Werkstoff Zirconium = new Werkstoff(
- new short[] {225,230,225},
+ new short[] {225, 230, 225},
"Zirconium",
subscriptNumbers("Zr"),
new Werkstoff.Stats().setBlastFurnace(true),
Werkstoff.Types.COMPOUND,
- new Werkstoff.GenerationFeatures().disable().onlyDust().addMetalItems().enforceUnification(),
+ new Werkstoff.GenerationFeatures()
+ .disable()
+ .onlyDust()
+ .addMetalItems()
+ .enforceUnification(),
offsetID + 7,
- TextureSet.SET_DULL
-
- );
+ TextureSet.SET_DULL);
public static final Werkstoff Zirconia = new Werkstoff(
- new short[] {177,152,101},
+ new short[] {177, 152, 101},
"Zirconia",
subscriptNumbers("ZrO2"),
new Werkstoff.Stats(),
Werkstoff.Types.COMPOUND,
new Werkstoff.GenerationFeatures().disable().onlyDust(),
offsetID + 8,
- TextureSet.SET_DULL
-
- );
+ TextureSet.SET_DULL);
public static final Werkstoff ZirconiumTetrachloride = new Werkstoff(
new short[] {179, 164, 151},
@@ -142,8 +138,7 @@ public class WerkstoffMaterialPool implements Runnable {
Werkstoff.Types.COMPOUND,
new Werkstoff.GenerationFeatures().disable().onlyDust(),
offsetID + 9,
- TextureSet.SET_DULL
- );
+ TextureSet.SET_DULL);
public static final Werkstoff ZirconiumTetrachlorideSolution = new Werkstoff(
new short[] {179, 164, 151},
@@ -151,10 +146,12 @@ public class WerkstoffMaterialPool implements Runnable {
subscriptNumbers("ZrCl4"),
new Werkstoff.Stats(),
Werkstoff.Types.COMPOUND,
- new Werkstoff.GenerationFeatures().disable().addCells(), //Blast Furnace needs liquid input because it can't do 3 item inputs so have a shitty material
+ new Werkstoff.GenerationFeatures()
+ .disable()
+ .addCells(), // Blast Furnace needs liquid input because it can't do 3 item inputs so have a shitty
+ // material
offsetID + 10,
- TextureSet.SET_FLUID
- );
+ TextureSet.SET_FLUID);
public static final Werkstoff HafniaZirconiaBlend = new Werkstoff(
new short[] {247, 223, 203},
@@ -164,22 +161,24 @@ public class WerkstoffMaterialPool implements Runnable {
Werkstoff.Types.COMPOUND,
new Werkstoff.GenerationFeatures().disable().onlyDust(),
offsetID + 11,
- TextureSet.SET_DULL
- );
+ TextureSet.SET_DULL);
public static final Werkstoff Iodine = new Werkstoff(
new short[] {171, 40, 175},
"Iodine",
subscriptNumbers("I"),
- new Werkstoff.Stats().setProtons(53).setMass(127).setSublimation(true).setBoilingPoint(484).setGas(true),
+ new Werkstoff.Stats()
+ .setProtons(53)
+ .setMass(127)
+ .setSublimation(true)
+ .setBoilingPoint(484)
+ .setGas(true),
Werkstoff.Types.ELEMENT,
new Werkstoff.GenerationFeatures().disable().onlyDust().addCells().enforceUnification(),
offsetID + 12,
- TextureSet.SET_FLUID
- );
-
+ TextureSet.SET_FLUID);
- //Lanthanide Line
+ // Lanthanide Line
public static final Werkstoff MuddyRareEarthMonaziteSolution = new Werkstoff(
new short[] {111, 78, 55},
"Muddy Monazite Rare Earth Solution",
@@ -188,8 +187,7 @@ public class WerkstoffMaterialPool implements Runnable {
Werkstoff.Types.MIXTURE,
new Werkstoff.GenerationFeatures().disable().addCells(),
offsetID + 14,
- TextureSet.SET_FLUID
- );
+ TextureSet.SET_FLUID);
public static final Werkstoff DilutedRareEarthMonaziteMud = new Werkstoff(
new short[] {160, 120, 90},
@@ -199,8 +197,7 @@ public class WerkstoffMaterialPool implements Runnable {
Werkstoff.Types.MIXTURE,
new Werkstoff.GenerationFeatures().disable().addCells(),
offsetID + 15,
- TextureSet.SET_FLUID
- );
+ TextureSet.SET_FLUID);
public static final Werkstoff DilutedMonaziteSulfate = new Werkstoff(
new short[] {237, 201, 175},
@@ -210,8 +207,7 @@ public class WerkstoffMaterialPool implements Runnable {
Werkstoff.Types.MIXTURE,
new Werkstoff.GenerationFeatures().disable().addCells(),
offsetID + 16,
- TextureSet.SET_FLUID
- );
+ TextureSet.SET_FLUID);
public static final Werkstoff NitratedRareEarthMonaziteConcentrate = new Werkstoff(
new short[] {250, 223, 173},
@@ -221,8 +217,7 @@ public class WerkstoffMaterialPool implements Runnable {
Werkstoff.Types.MIXTURE,
new Werkstoff.GenerationFeatures().disable().addCells(),
offsetID + 17,
- TextureSet.SET_FLUID
- );
+ TextureSet.SET_FLUID);
public static final Werkstoff NitricMonaziteLeachedConcentrate = new Werkstoff(
new short[] {244, 202, 22},
@@ -232,8 +227,7 @@ public class WerkstoffMaterialPool implements Runnable {
Werkstoff.Types.MIXTURE,
new Werkstoff.GenerationFeatures().disable().addCells(),
offsetID + 18,
- TextureSet.SET_FLUID
- );
+ TextureSet.SET_FLUID);
public static final Werkstoff MonaziteSulfate = new Werkstoff(
new short[] {152, 118, 84},
@@ -243,8 +237,7 @@ public class WerkstoffMaterialPool implements Runnable {
Werkstoff.Types.MIXTURE,
new Werkstoff.GenerationFeatures().disable().onlyDust(),
offsetID + 19,
- TextureSet.SET_DULL
- );
+ TextureSet.SET_DULL);
public static final Werkstoff AcidicMonazitePowder = new Werkstoff(
new short[] {50, 23, 77},
@@ -254,8 +247,7 @@ public class WerkstoffMaterialPool implements Runnable {
Werkstoff.Types.MIXTURE,
new Werkstoff.GenerationFeatures().disable().onlyDust(),
offsetID + 20,
- TextureSet.SET_DULL
- );
+ TextureSet.SET_DULL);
public static final Werkstoff MonaziteRareEarthFiltrate = new Werkstoff(
new short[] {72, 60, 50},
@@ -265,8 +257,7 @@ public class WerkstoffMaterialPool implements Runnable {
Werkstoff.Types.MIXTURE,
new Werkstoff.GenerationFeatures().disable().onlyDust(),
offsetID + 21,
- TextureSet.SET_DULL
- );
+ TextureSet.SET_DULL);
public static final Werkstoff NeutralizedMonaziteRareEarthFiltrate = new Werkstoff(
new short[] {50, 23, 77},
@@ -276,8 +267,7 @@ public class WerkstoffMaterialPool implements Runnable {
Werkstoff.Types.MIXTURE,
new Werkstoff.GenerationFeatures().disable().onlyDust(),
offsetID + 22,
- TextureSet.SET_DULL
- );
+ TextureSet.SET_DULL);
public static final Werkstoff MonaziteRareEarthHydroxideConcentrate = new Werkstoff(
new short[] {193, 154, 107},
@@ -287,8 +277,7 @@ public class WerkstoffMaterialPool implements Runnable {
Werkstoff.Types.MIXTURE,
new Werkstoff.GenerationFeatures().disable().onlyDust(),
offsetID + 23,
- TextureSet.SET_DULL
- );
+ TextureSet.SET_DULL);
public static final Werkstoff DriedMonaziteRareEarthConcentrate = new Werkstoff(
new short[] {250, 214, 165},
@@ -298,8 +287,7 @@ public class WerkstoffMaterialPool implements Runnable {
Werkstoff.Types.MIXTURE,
new Werkstoff.GenerationFeatures().disable().onlyDust(),
offsetID + 24,
- TextureSet.SET_DULL
- );
+ TextureSet.SET_DULL);
public static final Werkstoff CeriumDioxide = new Werkstoff(
new short[] {255, 255, 255},
@@ -309,8 +297,7 @@ public class WerkstoffMaterialPool implements Runnable {
Werkstoff.Types.MIXTURE,
new Werkstoff.GenerationFeatures().disable().onlyDust().enforceUnification(),
offsetID + 25,
- TextureSet.SET_DULL
- );
+ TextureSet.SET_DULL);
public static final Werkstoff CeriumChloride = new Werkstoff(
new short[] {255, 255, 255},
@@ -320,8 +307,7 @@ public class WerkstoffMaterialPool implements Runnable {
Werkstoff.Types.COMPOUND,
new Werkstoff.GenerationFeatures().disable().onlyDust(),
offsetID + 26,
- TextureSet.SET_DULL
- );
+ TextureSet.SET_DULL);
public static final Werkstoff CeriumOxalate = new Werkstoff(
new short[] {255, 255, 224},
@@ -331,8 +317,7 @@ public class WerkstoffMaterialPool implements Runnable {
Werkstoff.Types.COMPOUND,
new Werkstoff.GenerationFeatures().disable().onlyDust(),
offsetID + 27,
- TextureSet.SET_DULL
- );
+ TextureSet.SET_DULL);
public static final Werkstoff CeriumIIIOxide = new Werkstoff(
new short[] {255, 255, 102},
@@ -345,19 +330,17 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_DULL,
Arrays.asList(Materials.Cerium, Materials.Oxygen),
new Pair<>(Materials.Cerium, 2),
- new Pair<>(Materials.Oxygen, 3)
- );
+ new Pair<>(Materials.Oxygen, 3));
public static final Werkstoff CeriumRichMixture = new Werkstoff(
- new short[] {244, 164, 96},
- "Cerium-Rich Mixture",
- subscriptNumbers("??Ce??"),
- new Werkstoff.Stats(),
- Werkstoff.Types.COMPOUND,
- new Werkstoff.GenerationFeatures().disable().onlyDust(),
- offsetID + 29,
- TextureSet.SET_DULL
- );
+ new short[] {244, 164, 96},
+ "Cerium-Rich Mixture",
+ subscriptNumbers("??Ce??"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.COMPOUND,
+ new Werkstoff.GenerationFeatures().disable().onlyDust(),
+ offsetID + 29,
+ TextureSet.SET_DULL);
public static final Werkstoff CooledMonaziteRareEarthConcentrate = new Werkstoff(
new short[] {250, 214, 165},
@@ -367,8 +350,7 @@ public class WerkstoffMaterialPool implements Runnable {
Werkstoff.Types.MIXTURE,
new Werkstoff.GenerationFeatures().disable().onlyDust(),
offsetID + 30,
- TextureSet.SET_DULL
- );
+ TextureSet.SET_DULL);
public static final Werkstoff MonaziteRarerEarthSediment = new Werkstoff(
new short[] {250, 214, 165},
@@ -378,8 +360,7 @@ public class WerkstoffMaterialPool implements Runnable {
Werkstoff.Types.MIXTURE,
new Werkstoff.GenerationFeatures().disable().onlyDust(),
offsetID + 31,
- TextureSet.SET_DULL
- );
+ TextureSet.SET_DULL);
public static final Werkstoff MonaziteHeterogenousHalogenicRareEarthMixture = new Werkstoff(
new short[] {250, 214, 165},
@@ -389,8 +370,7 @@ public class WerkstoffMaterialPool implements Runnable {
Werkstoff.Types.MIXTURE,
new Werkstoff.GenerationFeatures().disable().onlyDust(),
offsetID + 32,
- TextureSet.SET_DULL
- );
+ TextureSet.SET_DULL);
public static final Werkstoff SaturatedMonaziteRareEarthMixture = new Werkstoff(
new short[] {250, 214, 165},
@@ -400,202 +380,177 @@ public class WerkstoffMaterialPool implements Runnable {
Werkstoff.Types.MIXTURE,
new Werkstoff.GenerationFeatures().disable().onlyDust(),
offsetID + 33,
- TextureSet.SET_DULL
- );
+ TextureSet.SET_DULL);
public static final Werkstoff SamaricResidue = new Werkstoff(
- new short[] {248, 243, 231},
- "Samaric Residue",
- subscriptNumbers("??SmGd??"),
- new Werkstoff.Stats(),
- Werkstoff.Types.MIXTURE,
- new Werkstoff.GenerationFeatures().disable().onlyDust(),
- offsetID + 34,
- TextureSet.SET_DULL
- );
+ new short[] {248, 243, 231},
+ "Samaric Residue",
+ subscriptNumbers("??SmGd??"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.MIXTURE,
+ new Werkstoff.GenerationFeatures().disable().onlyDust(),
+ offsetID + 34,
+ TextureSet.SET_DULL);
public static final Werkstoff MonaziteResidue = new Werkstoff(
- new short[] {64, 69, 62},
- "Monazite Residue",
- subscriptNumbers("??ZrHfTh??"),
- new Werkstoff.Stats(),
- Werkstoff.Types.MIXTURE,
- new Werkstoff.GenerationFeatures().disable().onlyDust(),
- offsetID + 35,
- TextureSet.SET_DULL
- );
+ new short[] {64, 69, 62},
+ "Monazite Residue",
+ subscriptNumbers("??ZrHfTh??"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.MIXTURE,
+ new Werkstoff.GenerationFeatures().disable().onlyDust(),
+ offsetID + 35,
+ TextureSet.SET_DULL);
public static final Werkstoff AmmoniumNitrate = new Werkstoff(
- new short[] {255, 255, 255},
- "Ammonium Nitrate Solution",
- subscriptNumbers("NH4NO3"),
- new Werkstoff.Stats(),
- Werkstoff.Types.COMPOUND,
- new Werkstoff.GenerationFeatures().disable().addCells(),
- offsetID + 36,
- TextureSet.SET_FLUID
- );
+ new short[] {255, 255, 255},
+ "Ammonium Nitrate Solution",
+ subscriptNumbers("NH4NO3"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.COMPOUND,
+ new Werkstoff.GenerationFeatures().disable().addCells(),
+ offsetID + 36,
+ TextureSet.SET_FLUID);
public static final Werkstoff ThoriumPhosphateCake = new Werkstoff(
- new short[] {188, 143, 143},
- "Thorium-Phosphate Cake",
- subscriptNumbers("??ThP??"),
- new Werkstoff.Stats(),
- Werkstoff.Types.MIXTURE,
- new Werkstoff.GenerationFeatures().disable().onlyDust(),
- offsetID + 37,
- TextureSet.SET_DULL
- );
+ new short[] {188, 143, 143},
+ "Thorium-Phosphate Cake",
+ subscriptNumbers("??ThP??"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.MIXTURE,
+ new Werkstoff.GenerationFeatures().disable().onlyDust(),
+ offsetID + 37,
+ TextureSet.SET_DULL);
public static final Werkstoff ThoriumPhosphateConcentrate = new Werkstoff(
- new short[] {217, 144, 88},
- "Thorium-Phosphate Concentrate",
- subscriptNumbers("??ThP??"),
- new Werkstoff.Stats(),
- Werkstoff.Types.MIXTURE,
- new Werkstoff.GenerationFeatures().disable().onlyDust(),
- offsetID + 38,
- TextureSet.SET_DULL
- );
+ new short[] {217, 144, 88},
+ "Thorium-Phosphate Concentrate",
+ subscriptNumbers("??ThP??"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.MIXTURE,
+ new Werkstoff.GenerationFeatures().disable().onlyDust(),
+ offsetID + 38,
+ TextureSet.SET_DULL);
public static final Werkstoff UraniumFiltrate = new Werkstoff(
- new short[] {190, 240, 94},
- "UraniumFiltrate",
- subscriptNumbers("??U??"),
- new Werkstoff.Stats(),
- Werkstoff.Types.MIXTURE,
- new Werkstoff.GenerationFeatures().disable().onlyDust(),
- offsetID + 39,
- TextureSet.SET_DULL
- );
+ new short[] {190, 240, 94},
+ "UraniumFiltrate",
+ subscriptNumbers("??U??"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.MIXTURE,
+ new Werkstoff.GenerationFeatures().disable().onlyDust(),
+ offsetID + 39,
+ TextureSet.SET_DULL);
public static final Werkstoff NeutralizedUraniumFiltrate = new Werkstoff(
- new short[] {217, 120, 88},
- "Neutralized Uranium Filtrate",
- subscriptNumbers("??U??"),
- new Werkstoff.Stats(),
- Werkstoff.Types.MIXTURE,
- new Werkstoff.GenerationFeatures().disable().onlyDust(),
- offsetID + 40,
- TextureSet.SET_DULL
- );
+ new short[] {217, 120, 88},
+ "Neutralized Uranium Filtrate",
+ subscriptNumbers("??U??"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.MIXTURE,
+ new Werkstoff.GenerationFeatures().disable().onlyDust(),
+ offsetID + 40,
+ TextureSet.SET_DULL);
public static final Werkstoff SeaweedAsh = new Werkstoff(
- new short[] {70, 75, 71},
- "Seaweed Ash",
- new Werkstoff.Stats(),
- Werkstoff.Types.BIOLOGICAL,
- new Werkstoff.GenerationFeatures().disable().onlyDust(),
- offsetID + 41,
- TextureSet.SET_DULL
- );
+ new short[] {70, 75, 71},
+ "Seaweed Ash",
+ new Werkstoff.Stats(),
+ Werkstoff.Types.BIOLOGICAL,
+ new Werkstoff.GenerationFeatures().disable().onlyDust(),
+ offsetID + 41,
+ TextureSet.SET_DULL);
public static final Werkstoff SeaweedConcentrate = new Werkstoff(
- new short[] {70, 100, 71},
- "Seaweed Concentrate",
- subscriptNumbers("??I??"),
- new Werkstoff.Stats(),
- Werkstoff.Types.BIOLOGICAL,
- new Werkstoff.GenerationFeatures().disable().addCells(),
- offsetID + 42,
- TextureSet.SET_FLUID
- );
+ new short[] {70, 100, 71},
+ "Seaweed Concentrate",
+ subscriptNumbers("??I??"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.BIOLOGICAL,
+ new Werkstoff.GenerationFeatures().disable().addCells(),
+ offsetID + 42,
+ TextureSet.SET_FLUID);
public static final Werkstoff PotassiumPermanganate = new Werkstoff(
- new short[] {165, 50, 138},
- "Potassium Permanganate",
- subscriptNumbers("KMnO4"),
- new Werkstoff.Stats(),
- Werkstoff.Types.COMPOUND,
- new Werkstoff.GenerationFeatures().disable().onlyDust(),
- offsetID + 43,
- TextureSet.SET_DULL
- );
+ new short[] {165, 50, 138},
+ "Potassium Permanganate",
+ subscriptNumbers("KMnO4"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.COMPOUND,
+ new Werkstoff.GenerationFeatures().disable().onlyDust(),
+ offsetID + 43,
+ TextureSet.SET_DULL);
public static final Werkstoff PotassiumPermanganateSolution = new Werkstoff(
- new short[] {165, 50, 138},
- "Potassium Permanganate Solution",
- subscriptNumbers("KMnO4"),
- new Werkstoff.Stats(),
- Werkstoff.Types.COMPOUND,
- new Werkstoff.GenerationFeatures().disable().addCells(),
- offsetID + 44,
- TextureSet.SET_FLUID
- );
-
+ new short[] {165, 50, 138},
+ "Potassium Permanganate Solution",
+ subscriptNumbers("KMnO4"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.COMPOUND,
+ new Werkstoff.GenerationFeatures().disable().addCells(),
+ offsetID + 44,
+ TextureSet.SET_FLUID);
public static final Werkstoff SeaweedByproducts = new Werkstoff(
- new short[] {125, 50, 138},
- "Seaweed Byproducts",
- new Werkstoff.Stats(),
- Werkstoff.Types.MIXTURE,
- new Werkstoff.GenerationFeatures().disable().addCells(),
- offsetID + 45,
- TextureSet.SET_FLUID
- );
+ new short[] {125, 50, 138},
+ "Seaweed Byproducts",
+ new Werkstoff.Stats(),
+ Werkstoff.Types.MIXTURE,
+ new Werkstoff.GenerationFeatures().disable().addCells(),
+ offsetID + 45,
+ TextureSet.SET_FLUID);
public static final Werkstoff NitricLeachedMonaziteMixture = new Werkstoff(
- new short[] {125, 50, 138},
- "Nitric-Leached Monazite Mixture",
- new Werkstoff.Stats(),
- Werkstoff.Types.MIXTURE,
- new Werkstoff.GenerationFeatures().disable().addCells(),
- offsetID + 46,
- TextureSet.SET_FLUID
- );
+ new short[] {125, 50, 138},
+ "Nitric-Leached Monazite Mixture",
+ new Werkstoff.Stats(),
+ Werkstoff.Types.MIXTURE,
+ new Werkstoff.GenerationFeatures().disable().addCells(),
+ offsetID + 46,
+ TextureSet.SET_FLUID);
public static final Werkstoff EuropiumOxide = new Werkstoff(
- new short[] {255, 255, 255},
- "Europium Oxide",
- subscriptNumbers("EuO"),
- new Werkstoff.Stats(),
- Werkstoff.Types.COMPOUND,
- new Werkstoff.GenerationFeatures().disable().onlyDust(),
- offsetID + 47,
- TextureSet.SET_DULL
- );
+ new short[] {255, 255, 255},
+ "Europium Oxide",
+ subscriptNumbers("EuO"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.COMPOUND,
+ new Werkstoff.GenerationFeatures().disable().onlyDust(),
+ offsetID + 47,
+ TextureSet.SET_DULL);
public static final Werkstoff EuropiumSulfide = new Werkstoff(
- new short[] {5, 0, 5},
- "Europium Sulfide",
- subscriptNumbers("EuS"),
- new Werkstoff.Stats(),
- Werkstoff.Types.COMPOUND,
- new Werkstoff.GenerationFeatures().disable().onlyDust(),
- offsetID + 48,
- TextureSet.SET_DULL
- );
+ new short[] {5, 0, 5},
+ "Europium Sulfide",
+ subscriptNumbers("EuS"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.COMPOUND,
+ new Werkstoff.GenerationFeatures().disable().onlyDust(),
+ offsetID + 48,
+ TextureSet.SET_DULL);
public static final Werkstoff UnknownBlend = new Werkstoff(
- new short[] {0, 0, 5},
- "UnknownBlend",
- subscriptNumbers("?????"),
- new Werkstoff.Stats(),
- Werkstoff.Types.MIXTURE,
- new Werkstoff.GenerationFeatures().disable().onlyDust(),
- offsetID + 49,
- TextureSet.SET_DULL
- );
-
-
-
+ new short[] {0, 0, 5},
+ "UnknownBlend",
+ subscriptNumbers("?????"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.MIXTURE,
+ new Werkstoff.GenerationFeatures().disable().onlyDust(),
+ offsetID + 49,
+ TextureSet.SET_DULL);
// TODO
-
-
-
// BASTNASITE
public static final Werkstoff MuddyRareEarthBastnasiteSolution = new Werkstoff(
- new short[] {205, 133, 63},
- "Muddy Bastnasite Rare Earth Solution",
- subscriptNumbers("??LaCeY??"),
- new Werkstoff.Stats(),
- Werkstoff.Types.MIXTURE,
- new Werkstoff.GenerationFeatures().disable().addCells(),
- offsetID2,
- TextureSet.SET_FLUID
- );
+ new short[] {205, 133, 63},
+ "Muddy Bastnasite Rare Earth Solution",
+ subscriptNumbers("??LaCeY??"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.MIXTURE,
+ new Werkstoff.GenerationFeatures().disable().addCells(),
+ offsetID2,
+ TextureSet.SET_FLUID);
/*
public static final Werkstoff FluorosilicicAcid = new Werkstoff(
new short[] {205, 133, 63},
@@ -609,541 +564,476 @@ public class WerkstoffMaterialPool implements Runnable {
);
*/
public static final Werkstoff SodiumFluorosilicate = new Werkstoff(
- new short[] {205, 133, 63},
- "Sodiumfluorosilicate",
- subscriptNumbers("Na2SiF6"),
- new Werkstoff.Stats(),
- Werkstoff.Types.COMPOUND,
- new Werkstoff.GenerationFeatures().disable().addCells(),
- offsetID2 + 2,
- TextureSet.SET_FLUID
- );
+ new short[] {205, 133, 63},
+ "Sodiumfluorosilicate",
+ subscriptNumbers("Na2SiF6"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.COMPOUND,
+ new Werkstoff.GenerationFeatures().disable().addCells(),
+ offsetID2 + 2,
+ TextureSet.SET_FLUID);
public static final Werkstoff SteamCrackedBasnasiteSolution = new Werkstoff(
- new short[] {205, 133, 63},
- "Steam-Cracked Bastnasite Mud",
- subscriptNumbers("??LaCeY??"),
- new Werkstoff.Stats(),
- Werkstoff.Types.MIXTURE,
- new Werkstoff.GenerationFeatures().disable().addCells(),
- offsetID2 + 3,
- TextureSet.SET_FLUID
- );
+ new short[] {205, 133, 63},
+ "Steam-Cracked Bastnasite Mud",
+ subscriptNumbers("??LaCeY??"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.MIXTURE,
+ new Werkstoff.GenerationFeatures().disable().addCells(),
+ offsetID2 + 3,
+ TextureSet.SET_FLUID);
public static final Werkstoff ConditionedBastnasiteMud = new Werkstoff(
- new short[] {205, 133, 63},
- "Conditioned Bastnasite Mud",
- subscriptNumbers("??LaCeY??"),
- new Werkstoff.Stats(),
- Werkstoff.Types.MIXTURE,
- new Werkstoff.GenerationFeatures().disable().addCells(),
- offsetID2 + 4,
- TextureSet.SET_FLUID
- );
+ new short[] {205, 133, 63},
+ "Conditioned Bastnasite Mud",
+ subscriptNumbers("??LaCeY??"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.MIXTURE,
+ new Werkstoff.GenerationFeatures().disable().addCells(),
+ offsetID2 + 4,
+ TextureSet.SET_FLUID);
public static final Werkstoff DiltedRareEarthBastnasiteMud = new Werkstoff(
- new short[] {205, 133, 63},
- "Diluted Bastnasite Mud",
- subscriptNumbers("??LaCeY??"),
- new Werkstoff.Stats(),
- Werkstoff.Types.MIXTURE,
- new Werkstoff.GenerationFeatures().disable().addCells(),
- offsetID2 + 5,
- TextureSet.SET_FLUID
- );
+ new short[] {205, 133, 63},
+ "Diluted Bastnasite Mud",
+ subscriptNumbers("??LaCeY??"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.MIXTURE,
+ new Werkstoff.GenerationFeatures().disable().addCells(),
+ offsetID2 + 5,
+ TextureSet.SET_FLUID);
public static final Werkstoff FilteredBastnasiteMud = new Werkstoff(
- new short[] {205, 133, 63},
- "Filtered Bastnasite Mud",
- subscriptNumbers("??LaCeY??"),
- new Werkstoff.Stats(),
- Werkstoff.Types.MIXTURE,
- new Werkstoff.GenerationFeatures().disable().addCells(),
- offsetID2 + 6,
- TextureSet.SET_FLUID
- );
+ new short[] {205, 133, 63},
+ "Filtered Bastnasite Mud",
+ subscriptNumbers("??LaCeY??"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.MIXTURE,
+ new Werkstoff.GenerationFeatures().disable().addCells(),
+ offsetID2 + 6,
+ TextureSet.SET_FLUID);
public static final Werkstoff BastnasiteRareEarthOxidePowder = new Werkstoff(
- new short[] {205, 133, 63},
- "Bastnasite Rare Earth Oxides",
- subscriptNumbers("??LaCeY??"),
- new Werkstoff.Stats(),
- Werkstoff.Types.MIXTURE,
- new Werkstoff.GenerationFeatures().disable().onlyDust(),
- offsetID2 + 7,
- TextureSet.SET_DULL
- );
+ new short[] {205, 133, 63},
+ "Bastnasite Rare Earth Oxides",
+ subscriptNumbers("??LaCeY??"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.MIXTURE,
+ new Werkstoff.GenerationFeatures().disable().onlyDust(),
+ offsetID2 + 7,
+ TextureSet.SET_DULL);
public static final Werkstoff LeachedBastnasiteRareEarthOxides = new Werkstoff(
- new short[] {205, 133, 63},
- "Acid-Leached Bastnasite Rare Earth Oxides",
- subscriptNumbers("??LaCeY??"),
- new Werkstoff.Stats(),
- Werkstoff.Types.MIXTURE,
- new Werkstoff.GenerationFeatures().disable().onlyDust(),
- offsetID2 + 8,
- TextureSet.SET_DULL
- );
+ new short[] {205, 133, 63},
+ "Acid-Leached Bastnasite Rare Earth Oxides",
+ subscriptNumbers("??LaCeY??"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.MIXTURE,
+ new Werkstoff.GenerationFeatures().disable().onlyDust(),
+ offsetID2 + 8,
+ TextureSet.SET_DULL);
public static final Werkstoff Gangue = new Werkstoff(
- new short[] {0, 0, 0},
- "Gangue",
- subscriptNumbers("Useless..."),
- new Werkstoff.Stats(),
- Werkstoff.Types.MIXTURE,
- new Werkstoff.GenerationFeatures().disable().onlyDust(),
- offsetID2 + 9,
- TextureSet.SET_DULL
- );
- //TODO: Deal with colouring
+ new short[] {0, 0, 0},
+ "Gangue",
+ subscriptNumbers("Useless..."),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.MIXTURE,
+ new Werkstoff.GenerationFeatures().disable().onlyDust(),
+ offsetID2 + 9,
+ TextureSet.SET_DULL);
+ // TODO: Deal with colouring
public static final Werkstoff RoastedRareEarthOxides = new Werkstoff(
- new short[] {160, 82, 45},
- "Roasted Rare Earth Oxides",
- new Werkstoff.Stats(),
- Werkstoff.Types.MIXTURE,
- new Werkstoff.GenerationFeatures().disable().onlyDust(),
- offsetID2 + 10,
- TextureSet.SET_DULL
- );
+ new short[] {160, 82, 45},
+ "Roasted Rare Earth Oxides",
+ new Werkstoff.Stats(),
+ Werkstoff.Types.MIXTURE,
+ new Werkstoff.GenerationFeatures().disable().onlyDust(),
+ offsetID2 + 10,
+ TextureSet.SET_DULL);
public static final Werkstoff WetRareEarthOxides = new Werkstoff(
- new short[] {160, 82, 49},
- "Wet Rare Earth Oxides",
- new Werkstoff.Stats(),
- Werkstoff.Types.MIXTURE,
- new Werkstoff.GenerationFeatures().disable().onlyDust(),
- offsetID2 + 11,
- TextureSet.SET_DULL
- );
+ new short[] {160, 82, 49},
+ "Wet Rare Earth Oxides",
+ new Werkstoff.Stats(),
+ Werkstoff.Types.MIXTURE,
+ new Werkstoff.GenerationFeatures().disable().onlyDust(),
+ offsetID2 + 11,
+ TextureSet.SET_DULL);
public static final Werkstoff CeriumOxidisedRareEarthOxides = new Werkstoff(
- new short[] {160, 82, 49},
- "Cerium-Oxidised Rare Earth Oxides",
- new Werkstoff.Stats(),
- Werkstoff.Types.MIXTURE,
- new Werkstoff.GenerationFeatures().disable().onlyDust(),
- offsetID2 + 12,
- TextureSet.SET_DULL
- );
+ new short[] {160, 82, 49},
+ "Cerium-Oxidised Rare Earth Oxides",
+ new Werkstoff.Stats(),
+ Werkstoff.Types.MIXTURE,
+ new Werkstoff.GenerationFeatures().disable().onlyDust(),
+ offsetID2 + 12,
+ TextureSet.SET_DULL);
public static final Werkstoff BastnasiteRarerEarthOxides = new Werkstoff(
- new short[] {160, 82, 49},
- "Bastnasite Rarer Earth Oxides",
- new Werkstoff.Stats(),
- Werkstoff.Types.MIXTURE,
- new Werkstoff.GenerationFeatures().disable().onlyDust(),
- offsetID2 + 13,
- TextureSet.SET_DULL
- );
+ new short[] {160, 82, 49},
+ "Bastnasite Rarer Earth Oxides",
+ new Werkstoff.Stats(),
+ Werkstoff.Types.MIXTURE,
+ new Werkstoff.GenerationFeatures().disable().onlyDust(),
+ offsetID2 + 13,
+ TextureSet.SET_DULL);
public static final Werkstoff NitratedBastnasiteRarerEarthOxides = new Werkstoff(
- new short[] {160, 90, 60},
- "Nitrogenated Bastnasite Rarer Earth Oxides",
- new Werkstoff.Stats(),
- Werkstoff.Types.MIXTURE,
- new Werkstoff.GenerationFeatures().disable().addCells(),
- offsetID2 + 14,
- TextureSet.SET_DULL
- );
+ new short[] {160, 90, 60},
+ "Nitrogenated Bastnasite Rarer Earth Oxides",
+ new Werkstoff.Stats(),
+ Werkstoff.Types.MIXTURE,
+ new Werkstoff.GenerationFeatures().disable().addCells(),
+ offsetID2 + 14,
+ TextureSet.SET_DULL);
public static final Werkstoff SaturatedBastnasiteRarerEarthOxides = new Werkstoff(
- new short[] {170, 90, 60},
- "Bastnasite Rarer Earth Oxide Suspension",
- new Werkstoff.Stats(),
- Werkstoff.Types.MIXTURE,
- new Werkstoff.GenerationFeatures().disable().addCells(),
- offsetID2 + 15,
- TextureSet.SET_DULL
- );
+ new short[] {170, 90, 60},
+ "Bastnasite Rarer Earth Oxide Suspension",
+ new Werkstoff.Stats(),
+ Werkstoff.Types.MIXTURE,
+ new Werkstoff.GenerationFeatures().disable().addCells(),
+ offsetID2 + 15,
+ TextureSet.SET_DULL);
public static final Werkstoff SamaricRareEarthConcentrate = new Werkstoff(
- new short[] {170, 90, 60},
- "Samaric Rare Earth Concentrate",
- subscriptNumbers("??SmHoTb??"),
- new Werkstoff.Stats(),
- Werkstoff.Types.MIXTURE,
- new Werkstoff.GenerationFeatures().disable().onlyDust(),
- offsetID2 + 16,
- TextureSet.SET_DULL
- );
+ new short[] {170, 90, 60},
+ "Samaric Rare Earth Concentrate",
+ subscriptNumbers("??SmHoTb??"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.MIXTURE,
+ new Werkstoff.GenerationFeatures().disable().onlyDust(),
+ offsetID2 + 16,
+ TextureSet.SET_DULL);
public static final Werkstoff NeodymicRareEarthConcentrate = new Werkstoff(
- new short[] {170, 90, 60},
- "Neodymium Rare Earth Concentrate",
- subscriptNumbers("??LaNdPr??"),
- new Werkstoff.Stats(),
- Werkstoff.Types.MIXTURE,
- new Werkstoff.GenerationFeatures().disable().onlyDust(),
- offsetID2 + 17,
- TextureSet.SET_DULL
- );
+ new short[] {170, 90, 60},
+ "Neodymium Rare Earth Concentrate",
+ subscriptNumbers("??LaNdPr??"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.MIXTURE,
+ new Werkstoff.GenerationFeatures().disable().onlyDust(),
+ offsetID2 + 17,
+ TextureSet.SET_DULL);
public static final Werkstoff FluorinatedNeodymicRareEarths = new Werkstoff(
- new short[] {170, 90, 60},
- "Fluorinated Neodymium Rare Earths",
- subscriptNumbers("??LaNdPr??"),
- new Werkstoff.Stats(),
- Werkstoff.Types.MIXTURE,
- new Werkstoff.GenerationFeatures().disable().onlyDust(),
- offsetID2 + 18,
- TextureSet.SET_DULL
- );
+ new short[] {170, 90, 60},
+ "Fluorinated Neodymium Rare Earths",
+ subscriptNumbers("??LaNdPr??"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.MIXTURE,
+ new Werkstoff.GenerationFeatures().disable().onlyDust(),
+ offsetID2 + 18,
+ TextureSet.SET_DULL);
public static final Werkstoff PraseodymiumTetrafluoride = new Werkstoff(
- new short[] {82, 112, 102},
- "Praseodymium Tetrafluoride",
- subscriptNumbers("PrF4"),
- new Werkstoff.Stats().setElektrolysis(true),
- Werkstoff.Types.COMPOUND,
- new Werkstoff.GenerationFeatures().disable().onlyDust(),
- offsetID2 + 19,
- TextureSet.SET_DULL,
- Arrays.asList(Materials.Praseodymium, Materials.Fluorine),
+ new short[] {82, 112, 102},
+ "Praseodymium Tetrafluoride",
+ subscriptNumbers("PrF4"),
+ new Werkstoff.Stats().setElektrolysis(true),
+ Werkstoff.Types.COMPOUND,
+ new Werkstoff.GenerationFeatures().disable().onlyDust(),
+ offsetID2 + 19,
+ TextureSet.SET_DULL,
+ Arrays.asList(Materials.Praseodymium, Materials.Fluorine),
new Pair<>(Materials.Praseodymium, 1),
- new Pair<>(Materials.Fluorine, 4)
- );
+ new Pair<>(Materials.Fluorine, 4));
public static final Werkstoff RareEarthTrifluorides = new Werkstoff(
- new short[] {82, 112, 102},
- "Rare Earth Trifluorides",
- subscriptNumbers("??LaNd??"),
- new Werkstoff.Stats(),
- Werkstoff.Types.MIXTURE,
- new Werkstoff.GenerationFeatures().disable().onlyDust(),
- offsetID2 + 20,
- TextureSet.SET_DULL
- );
+ new short[] {82, 112, 102},
+ "Rare Earth Trifluorides",
+ subscriptNumbers("??LaNd??"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.MIXTURE,
+ new Werkstoff.GenerationFeatures().disable().onlyDust(),
+ offsetID2 + 20,
+ TextureSet.SET_DULL);
public static final Werkstoff LanthaniumChloride = new Werkstoff(
- new short[] {82, 112, 102},
- "Lanthanium Chloride",
- subscriptNumbers("LaCl3"),
- new Werkstoff.Stats().setElektrolysis(true),
- Werkstoff.Types.COMPOUND,
- new Werkstoff.GenerationFeatures().disable().onlyDust(),
- offsetID2 + 21,
- TextureSet.SET_DULL,
- Arrays.asList(Materials.Lanthanum, Materials.Chlorine),
- new Pair<>(Materials.Lanthanum, 1),
- new Pair<>(Materials.Chlorine, 3)
- );
+ new short[] {82, 112, 102},
+ "Lanthanium Chloride",
+ subscriptNumbers("LaCl3"),
+ new Werkstoff.Stats().setElektrolysis(true),
+ Werkstoff.Types.COMPOUND,
+ new Werkstoff.GenerationFeatures().disable().onlyDust(),
+ offsetID2 + 21,
+ TextureSet.SET_DULL,
+ Arrays.asList(Materials.Lanthanum, Materials.Chlorine),
+ new Pair<>(Materials.Lanthanum, 1),
+ new Pair<>(Materials.Chlorine, 3));
public static final Werkstoff NeodymiumOxide = new Werkstoff(
- new short[] {82, 112, 102},
- "Neodymium Oxide",
- subscriptNumbers("Nd2O3"),
- new Werkstoff.Stats().setElektrolysis(true),
- Werkstoff.Types.COMPOUND,
- new Werkstoff.GenerationFeatures().disable().onlyDust(),
- offsetID2 + 22,
- TextureSet.SET_DULL,
- Arrays.asList(Materials.Neodymium, Materials.Oxygen),
- new Pair<>(Materials.Neodymium, 2),
- new Pair<>(Materials.Oxygen, 3)
- );
+ new short[] {82, 112, 102},
+ "Neodymium Oxide",
+ subscriptNumbers("Nd2O3"),
+ new Werkstoff.Stats().setElektrolysis(true),
+ Werkstoff.Types.COMPOUND,
+ new Werkstoff.GenerationFeatures().disable().onlyDust(),
+ offsetID2 + 22,
+ TextureSet.SET_DULL,
+ Arrays.asList(Materials.Neodymium, Materials.Oxygen),
+ new Pair<>(Materials.Neodymium, 2),
+ new Pair<>(Materials.Oxygen, 3));
public static final Werkstoff FluorinatedSamaricConcentrate = new Werkstoff(
- new short[] {255, 182, 193},
- "Fluorinated Samaric Concentrate",
- subscriptNumbers("??SmHo??"),
- new Werkstoff.Stats(),
- Werkstoff.Types.MIXTURE,
- new Werkstoff.GenerationFeatures().disable().onlyDust(),
- offsetID2 + 23,
- TextureSet.SET_DULL
- );
+ new short[] {255, 182, 193},
+ "Fluorinated Samaric Concentrate",
+ subscriptNumbers("??SmHo??"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.MIXTURE,
+ new Werkstoff.GenerationFeatures().disable().onlyDust(),
+ offsetID2 + 23,
+ TextureSet.SET_DULL);
public static final Werkstoff CalciumFluoride = new Werkstoff(
- new short[] {255, 250, 250},
- "Calcium Fluoride",
- subscriptNumbers("CaF2"),
- new Werkstoff.Stats().setElektrolysis(true),
- Werkstoff.Types.COMPOUND,
- new Werkstoff.GenerationFeatures().disable().onlyDust().addMolten().addCells(),
- offsetID2 + 24,
- TextureSet.SET_DULL,
- Arrays.asList(Materials.Calcium, Materials.Fluorine),
- new Pair<>(Materials.Calcium, 1),
- new Pair<>(Materials.Fluorine, 2)
- );
+ new short[] {255, 250, 250},
+ "Calcium Fluoride",
+ subscriptNumbers("CaF2"),
+ new Werkstoff.Stats().setElektrolysis(true),
+ Werkstoff.Types.COMPOUND,
+ new Werkstoff.GenerationFeatures().disable().onlyDust().addMolten().addCells(),
+ offsetID2 + 24,
+ TextureSet.SET_DULL,
+ Arrays.asList(Materials.Calcium, Materials.Fluorine),
+ new Pair<>(Materials.Calcium, 1),
+ new Pair<>(Materials.Fluorine, 2));
public static final Werkstoff SamariumTerbiumMixture = new Werkstoff(
- new short[] {223, 182, 193},
- "Samarium-Terbium Mixture",
- subscriptNumbers("??SmTb??"),
- new Werkstoff.Stats(),
- Werkstoff.Types.MIXTURE,
- new Werkstoff.GenerationFeatures().disable().onlyDust(),
- offsetID2 + 25,
- TextureSet.SET_DULL
- );
+ new short[] {223, 182, 193},
+ "Samarium-Terbium Mixture",
+ subscriptNumbers("??SmTb??"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.MIXTURE,
+ new Werkstoff.GenerationFeatures().disable().onlyDust(),
+ offsetID2 + 25,
+ TextureSet.SET_DULL);
public static final Werkstoff NitratedSamariumTerbiumMixture = new Werkstoff(
- new short[] {223, 182, 193},
- "Nitrogenated Samarium-Terbium Mixture",
- subscriptNumbers("??SmTb??NH4NO3"),
- new Werkstoff.Stats(),
- Werkstoff.Types.MIXTURE,
- new Werkstoff.GenerationFeatures().disable().onlyDust(),
- offsetID2 + 26,
- TextureSet.SET_DULL
- );
+ new short[] {223, 182, 193},
+ "Nitrogenated Samarium-Terbium Mixture",
+ subscriptNumbers("??SmTb??NH4NO3"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.MIXTURE,
+ new Werkstoff.GenerationFeatures().disable().onlyDust(),
+ offsetID2 + 26,
+ TextureSet.SET_DULL);
public static final Werkstoff TerbiumNitrate = new Werkstoff(
- new short[] {167, 252, 0},
- "Terbium Nitrate",
- subscriptNumbers("TbNO3"),
- new Werkstoff.Stats().setElektrolysis(true),
- Werkstoff.Types.COMPOUND,
- new Werkstoff.GenerationFeatures().disable().onlyDust(),
- offsetID2 + 27,
- TextureSet.SET_DULL,
- Arrays.asList(Materials.Terbium, Materials.Nitrogen, Materials.Oxygen),
- new Pair<>(Materials.Terbium, 1),
- new Pair<>(Materials.Nitrogen, 1),
- new Pair<>(Materials.Oxygen, 3)
- );
+ new short[] {167, 252, 0},
+ "Terbium Nitrate",
+ subscriptNumbers("TbNO3"),
+ new Werkstoff.Stats().setElektrolysis(true),
+ Werkstoff.Types.COMPOUND,
+ new Werkstoff.GenerationFeatures().disable().onlyDust(),
+ offsetID2 + 27,
+ TextureSet.SET_DULL,
+ Arrays.asList(Materials.Terbium, Materials.Nitrogen, Materials.Oxygen),
+ new Pair<>(Materials.Terbium, 1),
+ new Pair<>(Materials.Nitrogen, 1),
+ new Pair<>(Materials.Oxygen, 3));
public static final Werkstoff SamariumOreConcentrate = new Werkstoff(
- new short[] {255, 200, 230},
- "Samarium Ore Concentrate",
- subscriptNumbers("??Sm??"),
- new Werkstoff.Stats(),
- Werkstoff.Types.MIXTURE,
- new Werkstoff.GenerationFeatures().disable().onlyDust(),
- offsetID2 + 28,
- TextureSet.SET_DULL
- );
+ new short[] {255, 200, 230},
+ "Samarium Ore Concentrate",
+ subscriptNumbers("??Sm??"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.MIXTURE,
+ new Werkstoff.GenerationFeatures().disable().onlyDust(),
+ offsetID2 + 28,
+ TextureSet.SET_DULL);
public static final Werkstoff DephosphatedSamariumConcentrate = new Werkstoff(
- new short[] {255, 170, 220},
- "Dephosphated Samarium Concentrate",
- subscriptNumbers("??Sm??"),
- new Werkstoff.Stats(),
- Werkstoff.Types.MIXTURE,
- new Werkstoff.GenerationFeatures().disable().onlyDust(),
- offsetID2 + 29,
- TextureSet.SET_DULL
- );
-
-
+ new short[] {255, 170, 220},
+ "Dephosphated Samarium Concentrate",
+ subscriptNumbers("??Sm??"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.MIXTURE,
+ new Werkstoff.GenerationFeatures().disable().onlyDust(),
+ offsetID2 + 29,
+ TextureSet.SET_DULL);
// Weird/Exciting Chemicals
public static final Werkstoff Tetrahydrofuran = new Werkstoff(
- new short[] {222, 165, 164},
- "Tetrahydrofuran",
- subscriptNumbers("(CH2)4O"),
- new Werkstoff.Stats(),
- Werkstoff.Types.COMPOUND,
- new Werkstoff.GenerationFeatures().disable().addCells(),
- offsetID3,
- TextureSet.SET_FLUID
- );
+ new short[] {222, 165, 164},
+ "Tetrahydrofuran",
+ subscriptNumbers("(CH2)4O"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.COMPOUND,
+ new Werkstoff.GenerationFeatures().disable().addCells(),
+ offsetID3,
+ TextureSet.SET_FLUID);
- //1,4-Butanediol
+ // 1,4-Butanediol
public static final Werkstoff Butanediol = new Werkstoff(
- new short[] {185, 78, 72},
- "1,4-Butanediol",
- subscriptNumbers("HO(CH2)4OH"),
- new Werkstoff.Stats(),
- Werkstoff.Types.COMPOUND,
- new Werkstoff.GenerationFeatures().disable().addCells(),
- offsetID3 + 1,
- TextureSet.SET_FLUID
- );
+ new short[] {185, 78, 72},
+ "1,4-Butanediol",
+ subscriptNumbers("HO(CH2)4OH"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.COMPOUND,
+ new Werkstoff.GenerationFeatures().disable().addCells(),
+ offsetID3 + 1,
+ TextureSet.SET_FLUID);
- //Acidicised 1,4-Butanediol
+ // Acidicised 1,4-Butanediol
public static final Werkstoff AcidicButanediol = new Werkstoff(
- new short[] {255, 239, 213},
- "Acidicised 1,4-Butanediol",
- new Werkstoff.Stats(),
- Werkstoff.Types.MIXTURE,
- new Werkstoff.GenerationFeatures().disable().addCells(),
- offsetID3 + 2,
- TextureSet.SET_FLUID
- );
+ new short[] {255, 239, 213},
+ "Acidicised 1,4-Butanediol",
+ new Werkstoff.Stats(),
+ Werkstoff.Types.MIXTURE,
+ new Werkstoff.GenerationFeatures().disable().addCells(),
+ offsetID3 + 2,
+ TextureSet.SET_FLUID);
- //Tellurium-Molybdenum-Oxide Catalyst
- public static final Werkstoff MoTeOCatalyst= new Werkstoff(
- new short[] {238, 131, 238},
- "Tellurium-Molybdenum-Oxide Catalyst",
- new Werkstoff.Stats(),
- Werkstoff.Types.MIXTURE,
- new Werkstoff.GenerationFeatures().disable().onlyDust(),
- offsetID3 + 3,
- TextureSet.SET_DULL
- );
+ // Tellurium-Molybdenum-Oxide Catalyst
+ public static final Werkstoff MoTeOCatalyst = new Werkstoff(
+ new short[] {238, 131, 238},
+ "Tellurium-Molybdenum-Oxide Catalyst",
+ new Werkstoff.Stats(),
+ Werkstoff.Types.MIXTURE,
+ new Werkstoff.GenerationFeatures().disable().onlyDust(),
+ offsetID3 + 3,
+ TextureSet.SET_DULL);
- //Tellurium Oxide
+ // Tellurium Oxide
public static final Werkstoff TelluriumIVOxide = new Werkstoff(
- new short[] {229, 199, 187},
- "Tellurium (IV) Oxide",
- subscriptNumbers("TeO2"),
- new Werkstoff.Stats(),
- Werkstoff.Types.COMPOUND,
- new Werkstoff.GenerationFeatures().disable().onlyDust(),
- offsetID3 + 4,
- TextureSet.SET_DULL
- );
+ new short[] {229, 199, 187},
+ "Tellurium (IV) Oxide",
+ subscriptNumbers("TeO2"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.COMPOUND,
+ new Werkstoff.GenerationFeatures().disable().onlyDust(),
+ offsetID3 + 4,
+ TextureSet.SET_DULL);
public static final Werkstoff MolybdenumIVOxide = new Werkstoff(
- new short[] {52, 53, 57},
- "Molybdenum (IV) Oxide",
- subscriptNumbers("MoO2"),
- new Werkstoff.Stats(),
- Werkstoff.Types.COMPOUND,
- new Werkstoff.GenerationFeatures().disable().onlyDust(),
- offsetID3 + 5,
- TextureSet.SET_DULL
- );
+ new short[] {52, 53, 57},
+ "Molybdenum (IV) Oxide",
+ subscriptNumbers("MoO2"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.COMPOUND,
+ new Werkstoff.GenerationFeatures().disable().onlyDust(),
+ offsetID3 + 5,
+ TextureSet.SET_DULL);
public static final Werkstoff Polytetrahydrofuran = new Werkstoff(
- new short[] {192, 128, 129},
- "Polytetrahydrofuran",
- subscriptNumbers("(C4H8O)OH2"),
- new Werkstoff.Stats(),
- Werkstoff.Types.COMPOUND,
- new Werkstoff.GenerationFeatures().disable().onlyDust().addCells(),
- offsetID3 + 6,
- TextureSet.SET_DULL
- );
+ new short[] {192, 128, 129},
+ "Polytetrahydrofuran",
+ subscriptNumbers("(C4H8O)OH2"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.COMPOUND,
+ new Werkstoff.GenerationFeatures().disable().onlyDust().addCells(),
+ offsetID3 + 6,
+ TextureSet.SET_DULL);
public static final Werkstoff TungstophosphoricAcid = new Werkstoff(
- new short[] {223, 255, 0},
- "Tungstophosphoric Acid",
- subscriptNumbers("H3PW12O40"),
- new Werkstoff.Stats(),
- Werkstoff.Types.COMPOUND,
- new Werkstoff.GenerationFeatures().disable().addCells(),
- offsetID3 + 7,
- TextureSet.SET_FLUID
- );
+ new short[] {223, 255, 0},
+ "Tungstophosphoric Acid",
+ subscriptNumbers("H3PW12O40"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.COMPOUND,
+ new Werkstoff.GenerationFeatures().disable().addCells(),
+ offsetID3 + 7,
+ TextureSet.SET_FLUID);
public static final Werkstoff TolueneDiisocyanate = new Werkstoff(
- new short[] {255, 255, 102},
- "Toluene Diisocyanate",
- subscriptNumbers("CH3C6H3(NCO)2"),
- new Werkstoff.Stats(),
- Werkstoff.Types.COMPOUND,
- new Werkstoff.GenerationFeatures().disable().addCells(),
- offsetID3 + 8,
- TextureSet.SET_FLUID
- );
+ new short[] {255, 255, 102},
+ "Toluene Diisocyanate",
+ subscriptNumbers("CH3C6H3(NCO)2"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.COMPOUND,
+ new Werkstoff.GenerationFeatures().disable().addCells(),
+ offsetID3 + 8,
+ TextureSet.SET_FLUID);
public static final Werkstoff Dinitrotoluene = new Werkstoff(
- new short[] {216, 191, 216},
- "Dinitrotoluene",
- subscriptNumbers("C7H6N2O4"),
- new Werkstoff.Stats(),
- Werkstoff.Types.COMPOUND,
- new Werkstoff.GenerationFeatures().disable().addCells(),
- offsetID3 + 9,
- TextureSet.SET_FLUID
- );
+ new short[] {216, 191, 216},
+ "Dinitrotoluene",
+ subscriptNumbers("C7H6N2O4"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.COMPOUND,
+ new Werkstoff.GenerationFeatures().disable().addCells(),
+ offsetID3 + 9,
+ TextureSet.SET_FLUID);
public static final Werkstoff Diaminotoluene = new Werkstoff(
- new short[] {227, 218, 201},
- "Diaminotoluene",
- subscriptNumbers("C6H3(NH2)2CH3"),
- new Werkstoff.Stats(),
- Werkstoff.Types.COMPOUND,
- new Werkstoff.GenerationFeatures().disable().addCells(),
- offsetID3 + 10,
- TextureSet.SET_FLUID
- );
+ new short[] {227, 218, 201},
+ "Diaminotoluene",
+ subscriptNumbers("C6H3(NH2)2CH3"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.COMPOUND,
+ new Werkstoff.GenerationFeatures().disable().addCells(),
+ offsetID3 + 10,
+ TextureSet.SET_FLUID);
public static final Werkstoff TolueneTetramethylDiisocyanate = new Werkstoff(
- new short[] {255, 255, 255},
- "Toluene Tetramethyl Diisocyanate",
- subscriptNumbers("(CONH)2(C6H4)2CH2(C4O)"),
- new Werkstoff.Stats(),
- Werkstoff.Types.COMPOUND,
- new Werkstoff.GenerationFeatures().disable().addCells(),
- offsetID3 + 11,
- TextureSet.SET_FLUID
- );
+ new short[] {255, 255, 255},
+ "Toluene Tetramethyl Diisocyanate",
+ subscriptNumbers("(CONH)2(C6H4)2CH2(C4O)"),
+ new Werkstoff.Stats(),
+ Werkstoff.Types.COMPOUND,
+ new Werkstoff.GenerationFeatures().disable().addCells(),
+ offsetID3 + 11,
+ TextureSet.SET_FLUID);
public static final Werkstoff PTMEGElastomer = new Werkstoff(
- new short[] {248, 248, 255},
- "PTMEG Elastomer",
- new Werkstoff.Stats().setMeltingPoint(600).setMeltingVoltage(64),
- Werkstoff.Types.COMPOUND,
- new Werkstoff.GenerationFeatures().disable()
- .onlyDust()
- .addMolten()
- .addMetalItems()
- ,
- offsetID3 + 12,
- TextureSet.SET_DULL
- );
-
+ new short[] {248, 248, 255},
+ "PTMEG Elastomer",
+ new Werkstoff.Stats().setMeltingPoint(600).setMeltingVoltage(64),
+ Werkstoff.Types.COMPOUND,
+ new Werkstoff.GenerationFeatures().disable().onlyDust().addMolten().addMetalItems(),
+ offsetID3 + 12,
+ TextureSet.SET_DULL);
public static final Werkstoff MagnesiumPeroxide = new Werkstoff(
- new short[] {255, 250, 205},
- "Magnesium Peroxide",
+ new short[] {255, 250, 205},
+ "Magnesium Peroxide",
subscriptNumbers("MnO2"),
- new Werkstoff.Stats(),
- Werkstoff.Types.COMPOUND,
- new Werkstoff.GenerationFeatures().disable().onlyDust(),
- offsetID3 + 13,
- TextureSet.SET_METALLIC
- );
+ new Werkstoff.Stats(),
+ Werkstoff.Types.COMPOUND,
+ new Werkstoff.GenerationFeatures().disable().onlyDust(),
+ offsetID3 + 13,
+ TextureSet.SET_METALLIC);
public static final Werkstoff PotassiumChlorate = new Werkstoff(
- new short[] {240, 255, 255},
- "Potassium Chlorate",
+ new short[] {240, 255, 255},
+ "Potassium Chlorate",
subscriptNumbers("KClO3"),
- new Werkstoff.Stats(),
- Werkstoff.Types.COMPOUND,
- new Werkstoff.GenerationFeatures().disable().onlyDust().addMolten(),
- offsetID3 + 14,
- TextureSet.SET_DULL
- );
+ new Werkstoff.Stats(),
+ Werkstoff.Types.COMPOUND,
+ new Werkstoff.GenerationFeatures().disable().onlyDust().addMolten(),
+ offsetID3 + 14,
+ TextureSet.SET_DULL);
public static final Werkstoff MARM247 = new Werkstoff(
- new short[] {255, 133, 145},
- "MAR-M247",
- new Werkstoff.Stats().setMeltingPoint(8000).setBlastFurnace(true).setMeltingVoltage(7680),
- Werkstoff.Types.COMPOUND,
- new Werkstoff.GenerationFeatures().disable()
- .onlyDust()
- .addMolten()
- .addMetalItems()
- ,
- offsetID3 + 15,
- TextureSet.SET_METALLIC
- );
+ new short[] {255, 133, 145},
+ "MAR-M247",
+ new Werkstoff.Stats().setMeltingPoint(8000).setBlastFurnace(true).setMeltingVoltage(7680),
+ Werkstoff.Types.COMPOUND,
+ new Werkstoff.GenerationFeatures().disable().onlyDust().addMolten().addMetalItems(),
+ offsetID3 + 15,
+ TextureSet.SET_METALLIC);
public static final Werkstoff DilutedAcetone = new Werkstoff(
- new short[] {254, 254, 250},
- "Diluted Acetone",
- new Werkstoff.Stats(),
- Werkstoff.Types.MIXTURE,
- new Werkstoff.GenerationFeatures().disable().addCells(),
- offsetID3 + 16,
- TextureSet.SET_FLUID
- );
-
+ new short[] {254, 254, 250},
+ "Diluted Acetone",
+ new Werkstoff.Stats(),
+ Werkstoff.Types.MIXTURE,
+ new Werkstoff.GenerationFeatures().disable().addCells(),
+ offsetID3 + 16,
+ TextureSet.SET_FLUID);
public static void runInit() {
- addSubTags();
-
+ addSubTags();
}
private static void addSubTags() {
- //WerkstoffMaterialPool.PTMEGElastomer.add(SubTag.BOUNCY, SubTag.STRETCHY);
+ // WerkstoffMaterialPool.PTMEGElastomer.add(SubTag.BOUNCY, SubTag.STRETCHY);
}
-
-
-
@Override
- public void run() {
-
- }
-
-
+ public void run() {}
}
diff --git a/src/main/java/com/elisis/gtnhlanth/common/tileentity/Digester.java b/src/main/java/com/elisis/gtnhlanth/common/tileentity/Digester.java
index 5e3d552b20..2433458a02 100644
--- a/src/main/java/com/elisis/gtnhlanth/common/tileentity/Digester.java
+++ b/src/main/java/com/elisis/gtnhlanth/common/tileentity/Digester.java
@@ -12,15 +12,11 @@ import static gregtech.api.enums.Textures.BlockIcons.casingTexturePages;
import static gregtech.api.util.GT_StructureUtility.ofCoil;
import static gregtech.api.util.GT_StructureUtility.ofHatchAdder;
-import java.util.ArrayList;
-import java.util.Arrays;
-
import com.elisis.gtnhlanth.loader.RecipeAdder;
import com.elisis.gtnhlanth.util.DescTextLocalization;
import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable;
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
import com.gtnewhorizon.structurelib.structure.StructureDefinition;
-
import gregtech.api.GregTech_API;
import gregtech.api.enums.HeatingCoilLevel;
import gregtech.api.gui.GT_GUIContainer_MultiMachine;
@@ -32,177 +28,177 @@ import gregtech.api.render.TextureFactory;
import gregtech.api.util.GT_Log;
import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
import gregtech.api.util.GT_Recipe;
+import java.util.ArrayList;
+import java.util.Arrays;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
-
public class Digester extends GT_MetaTileEntity_EnhancedMultiBlockBase<Digester> implements IConstructable {
-
+
protected int casingAmount = 0;
protected int height = 0;
-
+
private HeatingCoilLevel heatLevel;
-
- private IStructureDefinition<Digester> multiDefinition = StructureDefinition.<Digester>builder()
- .addShape(mName, transpose(new String[][] {
- {"-------", "-ttttt-", "-t---t-", "-t---t-", "-t---t-", "-ttttt-", "-------"},
- {"--ttt--", "-t---t-", "t-----t", "t-----t", "t-----t", "-t---t-", "--ttt--"},
- {"-tccct-", "tc---ct", "c-----c", "c-----c", "c-----c", "tc---ct", "-tccct-"},
- {"-tt~tt-", "thhhhht", "thsssht", "thsssht", "thsssht", "thhhhht", "-ttttt-"},
-
-
-
-
-
- }))
- .addElement('t', ofChain(
- ofHatchAdder(Digester::addInputToMachineList, 47, 1),
- ofHatchAdder(Digester::addOutputToMachineList, 47, 1),
- ofHatchAdder(Digester::addEnergyInputToMachineList, 47, 1),
- ofHatchAdder(Digester::addMaintenanceToMachineList, 47, 1),
- ofHatchAdder(Digester::addMufflerToMachineList, 47, 1),
- ofBlock(GregTech_API.sBlockCasings4, 0)
- ))
- .addElement('h', ofBlock(GregTech_API.sBlockCasings1, 11))
- .addElement('s', ofBlock(GregTech_API.sBlockCasings4, 1))
- .addElement('c', ofCoil(Digester::setCoilLevel, Digester::getCoilLevel))
- .build();
-
-
- //private int mHeat;
- //private int mNeededHeat;
-
+
+ private IStructureDefinition<Digester> multiDefinition = StructureDefinition.<Digester>builder()
+ .addShape(mName, transpose(new String[][] {
+ {"-------", "-ttttt-", "-t---t-", "-t---t-", "-t---t-", "-ttttt-", "-------"},
+ {"--ttt--", "-t---t-", "t-----t", "t-----t", "t-----t", "-t---t-", "--ttt--"},
+ {"-tccct-", "tc---ct", "c-----c", "c-----c", "c-----c", "tc---ct", "-tccct-"},
+ {"-tt~tt-", "thhhhht", "thsssht", "thsssht", "thsssht", "thhhhht", "-ttttt-"},
+ }))
+ .addElement(
+ 't',
+ ofChain(
+ ofHatchAdder(Digester::addInputToMachineList, 47, 1),
+ ofHatchAdder(Digester::addOutputToMachineList, 47, 1),
+ ofHatchAdder(Digester::addEnergyInputToMachineList, 47, 1),
+ ofHatchAdder(Digester::addMaintenanceToMachineList, 47, 1),
+ ofHatchAdder(Digester::addMufflerToMachineList, 47, 1),
+ ofBlock(GregTech_API.sBlockCasings4, 0)))
+ .addElement('h', ofBlock(GregTech_API.sBlockCasings1, 11))
+ .addElement('s', ofBlock(GregTech_API.sBlockCasings4, 1))
+ .addElement('c', ofCoil(Digester::setCoilLevel, Digester::getCoilLevel))
+ .build();
+
+ // private int mHeat;
+ // private int mNeededHeat;
public Digester(String name) {
- super(name);
+ super(name);
+ }
+
+ public Digester(int id, String name, String nameRegional) {
+ super(id, name, nameRegional);
}
- public Digester(int id, String name, String nameRegional) {
- super(id, name, nameRegional);
- }
-
- @Override
+ @Override
public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) {
return checkPiece(mName, 3, 3, 0);
}
-
- @Override
+
+ @Override
public boolean isCorrectMachinePart(ItemStack aStack) {
return true;
}
-
- public HeatingCoilLevel getCoilLevel() {
- return this.heatLevel;
- }
-
- public void setCoilLevel(HeatingCoilLevel level) {
- this.heatLevel = level;
- }
-
- @Override
- public boolean checkRecipe(ItemStack itemStack) {
- GT_Log.out.print("in checkRecipe\n");
-
- ArrayList<FluidStack> tFluidInputs = this.getStoredFluids();
- FluidStack[] tFluidInputArray = tFluidInputs.toArray(new FluidStack[0]);
- ItemStack[] tItems = this.getStoredInputs().toArray(new ItemStack[0]);
- long tVoltage = this.getMaxInputVoltage();
-
- GT_Log.out.print(Arrays.toString(mInventory));
-
- //Collection<GT_Recipe> tRecipes = RecipeAdder.instance.DigesterRecipes.mRecipeList;
- GT_Recipe tRecipe = RecipeAdder.instance.DigesterRecipes.findRecipe(
- getBaseMetaTileEntity(),
- false,
- tVoltage,
- tFluidInputArray,
- tItems
- );
-
- if (tRecipe == null)
- return false;
- //GT_Log.out.print("Recipe not null\n");
- if (tRecipe.isRecipeInputEqual(true, tFluidInputArray, tItems)) {
- //GT_Log.out.print("in isRecipeInputEqual\n");
- this.mEfficiency = (10000 - (this.getIdealStatus() - this.getRepairStatus()) * 1000);
- this.mEfficiencyIncrease = 10000;
- this.calculateOverclockedNessMulti(tRecipe.mEUt, tRecipe.mDuration, 1, tVoltage);
-
- if (mMaxProgresstime == Integer.MAX_VALUE - 1 && this.mEUt == Integer.MAX_VALUE - 1)
- return false;
-
- if (this.mEUt > 0)
- this.mEUt = (-this.mEUt);
- //GT_Log.out.print("valid values");
-
- if (tRecipe.mSpecialValue > this.getCoilLevel().getHeat())
- return false;
- //GT_Log.out.print("Coils good\n");
- //GT_Log.out.print(tRecipe.getFluidOutput(0).getLocalizedName());
- this.mOutputFluids = new FluidStack[] {
- tRecipe.getFluidOutput(0)
- };
-
- this.mOutputItems = new ItemStack[] {
- tRecipe.getOutput(0)
- };
- return true;
- }
- return false;
- }
-
- @Override
- public int getMaxEfficiency(ItemStack itemStack) {
- return 10000;
- }
-
- @Override
+
+ public HeatingCoilLevel getCoilLevel() {
+ return this.heatLevel;
+ }
+
+ public void setCoilLevel(HeatingCoilLevel level) {
+ this.heatLevel = level;
+ }
+
+ @Override
+ public boolean checkRecipe(ItemStack itemStack) {
+ GT_Log.out.print("in checkRecipe\n");
+
+ ArrayList<FluidStack> tFluidInputs = this.getStoredFluids();
+ FluidStack[] tFluidInputArray = tFluidInputs.toArray(new FluidStack[0]);
+ ItemStack[] tItems = this.getStoredInputs().toArray(new ItemStack[0]);
+ long tVoltage = this.getMaxInputVoltage();
+
+ GT_Log.out.print(Arrays.toString(mInventory));
+
+ // Collection<GT_Recipe> tRecipes = RecipeAdder.instance.DigesterRecipes.mRecipeList;
+ GT_Recipe tRecipe = RecipeAdder.instance.DigesterRecipes.findRecipe(
+ getBaseMetaTileEntity(), false, tVoltage, tFluidInputArray, tItems);
+
+ if (tRecipe == null) return false;
+ // GT_Log.out.print("Recipe not null\n");
+ if (tRecipe.isRecipeInputEqual(true, tFluidInputArray, tItems)) {
+ // GT_Log.out.print("in isRecipeInputEqual\n");
+ this.mEfficiency = (10000 - (this.getIdealStatus() - this.getRepairStatus()) * 1000);
+ this.mEfficiencyIncrease = 10000;
+ this.calculateOverclockedNessMulti(tRecipe.mEUt, tRecipe.mDuration, 1, tVoltage);
+
+ if (mMaxProgresstime == Integer.MAX_VALUE - 1 && this.mEUt == Integer.MAX_VALUE - 1) return false;
+
+ if (this.mEUt > 0) this.mEUt = (-this.mEUt);
+ // GT_Log.out.print("valid values");
+
+ if (tRecipe.mSpecialValue > this.getCoilLevel().getHeat()) return false;
+ // GT_Log.out.print("Coils good\n");
+ // GT_Log.out.print(tRecipe.getFluidOutput(0).getLocalizedName());
+ this.mOutputFluids = new FluidStack[] {tRecipe.getFluidOutput(0)};
+
+ this.mOutputItems = new ItemStack[] {tRecipe.getOutput(0)};
+ return true;
+ }
+ return false;
+ }
+
+ @Override
+ public int getMaxEfficiency(ItemStack itemStack) {
+ return 10000;
+ }
+
+ @Override
public int getPollutionPerTick(ItemStack aStack) {
return 200;
}
-
- @Override
+
+ @Override
public Object getClientGUI(int id, InventoryPlayer playerInventory, IGregTechTileEntity metaTileEntity) {
return new GT_GUIContainer_MultiMachine(playerInventory, metaTileEntity, getLocalName(), "Digester.png");
}
-
- @Override
- public IMetaTileEntity newMetaEntity(IGregTechTileEntity arg0) {
- return new Digester(this.mName);
- }
-
- @Override
- public void construct(ItemStack itemStack, boolean b) {
- buildPiece(mName,itemStack, b, 3, 3, 0);
-
- }
-
- @Override
- public String[] getStructureDescription(ItemStack arg0) {
- return DescTextLocalization.addText("Digester.hint", 6);
- }
-
- @Override
- public ITexture[] getTexture(IGregTechTileEntity te, byte side, byte facing, byte colorIndex, boolean active,
- boolean redstone) {
-
- // Oil Cracker textures cuz I'm lazy
-
- if (side == facing) {
- if (active) return new ITexture[]{casingTexturePages[0][47],
- TextureFactory.builder().addIcon(OVERLAY_FRONT_OIL_CRACKER_ACTIVE).extFacing().build(),
- TextureFactory.builder().addIcon(OVERLAY_FRONT_OIL_CRACKER_ACTIVE_GLOW).extFacing().glow().build()};
- return new ITexture[]{casingTexturePages[0][47],
- TextureFactory.builder().addIcon(OVERLAY_FRONT_OIL_CRACKER).extFacing().build(),
- TextureFactory.builder().addIcon(OVERLAY_FRONT_OIL_CRACKER_GLOW).extFacing().glow().build()};
+
+ @Override
+ public IMetaTileEntity newMetaEntity(IGregTechTileEntity arg0) {
+ return new Digester(this.mName);
+ }
+
+ @Override
+ public void construct(ItemStack itemStack, boolean b) {
+ buildPiece(mName, itemStack, b, 3, 3, 0);
+ }
+
+ @Override
+ public String[] getStructureDescription(ItemStack arg0) {
+ return DescTextLocalization.addText("Digester.hint", 6);
+ }
+
+ @Override
+ public ITexture[] getTexture(
+ IGregTechTileEntity te, byte side, byte facing, byte colorIndex, boolean active, boolean redstone) {
+
+ // Oil Cracker textures cuz I'm lazy
+
+ if (side == facing) {
+ if (active)
+ return new ITexture[] {
+ casingTexturePages[0][47],
+ TextureFactory.builder()
+ .addIcon(OVERLAY_FRONT_OIL_CRACKER_ACTIVE)
+ .extFacing()
+ .build(),
+ TextureFactory.builder()
+ .addIcon(OVERLAY_FRONT_OIL_CRACKER_ACTIVE_GLOW)
+ .extFacing()
+ .glow()
+ .build()
+ };
+ return new ITexture[] {
+ casingTexturePages[0][47],
+ TextureFactory.builder()
+ .addIcon(OVERLAY_FRONT_OIL_CRACKER)
+ .extFacing()
+ .build(),
+ TextureFactory.builder()
+ .addIcon(OVERLAY_FRONT_OIL_CRACKER_GLOW)
+ .extFacing()
+ .glow()
+ .build()
+ };
}
- return new ITexture[]{casingTexturePages[0][47]};
+ return new ITexture[] {casingTexturePages[0][47]};
}
- @Override
- protected GT_Multiblock_Tooltip_Builder createTooltip() {
- final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+ @Override
+ protected GT_Multiblock_Tooltip_Builder createTooltip() {
+ final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
tt.addMachineType("Digester")
.addInfo("Controller block for the Digester")
.addInfo("Input ores and fluid, output water.")
@@ -217,23 +213,22 @@ public class Digester extends GT_MetaTileEntity_EnhancedMultiBlockBase<Digester>
.addMufflerHatch("Hint block with dot 1")
.toolTipFinisher("GTNH: Lanthanides");
return tt;
- }
-
- @Override
- public IStructureDefinition<Digester> getStructureDefinition() {
- return multiDefinition;
- }
+ }
- @Override
- public boolean explodesOnComponentBreak(ItemStack arg0) {
- // TODO Auto-generated method stub
- return false;
- }
+ @Override
+ public IStructureDefinition<Digester> getStructureDefinition() {
+ return multiDefinition;
+ }
- @Override
- public int getDamageToComponent(ItemStack arg0) {
- // TODO Auto-generated method stub
- return 0;
- }
+ @Override
+ public boolean explodesOnComponentBreak(ItemStack arg0) {
+ // TODO Auto-generated method stub
+ return false;
+ }
+ @Override
+ public int getDamageToComponent(ItemStack arg0) {
+ // TODO Auto-generated method stub
+ return 0;
+ }
}
diff --git a/src/main/java/com/elisis/gtnhlanth/common/tileentity/DissolutionTank.java b/src/main/java/com/elisis/gtnhlanth/common/tileentity/DissolutionTank.java
index b34a89a1b3..b6aa1dd172 100644
--- a/src/main/java/com/elisis/gtnhlanth/common/tileentity/DissolutionTank.java
+++ b/src/main/java/com/elisis/gtnhlanth/common/tileentity/DissolutionTank.java
@@ -12,19 +12,12 @@ import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_OIL_CRACKER_G
import static gregtech.api.enums.Textures.BlockIcons.casingTexturePages;
import static gregtech.api.util.GT_StructureUtility.ofHatchAdder;
-import java.util.ArrayList;
-import java.util.Arrays;
-
-import org.lwjgl.input.Keyboard;
-
import com.elisis.gtnhlanth.loader.RecipeAdder;
import com.elisis.gtnhlanth.util.DescTextLocalization;
import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry;
-import com.github.bartimaeusnek.bartworks.util.BW_Util;
import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable;
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
import com.gtnewhorizon.structurelib.structure.StructureDefinition;
-
import gregtech.api.GregTech_API;
import gregtech.api.gui.GT_GUIContainer_MultiMachine;
import gregtech.api.interfaces.ISecondaryDescribable;
@@ -33,228 +26,225 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_EnhancedMultiBlockBase;
import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Log;
import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
import gregtech.api.util.GT_Recipe;
+import java.util.ArrayList;
import net.minecraft.block.Block;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
-public class DissolutionTank extends GT_MetaTileEntity_EnhancedMultiBlockBase<DissolutionTank> implements IConstructable, ISecondaryDescribable {
-
- private IStructureDefinition<DissolutionTank> multiDefinition = StructureDefinition.<DissolutionTank>builder()
- .addShape(mName, transpose(new String[][] {
- {"-sss-", "sssss", "sssss", "sssss", "-sss-"},
- {"sgggs", "g---g", "g---g", "g---g", "sgggs"},
- {"sgggs", "g---g", "g---g", "g---g", "sgggs"},
- {"ss~ss", "shhhs", "shhhs", "shhhs", "sssss"},
- {"s---s", "-----", "-----", "-----", "s---s"}
- }))
- .addElement('s', ofChain(
- ofHatchAdder(DissolutionTank::addInputToMachineList, 49, 1),
- ofHatchAdder(DissolutionTank::addOutputToMachineList, 49, 1),
- ofHatchAdder(DissolutionTank::addEnergyInputToMachineList, 49, 1),
- ofHatchAdder(DissolutionTank::addMaintenanceToMachineList, 49, 1),
- ofHatchAdder(DissolutionTank::addMufflerToMachineList, 49, 1),
- ofBlock(GregTech_API.sBlockCasings4, 1)
- ))
- .addElement('h', ofBlock(GregTech_API.sBlockCasings1, 11))
- .addElement('g', ofBlockAdder(DissolutionTank::addGlass, ItemRegistry.bw_glasses[0], 1))
- .build();
-
- public DissolutionTank(String name) {
- super(name);
+public class DissolutionTank extends GT_MetaTileEntity_EnhancedMultiBlockBase<DissolutionTank>
+ implements IConstructable, ISecondaryDescribable {
+
+ private IStructureDefinition<DissolutionTank> multiDefinition = StructureDefinition.<DissolutionTank>builder()
+ .addShape(mName, transpose(new String[][] {
+ {"-sss-", "sssss", "sssss", "sssss", "-sss-"},
+ {"sgggs", "g---g", "g---g", "g---g", "sgggs"},
+ {"sgggs", "g---g", "g---g", "g---g", "sgggs"},
+ {"ss~ss", "shhhs", "shhhs", "shhhs", "sssss"},
+ {"s---s", "-----", "-----", "-----", "s---s"}
+ }))
+ .addElement(
+ 's',
+ ofChain(
+ ofHatchAdder(DissolutionTank::addInputToMachineList, 49, 1),
+ ofHatchAdder(DissolutionTank::addOutputToMachineList, 49, 1),
+ ofHatchAdder(DissolutionTank::addEnergyInputToMachineList, 49, 1),
+ ofHatchAdder(DissolutionTank::addMaintenanceToMachineList, 49, 1),
+ ofHatchAdder(DissolutionTank::addMufflerToMachineList, 49, 1),
+ ofBlock(GregTech_API.sBlockCasings4, 1)))
+ .addElement('h', ofBlock(GregTech_API.sBlockCasings1, 11))
+ .addElement('g', ofBlockAdder(DissolutionTank::addGlass, ItemRegistry.bw_glasses[0], 1))
+ .build();
+
+ public DissolutionTank(String name) {
+ super(name);
}
- public DissolutionTank(int id, String name, String nameRegional) {
- super(id, name, nameRegional);
- }
-
- @Override
- public IStructureDefinition<DissolutionTank> getStructureDefinition(){
- return multiDefinition;
- }
-
- @Override
+ public DissolutionTank(int id, String name, String nameRegional) {
+ super(id, name, nameRegional);
+ }
+
+ @Override
+ public IStructureDefinition<DissolutionTank> getStructureDefinition() {
+ return multiDefinition;
+ }
+
+ @Override
public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) {
return checkPiece(mName, 2, 3, 0);
}
-
- @Override
+
+ @Override
public boolean isCorrectMachinePart(ItemStack aStack) {
return true;
}
-
- private boolean addGlass(Block block, int meta) {
- if (block != ItemRegistry.bw_glasses[0]) {
- return false;
- }
- else {
- return true;
- }
-
- }
-
- @Override
- public boolean checkRecipe(ItemStack itemStack) {
-
- //GT_Log.out.print("in checkRecipe");
-
- ArrayList<FluidStack> tFluidInputs = this.getStoredFluids();
- FluidStack[] tFluidInputArray = tFluidInputs.toArray(new FluidStack[0]);
- ItemStack[] tItems = this.getStoredInputs().toArray(new ItemStack[0]);
- long tVoltage = this.getMaxInputVoltage();
-
- //Collection<GT_Recipe> tRecipes = RecipeAdder.instance.DigesterRecipes.mRecipeList;
- GT_Recipe tRecipe = RecipeAdder.instance.DissolutionTankRecipes.findRecipe(
- getBaseMetaTileEntity(),
- false,
- tVoltage,
- tFluidInputArray,
- tItems
- );
-
- if (tRecipe == null)
- return false;
-
- //GT_Log.out.print("Recipe not null\n");
- if (tRecipe.isRecipeInputEqual(true, tFluidInputArray, tItems)) {
-
- this.mEfficiency = (10000 - (this.getIdealStatus() - this.getRepairStatus()) * 1000);
- this.mEfficiencyIncrease = 10000;
- this.calculateOverclockedNessMulti(tRecipe.mEUt, tRecipe.mDuration, 1, tVoltage);
-
- if (mMaxProgresstime == Integer.MAX_VALUE - 1 && this.mEUt == Integer.MAX_VALUE - 1)
- return false;
-
- if (this.mEUt > 0)
- this.mEUt = (-this.mEUt);
-
- FluidStack majorGenericFluid = tRecipe.mFluidInputs[0];
- FluidStack minorGenericFluid = tRecipe.mFluidInputs[1];
-
- FluidStack majorInput = null;
- FluidStack minorInput = null;
-
- int majorAmount = 0;
- int minorAmount = 0;
-
- FluidStack fluidInputOne = tFluidInputs.get(0);
- FluidStack fluidInputTwo = tFluidInputs.get(1);
-
- majorInput = ((fluidInputOne.getUnlocalizedName().equals(majorGenericFluid.getUnlocalizedName())) ? fluidInputOne : fluidInputTwo);
- //GT_Log.out.print(majorInput.getLocalizedName());
- if (fluidInputOne.getUnlocalizedName().equals(majorGenericFluid.getUnlocalizedName())) {
- if (fluidInputTwo.getUnlocalizedName().equals(minorGenericFluid.getUnlocalizedName())) {
- majorInput = fluidInputOne;
- majorAmount = fluidInputOne.amount;
- minorInput = fluidInputTwo;
- minorAmount = fluidInputTwo.amount;
- //GT_Log.out.print("in first IF");
- }
- else
- return false; // No valid other input
-
- } else if (fluidInputTwo.getUnlocalizedName().equals(majorGenericFluid.getUnlocalizedName())) {
- if (fluidInputOne.getUnlocalizedName().equals(minorGenericFluid.getUnlocalizedName())) {
- majorInput = fluidInputTwo;
- majorAmount = fluidInputTwo.amount;
- minorInput = fluidInputOne;
- minorAmount = fluidInputOne.amount;
- //GT_Log.out.print("in second if");
- }
- else
- return false;
-
- }
- else
- return false;
-
- //GT_Log.out.print("out of switch weirdness");
-
- /*
- for (FluidStack fluid : tFluidInputs) {
- String name = fluid.getUnlocalizedName();
- if (name == majorGenericFluid.getUnlocalizedName())
- majorInput = fluid;
-
- else if (name == minorGenericFluid.getUnlocalizedName())
- minorInput = fluid;
- }
- */
- if (majorInput == null || minorInput == null)
- return false;
-
- //GT_Log.out.print("major " + majorInput.getLocalizedName());
- //GT_Log.out.print("minor " + minorInput.getLocalizedName());
-
- //GT_Log.out.print("mjrinputamt " + majorInput.amount);
- /*
- if ((majorInput.amount / tRecipe.mSpecialValue) != (minorInput.amount))
- return false;
- */
- if ((majorAmount / tRecipe.mSpecialValue) != (minorAmount))
- return false;
-
- this.mOutputFluids = new FluidStack[] {
- tRecipe.getFluidOutput(0)
- };
- this.mOutputItems = new ItemStack[] {
- tRecipe.getOutput(0)
- };
- return true;
- }
- return false;
- }
-
- @Override
- public int getMaxEfficiency(ItemStack itemStack) {
- return 10000;
- }
-
- @Override
+
+ private boolean addGlass(Block block, int meta) {
+ if (block != ItemRegistry.bw_glasses[0]) {
+ return false;
+ } else {
+ return true;
+ }
+ }
+
+ @Override
+ public boolean checkRecipe(ItemStack itemStack) {
+
+ // GT_Log.out.print("in checkRecipe");
+
+ ArrayList<FluidStack> tFluidInputs = this.getStoredFluids();
+ FluidStack[] tFluidInputArray = tFluidInputs.toArray(new FluidStack[0]);
+ ItemStack[] tItems = this.getStoredInputs().toArray(new ItemStack[0]);
+ long tVoltage = this.getMaxInputVoltage();
+
+ // Collection<GT_Recipe> tRecipes = RecipeAdder.instance.DigesterRecipes.mRecipeList;
+ GT_Recipe tRecipe = RecipeAdder.instance.DissolutionTankRecipes.findRecipe(
+ getBaseMetaTileEntity(), false, tVoltage, tFluidInputArray, tItems);
+
+ if (tRecipe == null) return false;
+
+ // GT_Log.out.print("Recipe not null\n");
+ if (tRecipe.isRecipeInputEqual(true, tFluidInputArray, tItems)) {
+
+ this.mEfficiency = (10000 - (this.getIdealStatus() - this.getRepairStatus()) * 1000);
+ this.mEfficiencyIncrease = 10000;
+ this.calculateOverclockedNessMulti(tRecipe.mEUt, tRecipe.mDuration, 1, tVoltage);
+
+ if (mMaxProgresstime == Integer.MAX_VALUE - 1 && this.mEUt == Integer.MAX_VALUE - 1) return false;
+
+ if (this.mEUt > 0) this.mEUt = (-this.mEUt);
+
+ FluidStack majorGenericFluid = tRecipe.mFluidInputs[0];
+ FluidStack minorGenericFluid = tRecipe.mFluidInputs[1];
+
+ FluidStack majorInput = null;
+ FluidStack minorInput = null;
+
+ int majorAmount = 0;
+ int minorAmount = 0;
+
+ FluidStack fluidInputOne = tFluidInputs.get(0);
+ FluidStack fluidInputTwo = tFluidInputs.get(1);
+
+ majorInput = ((fluidInputOne.getUnlocalizedName().equals(majorGenericFluid.getUnlocalizedName()))
+ ? fluidInputOne
+ : fluidInputTwo);
+ // GT_Log.out.print(majorInput.getLocalizedName());
+ if (fluidInputOne.getUnlocalizedName().equals(majorGenericFluid.getUnlocalizedName())) {
+ if (fluidInputTwo.getUnlocalizedName().equals(minorGenericFluid.getUnlocalizedName())) {
+ majorInput = fluidInputOne;
+ majorAmount = fluidInputOne.amount;
+ minorInput = fluidInputTwo;
+ minorAmount = fluidInputTwo.amount;
+ // GT_Log.out.print("in first IF");
+ } else return false; // No valid other input
+
+ } else if (fluidInputTwo.getUnlocalizedName().equals(majorGenericFluid.getUnlocalizedName())) {
+ if (fluidInputOne.getUnlocalizedName().equals(minorGenericFluid.getUnlocalizedName())) {
+ majorInput = fluidInputTwo;
+ majorAmount = fluidInputTwo.amount;
+ minorInput = fluidInputOne;
+ minorAmount = fluidInputOne.amount;
+ // GT_Log.out.print("in second if");
+ } else return false;
+
+ } else return false;
+
+ // GT_Log.out.print("out of switch weirdness");
+
+ /*
+ for (FluidStack fluid : tFluidInputs) {
+ String name = fluid.getUnlocalizedName();
+ if (name == majorGenericFluid.getUnlocalizedName())
+ majorInput = fluid;
+
+ else if (name == minorGenericFluid.getUnlocalizedName())
+ minorInput = fluid;
+ }
+ */
+ if (majorInput == null || minorInput == null) return false;
+
+ // GT_Log.out.print("major " + majorInput.getLocalizedName());
+ // GT_Log.out.print("minor " + minorInput.getLocalizedName());
+
+ // GT_Log.out.print("mjrinputamt " + majorInput.amount);
+ /*
+ if ((majorInput.amount / tRecipe.mSpecialValue) != (minorInput.amount))
+ return false;
+ */
+ if ((majorAmount / tRecipe.mSpecialValue) != (minorAmount)) return false;
+
+ this.mOutputFluids = new FluidStack[] {tRecipe.getFluidOutput(0)};
+ this.mOutputItems = new ItemStack[] {tRecipe.getOutput(0)};
+ return true;
+ }
+ return false;
+ }
+
+ @Override
+ public int getMaxEfficiency(ItemStack itemStack) {
+ return 10000;
+ }
+
+ @Override
public Object getClientGUI(int id, InventoryPlayer playerInventory, IGregTechTileEntity metaTileEntity) {
return new GT_GUIContainer_MultiMachine(playerInventory, metaTileEntity, getLocalName(), "Disstank.png");
}
-
-
-
- @Override
- public IMetaTileEntity newMetaEntity(IGregTechTileEntity arg0) {
- return new DissolutionTank(this.mName);
- }
-
- @Override
- public void construct(ItemStack itemStack, boolean b) {
- buildPiece(mName, itemStack, b, 2, 3, 0);
-
- }
-
- @Override
- public String[] getStructureDescription(ItemStack arg0) {
- return DescTextLocalization.addText("DissolutionTank.hint", 4);
- }
-
- @Override
- public ITexture[] getTexture(IGregTechTileEntity te, byte side, byte facing, byte colorIndex, boolean active,
- boolean redstone) {
-
- if (side == facing) {
- if (active) return new ITexture[]{casingTexturePages[0][49],
- TextureFactory.builder().addIcon(OVERLAY_FRONT_OIL_CRACKER_ACTIVE).extFacing().build(),
- TextureFactory.builder().addIcon(OVERLAY_FRONT_OIL_CRACKER_ACTIVE_GLOW).extFacing().glow().build()};
- return new ITexture[]{casingTexturePages[0][49],
- TextureFactory.builder().addIcon(OVERLAY_FRONT_OIL_CRACKER).extFacing().build(),
- TextureFactory.builder().addIcon(OVERLAY_FRONT_OIL_CRACKER_GLOW).extFacing().glow().build()};
+
+ @Override
+ public IMetaTileEntity newMetaEntity(IGregTechTileEntity arg0) {
+ return new DissolutionTank(this.mName);
+ }
+
+ @Override
+ public void construct(ItemStack itemStack, boolean b) {
+ buildPiece(mName, itemStack, b, 2, 3, 0);
+ }
+
+ @Override
+ public String[] getStructureDescription(ItemStack arg0) {
+ return DescTextLocalization.addText("DissolutionTank.hint", 4);
+ }
+
+ @Override
+ public ITexture[] getTexture(
+ IGregTechTileEntity te, byte side, byte facing, byte colorIndex, boolean active, boolean redstone) {
+
+ if (side == facing) {
+ if (active)
+ return new ITexture[] {
+ casingTexturePages[0][49],
+ TextureFactory.builder()
+ .addIcon(OVERLAY_FRONT_OIL_CRACKER_ACTIVE)
+ .extFacing()
+ .build(),
+ TextureFactory.builder()
+ .addIcon(OVERLAY_FRONT_OIL_CRACKER_ACTIVE_GLOW)
+ .extFacing()
+ .glow()
+ .build()
+ };
+ return new ITexture[] {
+ casingTexturePages[0][49],
+ TextureFactory.builder()
+ .addIcon(OVERLAY_FRONT_OIL_CRACKER)
+ .extFacing()
+ .build(),
+ TextureFactory.builder()
+ .addIcon(OVERLAY_FRONT_OIL_CRACKER_GLOW)
+ .extFacing()
+ .glow()
+ .build()
+ };
}
- return new ITexture[]{casingTexturePages[0][49]};
-
- }
-
- @Override
- protected GT_Multiblock_Tooltip_Builder createTooltip() {
- final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+ return new ITexture[] {casingTexturePages[0][49]};
+ }
+
+ @Override
+ protected GT_Multiblock_Tooltip_Builder createTooltip() {
+ final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
tt.addMachineType("Dissolution Tank")
.addInfo("Controller block for the Dissolution Tank")
.addInfo("Input Water and Fluid, output Fluid")
@@ -268,20 +258,17 @@ public class DissolutionTank extends GT_MetaTileEntity_EnhancedMultiBlockBase<Di
.addOutputBus("Hint block with dot 2")
.addMaintenanceHatch("Hint block with dot 2")
.toolTipFinisher("GTNH: Lanthanides");
-
- return tt;
- }
-
- @Override
- public boolean explodesOnComponentBreak(ItemStack arg0) {
- return false;
- }
- @Override
- public int getDamageToComponent(ItemStack arg0) {
- return 0;
- }
+ return tt;
+ }
-
+ @Override
+ public boolean explodesOnComponentBreak(ItemStack arg0) {
+ return false;
+ }
+ @Override
+ public int getDamageToComponent(ItemStack arg0) {
+ return 0;
+ }
}
diff --git a/src/main/java/com/elisis/gtnhlanth/loader/BotRecipes.java b/src/main/java/com/elisis/gtnhlanth/loader/BotRecipes.java
index cf45b84d78..9fbe4880bd 100644
--- a/src/main/java/com/elisis/gtnhlanth/loader/BotRecipes.java
+++ b/src/main/java/com/elisis/gtnhlanth/loader/BotRecipes.java
@@ -43,15 +43,8 @@ import static gregtech.api.enums.OrePrefixes.dustTiny;
import static gregtech.api.enums.OrePrefixes.ingotHot;
import static gregtech.api.enums.OrePrefixes.item;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.Collection;
-import java.util.HashSet;
-
import com.elisis.gtnhlanth.common.register.BotWerkstoffMaterialPool;
import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
-
import cpw.mods.fml.common.Loader;
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.Materials;
@@ -60,9 +53,15 @@ import gregtech.api.util.GT_OreDictUnificator;
import gregtech.api.util.GT_Recipe;
import gregtech.api.util.GT_Utility;
import ic2.core.Ic2Items;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.HashSet;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
+
/*
*
* Originally authored by botn365 under the MIT License. See BotdustriesLICENSE
@@ -71,387 +70,679 @@ import net.minecraftforge.fluids.FluidStack;
public class BotRecipes {
- public static void addGTRecipe() {
+ public static void addGTRecipe() {
ItemStack C1 = GT_Utility.getIntegratedCircuit(1);
ItemStack C2 = GT_Utility.getIntegratedCircuit(2);
ItemStack C24 = GT_Utility.getIntegratedCircuit(24);
- //CaCO3 + 2HCl = H2O + CO2 + CaCl2
- GT_Values.RA.addChemicalRecipe(Materials.Calcite.getDust(5), Materials.Empty.getCells(1),
- Materials.HydrochloricAcid.getFluid(2000), Materials.Water.getFluid(1000),
- Materials.CarbonDioxide.getCells(1), WerkstoffLoader.CalciumChloride.get(dust, 3), 80, 120);
+ // CaCO3 + 2HCl = H2O + CO2 + CaCl2
+ GT_Values.RA.addChemicalRecipe(
+ Materials.Calcite.getDust(5),
+ Materials.Empty.getCells(1),
+ Materials.HydrochloricAcid.getFluid(2000),
+ Materials.Water.getFluid(1000),
+ Materials.CarbonDioxide.getCells(1),
+ WerkstoffLoader.CalciumChloride.get(dust, 3),
+ 80,
+ 120);
// tungsten chain
FluidStack sodiumTungsten = SodiumTungstate.getFluidOrGas(1000);
ItemStack scheelite = Materials.Scheelite.getDust(6);
- //Li2WO4 + 2Na = Na2WO4 + 2Li
- GT_Values.RA.addAutoclaveRecipe(Materials.Tungstate.getDust(7), Materials.Sodium.getDust(2),
- Materials.Water.getFluid(4000), sodiumTungsten, Materials.Lithium.getDust(2), 10000, 100, 1920, false);
-
- //MnWO4 + 2Na = Na2WO4 + Mn
- GT_Values.RA.addAutoclaveRecipe(WerkstoffLoader.Huebnerit.get(dust, 6), Materials.Sodium.getDust(2),
- Materials.Water.getFluid(4000), sodiumTungsten, Materials.Manganese.getDust(1), 10000, 100, 1920, false);
-
- //FeWO4 + 2Na = Na2WO4 + Fe
- GT_Values.RA.addAutoclaveRecipe(WerkstoffLoader.Ferberite.get(dust, 6), Materials.Sodium.getDust(2),
- Materials.Water.getFluid(4000), sodiumTungsten, Materials.Iron.getDust(1), 10000, 100, 1920, false);
-
- //CaCl2 + Na2WO4 = 2NaCl + CaWO4
+ // Li2WO4 + 2Na = Na2WO4 + 2Li
+ GT_Values.RA.addAutoclaveRecipe(
+ Materials.Tungstate.getDust(7),
+ Materials.Sodium.getDust(2),
+ Materials.Water.getFluid(4000),
+ sodiumTungsten,
+ Materials.Lithium.getDust(2),
+ 10000,
+ 100,
+ 1920,
+ false);
+
+ // MnWO4 + 2Na = Na2WO4 + Mn
+ GT_Values.RA.addAutoclaveRecipe(
+ WerkstoffLoader.Huebnerit.get(dust, 6),
+ Materials.Sodium.getDust(2),
+ Materials.Water.getFluid(4000),
+ sodiumTungsten,
+ Materials.Manganese.getDust(1),
+ 10000,
+ 100,
+ 1920,
+ false);
+
+ // FeWO4 + 2Na = Na2WO4 + Fe
+ GT_Values.RA.addAutoclaveRecipe(
+ WerkstoffLoader.Ferberite.get(dust, 6),
+ Materials.Sodium.getDust(2),
+ Materials.Water.getFluid(4000),
+ sodiumTungsten,
+ Materials.Iron.getDust(1),
+ 10000,
+ 100,
+ 1920,
+ false);
+
+ // CaCl2 + Na2WO4 = 2NaCl + CaWO4
ItemStack Ca2Cl = WerkstoffLoader.CalciumChloride.get(dust, 3);
- GT_Values.RA.addChemicalRecipe(Ca2Cl, null, sodiumTungsten, null,
- scheelite, Materials.Salt.getDust(4), 100, 480);
+ GT_Values.RA.addChemicalRecipe(
+ Ca2Cl, null, sodiumTungsten, null, scheelite, Materials.Salt.getDust(4), 100, 480);
ItemStack H2WO4 = TungsticAcid.get(dust, 7);
- //CaWO4 + 2HCl = H2WO4 + CaCl2
- GT_Values.RA.addChemicalRecipe(scheelite, null, Materials.HydrochloricAcid.getFluid(2000), null,
- H2WO4, Ca2Cl, 50, 1920);
+ // CaWO4 + 2HCl = H2WO4 + CaCl2
+ GT_Values.RA.addChemicalRecipe(
+ scheelite, null, Materials.HydrochloricAcid.getFluid(2000), null, H2WO4, Ca2Cl, 50, 1920);
ItemStack WO3 = TungstenTrioxide.get(dust, 4);
- //H2WO4 = WO3 + H2O
- GT_Values.RA.addBlastRecipe(H2WO4, null, null, null, WO3, null,
- 200, 480, 1200);
-
-// ItemStack WO3Fe = TungstenSteelOxide.get(dust, 2);
-// GT_Values.RA.addMixerRecipe(WO3, Materials.Steel.getDust(1), null, null, null, null,
-// WO3Fe, 100, 1920);
-
- //WO3 + 6H = W + 3H2O
- GT_Values.RA.addBlastRecipe(WO3,C2,Materials.Hydrogen.getGas(6000),
- GT_ModHandler.getSteam(3000),Materials.Tungsten.getDust(1),null,100,1920,1000);
+ // H2WO4 = WO3 + H2O
+ GT_Values.RA.addBlastRecipe(H2WO4, null, null, null, WO3, null, 200, 480, 1200);
+
+ // ItemStack WO3Fe = TungstenSteelOxide.get(dust, 2);
+ // GT_Values.RA.addMixerRecipe(WO3, Materials.Steel.getDust(1), null, null, null, null,
+ // WO3Fe, 100, 1920);
+
+ // WO3 + 6H = W + 3H2O
+ GT_Values.RA.addBlastRecipe(
+ WO3,
+ C2,
+ Materials.Hydrogen.getGas(6000),
+ GT_ModHandler.getSteam(3000),
+ Materials.Tungsten.getDust(1),
+ null,
+ 100,
+ 1920,
+ 1000);
WO3.stackSize = 8;
- //2WO3 + 3C = 2W + 3CO2
- GT_Values.RA.addBlastRecipe(WO3, Materials.Carbon.getDust(3), null, Materials.CarbonDioxide.getGas(3000),
- GT_OreDictUnificator.get(ingotHot, Materials.Tungsten, 2L), null, 8000, 1920, 3000);
-
- //rocket fuels
- //LMP103S
- //2Cl + CO = COCl2
- GT_Values.RA.addChemicalRecipe(Materials.CarbonMonoxide.getCells(1), C2, Materials.Chlorine.getGas(2000),
- null, Phosgene.get(cell, 1), 50, 480);
- GT_Values.RA.addChemicalRecipe(Materials.Chlorine.getCells(2), C2, Materials.CarbonMonoxide.getGas(1000),
- null, Phosgene.get(cell, 1), Materials.Empty.getCells(1),50, 480);
- GT_Values.RA.addChemicalRecipe(Materials.CarbonMonoxide.getCells(1), C2, Materials.Chlorine.getGas(2000),
- BotWerkstoffMaterialPool.Phosgene.getFluidOrGas(1000), null, Materials.Empty.getCells(1),50, 480);
- GT_Values.RA.addChemicalRecipe(Materials.Chlorine.getCells(2), C2, Materials.CarbonMonoxide.getGas(1000),
- BotWerkstoffMaterialPool.Phosgene.getFluidOrGas(1000), null, Materials.Empty.getCells(2),50, 480);
- GT_Values.RA.addChemicalRecipe(Materials.CarbonMonoxide.getCells(1), Materials.Chlorine.getCells(2), null,
- null, Phosgene.get(cell, 1), Materials.Empty.getCells(2), 50, 480);
- GT_Values.RA.addChemicalRecipe(Materials.Chlorine.getCells(2), Materials.CarbonMonoxide.getCells(1), null,
- null, Phosgene.get(cell, 1), Materials.Empty.getCells(2),50, 480);
- GT_Values.RA.addChemicalRecipe(Materials.CarbonMonoxide.getCells(1), Materials.Chlorine.getCells(2), null,
- BotWerkstoffMaterialPool.Phosgene.getFluidOrGas(1000), null, Materials.Empty.getCells(3),50, 480);
- GT_Values.RA.addChemicalRecipe(Materials.Chlorine.getCells(2), Materials.CarbonMonoxide.getCells(1), null,
- BotWerkstoffMaterialPool.Phosgene.getFluidOrGas(1000), null, Materials.Empty.getCells(3),50, 480);
-
- //COCl2 + C2H6O = HCl + C3H5ClO2
- GT_Values.RA.addChemicalRecipe(Phosgene.get(cell, 1), C2, Materials.Ethanol.getFluid(1000),
- Materials.HydrochloricAcid.getFluid(1000), Ethylchloroformate.get(cell, 1), 20, 1920);
-
- //C3H5ClO2 + 2NH3 = C3H7O2N + NH4Cl
- GT_Values.RA.addChemicalRecipe(Ethylchloroformate.get(cell, 1), C2, Materials.Ammonia.getGas(2000),
- WerkstoffLoader.AmmoniumChloride.getFluidOrGas(1000), Ethylcarbamate.get(cell, 1), 200, 120);
-
- //C3H7O2N + HNO3 = C3H6N2O4 + H2O
- GT_Values.RA.addChemicalRecipe(Ethylcarbamate.get(cell, 1), C2, Materials.NitricAcid.getFluid(1000),
- Materials.Water.getFluid(1000), EthylNnitrocarbamate.get(cell, 1), 40, 1024);
-
- //C3H6N2O4 + NH3 = C3H9N3O4
- GT_Values.RA.addChemicalRecipe(EthylNnitrocarbamate.get(cell, 1), C2, Materials.Ammonia.getGas(1000),
- null, AmmoniumNnitrourethane.get(cell, 1), 40, 1920);
-
- //C3H9N3O4 + N2O5 = C3H5N3O6 + N2H4O3
- GT_Values.RA.addChemicalRecipe(AmmoniumNnitrourethane.get(cell, 1), DinitrogenPentoxide.get(dust, 7), null, null,
- EthylDinitrocarbamate.get(cell, 1), AmmoniumNitrate.get(dust, 9), 200, 480);
-
- //C3H5N3O6 + 2NH3 = C3H7O2N + H4N4O4
- GT_Values.RA.addChemicalRecipe(EthylDinitrocarbamate.get(cell, 1), C2, Materials.Ammonia.getGas(2000),
- Ethylcarbamate.getFluidOrGas(1000), AmmoniumDinitramide.get(cell, 1), 200, 1920);
-
- //LMP-103S
+ // 2WO3 + 3C = 2W + 3CO2
+ GT_Values.RA.addBlastRecipe(
+ WO3,
+ Materials.Carbon.getDust(3),
+ null,
+ Materials.CarbonDioxide.getGas(3000),
+ GT_OreDictUnificator.get(ingotHot, Materials.Tungsten, 2L),
+ null,
+ 8000,
+ 1920,
+ 3000);
+
+ // rocket fuels
+ // LMP103S
+ // 2Cl + CO = COCl2
+ GT_Values.RA.addChemicalRecipe(
+ Materials.CarbonMonoxide.getCells(1),
+ C2,
+ Materials.Chlorine.getGas(2000),
+ null,
+ Phosgene.get(cell, 1),
+ 50,
+ 480);
+ GT_Values.RA.addChemicalRecipe(
+ Materials.Chlorine.getCells(2),
+ C2,
+ Materials.CarbonMonoxide.getGas(1000),
+ null,
+ Phosgene.get(cell, 1),
+ Materials.Empty.getCells(1),
+ 50,
+ 480);
+ GT_Values.RA.addChemicalRecipe(
+ Materials.CarbonMonoxide.getCells(1),
+ C2,
+ Materials.Chlorine.getGas(2000),
+ BotWerkstoffMaterialPool.Phosgene.getFluidOrGas(1000),
+ null,
+ Materials.Empty.getCells(1),
+ 50,
+ 480);
+ GT_Values.RA.addChemicalRecipe(
+ Materials.Chlorine.getCells(2),
+ C2,
+ Materials.CarbonMonoxide.getGas(1000),
+ BotWerkstoffMaterialPool.Phosgene.getFluidOrGas(1000),
+ null,
+ Materials.Empty.getCells(2),
+ 50,
+ 480);
+ GT_Values.RA.addChemicalRecipe(
+ Materials.CarbonMonoxide.getCells(1),
+ Materials.Chlorine.getCells(2),
+ null,
+ null,
+ Phosgene.get(cell, 1),
+ Materials.Empty.getCells(2),
+ 50,
+ 480);
+ GT_Values.RA.addChemicalRecipe(
+ Materials.Chlorine.getCells(2),
+ Materials.CarbonMonoxide.getCells(1),
+ null,
+ null,
+ Phosgene.get(cell, 1),
+ Materials.Empty.getCells(2),
+ 50,
+ 480);
+ GT_Values.RA.addChemicalRecipe(
+ Materials.CarbonMonoxide.getCells(1),
+ Materials.Chlorine.getCells(2),
+ null,
+ BotWerkstoffMaterialPool.Phosgene.getFluidOrGas(1000),
+ null,
+ Materials.Empty.getCells(3),
+ 50,
+ 480);
+ GT_Values.RA.addChemicalRecipe(
+ Materials.Chlorine.getCells(2),
+ Materials.CarbonMonoxide.getCells(1),
+ null,
+ BotWerkstoffMaterialPool.Phosgene.getFluidOrGas(1000),
+ null,
+ Materials.Empty.getCells(3),
+ 50,
+ 480);
+
+ // COCl2 + C2H6O = HCl + C3H5ClO2
+ GT_Values.RA.addChemicalRecipe(
+ Phosgene.get(cell, 1),
+ C2,
+ Materials.Ethanol.getFluid(1000),
+ Materials.HydrochloricAcid.getFluid(1000),
+ Ethylchloroformate.get(cell, 1),
+ 20,
+ 1920);
+
+ // C3H5ClO2 + 2NH3 = C3H7O2N + NH4Cl
+ GT_Values.RA.addChemicalRecipe(
+ Ethylchloroformate.get(cell, 1),
+ C2,
+ Materials.Ammonia.getGas(2000),
+ WerkstoffLoader.AmmoniumChloride.getFluidOrGas(1000),
+ Ethylcarbamate.get(cell, 1),
+ 200,
+ 120);
+
+ // C3H7O2N + HNO3 = C3H6N2O4 + H2O
+ GT_Values.RA.addChemicalRecipe(
+ Ethylcarbamate.get(cell, 1),
+ C2,
+ Materials.NitricAcid.getFluid(1000),
+ Materials.Water.getFluid(1000),
+ EthylNnitrocarbamate.get(cell, 1),
+ 40,
+ 1024);
+
+ // C3H6N2O4 + NH3 = C3H9N3O4
+ GT_Values.RA.addChemicalRecipe(
+ EthylNnitrocarbamate.get(cell, 1),
+ C2,
+ Materials.Ammonia.getGas(1000),
+ null,
+ AmmoniumNnitrourethane.get(cell, 1),
+ 40,
+ 1920);
+
+ // C3H9N3O4 + N2O5 = C3H5N3O6 + N2H4O3
+ GT_Values.RA.addChemicalRecipe(
+ AmmoniumNnitrourethane.get(cell, 1),
+ DinitrogenPentoxide.get(dust, 7),
+ null,
+ null,
+ EthylDinitrocarbamate.get(cell, 1),
+ AmmoniumNitrate.get(dust, 9),
+ 200,
+ 480);
+
+ // C3H5N3O6 + 2NH3 = C3H7O2N + H4N4O4
+ GT_Values.RA.addChemicalRecipe(
+ EthylDinitrocarbamate.get(cell, 1),
+ C2,
+ Materials.Ammonia.getGas(2000),
+ Ethylcarbamate.getFluidOrGas(1000),
+ AmmoniumDinitramide.get(cell, 1),
+ 200,
+ 1920);
+
+ // LMP-103S
GT_Values.RA.addMultiblockChemicalRecipe(
- new ItemStack[]{C24},
- new FluidStack[]{
- AmmoniumDinitramide.getFluidOrGas(6000),
- Materials.Methanol.getFluid(2000),
- Materials.Ammonia.getGas(500),
- Materials.Water.getFluid(1500)},
- new FluidStack[]{LMP103S.getFluidOrGas(10000)},
+ new ItemStack[] {C24},
+ new FluidStack[] {
+ AmmoniumDinitramide.getFluidOrGas(6000),
+ Materials.Methanol.getFluid(2000),
+ Materials.Ammonia.getGas(500),
+ Materials.Water.getFluid(1500)
+ },
+ new FluidStack[] {LMP103S.getFluidOrGas(10000)},
null,
- 1200, 1920);
-
- //P4O10 + 2HNO3 + 5H2O = 4H3PO4 + N2O5
- GT_Values.RA.addChemicalRecipe(Materials.PhosphorousPentoxide.getDust(14), C2, Materials.NitricAcid.getFluid(2000),
- Materials.PhosphoricAcid.getFluid(4000), DinitrogenPentoxide.get(dust, 7), 200, 1920);
-
- //H3PO4 = P + H2O
- GT_Values.RA.addDistilleryRecipe(C2, Materials.PhosphoricAcid.getFluid(1000),
- Materials.Water.getFluid(500), Materials.Phosphorus.getDust(1), 20, 480, false);
+ 1200,
+ 1920);
+
+ // P4O10 + 2HNO3 + 5H2O = 4H3PO4 + N2O5
+ GT_Values.RA.addChemicalRecipe(
+ Materials.PhosphorousPentoxide.getDust(14),
+ C2,
+ Materials.NitricAcid.getFluid(2000),
+ Materials.PhosphoricAcid.getFluid(4000),
+ DinitrogenPentoxide.get(dust, 7),
+ 200,
+ 1920);
+
+ // H3PO4 = P + H2O
+ GT_Values.RA.addDistilleryRecipe(
+ C2,
+ Materials.PhosphoricAcid.getFluid(1000),
+ Materials.Water.getFluid(500),
+ Materials.Phosphorus.getDust(1),
+ 20,
+ 480,
+ false);
ItemStack cells = Ic2Items.cell.copy();
cells.stackSize = 1;
- //NH4Cl = HCl + NH3
- GT_Values.RA.addDistilleryRecipe(cells,WerkstoffLoader.AmmoniumChloride.getFluidOrGas(1000),
- Materials.HydrochloricAcid.getFluid(1000),Materials.Ammonia.getCells(1),50,120,false);
-
- //N2H4O3 + NaOH = NaNO3 + NH3 + H2O
- GT_Values.RA.addChemicalRecipeForBasicMachineOnly(AmmoniumNitrate.get(dust, 9), Materials.SodiumHydroxide.getDust(3), null,
- Materials.Ammonia.getGas(1000), WerkstoffLoader.SodiumNitrate.get(dust, 5), null, 100, 480);
+ // NH4Cl = HCl + NH3
+ GT_Values.RA.addDistilleryRecipe(
+ cells,
+ WerkstoffLoader.AmmoniumChloride.getFluidOrGas(1000),
+ Materials.HydrochloricAcid.getFluid(1000),
+ Materials.Ammonia.getCells(1),
+ 50,
+ 120,
+ false);
+
+ // N2H4O3 + NaOH = NaNO3 + NH3 + H2O
+ GT_Values.RA.addChemicalRecipeForBasicMachineOnly(
+ AmmoniumNitrate.get(dust, 9),
+ Materials.SodiumHydroxide.getDust(3),
+ null,
+ Materials.Ammonia.getGas(1000),
+ WerkstoffLoader.SodiumNitrate.get(dust, 5),
+ null,
+ 100,
+ 480);
GT_Values.RA.addMultiblockChemicalRecipe(
- new ItemStack[]{AmmoniumNitrate.get(dust, 9), Materials.SodiumHydroxide.getDust(3), C2},
+ new ItemStack[] {AmmoniumNitrate.get(dust, 9), Materials.SodiumHydroxide.getDust(3), C2},
null,
- new FluidStack[]{Materials.Ammonia.getGas(1000), Materials.Water.getFluid(1000)},
- new ItemStack[]{WerkstoffLoader.SodiumNitrate.get(dust, 5)},
- 100, 480
- );
-
- //2NaNO3 + H2SO4 = 2HNO3 + Na2SO4
- GT_Values.RA.addChemicalRecipe(WerkstoffLoader.SodiumNitrate.get(dust, 10), C2, Materials.SulfuricAcid.getFluid(1000),
- Materials.NitricAcid.getFluid(2000), WerkstoffLoader.Sodiumsulfate.get(dust, 7), 200, 120);
-
- //N2H4O3 + NaOH + H =H2SO4= NH3 + HNO3 + Na + H2O
+ new FluidStack[] {Materials.Ammonia.getGas(1000), Materials.Water.getFluid(1000)},
+ new ItemStack[] {WerkstoffLoader.SodiumNitrate.get(dust, 5)},
+ 100,
+ 480);
+
+ // 2NaNO3 + H2SO4 = 2HNO3 + Na2SO4
+ GT_Values.RA.addChemicalRecipe(
+ WerkstoffLoader.SodiumNitrate.get(dust, 10),
+ C2,
+ Materials.SulfuricAcid.getFluid(1000),
+ Materials.NitricAcid.getFluid(2000),
+ WerkstoffLoader.Sodiumsulfate.get(dust, 7),
+ 200,
+ 120);
+
+ // N2H4O3 + NaOH + H =H2SO4= NH3 + HNO3 + Na + H2O
GT_Values.RA.addMultiblockChemicalRecipe(
- new ItemStack[]{
- C24,
- AmmoniumNitrate.get(dust, 9),
- Materials.SodiumHydroxide.getDust(3)
- },
- new FluidStack[]{
- Materials.SulfuricAcid.getFluid(1000),
- Materials.Hydrogen.getGas(1000)
- },
- new FluidStack[]{
- Materials.Ammonia.getGas(1000),
- Materials.NitricAcid.getFluid(1000),
- Materials.DilutedSulfuricAcid.getFluid(1000)
+ new ItemStack[] {C24, AmmoniumNitrate.get(dust, 9), Materials.SodiumHydroxide.getDust(3)},
+ new FluidStack[] {Materials.SulfuricAcid.getFluid(1000), Materials.Hydrogen.getGas(1000)},
+ new FluidStack[] {
+ Materials.Ammonia.getGas(1000),
+ Materials.NitricAcid.getFluid(1000),
+ Materials.DilutedSulfuricAcid.getFluid(1000)
},
- new ItemStack[]{Materials.Sodium.getDust(1)},
- 300, 480
- );
+ new ItemStack[] {Materials.Sodium.getDust(1)},
+ 300,
+ 480);
- //Monomethylhydrazine
+ // Monomethylhydrazine
cells.stackSize = 1;
- //C7H8 + CH4O = C8H10 + H2O
- GT_Values.RA.addCrackingRecipe(1, Materials.Toluene.getFluid(1000), Materials.Methanol.getFluid(1000),
- OXylene.getFluidOrGas(1000), 600, 4096);
-
- //C8H10 + 6O =V2O5= C8H4O3 + 3H2O
- GT_Values.RA.addChemicalRecipe(OXylene.get(cell, 1), VanadiumPentoxide.get(dustTiny), Materials.Oxygen.getGas(6000),
- Materials.Water.getFluid(3000), PhthalicAnhydride.get(dust, 15), 800, 1920);
-
- //C6H6 + C4H8 = C10H14
- GT_Values.RA.addChemicalRecipe(Materials.Benzene.getCells(1), C2, Materials.Butene.getGas(1000),
- TertButylbenzene.getFluidOrGas(1000), cells, 100, 1920);
-
- //C8H4O3 + C10H14 = C18H16O2 + H2O
- GT_Values.RA.addChemicalRecipe(PhthalicAnhydride.get(dust, 15), C2, TertButylbenzene.getFluidOrGas(1000),
- TwoTertButylAnthraquinone.getFluidOrGas(1000), null, 200, 7680);
+ // C7H8 + CH4O = C8H10 + H2O
+ GT_Values.RA.addCrackingRecipe(
+ 1,
+ Materials.Toluene.getFluid(1000),
+ Materials.Methanol.getFluid(1000),
+ OXylene.getFluidOrGas(1000),
+ 600,
+ 4096);
+
+ // C8H10 + 6O =V2O5= C8H4O3 + 3H2O
+ GT_Values.RA.addChemicalRecipe(
+ OXylene.get(cell, 1),
+ VanadiumPentoxide.get(dustTiny),
+ Materials.Oxygen.getGas(6000),
+ Materials.Water.getFluid(3000),
+ PhthalicAnhydride.get(dust, 15),
+ 800,
+ 1920);
+
+ // C6H6 + C4H8 = C10H14
+ GT_Values.RA.addChemicalRecipe(
+ Materials.Benzene.getCells(1),
+ C2,
+ Materials.Butene.getGas(1000),
+ TertButylbenzene.getFluidOrGas(1000),
+ cells,
+ 100,
+ 1920);
+
+ // C8H4O3 + C10H14 = C18H16O2 + H2O
+ GT_Values.RA.addChemicalRecipe(
+ PhthalicAnhydride.get(dust, 15),
+ C2,
+ TertButylbenzene.getFluidOrGas(1000),
+ TwoTertButylAnthraquinone.getFluidOrGas(1000),
+ null,
+ 200,
+ 7680);
- //C18H16O2 + H =Pd= C18H17O2
- GT_Values.RA.addChemicalRecipeForBasicMachineOnly(Materials.Hydrogen.getCells(10), Materials.Palladium.getDustTiny(1),
+ // C18H16O2 + H =Pd= C18H17O2
+ GT_Values.RA.addChemicalRecipeForBasicMachineOnly(
+ Materials.Hydrogen.getCells(10),
+ Materials.Palladium.getDustTiny(1),
TwoTertButylAnthraquinone.getFluidOrGas(10000),
- TwoTertButylAnthrahydroquinone.getFluidOrGas(10000), null, null, 1200, 7680);
+ TwoTertButylAnthrahydroquinone.getFluidOrGas(10000),
+ null,
+ null,
+ 1200,
+ 7680);
GT_Values.RA.addMultiblockChemicalRecipe(
- new ItemStack[]{C2, Materials.Palladium.getDustTiny(1)},
- new FluidStack[]{
- Materials.Hydrogen.getGas(10000),
- TwoTertButylAnthraquinone.getFluidOrGas(10000)
- },
- new FluidStack[]{TwoTertButylAnthrahydroquinone.getFluidOrGas(10000)},
+ new ItemStack[] {C2, Materials.Palladium.getDustTiny(1)},
+ new FluidStack[] {Materials.Hydrogen.getGas(10000), TwoTertButylAnthraquinone.getFluidOrGas(10000)},
+ new FluidStack[] {TwoTertButylAnthrahydroquinone.getFluidOrGas(10000)},
null,
- 1200, 7680
- );
-
- //2C18H17O2 + 2O = 2C18H16O2 + H2O2
- GT_Values.RA.addChemicalRecipe(Materials.Oxygen.getCells(2), C2, TwoTertButylAnthrahydroquinone.getFluidOrGas(2000),
- TwoTertButylAnthraquinone.getFluidOrGas(2000), HydrogenPeroxide.get(cell, 1), Materials.Empty.getCells(1), 40, 1920);
-
- //2H + 2O =C18H16O2,Pd= H2O2
+ 1200,
+ 7680);
+
+ // 2C18H17O2 + 2O = 2C18H16O2 + H2O2
+ GT_Values.RA.addChemicalRecipe(
+ Materials.Oxygen.getCells(2),
+ C2,
+ TwoTertButylAnthrahydroquinone.getFluidOrGas(2000),
+ TwoTertButylAnthraquinone.getFluidOrGas(2000),
+ HydrogenPeroxide.get(cell, 1),
+ Materials.Empty.getCells(1),
+ 40,
+ 1920);
+
+ // 2H + 2O =C18H16O2,Pd= H2O2
GT_Values.RA.addMultiblockChemicalRecipe(
- new ItemStack[]{
- C24,
- Materials.Palladium.getDustTiny(1)
- },
- new FluidStack[]{
- Materials.Hydrogen.getGas(10000),
- Materials.Oxygen.getGas(10000),
- TwoTertButylAnthraquinone.getFluidOrGas(10000)
- },
- new FluidStack[]{
- HydrogenPeroxide.getFluidOrGas(5000),
- TwoTertButylAnthraquinone.getFluidOrGas(10000)
+ new ItemStack[] {C24, Materials.Palladium.getDustTiny(1)},
+ new FluidStack[] {
+ Materials.Hydrogen.getGas(10000),
+ Materials.Oxygen.getGas(10000),
+ TwoTertButylAnthraquinone.getFluidOrGas(10000)
},
+ new FluidStack[] {HydrogenPeroxide.getFluidOrGas(5000), TwoTertButylAnthraquinone.getFluidOrGas(10000)},
null,
- 1400, 7680
- );
-
- //H2O2 + 2NH3 = N2H4 + 2H2O
- GT_Values.RA.addChemicalRecipe(HydrogenPeroxide.get(cell, 1), C2, Materials.Ammonia.getGas(2000),
- Materials.Water.getFluid(2000), Hydrazine.get(cell, 1), 100, 120);
-
- //2CH4O + H2SO4 = C2H6O4S + 2H2O
- GT_Values.RA.addChemicalRecipe(Materials.SulfuricAcid.getCells(1), C2, Materials.Methanol.getFluid(2000),
- null, DimethylSulfate.get(cell, 1), 50, 480);
-
- GT_Values.RA.addChemicalRecipeForBasicMachineOnly(Materials.SulfuricAcid.getCells(1), C1, Materials.Methanol.getFluid(2000),
- DimethylSulfate.getFluidOrGas(1000), cells, null, 50, 480);
-
- //N2H4 + C2H6O4S = SO3 + CH6N2 + CH4O
- GT_Values.RA.addChemicalRecipe(Hydrazine.get(cell, 1), Materials.Empty.getCells(1), DimethylSulfate.getFluidOrGas(1000),
- Materials.SulfurTrioxide.getGas(1000), Monomethylhydrazine.get(cell, 1), Materials.Methanol.getCells(1), 80, 16000);
-
- GT_Values.RA.addMixerRecipe(AmmoniumDinitramide.get(cell, 1), C1, null, null, Monomethylhydrazine.getFluidOrGas(2000),
- MonomethylhydrazineFuelMix.getFluidOrGas(3000), cells, 20, 480);
+ 1400,
+ 7680);
+
+ // H2O2 + 2NH3 = N2H4 + 2H2O
+ GT_Values.RA.addChemicalRecipe(
+ HydrogenPeroxide.get(cell, 1),
+ C2,
+ Materials.Ammonia.getGas(2000),
+ Materials.Water.getFluid(2000),
+ Hydrazine.get(cell, 1),
+ 100,
+ 120);
+
+ // 2CH4O + H2SO4 = C2H6O4S + 2H2O
+ GT_Values.RA.addChemicalRecipe(
+ Materials.SulfuricAcid.getCells(1),
+ C2,
+ Materials.Methanol.getFluid(2000),
+ null,
+ DimethylSulfate.get(cell, 1),
+ 50,
+ 480);
+
+ GT_Values.RA.addChemicalRecipeForBasicMachineOnly(
+ Materials.SulfuricAcid.getCells(1),
+ C1,
+ Materials.Methanol.getFluid(2000),
+ DimethylSulfate.getFluidOrGas(1000),
+ cells,
+ null,
+ 50,
+ 480);
+
+ // N2H4 + C2H6O4S = SO3 + CH6N2 + CH4O
+ GT_Values.RA.addChemicalRecipe(
+ Hydrazine.get(cell, 1),
+ Materials.Empty.getCells(1),
+ DimethylSulfate.getFluidOrGas(1000),
+ Materials.SulfurTrioxide.getGas(1000),
+ Monomethylhydrazine.get(cell, 1),
+ Materials.Methanol.getCells(1),
+ 80,
+ 16000);
+
+ GT_Values.RA.addMixerRecipe(
+ AmmoniumDinitramide.get(cell, 1),
+ C1,
+ null,
+ null,
+ Monomethylhydrazine.getFluidOrGas(2000),
+ MonomethylhydrazineFuelMix.getFluidOrGas(3000),
+ cells,
+ 20,
+ 480);
cells.stackSize = 2;
- GT_Values.RA.addMixerRecipe(Monomethylhydrazine.get(cell, 2), C2, null, null, AmmoniumDinitramide.getFluidOrGas(1000),
- MonomethylhydrazineFuelMix.getFluidOrGas(3000), cells, 20, 480);
+ GT_Values.RA.addMixerRecipe(
+ Monomethylhydrazine.get(cell, 2),
+ C2,
+ null,
+ null,
+ AmmoniumDinitramide.getFluidOrGas(1000),
+ MonomethylhydrazineFuelMix.getFluidOrGas(3000),
+ cells,
+ 20,
+ 480);
cells.stackSize = 1;
- //unsimetrical hydazine
-
- //2HNO3 + C3H8 = 2CH3NO2 + 2H2O + C
- GT_Values.RA.addCrackingRecipe(2,Materials.Propane.getGas(1000),Materials.NitricAcid.getFluid(2000),
- Nitromethane.getFluidOrGas(2000),300,1920);
-
- //HF + BF3 + 3CH3NO2 + 6HNO3 = 3CO2 + 8H2O + 8NO + NO2BF4
- //Combine of two reactions:
- //BF3 + HF + HNO3 = NO2BF4 + H2O
- //3CH3NO2 + 5HNO3 = 3CO2 + 7H2O + 8NO
+ // unsimetrical hydazine
+
+ // 2HNO3 + C3H8 = 2CH3NO2 + 2H2O + C
+ GT_Values.RA.addCrackingRecipe(
+ 2,
+ Materials.Propane.getGas(1000),
+ Materials.NitricAcid.getFluid(2000),
+ Nitromethane.getFluidOrGas(2000),
+ 300,
+ 1920);
+
+ // HF + BF3 + 3CH3NO2 + 6HNO3 = 3CO2 + 8H2O + 8NO + NO2BF4
+ // Combine of two reactions:
+ // BF3 + HF + HNO3 = NO2BF4 + H2O
+ // 3CH3NO2 + 5HNO3 = 3CO2 + 7H2O + 8NO
GT_Values.RA.addMultiblockChemicalRecipe(
- new ItemStack[]{C2},
- new FluidStack[]{
- Materials.HydrofluoricAcid.getFluid(1000),
- BoronTrifluoride.getFluidOrGas(1000),
- Nitromethane.getFluidOrGas(3000),
- Materials.NitricAcid.getFluid(6000),
+ new ItemStack[] {C2},
+ new FluidStack[] {
+ Materials.HydrofluoricAcid.getFluid(1000),
+ BoronTrifluoride.getFluidOrGas(1000),
+ Nitromethane.getFluidOrGas(3000),
+ Materials.NitricAcid.getFluid(6000),
},
- new FluidStack[]{
- Materials.CarbonDioxide.getGas(3000),
- Materials.Water.getFluid(8000),
- Materials.NitricOxide.getGas(8000)
+ new FluidStack[] {
+ Materials.CarbonDioxide.getGas(3000),
+ Materials.Water.getFluid(8000),
+ Materials.NitricOxide.getGas(8000)
},
- new ItemStack[]{NitroniumTetrafluoroborate.get(dust,8)},
- 100,7_680
- );
+ new ItemStack[] {NitroniumTetrafluoroborate.get(dust, 8)},
+ 100,
+ 7_680);
- //NO2BF4 + H4N4O4 = N4O6 + NH4BF4
+ // NO2BF4 + H4N4O4 = N4O6 + NH4BF4
GT_Values.RA.addMultiblockChemicalRecipe(
- new ItemStack[]{C2,NitroniumTetrafluoroborate.get(dust,8)},
- new FluidStack[]{AmmoniumDinitramide.getFluidOrGas(1000)},
- new FluidStack[]{
- Trinitramid.getFluidOrGas(1000),
- AmmoniaBoronfluorideSolution.getFluidOrGas(1000)
- },
+ new ItemStack[] {C2, NitroniumTetrafluoroborate.get(dust, 8)},
+ new FluidStack[] {AmmoniumDinitramide.getFluidOrGas(1000)},
+ new FluidStack[] {Trinitramid.getFluidOrGas(1000), AmmoniaBoronfluorideSolution.getFluidOrGas(1000)},
null,
- 20,30_720
- );
+ 20,
+ 30_720);
- //B2O3 + 6HF = 2BF3 + 3H2O
+ // B2O3 + 6HF = 2BF3 + 3H2O
cells.stackSize = 3;
- GT_Values.RA.addChemicalRecipe(BoronTrioxide.get(dust,5),cells,Materials.HydrofluoricAcid.getFluid(6000),
- BoronTrifluoride.getFluidOrGas(2000),Materials.Water.getCells(3),50,480);
-
- //Na2B4O7(H2O)10 + H2SO4 -> 2B2O3 + Na2SO4 + 11H2O
- GT_Values.RA.addChemicalRecipe(Materials.Borax.getDust(23),C2,Materials.SulfuricAcid.getFluid(1000),
- null,WerkstoffLoader.Sodiumsulfate.get(dust,7),BoronTrioxide.get(dust,10),400,1920);
+ GT_Values.RA.addChemicalRecipe(
+ BoronTrioxide.get(dust, 5),
+ cells,
+ Materials.HydrofluoricAcid.getFluid(6000),
+ BoronTrifluoride.getFluidOrGas(2000),
+ Materials.Water.getCells(3),
+ 50,
+ 480);
+
+ // Na2B4O7(H2O)10 + H2SO4 -> 2B2O3 + Na2SO4 + 11H2O
+ GT_Values.RA.addChemicalRecipe(
+ Materials.Borax.getDust(23),
+ C2,
+ Materials.SulfuricAcid.getFluid(1000),
+ null,
+ WerkstoffLoader.Sodiumsulfate.get(dust, 7),
+ BoronTrioxide.get(dust, 10),
+ 400,
+ 1920);
- //NH4BF4 = NH3 + HBF4
+ // NH4BF4 = NH3 + HBF4
cells.stackSize = 1;
- GT_Values.RA.addUniversalDistillationRecipe(AmmoniaBoronfluorideSolution.getFluidOrGas(1000),
- new FluidStack[]{
- Materials.Ammonia.getGas(1000),
- Tetrafluoroborate.getFluidOrGas(1000)
- }, null,
- 20,30_720);
-
- //HBF4 + NaOH = NaBF4 + H2O
- GT_Values.RA.addChemicalRecipe(Materials.SodiumHydroxide.getDust(3),null,Tetrafluoroborate.getFluidOrGas(1000),
- SodiumTetrafluoroborate.getFluidOrGas(1000),null,100,1920);
-
- //NaBF4 = NaF + BF3
- GT_Values.RA.addDistilleryRecipe(C2,SodiumTetrafluoroborate.getFluidOrGas(1000),
- BoronTrifluoride.getFluidOrGas(1000),SodiumFluoride.get(dust,2),40,480,false);
-
- //2NaF + H2SO4 = 2HF + Na2SO4
- GT_Values.RA.addChemicalRecipe(SodiumFluoride.get(dust,4),C2,Materials.SulfuricAcid.getFluid(1000),
- Materials.HydrofluoricAcid.getFluid(2000),WerkstoffLoader.Sodiumsulfate.get(dust,7),50,1920);
-
- //O + CH4O =Ag= CH2O
- GT_Values.RA.addChemicalRecipe(Materials.Oxygen.getCells(4),Materials.Silver.getDustTiny(1),Materials.Methanol.getFluid(4000),
- Formaldehyde.getFluidOrGas(4000),cells,100,480);
+ GT_Values.RA.addUniversalDistillationRecipe(
+ AmmoniaBoronfluorideSolution.getFluidOrGas(1000),
+ new FluidStack[] {Materials.Ammonia.getGas(1000), Tetrafluoroborate.getFluidOrGas(1000)},
+ null,
+ 20,
+ 30_720);
- //N2H4 + C2H4O2 =C2H6O= C2H6N2O + H2O
+ // HBF4 + NaOH = NaBF4 + H2O
+ GT_Values.RA.addChemicalRecipe(
+ Materials.SodiumHydroxide.getDust(3),
+ null,
+ Tetrafluoroborate.getFluidOrGas(1000),
+ SodiumTetrafluoroborate.getFluidOrGas(1000),
+ null,
+ 100,
+ 1920);
+
+ // NaBF4 = NaF + BF3
+ GT_Values.RA.addDistilleryRecipe(
+ C2,
+ SodiumTetrafluoroborate.getFluidOrGas(1000),
+ BoronTrifluoride.getFluidOrGas(1000),
+ SodiumFluoride.get(dust, 2),
+ 40,
+ 480,
+ false);
+
+ // 2NaF + H2SO4 = 2HF + Na2SO4
+ GT_Values.RA.addChemicalRecipe(
+ SodiumFluoride.get(dust, 4),
+ C2,
+ Materials.SulfuricAcid.getFluid(1000),
+ Materials.HydrofluoricAcid.getFluid(2000),
+ WerkstoffLoader.Sodiumsulfate.get(dust, 7),
+ 50,
+ 1920);
+
+ // O + CH4O =Ag= CH2O
+ GT_Values.RA.addChemicalRecipe(
+ Materials.Oxygen.getCells(4),
+ Materials.Silver.getDustTiny(1),
+ Materials.Methanol.getFluid(4000),
+ Formaldehyde.getFluidOrGas(4000),
+ cells,
+ 100,
+ 480);
+
+ // N2H4 + C2H4O2 =C2H6O= C2H6N2O + H2O
GT_Values.RA.addMultiblockChemicalRecipe(
- new ItemStack[]{C2},
- new FluidStack[]{
- Materials.AceticAcid.getFluid(1000),
- Materials.Ethanol.getFluid(1000),
- Hydrazine.getFluidOrGas(1000)},
- new FluidStack[]{
- Acetylhydrazine.getFluidOrGas(1000),
- Materials.Ethanol.getFluid(1000)},
- null,
- 40,30_720
- );
-
- //C2H6N2O + 2CH2O + 4H = C2H8N2 + C2H4O2 + H2O
+ new ItemStack[] {C2},
+ new FluidStack[] {
+ Materials.AceticAcid.getFluid(1000), Materials.Ethanol.getFluid(1000), Hydrazine.getFluidOrGas(1000)
+ },
+ new FluidStack[] {Acetylhydrazine.getFluidOrGas(1000), Materials.Ethanol.getFluid(1000)},
+ null,
+ 40,
+ 30_720);
+
+ // C2H6N2O + 2CH2O + 4H = C2H8N2 + C2H4O2 + H2O
GT_Values.RA.addMultiblockChemicalRecipe(
- new ItemStack[]{C2},
- new FluidStack[]{
- Acetylhydrazine.getFluidOrGas(1000),
- Formaldehyde.getFluidOrGas(2000),
- Materials.Hydrogen.getGas(4000)},
- new FluidStack[]{
- UnsymmetricalDimethylhydrazine.getFluidOrGas(1000),
- Materials.AceticAcid.getFluid(1000),
- Materials.Water.getFluid(1000)},
- null,
- 20, 122_880
- );
+ new ItemStack[] {C2},
+ new FluidStack[] {
+ Acetylhydrazine.getFluidOrGas(1000),
+ Formaldehyde.getFluidOrGas(2000),
+ Materials.Hydrogen.getGas(4000)
+ },
+ new FluidStack[] {
+ UnsymmetricalDimethylhydrazine.getFluidOrGas(1000),
+ Materials.AceticAcid.getFluid(1000),
+ Materials.Water.getFluid(1000)
+ },
+ null,
+ 20,
+ 122_880);
cells.stackSize = 2;
- GT_Values.RA.addMixerRecipe(UnsymmetricalDimethylhydrazine.get(cell,2),C2,null,null,
- Trinitramid.getFluidOrGas(1000),UnsymmetricalDimethylhydrazineFuelMix.getFluidOrGas(3000),cells,10,120);
+ GT_Values.RA.addMixerRecipe(
+ UnsymmetricalDimethylhydrazine.get(cell, 2),
+ C2,
+ null,
+ null,
+ Trinitramid.getFluidOrGas(1000),
+ UnsymmetricalDimethylhydrazineFuelMix.getFluidOrGas(3000),
+ cells,
+ 10,
+ 120);
cells.stackSize = 1;
- GT_Values.RA.addMixerRecipe(Trinitramid.get(cell,1),C2,null,null,
- UnsymmetricalDimethylhydrazine.getFluidOrGas(2000),UnsymmetricalDimethylhydrazineFuelMix.getFluidOrGas(3000),cells,10,120);
-
+ GT_Values.RA.addMixerRecipe(
+ Trinitramid.get(cell, 1),
+ C2,
+ null,
+ null,
+ UnsymmetricalDimethylhydrazine.getFluidOrGas(2000),
+ UnsymmetricalDimethylhydrazineFuelMix.getFluidOrGas(3000),
+ cells,
+ 10,
+ 120);
}
- public static void addFuels()
- {
+
+ public static void addFuels() {
try {
if (Loader.isModLoaded(GT_Values.MOD_ID_GC_CORE)) {
Class<?> rocket = Class.forName("micdoodle8.mods.galacticraft.api.recipe.RocketFuelRecipe");
Method addFuel = rocket.getMethod("addFuel", Fluid.class, int.class);
addFuel.invoke(null, LMP103S.getFluidOrGas(1).getFluid(), 4);
addFuel.invoke(null, MonomethylhydrazineFuelMix.getFluidOrGas(1).getFluid(), 6);
- addFuel.invoke(null, UnsymmetricalDimethylhydrazineFuelMix.getFluidOrGas(1).getFluid(), 8);
+ addFuel.invoke(
+ null,
+ UnsymmetricalDimethylhydrazineFuelMix.getFluidOrGas(1).getFluid(),
+ 8);
}
- if (Loader.isModLoaded("miscutils"))
- {
+ if (Loader.isModLoaded("miscutils")) {
Class<?> gtppRecipeMap = Class.forName("gregtech.api.util.GTPP_Recipe$GTPP_Recipe_Map");
Field rocketFuels = gtppRecipeMap.getDeclaredField("sRocketFuels");
rocketFuels.setAccessible(true);
Class<?> rocketFuelsClass = rocketFuels.getType();
Object rocketFuelsObject = rocketFuels.get(null);
- Method addFuel = rocketFuelsClass.getDeclaredMethod("addFuel",FluidStack.class,FluidStack.class,int.class);
- addFuel.invoke(rocketFuelsObject,LMP103S.getFluidOrGas(1000),null,666);
- addFuel.invoke(rocketFuelsObject,MonomethylhydrazineFuelMix.getFluidOrGas(1000),null,1500);
- addFuel.invoke(rocketFuelsObject,UnsymmetricalDimethylhydrazineFuelMix.getFluidOrGas(1000),null,3000);
+ Method addFuel =
+ rocketFuelsClass.getDeclaredMethod("addFuel", FluidStack.class, FluidStack.class, int.class);
+ addFuel.invoke(rocketFuelsObject, LMP103S.getFluidOrGas(1000), null, 666);
+ addFuel.invoke(rocketFuelsObject, MonomethylhydrazineFuelMix.getFluidOrGas(1000), null, 1500);
+ addFuel.invoke(
+ rocketFuelsObject, UnsymmetricalDimethylhydrazineFuelMix.getFluidOrGas(1000), null, 3000);
}
- } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException | InvocationTargetException | NoSuchFieldException e) {
+ } catch (ClassNotFoundException
+ | NoSuchMethodException
+ | IllegalAccessException
+ | InvocationTargetException
+ | NoSuchFieldException e) {
e.printStackTrace();
}
- GT_Recipe.GT_Recipe_Map.sTurbineFuels.addFuel(TertButylbenzene.get(cell,1),null,420);
+ GT_Recipe.GT_Recipe_Map.sTurbineFuels.addFuel(TertButylbenzene.get(cell, 1), null, 420);
}
- public static void removeRecipes()
- {
+ public static void removeRecipes() {
BotRecipes.removeTungstenElectro();
}
@@ -459,17 +750,16 @@ public class BotRecipes {
Collection<GT_Recipe> electroRecipeMap = GT_Recipe.GT_Recipe_Map.sElectrolyzerRecipes.mRecipeList;
HashSet<GT_Recipe> toDel = new HashSet<>();
ItemStack[] toRemove = {
- Materials.Scheelite.getDust(1),
- Materials.Tungstate.getDust(1),
- WerkstoffLoader.Ferberite.get(dust, 1),
- WerkstoffLoader.Huebnerit.get(dust, 1)};
+ Materials.Scheelite.getDust(1),
+ Materials.Tungstate.getDust(1),
+ WerkstoffLoader.Ferberite.get(dust, 1),
+ WerkstoffLoader.Huebnerit.get(dust, 1)
+ };
for (GT_Recipe tRecipe : electroRecipeMap) {
- if (tRecipe.mFakeRecipe)
- continue;
+ if (tRecipe.mFakeRecipe) continue;
for (int i = 0; i < tRecipe.mInputs.length; i++) {
ItemStack tItem = tRecipe.mInputs[i];
- if (item == null || !GT_Utility.isStackValid(tItem))
- continue;
+ if (item == null || !GT_Utility.isStackValid(tItem)) continue;
for (ItemStack tStack : toRemove) {
if (GT_Utility.areStacksEqual(tItem, tStack)) {
toDel.add(tRecipe);
@@ -481,5 +771,4 @@ public class BotRecipes {
electroRecipeMap.removeAll(toDel);
GT_Recipe.GT_Recipe_Map.sElectrolyzerRecipes.reInit();
}
-
}
diff --git a/src/main/java/com/elisis/gtnhlanth/loader/MetaTileEntity_Loader.java b/src/main/java/com/elisis/gtnhlanth/loader/MetaTileEntity_Loader.java
index a2cd209a13..73f900a687 100644
--- a/src/main/java/com/elisis/gtnhlanth/loader/MetaTileEntity_Loader.java
+++ b/src/main/java/com/elisis/gtnhlanth/loader/MetaTileEntity_Loader.java
@@ -1,5 +1,3 @@
package com.elisis.gtnhlanth.loader;
-public class MetaTileEntity_Loader {
-
-}
+public class MetaTileEntity_Loader {}
diff --git a/src/main/java/com/elisis/gtnhlanth/loader/RecipeAdder.java b/src/main/java/com/elisis/gtnhlanth/loader/RecipeAdder.java
index fcb0b0d0da..ed075ef88d 100644
--- a/src/main/java/com/elisis/gtnhlanth/loader/RecipeAdder.java
+++ b/src/main/java/com/elisis/gtnhlanth/loader/RecipeAdder.java
@@ -1,91 +1,161 @@
package com.elisis.gtnhlanth.loader;
+import gregtech.api.util.GT_Recipe;
import java.util.Collection;
import java.util.HashSet;
-
-import gregtech.api.util.GT_Recipe;
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector;
import net.minecraftforge.fluids.FluidStack;
public class RecipeAdder {
-
-
- public static final RecipeAdder instance = new RecipeAdder();
-
- public final DigestMap DigesterRecipes = new DigestMap(
- new HashSet<>(100),
- "gtnhlanth.recipe.digester",
- StatCollector.translateToLocal("tile.recipe.digester"),
- null,
- "gtnhlanth:textures/gui/Digester",
- 1, 1, 1, 1, 1,
- StatCollector.translateToLocal("value.digester") + ": ", //Heat Capacity
- 1,
- "K",
- false,
- false
- );
-
- public final DissolutionTankMap DissolutionTankRecipes = new DissolutionTankMap(
- new HashSet<>(100),
- "gtnhlanth.recipe.disstank",
- StatCollector.translateToLocal("tile.recipe.disstank"),
- null,
- "gtnhlanth:textures/gui/Disstank",
- 1, 1, 1, 1, 1,
- StatCollector.translateToLocal("value.disstank") + ": ", // Ratio
- 1,
- ":1",
- false,
- false
- );
-
-
- public class DigestMap extends GT_Recipe.GT_Recipe_Map {
+ public static final RecipeAdder instance = new RecipeAdder();
+
+ public final DigestMap DigesterRecipes = new DigestMap(
+ new HashSet<>(100),
+ "gtnhlanth.recipe.digester",
+ StatCollector.translateToLocal("tile.recipe.digester"),
+ null,
+ "gtnhlanth:textures/gui/Digester",
+ 1,
+ 1,
+ 1,
+ 1,
+ 1,
+ StatCollector.translateToLocal("value.digester") + ": ", // Heat Capacity
+ 1,
+ "K",
+ false,
+ false);
+
+ public final DissolutionTankMap DissolutionTankRecipes = new DissolutionTankMap(
+ new HashSet<>(100),
+ "gtnhlanth.recipe.disstank",
+ StatCollector.translateToLocal("tile.recipe.disstank"),
+ null,
+ "gtnhlanth:textures/gui/Disstank",
+ 1,
+ 3,
+ 1,
+ 1,
+ 1,
+ StatCollector.translateToLocal("value.disstank") + ": ", // Ratio
+ 1,
+ ":1",
+ false,
+ false);
- public DigestMap(Collection<GT_Recipe> aRecipeList,
- String aUnlocalizedName, String aLocalName,
- String aNEIName, String aNEIGUIPath,
- int aUsualInputCount, int aUsualOutputCount,
- int aMinimalInputItems, int aMinimalInputFluids,
- int aAmperage, String aNEISpecialValuePre,
- int aNEISpecialValueMultiplier, String aNEISpecialValuePost,
- boolean aShowVoltageAmperageInNEI, boolean aNEIAllowed) {
- super(aRecipeList, aUnlocalizedName, aLocalName, aNEIName, aNEIGUIPath, aUsualInputCount, aUsualOutputCount,
- aMinimalInputItems, aMinimalInputFluids, aAmperage, aNEISpecialValuePre, aNEISpecialValueMultiplier,
- aNEISpecialValuePost, aShowVoltageAmperageInNEI, aNEIAllowed);
-
- }
-
- public void addDigesterRecipe(FluidStack[] fluidInputs, ItemStack[] itemInputs, FluidStack fluidOutput, ItemStack[] itemOutputs, int EUt, int ticks, int heat){
- super.addRecipe(false, itemInputs, itemOutputs, null, fluidInputs, new FluidStack[]{fluidOutput}, ticks, EUt, heat);
+ public class DigestMap extends GT_Recipe.GT_Recipe_Map {
+
+ public DigestMap(
+ Collection<GT_Recipe> aRecipeList,
+ String aUnlocalizedName,
+ String aLocalName,
+ String aNEIName,
+ String aNEIGUIPath,
+ int aUsualInputCount,
+ int aUsualOutputCount,
+ int aMinimalInputItems,
+ int aMinimalInputFluids,
+ int aAmperage,
+ String aNEISpecialValuePre,
+ int aNEISpecialValueMultiplier,
+ String aNEISpecialValuePost,
+ boolean aShowVoltageAmperageInNEI,
+ boolean aNEIAllowed) {
+ super(
+ aRecipeList,
+ aUnlocalizedName,
+ aLocalName,
+ aNEIName,
+ aNEIGUIPath,
+ aUsualInputCount,
+ aUsualOutputCount,
+ aMinimalInputItems,
+ aMinimalInputFluids,
+ aAmperage,
+ aNEISpecialValuePre,
+ aNEISpecialValueMultiplier,
+ aNEISpecialValuePost,
+ aShowVoltageAmperageInNEI,
+ aNEIAllowed);
+ }
+
+ public void addDigesterRecipe(
+ FluidStack[] fluidInputs,
+ ItemStack[] itemInputs,
+ FluidStack fluidOutput,
+ ItemStack[] itemOutputs,
+ int EUt,
+ int ticks,
+ int heat) {
+ super.addRecipe(
+ false,
+ itemInputs,
+ itemOutputs,
+ null,
+ fluidInputs,
+ new FluidStack[] {fluidOutput},
+ ticks,
+ EUt,
+ heat);
}
-
+ }
- }
-
- public class DissolutionTankMap extends GT_Recipe.GT_Recipe_Map {
-
- public DissolutionTankMap(Collection<GT_Recipe> aRecipeList,
- String aUnlocalizedName, String aLocalName,
- String aNEIName, String aNEIGUIPath,
- int aUsualInputCount, int aUsualOutputCount,
- int aMinimalInputItems, int aMinimalInputFluids,
- int aAmperage, String aNEISpecialValuePre,
- int aNEISpecialValueMultiplier, String aNEISpecialValuePost,
- boolean aShowVoltageAmperageInNEI, boolean aNEIAllowed) {
- super(aRecipeList, aUnlocalizedName, aLocalName, aNEIName, aNEIGUIPath, aUsualInputCount, aUsualOutputCount,
- aMinimalInputItems, aMinimalInputFluids, aAmperage, aNEISpecialValuePre, aNEISpecialValueMultiplier,
- aNEISpecialValuePost, aShowVoltageAmperageInNEI, aNEIAllowed);
-
- }
- /** Higher part input fluid first, always **/
- public void addDissolutionTankRecipe(FluidStack[] fluidInputs, ItemStack[] itemInputs, FluidStack fluidOutput, ItemStack[] itemOutputs, int EUt, int ticks, int ratio) {
- super.addRecipe(false, itemInputs, itemOutputs, null, fluidInputs, new FluidStack[] {fluidOutput}, ticks, EUt, ratio);
- }
-
- }
+ public class DissolutionTankMap extends GT_Recipe.GT_Recipe_Map {
+ public DissolutionTankMap(
+ Collection<GT_Recipe> aRecipeList,
+ String aUnlocalizedName,
+ String aLocalName,
+ String aNEIName,
+ String aNEIGUIPath,
+ int aUsualInputCount,
+ int aUsualOutputCount,
+ int aMinimalInputItems,
+ int aMinimalInputFluids,
+ int aAmperage,
+ String aNEISpecialValuePre,
+ int aNEISpecialValueMultiplier,
+ String aNEISpecialValuePost,
+ boolean aShowVoltageAmperageInNEI,
+ boolean aNEIAllowed) {
+ super(
+ aRecipeList,
+ aUnlocalizedName,
+ aLocalName,
+ aNEIName,
+ aNEIGUIPath,
+ aUsualInputCount,
+ aUsualOutputCount,
+ aMinimalInputItems,
+ aMinimalInputFluids,
+ aAmperage,
+ aNEISpecialValuePre,
+ aNEISpecialValueMultiplier,
+ aNEISpecialValuePost,
+ aShowVoltageAmperageInNEI,
+ aNEIAllowed);
+ }
+ /** Higher part input fluid first, always **/
+ public void addDissolutionTankRecipe(
+ FluidStack[] fluidInputs,
+ ItemStack[] itemInputs,
+ FluidStack fluidOutput,
+ ItemStack[] itemOutputs,
+ int EUt,
+ int ticks,
+ int ratio) {
+ super.addRecipe(
+ false,
+ itemInputs,
+ itemOutputs,
+ null,
+ fluidInputs,
+ new FluidStack[] {fluidOutput},
+ ticks,
+ EUt,
+ ratio);
+ }
+ }
}
diff --git a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java
index c65067fb8a..5feb5db17c 100644
--- a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java
+++ b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java
@@ -11,110 +11,102 @@ import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.util.*;
+import java.util.HashSet;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.oredict.OreDictionary;
-import java.lang.reflect.Array;
-import java.util.Arrays;
-import java.util.HashSet;
-
public class RecipeLoader {
private static final Materials[] BLACKLIST = null;
- public static void loadGeneral() {
+ public static void loadGeneral() {
/* ZIRCONIUM */
- //ZrCl4
- //ZrO2 + 4HCl = ZrCl4 + 2H2O
+ // ZrCl4
+ // ZrO2 + 4HCl = ZrCl4 + 2H2O
GT_Values.RA.addChemicalRecipe(
GT_Utility.getIntegratedCircuit(1),
WerkstoffMaterialPool.Zirconia.get(OrePrefixes.dust, 3),
Materials.HydrochloricAcid.getFluid(4000),
Materials.Water.getFluid(2000),
WerkstoffMaterialPool.ZirconiumTetrachloride.get(OrePrefixes.dust, 5),
- 300
- );
+ 300);
- //ZrCl4-H2O
+ // ZrCl4-H2O
GT_Values.RA.addChemicalRecipe(
GT_Utility.getIntegratedCircuit(1),
WerkstoffMaterialPool.ZirconiumTetrachloride.get(OrePrefixes.dust, 5),
Materials.Water.getFluid(1000),
WerkstoffMaterialPool.ZirconiumTetrachlorideSolution.getFluidOrGas(1000),
null,
- 200
- );
+ 200);
- //Zr
- //ZrCl4·H2O + 2Mg = Zr + 2MgCl2
+ // Zr
+ // ZrCl4·H2O + 2Mg = Zr + 2MgCl2
GT_Values.RA.addBlastRecipe(
GT_Utility.getIntegratedCircuit(2),
GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesium, 2),
WerkstoffMaterialPool.ZirconiumTetrachlorideSolution.getFluidOrGas(1000),
- null, //No fluid output
+ null, // No fluid output
WerkstoffMaterialPool.Zirconium.get(OrePrefixes.ingotHot, 1),
GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesiumchloride, 6),
- 600, 1920, 4500
- );
-
+ 600,
+ 1920,
+ 4500);
/* HAFNIUM */
- //HfCl4
- //HfO2 + 4HCl = HfCl4 + 2H2O
+ // HfCl4
+ // HfO2 + 4HCl = HfCl4 + 2H2O
GT_Values.RA.addChemicalRecipe(
GT_Utility.getIntegratedCircuit(1),
WerkstoffMaterialPool.Hafnia.get(OrePrefixes.dust, 3),
Materials.HydrochloricAcid.getFluid(4000),
Materials.Water.getFluid(2000),
WerkstoffMaterialPool.HafniumTetrachloride.get(OrePrefixes.dust, 5),
- 300
- );
+ 300);
- //HfCl4-H2O
+ // HfCl4-H2O
GT_Values.RA.addChemicalRecipe(
GT_Utility.getIntegratedCircuit(1),
WerkstoffMaterialPool.HafniumTetrachloride.get(OrePrefixes.dust, 5),
Materials.Water.getFluid(1000),
WerkstoffMaterialPool.HafniumTetrachlorideSolution.getFluidOrGas(1000),
null,
- 200
- );
+ 200);
- //LP-Hf
- //HfCl4 + 2Mg = ??Hf?? + 2MgCl2
+ // LP-Hf
+ // HfCl4 + 2Mg = ??Hf?? + 2MgCl2
GT_Values.RA.addBlastRecipe(
GT_Utility.getIntegratedCircuit(2),
GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesium, 2),
WerkstoffMaterialPool.HafniumTetrachlorideSolution.getFluidOrGas(1000),
- null, //No fluid output
+ null, // No fluid output
WerkstoffMaterialPool.LowPurityHafnium.get(OrePrefixes.dust, 1),
GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesiumchloride, 6),
- 600, 1920, 2700
- );
+ 600,
+ 1920,
+ 2700);
- //HfI4
- //??Hf?? + 4I = HfI4
+ // HfI4
+ // ??Hf?? + 4I = HfI4
GT_Values.RA.addChemicalRecipe(
GT_Utility.getIntegratedCircuit(1),
WerkstoffMaterialPool.LowPurityHafnium.get(OrePrefixes.dust, 1),
WerkstoffMaterialPool.Iodine.getFluidOrGas(4000),
null,
WerkstoffMaterialPool.HafniumIodide.get(OrePrefixes.dust, 5),
- 300
- );
+ 300);
GT_Values.RA.addChemicalRecipe(
WerkstoffMaterialPool.LowPurityHafnium.get(OrePrefixes.dust, 1),
WerkstoffMaterialPool.Iodine.get(OrePrefixes.dust, 4),
null,
null,
WerkstoffMaterialPool.HafniumIodide.get(OrePrefixes.dust, 5),
- 300
- );
+ 300);
- //Hf
- //HfI4 = Hf + 4I
+ // Hf
+ // HfI4 = Hf + 4I
GT_Values.RA.addBlastRecipe(
GT_Utility.getIntegratedCircuit(12),
WerkstoffMaterialPool.HafniumIodide.get(OrePrefixes.dust, 5),
@@ -122,10 +114,11 @@ public class RecipeLoader {
WerkstoffMaterialPool.Iodine.getFluidOrGas(4000),
WerkstoffMaterialPool.Hafnium.get(OrePrefixes.ingotHot, 1),
WerkstoffMaterialPool.HafniumRunoff.get(OrePrefixes.dustTiny, 1),
- 600, 1920, 3400
- );
+ 600,
+ 1920,
+ 3400);
- //Hf * 9
+ // Hf * 9
GT_Values.RA.addBlastRecipe(
GT_Utility.getIntegratedCircuit(13),
WerkstoffMaterialPool.HafniumIodide.get(OrePrefixes.dust, 45),
@@ -133,12 +126,12 @@ public class RecipeLoader {
WerkstoffMaterialPool.Iodine.getFluidOrGas(36000),
WerkstoffMaterialPool.Hafnium.get(OrePrefixes.ingotHot, 9),
WerkstoffMaterialPool.HafniumRunoff.get(OrePrefixes.dust, 1),
- 5400, 1920, 3400
- );
-
+ 5400,
+ 1920,
+ 3400);
- //Zirconia-Hafnia
- //??HfZr?? = HfO2 + ZrO2
+ // Zirconia-Hafnia
+ // ??HfZr?? = HfO2 + ZrO2
GT_Values.RA.addCentrifugeRecipe(
WerkstoffMaterialPool.HafniaZirconiaBlend.get(OrePrefixes.dust, 1),
null,
@@ -152,130 +145,112 @@ public class RecipeLoader {
null,
new int[] {10000, 10000},
600,
- 1920
- );
+ 1920);
- //Ammonium Nitrate
- //HNO3 + NH3 = NH4NO3
+ // Ammonium Nitrate
+ // HNO3 + NH3 = NH4NO3
GT_Values.RA.addChemicalRecipeForBasicMachineOnly(
- GT_Utility.getIntegratedCircuit(12),
- Materials.NitricAcid.getCells(1),
- Materials.Ammonia.getGas(1000),
- WerkstoffMaterialPool.AmmoniumNitrate.getFluidOrGas(1000),
- Materials.Empty.getCells(1),
- null,
- 30,
- 400
- );
+ GT_Utility.getIntegratedCircuit(12),
+ Materials.NitricAcid.getCells(1),
+ Materials.Ammonia.getGas(1000),
+ WerkstoffMaterialPool.AmmoniumNitrate.getFluidOrGas(1000),
+ Materials.Empty.getCells(1),
+ null,
+ 30,
+ 400);
GT_Values.RA.addMultiblockChemicalRecipe(
- new ItemStack[] {
- GT_Utility.getIntegratedCircuit(12)
- },
- new FluidStack[] {
- Materials.NitricAcid.getFluid(1000),
- Materials.Ammonia.getGas(1000)
- },
- new FluidStack[] {
- WerkstoffMaterialPool.AmmoniumNitrate.getFluidOrGas(1000)
- },
- new ItemStack[] {
- },
- 30,
- 400
- );
-
- //IODINE-START
- //SeaweedAsh
+ new ItemStack[] {GT_Utility.getIntegratedCircuit(12)},
+ new FluidStack[] {Materials.NitricAcid.getFluid(1000), Materials.Ammonia.getGas(1000)},
+ new FluidStack[] {WerkstoffMaterialPool.AmmoniumNitrate.getFluidOrGas(1000)},
+ new ItemStack[] {},
+ 30,
+ 400);
+
+ // IODINE-START
+ // SeaweedAsh
GT_ModHandler.addSmeltingRecipe(
- GT_ModHandler.getModItem("harvestcraft", "seaweedItem", 1),
- WerkstoffMaterialPool.SeaweedAsh.get(OrePrefixes.dustSmall, 1)
- );
+ GT_ModHandler.getModItem("harvestcraft", "seaweedItem", 1),
+ WerkstoffMaterialPool.SeaweedAsh.get(OrePrefixes.dustSmall, 1));
- //SeaweedConcentrate
+ // SeaweedConcentrate
GT_Values.RA.addMixerRecipe(
- WerkstoffMaterialPool.SeaweedAsh.get(OrePrefixes.dust, 1),
- null,
- null,
- null,
- Materials.DilutedSulfuricAcid.getFluid(600),
- WerkstoffMaterialPool.SeaweedConcentrate.getFluidOrGas(600),
- Materials.Calcite.getDustSmall(2),
- 300,
- 240
- );
+ WerkstoffMaterialPool.SeaweedAsh.get(OrePrefixes.dust, 1),
+ null,
+ null,
+ null,
+ Materials.DilutedSulfuricAcid.getFluid(600),
+ WerkstoffMaterialPool.SeaweedConcentrate.getFluidOrGas(600),
+ Materials.Calcite.getDustSmall(2),
+ 300,
+ 240);
- //SeaweedConcentrate * 4
+ // SeaweedConcentrate * 4
GT_Values.RA.addMixerRecipe(
- WerkstoffMaterialPool.SeaweedAsh.get(OrePrefixes.dust, 4),
- null,
- null,
- null,
- Materials.DilutedSulfuricAcid.getFluid(2400),
- WerkstoffMaterialPool.SeaweedConcentrate.getFluidOrGas(2400),
- Materials.Calcite.getDust(2),
- 1200,
- 240
- );
+ WerkstoffMaterialPool.SeaweedAsh.get(OrePrefixes.dust, 4),
+ null,
+ null,
+ null,
+ Materials.DilutedSulfuricAcid.getFluid(2400),
+ WerkstoffMaterialPool.SeaweedConcentrate.getFluidOrGas(2400),
+ Materials.Calcite.getDust(2),
+ 1200,
+ 240);
- //Iodine
+ // Iodine
GT_Values.RA.addCentrifugeRecipe(
- Materials.Benzene.getCells(1),
- null,
- WerkstoffMaterialPool.SeaweedConcentrate.getFluidOrGas(2000),
- WerkstoffMaterialPool.SeaweedByproducts.getFluidOrGas(200),
- Materials.Empty.getCells(1),
- WerkstoffMaterialPool.Iodine.get(OrePrefixes.dust, 1),
- null,
- null,
- null,
- null,
- new int[] {10000, 10000},
- 760,
- 480
- );
+ Materials.Benzene.getCells(1),
+ null,
+ WerkstoffMaterialPool.SeaweedConcentrate.getFluidOrGas(2000),
+ WerkstoffMaterialPool.SeaweedByproducts.getFluidOrGas(200),
+ Materials.Empty.getCells(1),
+ WerkstoffMaterialPool.Iodine.get(OrePrefixes.dust, 1),
+ null,
+ null,
+ null,
+ null,
+ new int[] {10000, 10000},
+ 760,
+ 480);
- //IODINE-END
+ // IODINE-END
- //2MnO2 + 2KOH + KClO3 = 2KMnO4 + H2O + KCl
+ // 2MnO2 + 2KOH + KClO3 = 2KMnO4 + H2O + KCl
GT_Values.RA.addBlastRecipe(
- Materials.Pyrolusite.getDust(6),
- GT_ModHandler.getModItem("dreamcraft", "item.PotassiumHydroxideDust", 6),
+ Materials.Pyrolusite.getDust(6),
+ GT_ModHandler.getModItem("dreamcraft", "item.PotassiumHydroxideDust", 6),
WerkstoffMaterialPool.PotassiumChlorate.get(OrePrefixes.dust, 5),
- null,
- null,
- Materials.Water.getFluid(1000),
- WerkstoffMaterialPool.PotassiumPermanganate.get(OrePrefixes.dust, 12),
- Materials.RockSalt.getDust(2),
- null,
- null,
- 150,
- 480,
- 1200
- );
+ null,
+ null,
+ Materials.Water.getFluid(1000),
+ WerkstoffMaterialPool.PotassiumPermanganate.get(OrePrefixes.dust, 12),
+ Materials.RockSalt.getDust(2),
+ null,
+ null,
+ 150,
+ 480,
+ 1200);
- //Mn + 2O = MnO2
+ // Mn + 2O = MnO2
GT_Values.RA.addChemicalRecipe(
- Materials.Manganese.getDust(1),
- GT_Utility.getIntegratedCircuit(1),
- Materials.Oxygen.getGas(2000),
- null,
- Materials.Pyrolusite.getDust(3),
- 40,
- 30
- );
-
- //6KOH + 6Cl = KClO3 + 5KCl + 3H2O
+ Materials.Manganese.getDust(1),
+ GT_Utility.getIntegratedCircuit(1),
+ Materials.Oxygen.getGas(2000),
+ null,
+ Materials.Pyrolusite.getDust(3),
+ 40,
+ 30);
+
+ // 6KOH + 6Cl = KClO3 + 5KCl + 3H2O
GT_Values.RA.addChemicalRecipe(
- GT_ModHandler.getModItem("dreamcraft", "item.PotassiumHydroxideDust", 18),
- GT_Utility.getIntegratedCircuit(3),
- Materials.Chlorine.getGas(6000),
- Materials.Water.getFluid(3000),
- Materials.RockSalt.getDust(10),
- WerkstoffMaterialPool.PotassiumChlorate.get(OrePrefixes.dust, 5),
- 40,
- 30
- );
+ GT_ModHandler.getModItem("dreamcraft", "item.PotassiumHydroxideDust", 18),
+ GT_Utility.getIntegratedCircuit(3),
+ Materials.Chlorine.getGas(6000),
+ Materials.Water.getFluid(3000),
+ Materials.RockSalt.getDust(10),
+ WerkstoffMaterialPool.PotassiumChlorate.get(OrePrefixes.dust, 5),
+ 40,
+ 30);
/*
//Fluorosilicic Acid
@@ -289,467 +264,398 @@ public class RecipeLoader {
600
);
*/
- //Sodium Fluorosilicate
- //2NaCl + H2SiF6 = 2HCl + Na2SiF6
+ // Sodium Fluorosilicate
+ // 2NaCl + H2SiF6 = 2HCl + Na2SiF6
GT_Values.RA.addChemicalRecipe(
- Materials.Empty.getCells(2),
- Materials.Salt.getDust(4),
- WerkstoffLoader.HexafluorosilicicAcid.getFluidOrGas(1000),
- WerkstoffMaterialPool.SodiumFluorosilicate.getFluidOrGas(1000),
- Materials.HydrochloricAcid.getCells(2),
- 600,
- 450
- );
-
+ Materials.Empty.getCells(2),
+ Materials.Salt.getDust(4),
+ WerkstoffLoader.HexafluorosilicicAcid.getFluidOrGas(1000),
+ WerkstoffMaterialPool.SodiumFluorosilicate.getFluidOrGas(1000),
+ Materials.HydrochloricAcid.getCells(2),
+ 600,
+ 450);
}
public static void loadLanthanideRecipes() {
- // Methanol
- //CH4O + CO + 3O =V2O5= H2C2O4 + H2O
+ // Methanol
+ // CH4O + CO + 3O =V2O5= H2C2O4 + H2O
GT_Values.RA.addMultiblockChemicalRecipe(
- new ItemStack[] {
- MyMaterial.vanadiumPentoxide.get(OrePrefixes.dustTiny, 1)
- },
+ new ItemStack[] {MyMaterial.vanadiumPentoxide.get(OrePrefixes.dustTiny, 1)},
new FluidStack[] {
Materials.Methanol.getFluid(1000),
Materials.CarbonMonoxide.getGas(1000),
Materials.Oxygen.getGas(3000)
},
- new FluidStack[] {
- MyMaterial.oxalate.getFluidOrGas(1000),
- Materials.Water.getFluid(1000)
- },
+ new FluidStack[] {MyMaterial.oxalate.getFluidOrGas(1000), Materials.Water.getFluid(1000)},
null,
450,
- 240
- );
+ 240);
// Ethanol
- //C2H6O + 5O =V2O5= H2C2O4 + 2H2O
+ // C2H6O + 5O =V2O5= H2C2O4 + 2H2O
GT_Values.RA.addMultiblockChemicalRecipe(
- new ItemStack[] {
- MyMaterial.vanadiumPentoxide.get(OrePrefixes.dustTiny, 1)
- },
- new FluidStack[] {
- Materials.Ethanol.getFluid(1000),
- Materials.Oxygen.getGas(5000)
- },
- new FluidStack[] {
- MyMaterial.oxalate.getFluidOrGas(1000),
- Materials.Water.getFluid(2000)
- },
+ new ItemStack[] {MyMaterial.vanadiumPentoxide.get(OrePrefixes.dustTiny, 1)},
+ new FluidStack[] {Materials.Ethanol.getFluid(1000), Materials.Oxygen.getGas(5000)},
+ new FluidStack[] {MyMaterial.oxalate.getFluidOrGas(1000), Materials.Water.getFluid(2000)},
null,
450,
- 240
- );
+ 240);
- //GT_Values.RA.addChemicalRecipe(
- // GT_Utility.getIntegratedCircuit(2),
- //WerkstoffMaterialPool.CeriumDioxide
- //
- //)
+ // GT_Values.RA.addChemicalRecipe(
+ // GT_Utility.getIntegratedCircuit(2),
+ // WerkstoffMaterialPool.CeriumDioxide
+ //
+ // )
// Cerium Oxalate
- //2CeCl3 + 3H2C2O4 = 6HCl + Ce2(C2O4)3
+ // 2CeCl3 + 3H2C2O4 = 6HCl + Ce2(C2O4)3
GT_Values.RA.addChemicalRecipe(
- GT_Utility.getIntegratedCircuit(1),
- WerkstoffMaterialPool.CeriumChloride.get(OrePrefixes.dust, 8),
- MyMaterial.oxalate.getFluidOrGas(3000),
- Materials.HydrochloricAcid.getFluid(6000),
- WerkstoffMaterialPool.CeriumOxalate.get(OrePrefixes.dust, 5),
- null,
- 300,
- 450
- );
+ GT_Utility.getIntegratedCircuit(1),
+ WerkstoffMaterialPool.CeriumChloride.get(OrePrefixes.dust, 8),
+ MyMaterial.oxalate.getFluidOrGas(3000),
+ Materials.HydrochloricAcid.getFluid(6000),
+ WerkstoffMaterialPool.CeriumOxalate.get(OrePrefixes.dust, 5),
+ null,
+ 300,
+ 450);
// Cerium
- //Ce2O3 = 2Ce + 3O
+ // Ce2O3 = 2Ce + 3O
GT_Values.RA.addElectrolyzerRecipe(
- WerkstoffMaterialPool.CeriumIIIOxide.get(OrePrefixes.dust, 5),
- null,
- null,
- Materials.Oxygen.getFluid(3000),
- GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cerium, 2),
- null,
- null,
- null,
- null,
- null,
- new int[]{10000},
- 150,
- 120
- );
+ WerkstoffMaterialPool.CeriumIIIOxide.get(OrePrefixes.dust, 5),
+ null,
+ null,
+ Materials.Oxygen.getFluid(3000),
+ GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cerium, 2),
+ null,
+ null,
+ null,
+ null,
+ null,
+ new int[] {10000},
+ 150,
+ 120);
- //CHAIN BEGIN
+ // CHAIN BEGIN
// MONAZITE
RecipeAdder.instance.DigesterRecipes.addDigesterRecipe(
- new FluidStack[] {Materials.NitricAcid.getFluid(350)},
- new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Monazite, 1)},
- WerkstoffMaterialPool.MuddyRareEarthMonaziteSolution.getFluidOrGas(200),
- new ItemStack[] {
- Materials.SiliconDioxide.getDustSmall(2)
- },
- 1920,
- 200,
- 800
- );
+ new FluidStack[] {Materials.NitricAcid.getFluid(350)},
+ new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Monazite, 1)},
+ WerkstoffMaterialPool.MuddyRareEarthMonaziteSolution.getFluidOrGas(200),
+ new ItemStack[] {Materials.SiliconDioxide.getDustSmall(2)},
+ 1920,
+ 200,
+ 800);
RecipeAdder.instance.DissolutionTankRecipes.addDissolutionTankRecipe(
- new FluidStack[] {
- Materials.Water.getFluid(10000),
- WerkstoffMaterialPool.MuddyRareEarthMonaziteSolution.getFluidOrGas(1000)
- },
- new ItemStack[] {
- Materials.Saltpeter.getDust(1)
- },
- WerkstoffMaterialPool.DilutedRareEarthMonaziteMud.getFluidOrGas(11000),
- new ItemStack[] {
- WerkstoffMaterialPool.HafniaZirconiaBlend.get(OrePrefixes.dustTiny, 4),
- WerkstoffLoader.Thorianit.get(OrePrefixes.dust, 1),
- Materials.Monazite.getDustTiny(2)
- },
- 480,
- 900,
- 10
- );
+ new FluidStack[] {
+ Materials.Water.getFluid(10000),
+ WerkstoffMaterialPool.MuddyRareEarthMonaziteSolution.getFluidOrGas(1000)
+ },
+ new ItemStack[] {Materials.Saltpeter.getDust(1)},
+ WerkstoffMaterialPool.DilutedRareEarthMonaziteMud.getFluidOrGas(11000),
+ new ItemStack[] {
+ WerkstoffMaterialPool.HafniaZirconiaBlend.get(OrePrefixes.dustTiny, 4),
+ WerkstoffLoader.Thorianit.get(OrePrefixes.dust, 1),
+ Materials.Monazite.getDustTiny(2)
+ },
+ 480,
+ 900,
+ 10);
GT_Recipe.GT_Recipe_Map.sSifterRecipes.addRecipe(
- false,
- null,
- new ItemStack[] {
- WerkstoffMaterialPool.MonaziteSulfate.get(OrePrefixes.dust, 1),
- Materials.SiliconDioxide.getDust(1),
- Materials.Rutile.getDust(1),
- WerkstoffLoader.RedZircon.get(OrePrefixes.dust, 1),
- Materials.Ilmenite.getDust(1)
- },
- null,
- new int[] {
- 9000, 7500, 2000, 500, 2000
- },
- new FluidStack[] {
- WerkstoffMaterialPool.DilutedRareEarthMonaziteMud.getFluidOrGas(1000)
- },
- null,
- 400,
- 240,
- 0
- );
+ false,
+ null,
+ new ItemStack[] {
+ WerkstoffMaterialPool.MonaziteSulfate.get(OrePrefixes.dust, 1),
+ Materials.SiliconDioxide.getDust(1),
+ Materials.Rutile.getDust(1),
+ WerkstoffLoader.RedZircon.get(OrePrefixes.dust, 1),
+ Materials.Ilmenite.getDust(1)
+ },
+ null,
+ new int[] {9000, 7500, 2000, 500, 2000},
+ new FluidStack[] {WerkstoffMaterialPool.DilutedRareEarthMonaziteMud.getFluidOrGas(1000)},
+ null,
+ 400,
+ 240,
+ 0);
GT_Values.RA.addMixerRecipe(
- WerkstoffMaterialPool.MonaziteSulfate.get(OrePrefixes.dust, 1),
- null, null, null, null, null,
- Materials.Water.getFluid(6000),
- WerkstoffMaterialPool.DilutedMonaziteSulfate.getFluidOrGas(7000),
- null,
- 480,
- 400
- );
+ WerkstoffMaterialPool.MonaziteSulfate.get(OrePrefixes.dust, 1),
+ null,
+ null,
+ null,
+ null,
+ null,
+ Materials.Water.getFluid(6000),
+ WerkstoffMaterialPool.DilutedMonaziteSulfate.getFluidOrGas(7000),
+ null,
+ 480,
+ 400);
GT_Values.RA.addMultiblockChemicalRecipe(
- new ItemStack[] {
- GT_Utility.getIntegratedCircuit(13)
- },
- new FluidStack[] {
- WerkstoffMaterialPool.DilutedMonaziteSulfate.getFluidOrGas(1000),
- WerkstoffMaterialPool.AmmoniumNitrate.getFluidOrGas(200)
- },
- null,
- new ItemStack[] {
- WerkstoffMaterialPool.AcidicMonazitePowder.get(OrePrefixes.dustTiny, 3),
- },
- 480,
- 480
- );
+ new ItemStack[] {GT_Utility.getIntegratedCircuit(13)},
+ new FluidStack[] {
+ WerkstoffMaterialPool.DilutedMonaziteSulfate.getFluidOrGas(1000),
+ WerkstoffMaterialPool.AmmoniumNitrate.getFluidOrGas(200)
+ },
+ null,
+ new ItemStack[] {
+ WerkstoffMaterialPool.AcidicMonazitePowder.get(OrePrefixes.dustTiny, 3),
+ },
+ 480,
+ 480);
GT_Values.RA.addMultiblockChemicalRecipe(
- new ItemStack[] {
- GT_Utility.getIntegratedCircuit(14)
- },
- new FluidStack[] {
- WerkstoffMaterialPool.DilutedMonaziteSulfate.getFluidOrGas(9000),
- WerkstoffMaterialPool.AmmoniumNitrate.getFluidOrGas(1800)
- },
- null,
- new ItemStack[] {
- WerkstoffMaterialPool.AcidicMonazitePowder.get(OrePrefixes.dust, 3),
- },
- 4320,
- 480
- );
+ new ItemStack[] {GT_Utility.getIntegratedCircuit(14)},
+ new FluidStack[] {
+ WerkstoffMaterialPool.DilutedMonaziteSulfate.getFluidOrGas(9000),
+ WerkstoffMaterialPool.AmmoniumNitrate.getFluidOrGas(1800)
+ },
+ null,
+ new ItemStack[] {
+ WerkstoffMaterialPool.AcidicMonazitePowder.get(OrePrefixes.dust, 3),
+ },
+ 4320,
+ 480);
GT_Values.RA.addSifterRecipe(
- WerkstoffMaterialPool.AcidicMonazitePowder.get(OrePrefixes.dust, 1),
- new ItemStack[] {
- WerkstoffMaterialPool.MonaziteRareEarthFiltrate.get(OrePrefixes.dust, 1),
- WerkstoffMaterialPool.ThoriumPhosphateCake.get(OrePrefixes.dust, 1)
- },
- new int[] {9000, 7000},
- 600,
- 256
- );
+ WerkstoffMaterialPool.AcidicMonazitePowder.get(OrePrefixes.dust, 1),
+ new ItemStack[] {
+ WerkstoffMaterialPool.MonaziteRareEarthFiltrate.get(OrePrefixes.dust, 1),
+ WerkstoffMaterialPool.ThoriumPhosphateCake.get(OrePrefixes.dust, 1)
+ },
+ new int[] {9000, 7000},
+ 600,
+ 256);
GT_Values.RA.addBlastRecipe(
- WerkstoffMaterialPool.ThoriumPhosphateCake.get(OrePrefixes.dust, 1),
- null,
- null,
- null,
- WerkstoffMaterialPool.ThoriumPhosphateConcentrate.get(OrePrefixes.dust, 1),
- null,
- 300,
- 128,
- 1500
- );
+ WerkstoffMaterialPool.ThoriumPhosphateCake.get(OrePrefixes.dust, 1),
+ null,
+ null,
+ null,
+ WerkstoffMaterialPool.ThoriumPhosphateConcentrate.get(OrePrefixes.dust, 1),
+ null,
+ 300,
+ 128,
+ 1500);
GT_Values.RA.addThermalCentrifugeRecipe(
- WerkstoffMaterialPool.ThoriumPhosphateConcentrate.get(OrePrefixes.dust),
- Materials.Thorium.getDust(1),
- Materials.Phosphate.getDust(1),
- null,
- new int[] {
- 10000, 10000
- },
- 200,
- 480
- );
+ WerkstoffMaterialPool.ThoriumPhosphateConcentrate.get(OrePrefixes.dust),
+ Materials.Thorium.getDust(1),
+ Materials.Phosphate.getDust(1),
+ null,
+ new int[] {10000, 10000},
+ 200,
+ 480);
GT_Values.RA.addChemicalBathRecipe(
- WerkstoffMaterialPool.MonaziteRareEarthFiltrate.get(OrePrefixes.dust, 1),
- WerkstoffMaterialPool.AmmoniumNitrate.getFluidOrGas(320),
- WerkstoffMaterialPool.NeutralizedMonaziteRareEarthFiltrate.get(OrePrefixes.dust, 1),
- null,
- null,
- new int[] {10000},
- 120,
- 240
- );
+ WerkstoffMaterialPool.MonaziteRareEarthFiltrate.get(OrePrefixes.dust, 1),
+ WerkstoffMaterialPool.AmmoniumNitrate.getFluidOrGas(320),
+ WerkstoffMaterialPool.NeutralizedMonaziteRareEarthFiltrate.get(OrePrefixes.dust, 1),
+ null,
+ null,
+ new int[] {10000},
+ 120,
+ 240);
GT_Values.RA.addSifterRecipe(
- WerkstoffMaterialPool.NeutralizedMonaziteRareEarthFiltrate.get(OrePrefixes.dust, 1),
- new ItemStack[] {
- WerkstoffMaterialPool.MonaziteRareEarthHydroxideConcentrate.get(OrePrefixes.dust, 1),
- WerkstoffMaterialPool.UraniumFiltrate.get(OrePrefixes.dust, 1),
- WerkstoffMaterialPool.UraniumFiltrate.get(OrePrefixes.dust, 1)
- },
- new int[] {9000, 5000, 4000},
- 800,
- 480
- );
+ WerkstoffMaterialPool.NeutralizedMonaziteRareEarthFiltrate.get(OrePrefixes.dust, 1),
+ new ItemStack[] {
+ WerkstoffMaterialPool.MonaziteRareEarthHydroxideConcentrate.get(OrePrefixes.dust, 1),
+ WerkstoffMaterialPool.UraniumFiltrate.get(OrePrefixes.dust, 1),
+ WerkstoffMaterialPool.UraniumFiltrate.get(OrePrefixes.dust, 1)
+ },
+ new int[] {9000, 5000, 4000},
+ 800,
+ 480);
GT_Values.RA.addChemicalBathRecipe(
- WerkstoffMaterialPool.UraniumFiltrate.get(OrePrefixes.dust, 1),
- Materials.HydrofluoricAcid.getFluid(100),
- WerkstoffMaterialPool.NeutralizedUraniumFiltrate.get(OrePrefixes.dust, 1),
- null,
- null,
- new int[] {10000},
- 360,
- 120
- );
+ WerkstoffMaterialPool.UraniumFiltrate.get(OrePrefixes.dust, 1),
+ Materials.HydrofluoricAcid.getFluid(100),
+ WerkstoffMaterialPool.NeutralizedUraniumFiltrate.get(OrePrefixes.dust, 1),
+ null,
+ null,
+ new int[] {10000},
+ 360,
+ 120);
GT_Values.RA.addSifterRecipe(
- WerkstoffMaterialPool.NeutralizedUraniumFiltrate.get(OrePrefixes.dust, 1),
- new ItemStack[] {
- Materials.Fluorite.getDust(1),
- Materials.Uranium.getDust(1),
- Materials.Uranium.getDust(1),
- Materials.Uranium.getDust(1),
- Materials.Uranium235.getDust(1),
- Materials.Uranium235.getDust(1),
- },
- new int[] {9500, 4500, 4000, 3000, 3000, 2000},
- 1000,
- 30
- );
+ WerkstoffMaterialPool.NeutralizedUraniumFiltrate.get(OrePrefixes.dust, 1),
+ new ItemStack[] {
+ Materials.Fluorite.getDust(1),
+ Materials.Uranium.getDust(1),
+ Materials.Uranium.getDust(1),
+ Materials.Uranium.getDust(1),
+ Materials.Uranium235.getDust(1),
+ Materials.Uranium235.getDust(1),
+ },
+ new int[] {9500, 4500, 4000, 3000, 3000, 2000},
+ 1000,
+ 30);
GT_Values.RA.addBlastRecipe(
- WerkstoffMaterialPool.MonaziteRareEarthHydroxideConcentrate.get(OrePrefixes.dust, 1),
- null,
- null,
- null,
- WerkstoffMaterialPool.DriedMonaziteRareEarthConcentrate.get(OrePrefixes.dust, 1),
- null,
- 300,
- 120,
- 1200
- );
+ WerkstoffMaterialPool.MonaziteRareEarthHydroxideConcentrate.get(OrePrefixes.dust, 1),
+ null,
+ null,
+ null,
+ WerkstoffMaterialPool.DriedMonaziteRareEarthConcentrate.get(OrePrefixes.dust, 1),
+ null,
+ 300,
+ 120,
+ 1200);
GT_Values.RA.addChemicalRecipe(
- WerkstoffMaterialPool.DriedMonaziteRareEarthConcentrate.get(OrePrefixes.dust, 1),
- null,
- Materials.NitricAcid.getFluid(500),
- WerkstoffMaterialPool.NitratedRareEarthMonaziteConcentrate.getFluidOrGas(1000),
- null,
- 500,
- 480
- );
+ WerkstoffMaterialPool.DriedMonaziteRareEarthConcentrate.get(OrePrefixes.dust, 1),
+ null,
+ Materials.NitricAcid.getFluid(500),
+ WerkstoffMaterialPool.NitratedRareEarthMonaziteConcentrate.getFluidOrGas(1000),
+ null,
+ 500,
+ 480);
GT_Values.RA.addMixerRecipe(
- Materials.Water.getCells(1),
- null,
- null,
- null,
- WerkstoffMaterialPool.NitratedRareEarthMonaziteConcentrate.getFluidOrGas(1000),
- WerkstoffMaterialPool.NitricLeachedMonaziteMixture.getFluidOrGas(1000),
- Materials.Empty.getCells(1),
- 200,
- 120
- );
+ Materials.Water.getCells(1),
+ null,
+ null,
+ null,
+ WerkstoffMaterialPool.NitratedRareEarthMonaziteConcentrate.getFluidOrGas(1000),
+ WerkstoffMaterialPool.NitricLeachedMonaziteMixture.getFluidOrGas(1000),
+ Materials.Empty.getCells(1),
+ 200,
+ 120);
GT_Values.RA.addMixerRecipe(
- WerkstoffMaterialPool.CeriumRichMixture.get(OrePrefixes.dust, 3),
- null,
- null,
- null,
- WerkstoffMaterialPool.NitratedRareEarthMonaziteConcentrate.getFluidOrGas(1000),
- WerkstoffMaterialPool.NitricLeachedMonaziteMixture.getFluidOrGas(2000),
- null,
- 220,
- 120
- );
+ WerkstoffMaterialPool.CeriumRichMixture.get(OrePrefixes.dust, 3),
+ null,
+ null,
+ null,
+ WerkstoffMaterialPool.NitratedRareEarthMonaziteConcentrate.getFluidOrGas(1000),
+ WerkstoffMaterialPool.NitricLeachedMonaziteMixture.getFluidOrGas(2000),
+ null,
+ 220,
+ 120);
GT_Recipe.GT_Recipe_Map.sSifterRecipes.addRecipe(
- false,
- null,
- new ItemStack[] {
- WerkstoffMaterialPool.CeriumDioxide.get(OrePrefixes.dust, 1)
- },
- null,
- new int[] {
- 1111
- },
- new FluidStack[] {
- WerkstoffMaterialPool.NitricLeachedMonaziteMixture.getFluidOrGas(1000)
- },
- new FluidStack[] {
- WerkstoffMaterialPool.NitricMonaziteLeachedConcentrate.getFluidOrGas(1000)
- },
- 400,
- 240,
- 0
- );
-
- //BEGIN Cerium
- //CeO2 + 3NH4Cl + H = 3NH3 + CeCl3 + 2H2O
+ false,
+ null,
+ new ItemStack[] {WerkstoffMaterialPool.CeriumDioxide.get(OrePrefixes.dust, 1)},
+ null,
+ new int[] {1111},
+ new FluidStack[] {WerkstoffMaterialPool.NitricLeachedMonaziteMixture.getFluidOrGas(1000)},
+ new FluidStack[] {WerkstoffMaterialPool.NitricMonaziteLeachedConcentrate.getFluidOrGas(1000)},
+ 400,
+ 240,
+ 0);
+
+ // BEGIN Cerium
+ // CeO2 + 3NH4Cl + H = 3NH3 + CeCl3 + 2H2O
GT_Values.RA.addChemicalRecipe(
- WerkstoffMaterialPool.CeriumDioxide.get(OrePrefixes.dust, 3),
- WerkstoffLoader.AmmoniumChloride.get(OrePrefixes.cell, 3),
- Materials.Hydrogen.getGas(1000),
- Materials.Water.getGas(2000),
- WerkstoffMaterialPool.CeriumChloride.get(OrePrefixes.dust, 4),
- Materials.Ammonia.getCells(3),
- 300,
- 450
- );
-
- //Ce2(C2O4)3 + 3C = Ce2O3 + 9CO
+ WerkstoffMaterialPool.CeriumDioxide.get(OrePrefixes.dust, 3),
+ WerkstoffLoader.AmmoniumChloride.get(OrePrefixes.cell, 3),
+ Materials.Hydrogen.getGas(1000),
+ Materials.Water.getGas(2000),
+ WerkstoffMaterialPool.CeriumChloride.get(OrePrefixes.dust, 4),
+ Materials.Ammonia.getCells(3),
+ 300,
+ 450);
+
+ // Ce2(C2O4)3 + 3C = Ce2O3 + 9CO
GT_Values.RA.addBlastRecipe(
- WerkstoffMaterialPool.CeriumOxalate.get(OrePrefixes.dust, 5),
- Materials.Carbon.getDust(3),
- null,
- Materials.CarbonMonoxide.getGas(9000),
- WerkstoffMaterialPool.CeriumIIIOxide.get(OrePrefixes.dust, 5),
- null,
- 200,
- 480,
- 800
- );
+ WerkstoffMaterialPool.CeriumOxalate.get(OrePrefixes.dust, 5),
+ Materials.Carbon.getDust(3),
+ null,
+ Materials.CarbonMonoxide.getGas(9000),
+ WerkstoffMaterialPool.CeriumIIIOxide.get(OrePrefixes.dust, 5),
+ null,
+ 200,
+ 480,
+ 800);
- //END Cerium (NMLC)
+ // END Cerium (NMLC)
- GT_Recipe.GT_Recipe_Map.sVacuumRecipes.addRecipe( //Uses fluid, outputs item. Yet another hacky recipe
- false,
- null,
- new ItemStack[] {
- WerkstoffMaterialPool.CooledMonaziteRareEarthConcentrate.get(OrePrefixes.dust, 1), //TODO: Perhaps add more shit on output
- },
- null,
- new FluidStack[] {
- WerkstoffMaterialPool.NitricMonaziteLeachedConcentrate.getFluidOrGas(1000)
- },
- null,
- 100,
- 240,
- 0
- );
+ GT_Recipe.GT_Recipe_Map.sVacuumRecipes.addRecipe( // Uses fluid, outputs item. Yet another hacky recipe
+ false,
+ null,
+ new ItemStack[] {
+ WerkstoffMaterialPool.CooledMonaziteRareEarthConcentrate.get(
+ OrePrefixes.dust, 1), // TODO: Perhaps add more shit on output
+ },
+ null,
+ new FluidStack[] {WerkstoffMaterialPool.NitricMonaziteLeachedConcentrate.getFluidOrGas(1000)},
+ null,
+ 100,
+ 240,
+ 0);
GT_Values.RA.addElectromagneticSeparatorRecipe(
- WerkstoffMaterialPool.CooledMonaziteRareEarthConcentrate.get(OrePrefixes.dust, 1),
- WerkstoffMaterialPool.MonaziteRarerEarthSediment.get(OrePrefixes.dust, 1),
- WerkstoffMaterialPool.EuropiumOxide.get(OrePrefixes.dust, 2), // Maybe also holmium
- null,
- new int[] {
- 9000, 500
- },
- 600,
- 1920
- );
+ WerkstoffMaterialPool.CooledMonaziteRareEarthConcentrate.get(OrePrefixes.dust, 1),
+ WerkstoffMaterialPool.MonaziteRarerEarthSediment.get(OrePrefixes.dust, 1),
+ WerkstoffMaterialPool.EuropiumOxide.get(OrePrefixes.dust, 2), // Maybe also holmium
+ null,
+ new int[] {9000, 500},
+ 600,
+ 1920);
- //EuO + H2S = EuS + H2O
+ // EuO + H2S = EuS + H2O
GT_Values.RA.addChemicalRecipe(
- WerkstoffMaterialPool.EuropiumOxide.get(OrePrefixes.dust, 2),
- null,
- Materials.HydricSulfide.getGas(1000),
- Materials.Water.getFluid(1000),
- WerkstoffMaterialPool.EuropiumSulfide.get(OrePrefixes.dust, 2),
- 300,
- 8400
- );
+ WerkstoffMaterialPool.EuropiumOxide.get(OrePrefixes.dust, 2),
+ null,
+ Materials.HydricSulfide.getGas(1000),
+ Materials.Water.getFluid(1000),
+ WerkstoffMaterialPool.EuropiumSulfide.get(OrePrefixes.dust, 2),
+ 300,
+ 8400);
- //EuS = Eu + S
+ // EuS = Eu + S
GT_Values.RA.addElectrolyzerRecipe(
- WerkstoffMaterialPool.EuropiumSulfide.get(OrePrefixes.dust, 2),
- null,
- null,
- null,
- Materials.Europium.getDust(1),
- Materials.Sulfur.getDust(1),
- null,
- null,
- null,
- null,
- new int[] {
- 10000, 10000
- },
- 600,
- 33000
- );
+ WerkstoffMaterialPool.EuropiumSulfide.get(OrePrefixes.dust, 2),
+ null,
+ null,
+ null,
+ Materials.Europium.getDust(1),
+ Materials.Sulfur.getDust(1),
+ null,
+ null,
+ null,
+ null,
+ new int[] {10000, 10000},
+ 600,
+ 33000);
GT_Values.RA.addBlastRecipe(
- WerkstoffMaterialPool.MonaziteRarerEarthSediment.get(OrePrefixes.dust, 1),
- null,
- Materials.Chlorine.getGas(1000),
- null,
- WerkstoffMaterialPool.MonaziteHeterogenousHalogenicRareEarthMixture.get(OrePrefixes.dust, 1),
- null,
- 500,
- 480,
- 1200
- );
+ WerkstoffMaterialPool.MonaziteRarerEarthSediment.get(OrePrefixes.dust, 1),
+ null,
+ Materials.Chlorine.getGas(1000),
+ null,
+ WerkstoffMaterialPool.MonaziteHeterogenousHalogenicRareEarthMixture.get(OrePrefixes.dust, 1),
+ null,
+ 500,
+ 480,
+ 1200);
GT_Values.RA.addMixerRecipe(
- Materials.Salt.getDust(1),
- WerkstoffMaterialPool.MonaziteHeterogenousHalogenicRareEarthMixture.get(OrePrefixes.dust, 1),
- null,
- null,
- Materials.Acetone.getFluid(1000),
- null,
- WerkstoffMaterialPool.SaturatedMonaziteRareEarthMixture.get(OrePrefixes.dust, 1),
- 200,
- 240
- );
+ Materials.Salt.getDust(1),
+ WerkstoffMaterialPool.MonaziteHeterogenousHalogenicRareEarthMixture.get(OrePrefixes.dust, 1),
+ null,
+ null,
+ Materials.Acetone.getFluid(1000),
+ null,
+ WerkstoffMaterialPool.SaturatedMonaziteRareEarthMixture.get(OrePrefixes.dust, 1),
+ 200,
+ 240);
GT_Values.RA.addMixerRecipe(
- WerkstoffMaterialPool.MonaziteHeterogenousHalogenicRareEarthMixture.get(OrePrefixes.dust, 1),
- WerkstoffMaterialPool.SamariumOreConcentrate.get(OrePrefixes.dust, 2),
- null,
- null,
- Materials.Acetone.getFluid(1000),
- null,
- WerkstoffMaterialPool.SaturatedMonaziteRareEarthMixture.get(OrePrefixes.dust, 3),
- 400,
- 240
- );
+ WerkstoffMaterialPool.MonaziteHeterogenousHalogenicRareEarthMixture.get(OrePrefixes.dust, 1),
+ WerkstoffMaterialPool.SamariumOreConcentrate.get(OrePrefixes.dust, 2),
+ null,
+ null,
+ Materials.Acetone.getFluid(1000),
+ null,
+ WerkstoffMaterialPool.SaturatedMonaziteRareEarthMixture.get(OrePrefixes.dust, 3),
+ 400,
+ 240);
/*
GT_Values.RA.addCentrifugeRecipe(
WerkstoffMaterialPool.SaturatedMonaziteRareEarthMixture.get(OrePrefixes.dust, 2),
@@ -770,545 +676,505 @@ public class RecipeLoader {
);
*/
GT_Values.RA.addCentrifugeRecipe(
- GT_Utility.getIntegratedCircuit(4),
- WerkstoffMaterialPool.SaturatedMonaziteRareEarthMixture.get(OrePrefixes.dust, 8),
- null,
- Materials.Chloromethane.getGas(800),
- WerkstoffMaterialPool.SamaricResidue.get(OrePrefixes.dust, 6),
- null, //WerkstoffMaterialPool.UnknownBlend.get(OrePrefixes.dust, 2) TODO
- null,
- null,
- null,
- null,
- new int[] {
- 10000, //10000
- },
- 6300,
- 1920
- );
+ GT_Utility.getIntegratedCircuit(4),
+ WerkstoffMaterialPool.SaturatedMonaziteRareEarthMixture.get(OrePrefixes.dust, 8),
+ null,
+ Materials.Chloromethane.getGas(800),
+ WerkstoffMaterialPool.SamaricResidue.get(OrePrefixes.dust, 6),
+ null, // WerkstoffMaterialPool.UnknownBlend.get(OrePrefixes.dust, 2) TODO
+ null,
+ null,
+ null,
+ null,
+ new int[] {
+ 10000, // 10000
+ },
+ 6300,
+ 1920);
GT_Values.RA.addSifterRecipe(
- WerkstoffMaterialPool.SamaricResidue.get(OrePrefixes.dust, 9),
- new ItemStack[] {
- Materials.Samarium.getDust(6),
- Materials.Gadolinium.getDust(3)
- },
- new int[] {
- 10000, 10000
- },
- 400,
- 1920
- );
+ WerkstoffMaterialPool.SamaricResidue.get(OrePrefixes.dust, 9),
+ new ItemStack[] {Materials.Samarium.getDust(6), Materials.Gadolinium.getDust(3)},
+ new int[] {10000, 10000},
+ 400,
+ 1920);
// BASTNASITE (god help me)
RecipeAdder.instance.DigesterRecipes.addDigesterRecipe(
- new FluidStack[] {Materials.NitricAcid.getFluid(350)},
- new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Bastnasite, 1)},
- WerkstoffMaterialPool.MuddyRareEarthBastnasiteSolution.getFluidOrGas(200),
- new ItemStack[] {
- Materials.SiliconDioxide.getDustSmall(2)
- },
- 1920,
- 200,
- 800
- );
+ new FluidStack[] {Materials.NitricAcid.getFluid(350)},
+ new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Bastnasite, 1)},
+ WerkstoffMaterialPool.MuddyRareEarthBastnasiteSolution.getFluidOrGas(200),
+ new ItemStack[] {Materials.SiliconDioxide.getDustSmall(2)},
+ 1920,
+ 200,
+ 800);
GT_Values.RA.addCrackingRecipe(
- 1,
- WerkstoffMaterialPool.MuddyRareEarthBastnasiteSolution.getFluidOrGas(1000),
- GT_ModHandler.getSteam(1000),
- WerkstoffMaterialPool.SteamCrackedBasnasiteSolution.getFluidOrGas(2000),
- 600,
- 480
- );
+ 1,
+ WerkstoffMaterialPool.MuddyRareEarthBastnasiteSolution.getFluidOrGas(1000),
+ GT_ModHandler.getSteam(1000),
+ WerkstoffMaterialPool.SteamCrackedBasnasiteSolution.getFluidOrGas(2000),
+ 600,
+ 480);
GT_Values.RA.addMixerRecipe(
- GT_Utility.getIntegratedCircuit(6),
- WerkstoffMaterialPool.SteamCrackedBasnasiteSolution.get(OrePrefixes.cell, 1),
- null,
- null,
- WerkstoffMaterialPool.SodiumFluorosilicate.getFluidOrGas(320),
- WerkstoffMaterialPool.ConditionedBastnasiteMud.getFluidOrGas(1320),
- null,
- 800,
- 120
- );
+ GT_Utility.getIntegratedCircuit(6),
+ WerkstoffMaterialPool.SteamCrackedBasnasiteSolution.get(OrePrefixes.cell, 1),
+ null,
+ null,
+ WerkstoffMaterialPool.SodiumFluorosilicate.getFluidOrGas(320),
+ WerkstoffMaterialPool.ConditionedBastnasiteMud.getFluidOrGas(1320),
+ null,
+ 800,
+ 120);
RecipeAdder.instance.DissolutionTankRecipes.addDissolutionTankRecipe(
- new FluidStack[] {
- Materials.Water.getFluid(10000),
- WerkstoffMaterialPool.ConditionedBastnasiteMud.getFluidOrGas(1000)
- },
- new ItemStack[] {
- Materials.Saltpeter.getDust(1)
- },
- WerkstoffMaterialPool.DiltedRareEarthBastnasiteMud.getFluidOrGas(11000),
- new ItemStack[] {
- WerkstoffMaterialPool.Gangue.get(OrePrefixes.dust, 1)
- },
- 1920,
- 1000,
- 10
- );
+ new FluidStack[] {
+ Materials.Water.getFluid(10000), WerkstoffMaterialPool.ConditionedBastnasiteMud.getFluidOrGas(1000)
+ },
+ new ItemStack[] {Materials.Saltpeter.getDust(1)},
+ WerkstoffMaterialPool.DiltedRareEarthBastnasiteMud.getFluidOrGas(11000),
+ new ItemStack[] {WerkstoffMaterialPool.Gangue.get(OrePrefixes.dust, 1)},
+ 1920,
+ 1000,
+ 10);
GT_Recipe.GT_Recipe_Map.sSifterRecipes.addRecipe(
- false,
- null,
- new ItemStack[] {
- Materials.SiliconDioxide.getDust(1),
- Materials.Rutile.getDust(1),
- WerkstoffLoader.RedZircon.get(OrePrefixes.dust, 1), //TODO:Change outputs to complement Monazite
- Materials.Ilmenite.getDust(1)
- },
- null,
- new int[] {
- 9000, 7500, 1000, 500, 2000
- },
- new FluidStack[] {
- WerkstoffMaterialPool.DiltedRareEarthBastnasiteMud.getFluidOrGas(1000)
- },
- new FluidStack[] {
- WerkstoffMaterialPool.FilteredBastnasiteMud.getFluidOrGas(400)
- },
- 400,
- 240,
- 0
- );
+ false,
+ null,
+ new ItemStack[] {
+ Materials.SiliconDioxide.getDust(1),
+ Materials.Rutile.getDust(1),
+ WerkstoffLoader.RedZircon.get(OrePrefixes.dust, 1), // TODO:Change outputs to complement Monazite
+ Materials.Ilmenite.getDust(1)
+ },
+ null,
+ new int[] {9000, 7500, 1000, 500, 2000},
+ new FluidStack[] {WerkstoffMaterialPool.DiltedRareEarthBastnasiteMud.getFluidOrGas(1000)},
+ new FluidStack[] {WerkstoffMaterialPool.FilteredBastnasiteMud.getFluidOrGas(400)},
+ 400,
+ 240,
+ 0);
GT_Values.RA.addBlastRecipe(
- GT_Utility.getIntegratedCircuit(1),
- null,
- WerkstoffMaterialPool.FilteredBastnasiteMud.getFluidOrGas(1000),
- null, //TODO: Maybe add some useful shit?
- WerkstoffMaterialPool.BastnasiteRareEarthOxidePowder.get(OrePrefixes.dust, 1),
- null, //See above
- 500,
- 600,
- 1400
- );
+ GT_Utility.getIntegratedCircuit(1),
+ null,
+ WerkstoffMaterialPool.FilteredBastnasiteMud.getFluidOrGas(1000),
+ null, // TODO: Maybe add some useful shit?
+ WerkstoffMaterialPool.BastnasiteRareEarthOxidePowder.get(OrePrefixes.dust, 1),
+ null, // See above
+ 500,
+ 600,
+ 1400);
GT_Values.RA.addChemicalBathRecipe(
- WerkstoffMaterialPool.BastnasiteRareEarthOxidePowder.get(OrePrefixes.dust, 1),
- Materials.HydrochloricAcid.getFluid(500),
- WerkstoffMaterialPool.LeachedBastnasiteRareEarthOxides.get(OrePrefixes.dust, 1),
- null,
- null,
- new int[] {10000},
- 200,
- 30
- );
+ WerkstoffMaterialPool.BastnasiteRareEarthOxidePowder.get(OrePrefixes.dust, 1),
+ Materials.HydrochloricAcid.getFluid(500),
+ WerkstoffMaterialPool.LeachedBastnasiteRareEarthOxides.get(OrePrefixes.dust, 1),
+ null,
+ null,
+ new int[] {10000},
+ 200,
+ 30);
GT_Values.RA.addBlastRecipe(
- GT_Utility.getIntegratedCircuit(1),
- WerkstoffMaterialPool.LeachedBastnasiteRareEarthOxides.get(OrePrefixes.dust, 1),
- Materials.Oxygen.getGas(1000),
- Materials.Fluorine.getGas(13),
- WerkstoffMaterialPool.RoastedRareEarthOxides.get(OrePrefixes.dust, 1),
- null,
- 600,
- 120,
- 1200
- );
+ GT_Utility.getIntegratedCircuit(1),
+ WerkstoffMaterialPool.LeachedBastnasiteRareEarthOxides.get(OrePrefixes.dust, 1),
+ Materials.Oxygen.getGas(1000),
+ Materials.Fluorine.getGas(13),
+ WerkstoffMaterialPool.RoastedRareEarthOxides.get(OrePrefixes.dust, 1),
+ null,
+ 600,
+ 120,
+ 1200);
GT_Values.RA.addMixerRecipe(
- GT_Utility.getIntegratedCircuit(7),
- WerkstoffMaterialPool.RoastedRareEarthOxides.get(OrePrefixes.dust, 1),
- null,
- null,
- Materials.Water.getFluid(200),
- null,
- WerkstoffMaterialPool.WetRareEarthOxides.get(OrePrefixes.dust, 1),
- 100,
- 30
- );
+ GT_Utility.getIntegratedCircuit(7),
+ WerkstoffMaterialPool.RoastedRareEarthOxides.get(OrePrefixes.dust, 1),
+ null,
+ null,
+ Materials.Water.getFluid(200),
+ null,
+ WerkstoffMaterialPool.WetRareEarthOxides.get(OrePrefixes.dust, 1),
+ 100,
+ 30);
GT_Values.RA.addChemicalRecipe(
- WerkstoffMaterialPool.WetRareEarthOxides.get(OrePrefixes.dust, 1),
- null,
- Materials.Fluorine.getGas(4000),
- Materials.HydrofluoricAcid.getFluid(4000),
- WerkstoffMaterialPool.CeriumOxidisedRareEarthOxides.get(OrePrefixes.dust, 1),
- 300,
- 480
- );
+ WerkstoffMaterialPool.WetRareEarthOxides.get(OrePrefixes.dust, 1),
+ null,
+ Materials.Fluorine.getGas(4000),
+ Materials.HydrofluoricAcid.getFluid(4000),
+ WerkstoffMaterialPool.CeriumOxidisedRareEarthOxides.get(OrePrefixes.dust, 1),
+ 300,
+ 480);
GT_Values.RA.addCentrifugeRecipe(
- WerkstoffMaterialPool.CeriumOxidisedRareEarthOxides.get(OrePrefixes.dust, 1),
- null,
- null,
- null,
- WerkstoffMaterialPool.BastnasiteRarerEarthOxides.get(OrePrefixes.dust, 1),
- WerkstoffMaterialPool.CeriumDioxide.get(OrePrefixes.dust, 1),
- null,
- null,
- null,
- null,
- new int[] {
- 10000, 9000
- },
- 600,
- 480
- );
+ WerkstoffMaterialPool.CeriumOxidisedRareEarthOxides.get(OrePrefixes.dust, 1),
+ null,
+ null,
+ null,
+ WerkstoffMaterialPool.BastnasiteRarerEarthOxides.get(OrePrefixes.dust, 1),
+ WerkstoffMaterialPool.CeriumDioxide.get(OrePrefixes.dust, 1),
+ null,
+ null,
+ null,
+ null,
+ new int[] {10000, 9000},
+ 600,
+ 480);
GT_Values.RA.addMixerRecipe(
- WerkstoffMaterialPool.BastnasiteRarerEarthOxides.get(OrePrefixes.dust, 1),
- null,
- null,
- null,
- Materials.NitricAcid.getFluid(400),
- WerkstoffMaterialPool.NitratedBastnasiteRarerEarthOxides.getFluidOrGas(1000),
- null,
- 300,
- 480
- );
+ WerkstoffMaterialPool.BastnasiteRarerEarthOxides.get(OrePrefixes.dust, 1),
+ null,
+ null,
+ null,
+ Materials.NitricAcid.getFluid(400),
+ WerkstoffMaterialPool.NitratedBastnasiteRarerEarthOxides.getFluidOrGas(1000),
+ null,
+ 300,
+ 480);
GT_Values.RA.addChemicalRecipe(
- WerkstoffMaterialPool.NitratedBastnasiteRarerEarthOxides.get(OrePrefixes.cell, 1),
- null,
- Materials.Acetone.getFluid(1000),
- WerkstoffMaterialPool.SaturatedBastnasiteRarerEarthOxides.getFluidOrGas(1000),
- null,
- 700,
- 480
- );
+ WerkstoffMaterialPool.NitratedBastnasiteRarerEarthOxides.get(OrePrefixes.cell, 1),
+ null,
+ Materials.Acetone.getFluid(1000),
+ WerkstoffMaterialPool.SaturatedBastnasiteRarerEarthOxides.getFluidOrGas(1000),
+ null,
+ 700,
+ 480);
GT_Values.RA.addCentrifugeRecipe(
- null,
- null,
- WerkstoffMaterialPool.SaturatedBastnasiteRarerEarthOxides.getFluidOrGas(1000),
- WerkstoffMaterialPool.DilutedAcetone.getFluidOrGas(750),
- WerkstoffMaterialPool.NeodymicRareEarthConcentrate.get(OrePrefixes.dust, 1),
- WerkstoffMaterialPool.SamaricRareEarthConcentrate.get(OrePrefixes.dust, 1),
- null,
- null,
- null,
- null,
- new int[] {
- 8000, 5000
- },
- 900,
- 480
- );
+ null,
+ null,
+ WerkstoffMaterialPool.SaturatedBastnasiteRarerEarthOxides.getFluidOrGas(1000),
+ WerkstoffMaterialPool.DilutedAcetone.getFluidOrGas(750),
+ WerkstoffMaterialPool.NeodymicRareEarthConcentrate.get(OrePrefixes.dust, 1),
+ WerkstoffMaterialPool.SamaricRareEarthConcentrate.get(OrePrefixes.dust, 1),
+ null,
+ null,
+ null,
+ null,
+ new int[] {8000, 5000},
+ 900,
+ 480);
- //Nd RE
+ // Nd RE
GT_Values.RA.addChemicalRecipe(
- WerkstoffMaterialPool.NeodymicRareEarthConcentrate.get(OrePrefixes.dust, 1),
- null,
- Materials.HydrochloricAcid.getFluid(1000),
- null,
- WerkstoffMaterialPool.LanthaniumChloride.get(OrePrefixes.dustSmall, 2),
- WerkstoffMaterialPool.NeodymiumOxide.get(OrePrefixes.dustSmall, 2),
- 450,
- 800
- );
+ WerkstoffMaterialPool.NeodymicRareEarthConcentrate.get(OrePrefixes.dust, 1),
+ null,
+ Materials.HydrochloricAcid.getFluid(1000),
+ null,
+ WerkstoffMaterialPool.LanthaniumChloride.get(OrePrefixes.dustSmall, 2),
+ WerkstoffMaterialPool.NeodymiumOxide.get(OrePrefixes.dustSmall, 2),
+ 450,
+ 800);
- //Sm RE
+ // Sm RE
GT_Values.RA.addChemicalRecipe(
- WerkstoffMaterialPool.SamaricRareEarthConcentrate.get(OrePrefixes.dust, 1),
- null,
- Materials.HydrofluoricAcid.getFluid(2000),
- null,
- WerkstoffMaterialPool.FluorinatedSamaricConcentrate.get(OrePrefixes.dust, 1),
- null,
- 300,
- 480
- );
+ WerkstoffMaterialPool.SamaricRareEarthConcentrate.get(OrePrefixes.dust, 1),
+ null,
+ Materials.HydrofluoricAcid.getFluid(2000),
+ null,
+ WerkstoffMaterialPool.FluorinatedSamaricConcentrate.get(OrePrefixes.dust, 1),
+ null,
+ 300,
+ 480);
GT_Values.RA.addChemicalRecipe(
- WerkstoffMaterialPool.SamaricRareEarthConcentrate.get(OrePrefixes.dust, 1),
- WerkstoffMaterialPool.SamariumOreConcentrate.get(OrePrefixes.dust, 1),
- Materials.HydrofluoricAcid.getFluid(2000),
- null,
- WerkstoffMaterialPool.FluorinatedSamaricConcentrate.get(OrePrefixes.dust, 2),
- null,
- 350,
- 480
- );
+ WerkstoffMaterialPool.SamaricRareEarthConcentrate.get(OrePrefixes.dust, 1),
+ WerkstoffMaterialPool.SamariumOreConcentrate.get(OrePrefixes.dust, 1),
+ Materials.HydrofluoricAcid.getFluid(2000),
+ null,
+ WerkstoffMaterialPool.FluorinatedSamaricConcentrate.get(OrePrefixes.dust, 2),
+ null,
+ 350,
+ 480);
GT_Values.RA.addBlastRecipe(
- WerkstoffMaterialPool.FluorinatedSamaricConcentrate.get(OrePrefixes.dust, 2),
- Materials.Calcium.getDust(1),
- null,
- WerkstoffMaterialPool.CalciumFluoride.getFluidOrGas(3000),
- Materials.Holmium.getDustSmall(1),
- WerkstoffMaterialPool.SamariumTerbiumMixture.get(OrePrefixes.dust, 1),
- 400,
- 1920,
- 1200
- );
+ WerkstoffMaterialPool.FluorinatedSamaricConcentrate.get(OrePrefixes.dust, 2),
+ Materials.Calcium.getDust(1),
+ null,
+ WerkstoffMaterialPool.CalciumFluoride.getFluidOrGas(3000),
+ Materials.Holmium.getDustSmall(1),
+ WerkstoffMaterialPool.SamariumTerbiumMixture.get(OrePrefixes.dust, 1),
+ 400,
+ 1920,
+ 1200);
GT_Values.RA.addChemicalRecipe(
- WerkstoffMaterialPool.SamariumTerbiumMixture.get(OrePrefixes.dust, 1),
- BotWerkstoffMaterialPool.AmmoniumNitrate.get(OrePrefixes.dust, 9),
- null,
- null,
- WerkstoffMaterialPool.NitratedSamariumTerbiumMixture.get(OrePrefixes.dust, 1),
- null,
- 600,
- 480
- );
+ WerkstoffMaterialPool.SamariumTerbiumMixture.get(OrePrefixes.dust, 1),
+ BotWerkstoffMaterialPool.AmmoniumNitrate.get(OrePrefixes.dust, 9),
+ null,
+ null,
+ WerkstoffMaterialPool.NitratedSamariumTerbiumMixture.get(OrePrefixes.dust, 1),
+ null,
+ 600,
+ 480);
GT_Values.RA.addChemicalRecipe(
- WerkstoffMaterialPool.NitratedSamariumTerbiumMixture.get(OrePrefixes.dust, 1),
- Materials.Copper.getDustSmall(1),
- null,
- null,
- WerkstoffMaterialPool.TerbiumNitrate.get(OrePrefixes.dustSmall, 2),
- WerkstoffMaterialPool.SamaricResidue.get(OrePrefixes.dustSmall, 2), // Potentially make only Samarium
- 800,
- 1920
- );
+ WerkstoffMaterialPool.NitratedSamariumTerbiumMixture.get(OrePrefixes.dust, 1),
+ Materials.Copper.getDustSmall(1),
+ null,
+ null,
+ WerkstoffMaterialPool.TerbiumNitrate.get(OrePrefixes.dustSmall, 2),
+ WerkstoffMaterialPool.SamaricResidue.get(OrePrefixes.dustSmall, 2), // Potentially make only Samarium
+ 800,
+ 1920);
GT_Values.RA.addChemicalRecipe(
- WerkstoffMaterialPool.SamariumOreConcentrate.get(OrePrefixes.dust, 2),
- Materials.Calcium.getDust(3),
- null,
- null,
- WerkstoffMaterialPool.DephosphatedSamariumConcentrate.get(OrePrefixes.dust, 1),
- Materials.TricalciumPhosphate.getDust(5),
- 300,
- 1920
- );
+ WerkstoffMaterialPool.SamariumOreConcentrate.get(OrePrefixes.dust, 2),
+ Materials.Calcium.getDust(3),
+ null,
+ null,
+ WerkstoffMaterialPool.DephosphatedSamariumConcentrate.get(OrePrefixes.dust, 1),
+ Materials.TricalciumPhosphate.getDust(5),
+ 300,
+ 1920);
GT_Values.RA.addCentrifugeRecipe(
- WerkstoffMaterialPool.DephosphatedSamariumConcentrate.get(OrePrefixes.dust, 6),
- null,
- null,
- null,
- Materials.Samarium.getDust(1),
- WerkstoffLoader.Thorianit.get(OrePrefixes.dust, 2),
- WerkstoffMaterialPool.Gangue.get(OrePrefixes.dust, 4),
- null,
- null,
- null,
- new int[] {
- 9000, 8000, 10000
- },
- 200,
- 1920
- );
+ WerkstoffMaterialPool.DephosphatedSamariumConcentrate.get(OrePrefixes.dust, 6),
+ null,
+ null,
+ null,
+ Materials.Samarium.getDust(1),
+ WerkstoffLoader.Thorianit.get(OrePrefixes.dust, 2),
+ WerkstoffMaterialPool.Gangue.get(OrePrefixes.dust, 4),
+ null,
+ null,
+ null,
+ new int[] {9000, 8000, 10000},
+ 200,
+ 1920);
}
public static void addRandomChemCrafting() {
- //PTMEG Elastomer
- GT_Values.RA.addChemicalRecipe(
- WerkstoffMaterialPool.Butanediol.get(OrePrefixes.cell, 1),
- null,
- WerkstoffMaterialPool.TolueneTetramethylDiisocyanate.getFluidOrGas(4000),
- WerkstoffMaterialPool.PTMEGElastomer.getMolten(4000),
- Materials.Empty.getCells(1),
- 1500,
- 480
- );
-
- //Toluene Tetramethyl Diisocyanate
- GT_Values.RA.addChemicalRecipe(
- WerkstoffMaterialPool.TolueneDiisocyanate.get(OrePrefixes.cell, 3),
- Materials.Hydrogen.getCells(2),
- WerkstoffMaterialPool.Polytetrahydrofuran.getFluidOrGas(1000),
- WerkstoffMaterialPool.TolueneTetramethylDiisocyanate.getFluidOrGas(2000),
- Materials.Empty.getCells(5),
- 1200,
- 480
- );
-
- //PTHF
- GT_Values.RA.addChemicalRecipe(
- WerkstoffMaterialPool.TungstophosphoricAcid.get(OrePrefixes.cell, 1),
- Materials.Oxygen.getCells(1),
- WerkstoffMaterialPool.Tetrahydrofuran.getFluidOrGas(144),
- WerkstoffMaterialPool.Polytetrahydrofuran.getFluidOrGas(432),
- Materials.Empty.getCells(2),
- 1000,
- 120
- );
-
- //THF
- GT_Values.RA.addChemicalRecipe(
- WerkstoffMaterialPool.AcidicButanediol.get(OrePrefixes.cell, 1),
- null,
- Materials.Ethanol.getFluid(1000),
- WerkstoffMaterialPool.Tetrahydrofuran.getFluidOrGas(1000),
- Materials.Empty.getCells(1),
- 800,
- 480
- );
-
- //Acidicised Butanediol
- GT_Values.RA.addMixerRecipe(
- Materials.SulfuricAcid.getCells(1),
- null,
- null,
- null,
- WerkstoffMaterialPool.Butanediol.getFluidOrGas(1000),
- WerkstoffMaterialPool.AcidicButanediol.getFluidOrGas(1000),
- Materials.Water.getCells(1),
- 600,
- 2000
- );
-
- //Butanediol
- GT_Values.RA.addChemicalRecipe(
- WerkstoffMaterialPool.MoTeOCatalyst.get(OrePrefixes.dustTiny, 1),
- null,
- Materials.Butane.getGas(1000),
- WerkstoffMaterialPool.Butanediol.getFluidOrGas(1000),
- null,
- 900,
- 1920
- );
-
- //Moly-Te-Oxide Catalyst
- GT_Values.RA.addMixerRecipe(
- WerkstoffMaterialPool.MolybdenumIVOxide.get(OrePrefixes.dust, 1),
- WerkstoffMaterialPool.TelluriumIVOxide.get(OrePrefixes.dust, 1),
- null,
- null,
- null,
- null,
- WerkstoffMaterialPool.MoTeOCatalyst.get(OrePrefixes.dust, 2),
- 300,
- 120
- );
-
- //Tungstophosphoric Acid
- GT_Values.RA.addChemicalRecipe(
- Materials.PhosphoricAcid.getCells(1),
- Materials.HydrochloricAcid.getCells(24),
- BotWerkstoffMaterialPool.SodiumTungstate.getFluidOrGas(12000),
- WerkstoffMaterialPool.TungstophosphoricAcid.getFluidOrGas(1000),
- Materials.Salt.getDust(24),
- Materials.Empty.getCells(25),
- 500,
- 1024
- );
-
-
-
- //Toluene Diisocyanate
- GT_Values.RA.addChemicalRecipe(
- WerkstoffMaterialPool.Diaminotoluene.get(OrePrefixes.cell, 1),
- null,
- BotWerkstoffMaterialPool.Phosgene.getFluidOrGas(2000),
- WerkstoffMaterialPool.TolueneDiisocyanate.getFluidOrGas(1000),
- Materials.HydrochloricAcid.getCells(4),
- 900,
- 480
- );
-
- //Diaminotoluene
- GT_Values.RA.addChemicalRecipe(
- Materials.Hydrogen.getCells(4),
- null,
- WerkstoffMaterialPool.Dinitrotoluene.getFluidOrGas(1000),
- WerkstoffMaterialPool.Diaminotoluene.getFluidOrGas(1000),
- Materials.Empty.getCells(4),
- 300,
- 480
- );
-
- //Dinitrotoluene
- GT_Values.RA.addChemicalRecipe(
- Materials.NitricAcid.getCells(2),
- null,
- Materials.Toluene.getFluid(1000),
- WerkstoffMaterialPool.Dinitrotoluene.getFluidOrGas(1000),
- Materials.Empty.getCells(2),
- 900,
- 480
- );
- //Digester Control Block
- GT_Values.RA.addAssemblerRecipe(new ItemStack[]
- {ItemList.Hull_IV.get(1L), ItemList.Super_Tank_EV.get(2L), ItemList.Electric_Motor_IV.get(4L), ItemList.Electric_Pump_IV.get(4L), GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Desh, 4L), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 4L), GT_Utility.getIntegratedCircuit(1)},
- Materials.Polytetrafluoroethylene.getMolten(1440), LanthItemList.DIGESTER, 600, 4096);
-
- //Dissolution Tank
- GT_Values.RA.addAssemblerRecipe(new ItemStack[]
- {ItemList.Hull_EV.get(1L), ItemList.Super_Tank_HV.get(2L), ItemList.Electric_Motor_EV.get(4L), ItemList.Electric_Pump_EV.get(2L), GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.VibrantAlloy, 4L), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 4L), GT_Utility.getIntegratedCircuit(2)},
- Materials.Polytetrafluoroethylene.getMolten(720), LanthItemList.DISSOLUTION_TANK, 400, 960);
-
-
- GT_Values.RA.addMixerRecipe(
- Materials.Nichrome.getDust(4),
- Materials.Aluminium.getDust(2),
- WerkstoffMaterialPool.Hafnium.get(OrePrefixes.dust, 1),
- Materials.Tantalum.getDust(2),
- Materials.Tungsten.getDust(5),
- WerkstoffMaterialPool.Zirconium.get(OrePrefixes.dust, 1),
- Materials.Titanium.getDust(1),
- null,
- null,
- null,
- null,
- WerkstoffMaterialPool.MARM247.get(OrePrefixes.dust, 16),
- null,
- null,
- null,
- 800,
- 7680
- );
-
- GT_Values.RA.addFluidHeaterRecipe(
- null,
- WerkstoffMaterialPool.DilutedAcetone.getFluidOrGas(250),
- Materials.Acetone.getFluid(150),
- 120,
- 120
- );
-
- // PTMEG Manipulation
-
- GT_Values.RA.addFluidSolidifierRecipe(
- ItemList.Shape_Mold_Ingot.get(0L),
- WerkstoffMaterialPool.PTMEGElastomer.getMolten(144),
- WerkstoffMaterialPool.PTMEGElastomer.get(OrePrefixes.ingot, 1),
- 40,
- 64
- );
-
- GT_Values.RA.addFluidSolidifierRecipe(
- ItemList.Shape_Mold_Plate.get(0L),
- WerkstoffMaterialPool.PTMEGElastomer.getMolten(144),
- WerkstoffMaterialPool.PTMEGElastomer.get(OrePrefixes.plate, 1),
- 40,
- 64
- );
-
- }
-
- //public static void loadZylon
-
- public static void removeCeriumSources() {
-
- GT_Log.out.print(Tags.MODID + ": AAAAAA");
-
- HashSet<GT_Recipe> remove = new HashSet<>(5000);
+ // PTMEG Elastomer
+ GT_Values.RA.addChemicalRecipe(
+ WerkstoffMaterialPool.Butanediol.get(OrePrefixes.cell, 1),
+ null,
+ WerkstoffMaterialPool.TolueneTetramethylDiisocyanate.getFluidOrGas(4000),
+ WerkstoffMaterialPool.PTMEGElastomer.getMolten(4000),
+ Materials.Empty.getCells(1),
+ 1500,
+ 480);
+
+ // Toluene Tetramethyl Diisocyanate
+ GT_Values.RA.addChemicalRecipe(
+ WerkstoffMaterialPool.TolueneDiisocyanate.get(OrePrefixes.cell, 3),
+ Materials.Hydrogen.getCells(2),
+ WerkstoffMaterialPool.Polytetrahydrofuran.getFluidOrGas(1000),
+ WerkstoffMaterialPool.TolueneTetramethylDiisocyanate.getFluidOrGas(2000),
+ Materials.Empty.getCells(5),
+ 1200,
+ 480);
+
+ // PTHF
+ GT_Values.RA.addChemicalRecipe(
+ WerkstoffMaterialPool.TungstophosphoricAcid.get(OrePrefixes.cell, 1),
+ Materials.Oxygen.getCells(1),
+ WerkstoffMaterialPool.Tetrahydrofuran.getFluidOrGas(144),
+ WerkstoffMaterialPool.Polytetrahydrofuran.getFluidOrGas(432),
+ Materials.Empty.getCells(2),
+ 1000,
+ 120);
+
+ // THF
+ GT_Values.RA.addChemicalRecipe(
+ WerkstoffMaterialPool.AcidicButanediol.get(OrePrefixes.cell, 1),
+ null,
+ Materials.Ethanol.getFluid(1000),
+ WerkstoffMaterialPool.Tetrahydrofuran.getFluidOrGas(1000),
+ Materials.Empty.getCells(1),
+ 800,
+ 480);
+
+ // Acidicised Butanediol
+ GT_Values.RA.addMixerRecipe(
+ Materials.SulfuricAcid.getCells(1),
+ null,
+ null,
+ null,
+ WerkstoffMaterialPool.Butanediol.getFluidOrGas(1000),
+ WerkstoffMaterialPool.AcidicButanediol.getFluidOrGas(1000),
+ Materials.Water.getCells(1),
+ 600,
+ 2000);
+
+ // Butanediol
+ GT_Values.RA.addChemicalRecipe(
+ WerkstoffMaterialPool.MoTeOCatalyst.get(OrePrefixes.dustTiny, 1),
+ null,
+ Materials.Butane.getGas(1000),
+ WerkstoffMaterialPool.Butanediol.getFluidOrGas(1000),
+ null,
+ 900,
+ 1920);
+
+ // Moly-Te-Oxide Catalyst
+ GT_Values.RA.addMixerRecipe(
+ WerkstoffMaterialPool.MolybdenumIVOxide.get(OrePrefixes.dust, 1),
+ WerkstoffMaterialPool.TelluriumIVOxide.get(OrePrefixes.dust, 1),
+ null,
+ null,
+ null,
+ null,
+ WerkstoffMaterialPool.MoTeOCatalyst.get(OrePrefixes.dust, 2),
+ 300,
+ 120);
+
+ // Tungstophosphoric Acid
+ GT_Values.RA.addChemicalRecipe(
+ Materials.PhosphoricAcid.getCells(1),
+ Materials.HydrochloricAcid.getCells(24),
+ BotWerkstoffMaterialPool.SodiumTungstate.getFluidOrGas(12000),
+ WerkstoffMaterialPool.TungstophosphoricAcid.getFluidOrGas(1000),
+ Materials.Salt.getDust(24),
+ Materials.Empty.getCells(25),
+ 500,
+ 1024);
+
+ // Toluene Diisocyanate
+ GT_Values.RA.addChemicalRecipe(
+ WerkstoffMaterialPool.Diaminotoluene.get(OrePrefixes.cell, 1),
+ null,
+ BotWerkstoffMaterialPool.Phosgene.getFluidOrGas(2000),
+ WerkstoffMaterialPool.TolueneDiisocyanate.getFluidOrGas(1000),
+ Materials.HydrochloricAcid.getCells(4),
+ 900,
+ 480);
+
+ // Diaminotoluene
+ GT_Values.RA.addChemicalRecipe(
+ Materials.Hydrogen.getCells(4),
+ null,
+ WerkstoffMaterialPool.Dinitrotoluene.getFluidOrGas(1000),
+ WerkstoffMaterialPool.Diaminotoluene.getFluidOrGas(1000),
+ Materials.Empty.getCells(4),
+ 300,
+ 480);
+
+ // Dinitrotoluene
+ GT_Values.RA.addChemicalRecipe(
+ Materials.NitricAcid.getCells(2),
+ null,
+ Materials.Toluene.getFluid(1000),
+ WerkstoffMaterialPool.Dinitrotoluene.getFluidOrGas(1000),
+ Materials.Empty.getCells(2),
+ 900,
+ 480);
+ // Digester Control Block
+ GT_Values.RA.addAssemblerRecipe(
+ new ItemStack[] {
+ ItemList.Hull_IV.get(1L),
+ ItemList.Super_Tank_EV.get(2L),
+ ItemList.Electric_Motor_IV.get(4L),
+ ItemList.Electric_Pump_IV.get(4L),
+ GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Desh, 4L),
+ GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 4L),
+ GT_Utility.getIntegratedCircuit(1)
+ },
+ Materials.Polytetrafluoroethylene.getMolten(1440),
+ LanthItemList.DIGESTER,
+ 600,
+ 4096);
+
+ // Dissolution Tank
+ GT_Values.RA.addAssemblerRecipe(
+ new ItemStack[] {
+ ItemList.Hull_EV.get(1L),
+ ItemList.Super_Tank_HV.get(2L),
+ ItemList.Electric_Motor_EV.get(4L),
+ ItemList.Electric_Pump_EV.get(2L),
+ GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.VibrantAlloy, 4L),
+ GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 4L),
+ GT_Utility.getIntegratedCircuit(2)
+ },
+ Materials.Polytetrafluoroethylene.getMolten(720),
+ LanthItemList.DISSOLUTION_TANK,
+ 400,
+ 960);
+
+ GT_Values.RA.addMixerRecipe(
+ Materials.Nichrome.getDust(4),
+ Materials.Aluminium.getDust(2),
+ WerkstoffMaterialPool.Hafnium.get(OrePrefixes.dust, 1),
+ Materials.Tantalum.getDust(2),
+ Materials.Tungsten.getDust(5),
+ WerkstoffMaterialPool.Zirconium.get(OrePrefixes.dust, 1),
+ Materials.Titanium.getDust(1),
+ null,
+ null,
+ null,
+ null,
+ WerkstoffMaterialPool.MARM247.get(OrePrefixes.dust, 16),
+ null,
+ null,
+ null,
+ 800,
+ 7680);
+
+ GT_Values.RA.addFluidHeaterRecipe(
+ null,
+ WerkstoffMaterialPool.DilutedAcetone.getFluidOrGas(250),
+ Materials.Acetone.getFluid(150),
+ 120,
+ 120);
+
+ // PTMEG Manipulation
+
+ GT_Values.RA.addFluidSolidifierRecipe(
+ ItemList.Shape_Mold_Ingot.get(0L),
+ WerkstoffMaterialPool.PTMEGElastomer.getMolten(144),
+ WerkstoffMaterialPool.PTMEGElastomer.get(OrePrefixes.ingot, 1),
+ 40,
+ 64);
+
+ GT_Values.RA.addFluidSolidifierRecipe(
+ ItemList.Shape_Mold_Plate.get(0L),
+ WerkstoffMaterialPool.PTMEGElastomer.getMolten(144),
+ WerkstoffMaterialPool.PTMEGElastomer.get(OrePrefixes.plate, 1),
+ 40,
+ 64);
+ }
+
+ // public static void loadZylon
+
+ public static void removeCeriumSources() {
+
+ GT_Log.out.print(Tags.MODID + ": AAAAAA");
+
+ HashSet<GT_Recipe> remove = new HashSet<>(5000);
HashSet<GT_Recipe> reAdd = new HashSet<>(5000);
- //For Crusher
+ // For Crusher
for (GT_Recipe recipe : GT_Recipe.GT_Recipe_Map.sMaceratorRecipes.mRecipeList) {
ItemStack input = recipe.mInputs[0];
- //GT_Log.out.print("\n" + input.getDisplayName());
+ // GT_Log.out.print("\n" + input.getDisplayName());
if (GT_Utility.isStackValid(input)) {
int[] oreDict = OreDictionary.getOreIDs(input);
for (int oreDictID : oreDict) {
- if ((OreDictionary.getOreName(oreDictID).startsWith("ore") || OreDictionary.getOreName(oreDictID).startsWith("crushed")) /*&& OreDictionary.getOreName(oreDictID).contains("Cerium")*/) {
- GT_Log.out.print(OreDictionary.getOreName(oreDictID));
+ if ((OreDictionary.getOreName(oreDictID).startsWith("ore")
+ || OreDictionary.getOreName(oreDictID)
+ .startsWith(
+ "crushed")) /*&& OreDictionary.getOreName(oreDictID).contains("Cerium")*/) {
+ GT_Log.out.print(OreDictionary.getOreName(oreDictID));
GT_Recipe tRecipe = recipe.copy();
for (int i = 0; i < tRecipe.mOutputs.length; i++) {
if (!GT_Utility.isStackValid(tRecipe.mOutputs[i])) continue;
if (tRecipe.mOutputs[i].isItemEqual(Materials.Cerium.getDust(1))) {
- tRecipe.mOutputs[i] = GT_Utility.copyAmount(tRecipe.mOutputs[i].stackSize * 2, WerkstoffMaterialPool.CeriumRichMixture.get(OrePrefixes.dust, 1));
- }
- else if (tRecipe.mOutputs[i].isItemEqual(Materials.Samarium.getDust(1)) ) {
- tRecipe.mOutputs[i] = GT_Utility.copyAmount(tRecipe.mOutputs[i].stackSize * 2, WerkstoffMaterialPool.SamariumOreConcentrate.get(OrePrefixes.dust, 1));
- }
- else if (tRecipe.mOutputs[i].isItemEqual(Materials.Lanthanum.getDust(1)) ) {
- tRecipe.mOutputs[i] = null;
+ tRecipe.mOutputs[i] = GT_Utility.copyAmount(
+ tRecipe.mOutputs[i].stackSize * 2,
+ WerkstoffMaterialPool.CeriumRichMixture.get(OrePrefixes.dust, 1));
+ } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Samarium.getDust(1))) {
+ tRecipe.mOutputs[i] = GT_Utility.copyAmount(
+ tRecipe.mOutputs[i].stackSize * 2,
+ WerkstoffMaterialPool.SamariumOreConcentrate.get(OrePrefixes.dust, 1));
+ } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Lanthanum.getDust(1))) {
+ tRecipe.mOutputs[i] = null;
}
}
- if (!tRecipe.equals(recipe)){
+ if (!tRecipe.equals(recipe)) {
reAdd.add(tRecipe);
remove.add(recipe);
}
@@ -1328,27 +1194,30 @@ public class RecipeLoader {
GT_Log.out.print("Crusher done!\n");
- //For Washer
+ // For Washer
for (GT_Recipe recipe : GT_Recipe.GT_Recipe_Map.sOreWasherRecipes.mRecipeList) {
ItemStack input = recipe.mInputs[0];
if (GT_Utility.isStackValid(input)) {
int[] oreDict = OreDictionary.getOreIDs(input);
for (int oreDictID : oreDict) {
- if (OreDictionary.getOreName(oreDictID).startsWith("crushed") /*&& OreDictionary.getOreName(oreDictID).contains("Cerium")*/) {
+ if (OreDictionary.getOreName(oreDictID)
+ .startsWith("crushed") /*&& OreDictionary.getOreName(oreDictID).contains("Cerium")*/) {
GT_Recipe tRecipe = recipe.copy();
- for (int i = 0; i < tRecipe.mOutputs.length; i ++) {
+ for (int i = 0; i < tRecipe.mOutputs.length; i++) {
if (!GT_Utility.isStackValid(tRecipe.mOutputs[i])) continue;
if (tRecipe.mOutputs[i].isItemEqual(Materials.Cerium.getDust(1))) {
- tRecipe.mOutputs[i] = GT_Utility.copyAmount(tRecipe.mOutputs[i].stackSize * 2, WerkstoffMaterialPool.CeriumRichMixture.get(OrePrefixes.dust, 1));
- }
- else if (tRecipe.mOutputs[i].isItemEqual(Materials.Samarium.getDust(1)) ) {
- tRecipe.mOutputs[i] = GT_Utility.copyAmount(tRecipe.mOutputs[i].stackSize * 2, WerkstoffMaterialPool.SamariumOreConcentrate.get(OrePrefixes.dust, 1));
- }
- else if (tRecipe.mOutputs[i].isItemEqual(Materials.Lanthanum.getDust(1)) ) {
- tRecipe.mOutputs[i] = null;
+ tRecipe.mOutputs[i] = GT_Utility.copyAmount(
+ tRecipe.mOutputs[i].stackSize * 2,
+ WerkstoffMaterialPool.CeriumRichMixture.get(OrePrefixes.dust, 1));
+ } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Samarium.getDust(1))) {
+ tRecipe.mOutputs[i] = GT_Utility.copyAmount(
+ tRecipe.mOutputs[i].stackSize * 2,
+ WerkstoffMaterialPool.SamariumOreConcentrate.get(OrePrefixes.dust, 1));
+ } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Lanthanum.getDust(1))) {
+ tRecipe.mOutputs[i] = null;
}
}
- if (!tRecipe.equals(recipe)){
+ if (!tRecipe.equals(recipe)) {
reAdd.add(tRecipe);
remove.add(recipe);
}
@@ -1368,27 +1237,32 @@ public class RecipeLoader {
GT_Log.out.print("Washer done!\n");
- //For Thermal Centrifuge
+ // For Thermal Centrifuge
for (GT_Recipe recipe : GT_Recipe.GT_Recipe_Map.sThermalCentrifugeRecipes.mRecipeList) {
ItemStack input = recipe.mInputs[0];
if (GT_Utility.isStackValid(input)) {
int[] oreDict = OreDictionary.getOreIDs(input);
for (int oreDictID : oreDict) {
- if ((OreDictionary.getOreName(oreDictID).startsWith("crushed") || OreDictionary.getOreName(oreDictID).startsWith("purified")) /*&& OreDictionary.getOreName(oreDictID).contains("Cerium")*/) {
+ if ((OreDictionary.getOreName(oreDictID).startsWith("crushed")
+ || OreDictionary.getOreName(oreDictID)
+ .startsWith(
+ "purified")) /*&& OreDictionary.getOreName(oreDictID).contains("Cerium")*/) {
GT_Recipe tRecipe = recipe.copy();
- for (int i = 0; i < tRecipe.mOutputs.length; i ++) {
+ for (int i = 0; i < tRecipe.mOutputs.length; i++) {
if (!GT_Utility.isStackValid(tRecipe.mOutputs[i])) continue;
if (tRecipe.mOutputs[i].isItemEqual(Materials.Cerium.getDust(1))) {
- tRecipe.mOutputs[i] = GT_Utility.copyAmount(tRecipe.mOutputs[i].stackSize * 2, WerkstoffMaterialPool.CeriumRichMixture.get(OrePrefixes.dust, 1));
- }
- else if (tRecipe.mOutputs[i].isItemEqual(Materials.Samarium.getDust(1)) ) {
- tRecipe.mOutputs[i] = GT_Utility.copyAmount(tRecipe.mOutputs[i].stackSize * 2, WerkstoffMaterialPool.SamariumOreConcentrate.get(OrePrefixes.dust, 1));
- }
- else if (tRecipe.mOutputs[i].isItemEqual(Materials.Lanthanum.getDust(1)) ) {
- tRecipe.mOutputs[i] = null;
+ tRecipe.mOutputs[i] = GT_Utility.copyAmount(
+ tRecipe.mOutputs[i].stackSize * 2,
+ WerkstoffMaterialPool.CeriumRichMixture.get(OrePrefixes.dust, 1));
+ } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Samarium.getDust(1))) {
+ tRecipe.mOutputs[i] = GT_Utility.copyAmount(
+ tRecipe.mOutputs[i].stackSize * 2,
+ WerkstoffMaterialPool.SamariumOreConcentrate.get(OrePrefixes.dust, 1));
+ } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Lanthanum.getDust(1))) {
+ tRecipe.mOutputs[i] = null;
}
}
- if (!tRecipe.equals(recipe)){
+ if (!tRecipe.equals(recipe)) {
reAdd.add(tRecipe);
remove.add(recipe);
}
@@ -1408,7 +1282,7 @@ public class RecipeLoader {
GT_Log.out.print("Thermal Centrifuge done!\n");
- //For Centrifuge
+ // For Centrifuge
for (GT_Recipe recipe : GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.mRecipeList) {
ItemStack input = null;
FluidStack fluidInput = null;
@@ -1417,28 +1291,40 @@ public class RecipeLoader {
if (GT_Utility.isStackValid(input)) {
int[] oreDict = OreDictionary.getOreIDs(input);
for (int oreDictID : oreDict) {
- if (OreDictionary.getOreName(oreDictID).startsWith("dust") && (!OreDictionary.getOreName(oreDictID).contains("Dephosphated")) /*OreDictionary.getOreName(oreDictID).startsWith("dustPureCerium") || OreDictionary.getOreName(oreDictID).startsWith("dustImpureCerium") || OreDictionary.getOreName(oreDictID).startsWith("dustSpace") || OreDictionary.getOreName(oreDictID).startsWith("dustCerium")*/) {
+ if (OreDictionary.getOreName(oreDictID).startsWith("dust")
+ && (!OreDictionary.getOreName(oreDictID)
+ .contains(
+ "Dephosphated")) /*OreDictionary.getOreName(oreDictID).startsWith("dustPureCerium") || OreDictionary.getOreName(oreDictID).startsWith("dustImpureCerium") || OreDictionary.getOreName(oreDictID).startsWith("dustSpace") || OreDictionary.getOreName(oreDictID).startsWith("dustCerium")*/) {
GT_Recipe tRecipe = recipe.copy();
- for (int i = 0; i < tRecipe.mOutputs.length; i ++) {
+ for (int i = 0; i < tRecipe.mOutputs.length; i++) {
if (!GT_Utility.isStackValid(tRecipe.mOutputs[i])) continue;
if (tRecipe.mOutputs[i].isItemEqual(Materials.Cerium.getDustTiny(1))) {
- tRecipe.mOutputs[i] = GT_Utility.copyAmount(tRecipe.mOutputs[i].stackSize * 2, WerkstoffMaterialPool.CeriumRichMixture.get(OrePrefixes.dustTiny, 1));
+ tRecipe.mOutputs[i] = GT_Utility.copyAmount(
+ tRecipe.mOutputs[i].stackSize * 2,
+ WerkstoffMaterialPool.CeriumRichMixture.get(OrePrefixes.dustTiny, 1));
} else if (tRecipe.mOutputs[i].isItemEqual(Materials.Cerium.getDust(1))) {
- tRecipe.mOutputs[i] = GT_Utility.copyAmount(tRecipe.mOutputs[i].stackSize * 2, WerkstoffMaterialPool.CeriumRichMixture.get(OrePrefixes.dust, 1));
+ tRecipe.mOutputs[i] = GT_Utility.copyAmount(
+ tRecipe.mOutputs[i].stackSize * 2,
+ WerkstoffMaterialPool.CeriumRichMixture.get(OrePrefixes.dust, 1));
} else if (tRecipe.mOutputs[i].isItemEqual(Materials.Cerium.getDustSmall(1))) {
- tRecipe.mOutputs[i] = GT_Utility.copyAmount(tRecipe.mOutputs[i].stackSize * 2, WerkstoffMaterialPool.CeriumRichMixture.get(OrePrefixes.dustSmall, 1));
- }
- else if (tRecipe.mOutputs[i].isItemEqual(Materials.Samarium.getDustTiny(1)) ) {
- tRecipe.mOutputs[i] = GT_Utility.copyAmount(tRecipe.mOutputs[i].stackSize * 2, WerkstoffMaterialPool.SamariumOreConcentrate.get(OrePrefixes.dustTiny, 1));
- }
- else if (tRecipe.mOutputs[i].isItemEqual(Materials.Samarium.getDust(1)) ) {
- tRecipe.mOutputs[i] = GT_Utility.copyAmount(tRecipe.mOutputs[i].stackSize * 2, WerkstoffMaterialPool.SamariumOreConcentrate.get(OrePrefixes.dust, 1));
- }
- else if (tRecipe.mOutputs[i].isItemEqual(Materials.Samarium.getDustSmall(1)) ) {
- tRecipe.mOutputs[i] = GT_Utility.copyAmount(tRecipe.mOutputs[i].stackSize * 2, WerkstoffMaterialPool.SamariumOreConcentrate.get(OrePrefixes.dustSmall, 1));
+ tRecipe.mOutputs[i] = GT_Utility.copyAmount(
+ tRecipe.mOutputs[i].stackSize * 2,
+ WerkstoffMaterialPool.CeriumRichMixture.get(OrePrefixes.dustSmall, 1));
+ } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Samarium.getDustTiny(1))) {
+ tRecipe.mOutputs[i] = GT_Utility.copyAmount(
+ tRecipe.mOutputs[i].stackSize * 2,
+ WerkstoffMaterialPool.SamariumOreConcentrate.get(OrePrefixes.dustTiny, 1));
+ } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Samarium.getDust(1))) {
+ tRecipe.mOutputs[i] = GT_Utility.copyAmount(
+ tRecipe.mOutputs[i].stackSize * 2,
+ WerkstoffMaterialPool.SamariumOreConcentrate.get(OrePrefixes.dust, 1));
+ } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Samarium.getDustSmall(1))) {
+ tRecipe.mOutputs[i] = GT_Utility.copyAmount(
+ tRecipe.mOutputs[i].stackSize * 2,
+ WerkstoffMaterialPool.SamariumOreConcentrate.get(OrePrefixes.dustSmall, 1));
}
}
- if (!tRecipe.equals(recipe)){
+ if (!tRecipe.equals(recipe)) {
reAdd.add(tRecipe);
remove.add(recipe);
}
@@ -1468,24 +1354,28 @@ public class RecipeLoader {
GT_Log.out.print("Centrifuge done!\n");
- //For Hammer
+ // For Hammer
for (GT_Recipe recipe : GT_Recipe.GT_Recipe_Map.sHammerRecipes.mRecipeList) {
ItemStack input = recipe.mInputs[0];
if (GT_Utility.isStackValid(input)) {
int[] oreDict = OreDictionary.getOreIDs(input);
for (int oreDictID : oreDict) {
- if (OreDictionary.getOreName(oreDictID).startsWith("crushed") /*&& OreDictionary.getOreName(oreDictID).contains("Cerium")*/) {
+ if (OreDictionary.getOreName(oreDictID)
+ .startsWith("crushed") /*&& OreDictionary.getOreName(oreDictID).contains("Cerium")*/) {
GT_Recipe tRecipe = recipe.copy();
- for (int i = 0; i < tRecipe.mOutputs.length; i ++) {
+ for (int i = 0; i < tRecipe.mOutputs.length; i++) {
if (!GT_Utility.isStackValid(tRecipe.mOutputs[i])) continue;
if (tRecipe.mOutputs[i].isItemEqual(Materials.Cerium.getDust(1))) {
- tRecipe.mOutputs[i] = GT_Utility.copyAmount(tRecipe.mOutputs[i].stackSize * 2, WerkstoffMaterialPool.CeriumRichMixture.get(OrePrefixes.dust, 1));
- }
- else if (tRecipe.mOutputs[i].isItemEqual(Materials.Samarium.getDust(1)) ) {
- tRecipe.mOutputs[i] = GT_Utility.copyAmount(tRecipe.mOutputs[i].stackSize * 2, WerkstoffMaterialPool.SamariumOreConcentrate.get(OrePrefixes.dust, 1));
+ tRecipe.mOutputs[i] = GT_Utility.copyAmount(
+ tRecipe.mOutputs[i].stackSize * 2,
+ WerkstoffMaterialPool.CeriumRichMixture.get(OrePrefixes.dust, 1));
+ } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Samarium.getDust(1))) {
+ tRecipe.mOutputs[i] = GT_Utility.copyAmount(
+ tRecipe.mOutputs[i].stackSize * 2,
+ WerkstoffMaterialPool.SamariumOreConcentrate.get(OrePrefixes.dust, 1));
}
}
- if (!tRecipe.equals(recipe)){
+ if (!tRecipe.equals(recipe)) {
reAdd.add(tRecipe);
remove.add(recipe);
}
@@ -1505,35 +1395,39 @@ public class RecipeLoader {
GT_Log.out.print("Hammer done!\n");
- //Electrolyzer
+ // Electrolyzer
for (GT_Recipe recipe : GT_Recipe.GT_Recipe_Map.sElectrolyzerRecipes.mRecipeList) {
- //ItemStack input = recipe.mInputs[0];
- for (ItemStack input : recipe.mInputs) {
- GT_Log.out.print(input.getDisplayName() + "\n");
- if (GT_Utility.isStackValid(input)) {
- if (input.getDisplayName().startsWith("Hibonite") || input.getDisplayName().startsWith("Lanthanite") || input.getDisplayName().startsWith("Zirconolite") || input.getDisplayName().startsWith("Yttrocerite") || input.getDisplayName().startsWith("Xenotime")) {
- GT_Recipe tRecipe = recipe.copy();
- for (int i = 0; i < tRecipe.mOutputs.length; i ++) {
- if (!GT_Utility.isStackValid(tRecipe.mOutputs[i])) continue;
- if (tRecipe.mOutputs[i].isItemEqual(Materials.Cerium.getDust(1))) {
- tRecipe.mOutputs[i] = GT_Utility.copyAmount(tRecipe.mOutputs[i].stackSize, WerkstoffMaterialPool.CeriumRichMixture.get(OrePrefixes.dust, 1));
- }
- else if (tRecipe.mOutputs[i].isItemEqual(WerkstoffMaterialPool.Zirconium.get(OrePrefixes.dust, 1))) { //TODO: Does not work and I have zero clue why
- tRecipe.mOutputs[i] = null;
- }
- else if (tRecipe.mOutputs[i].isItemEqual(Materials.Samarium.getDust(1)) ) {
- tRecipe.mOutputs[i] = null;
+ // ItemStack input = recipe.mInputs[0];
+ for (ItemStack input : recipe.mInputs) {
+ GT_Log.out.print(input.getDisplayName() + "\n");
+ if (GT_Utility.isStackValid(input)) {
+ if (input.getDisplayName().startsWith("Hibonite")
+ || input.getDisplayName().startsWith("Lanthanite")
+ || input.getDisplayName().startsWith("Zirconolite")
+ || input.getDisplayName().startsWith("Yttrocerite")
+ || input.getDisplayName().startsWith("Xenotime")) {
+ GT_Recipe tRecipe = recipe.copy();
+ for (int i = 0; i < tRecipe.mOutputs.length; i++) {
+ if (!GT_Utility.isStackValid(tRecipe.mOutputs[i])) continue;
+ if (tRecipe.mOutputs[i].isItemEqual(Materials.Cerium.getDust(1))) {
+ tRecipe.mOutputs[i] = GT_Utility.copyAmount(
+ tRecipe.mOutputs[i].stackSize,
+ WerkstoffMaterialPool.CeriumRichMixture.get(OrePrefixes.dust, 1));
+ } else if (tRecipe.mOutputs[i].isItemEqual(WerkstoffMaterialPool.Zirconium.get(
+ OrePrefixes.dust, 1))) { // TODO: Does not work and I have zero clue why
+ tRecipe.mOutputs[i] = null;
+ } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Samarium.getDust(1))) {
+ tRecipe.mOutputs[i] = null;
}
-
- }
- if (!tRecipe.equals(recipe)){
- reAdd.add(tRecipe);
- remove.add(recipe);
- }
- break;
- }
- }
- }
+ }
+ if (!tRecipe.equals(recipe)) {
+ reAdd.add(tRecipe);
+ remove.add(recipe);
+ }
+ break;
+ }
+ }
+ }
}
GT_Recipe.GT_Recipe_Map.sElectrolyzerRecipes.mRecipeList.removeAll(remove);
@@ -1630,50 +1524,50 @@ public class RecipeLoader {
}
*/
-
/* DOES NOT WORK, something to do with load times for sifter recipes or some shit
- //Sifter
- for (GT_Recipe recipe : GT_Recipe.GT_Recipe_Map.sSifterRecipes.mRecipeList) {
- if (recipe.mInputs.length == 0)
- break;
- ItemStack input = recipe.mInputs[0];
- GT_Log.out.print("Sift ore found " + input.getDisplayName() + "\n");
- if (GT_Utility.isStackValid(input)) {
- if (true) {
- GT_Log.out.print("Sift ore found and iffed " + input.getDisplayName() + "\n");
- //GT_Recipe tRecipe = recipe.copy();
- remove.add(recipe);
- break;
- }
- }
-
- }
-
- GT_Recipe.GT_Recipe_Map.sSifterRecipes.mRecipeList.removeAll(remove);
- GT_Recipe.GT_Recipe_Map.sSifterRecipes.mRecipeList.addAll(reAdd);
- GT_Recipe.GT_Recipe_Map.sSifterRecipes.reInit();
-
- GT_Log.out.print(Tags.MODID + ": Replace " + remove.size() + "! ");
-
- remove.clear();
- reAdd.clear();
-
- GT_Log.out.print("Sifter done!\n");
- */
- //Chemical Bath
+ //Sifter
+ for (GT_Recipe recipe : GT_Recipe.GT_Recipe_Map.sSifterRecipes.mRecipeList) {
+ if (recipe.mInputs.length == 0)
+ break;
+ ItemStack input = recipe.mInputs[0];
+ GT_Log.out.print("Sift ore found " + input.getDisplayName() + "\n");
+ if (GT_Utility.isStackValid(input)) {
+ if (true) {
+ GT_Log.out.print("Sift ore found and iffed " + input.getDisplayName() + "\n");
+ //GT_Recipe tRecipe = recipe.copy();
+ remove.add(recipe);
+ break;
+ }
+ }
+
+ }
+
+ GT_Recipe.GT_Recipe_Map.sSifterRecipes.mRecipeList.removeAll(remove);
+ GT_Recipe.GT_Recipe_Map.sSifterRecipes.mRecipeList.addAll(reAdd);
+ GT_Recipe.GT_Recipe_Map.sSifterRecipes.reInit();
+
+ GT_Log.out.print(Tags.MODID + ": Replace " + remove.size() + "! ");
+
+ remove.clear();
+ reAdd.clear();
+
+ GT_Log.out.print("Sifter done!\n");
+ */
+ // Chemical Bath
for (GT_Recipe recipe : GT_Recipe.GT_Recipe_Map.sChemicalBathRecipes.mRecipeList) {
- //ItemStack input = recipe.mInputs[0];
- for (ItemStack input : recipe.mInputs) {
- GT_Log.out.print(input.getDisplayName() + "\n");
- if (GT_Utility.isStackValid(input)) {
- if (input.getDisplayName().contains("Tin Dust") || input.getDisplayName().contains("Rutile Dust")) {
-
- GT_Recipe tRecipe = recipe.copy();
- remove.add(recipe);
- break;
- }
- }
- }
+ // ItemStack input = recipe.mInputs[0];
+ for (ItemStack input : recipe.mInputs) {
+ GT_Log.out.print(input.getDisplayName() + "\n");
+ if (GT_Utility.isStackValid(input)) {
+ if (input.getDisplayName().contains("Tin Dust")
+ || input.getDisplayName().contains("Rutile Dust")) {
+
+ GT_Recipe tRecipe = recipe.copy();
+ remove.add(recipe);
+ break;
+ }
+ }
+ }
}
GT_Recipe.GT_Recipe_Map.sChemicalBathRecipes.mRecipeList.removeAll(remove);
@@ -1687,21 +1581,21 @@ public class RecipeLoader {
GT_Log.out.print("Chemical Bath done!\n");
- //For ByProduct List
+ // For ByProduct List
for (GT_Recipe recipe : GT_Recipe.GT_Recipe_Map.sByProductList.mRecipeList) {
ItemStack input = recipe.mInputs[0];
if (GT_Utility.isStackValid(input)) {
int[] oreDict = OreDictionary.getOreIDs(input);
for (int oreDictID : oreDict) {
- if (OreDictionary.getOreName(oreDictID).startsWith("ore") && OreDictionary.getOreName(oreDictID).contains("Cerium")) {
+ if (OreDictionary.getOreName(oreDictID).startsWith("ore")
+ && OreDictionary.getOreName(oreDictID).contains("Cerium")) {
GT_Recipe tRecipe = recipe.copy();
- for (int i = 0; i < tRecipe.mOutputs.length; i ++) {
+ for (int i = 0; i < tRecipe.mOutputs.length; i++) {
if (!GT_Utility.isStackValid(tRecipe.mOutputs[i])) continue;
if (tRecipe.mOutputs[i].isItemEqual(Materials.Cerium.getDust(1))) {
remove.add(tRecipe);
- }
- else if (tRecipe.mOutputs[i].isItemEqual(Materials.Samarium.getDust(1)) ) {
- remove.add(tRecipe);
+ } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Samarium.getDust(1))) {
+ remove.add(tRecipe);
}
}
break;
@@ -1721,6 +1615,3 @@ public class RecipeLoader {
GT_Log.out.print("ByProduct List done!\n");
}
}
-
-
-
diff --git a/src/main/java/com/elisis/gtnhlanth/loader/ZPMRubberChanges.java b/src/main/java/com/elisis/gtnhlanth/loader/ZPMRubberChanges.java
index 7ebb17c935..ff9f58862e 100644
--- a/src/main/java/com/elisis/gtnhlanth/loader/ZPMRubberChanges.java
+++ b/src/main/java/com/elisis/gtnhlanth/loader/ZPMRubberChanges.java
@@ -2,24 +2,10 @@ package com.elisis.gtnhlanth.loader;
import static gregtech.api.enums.OrePrefixes.*;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.function.Consumer;
-import java.util.function.Predicate;
-
-import org.apache.commons.lang3.reflect.FieldUtils;
-import org.apache.commons.lang3.reflect.MethodUtils;
-
import com.elisis.gtnhlanth.common.register.WerkstoffMaterialPool;
import com.github.bartimaeusnek.bartworks.API.LoaderReference;
import com.github.bartimaeusnek.bartworks.system.material.Werkstoff;
import com.github.bartimaeusnek.bartworks.util.BW_Util;
-
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
@@ -32,53 +18,62 @@ import gregtech.api.util.GT_Recipe.GT_Recipe_AssemblyLine;
import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
import gregtech.api.util.GT_Shaped_Recipe;
import gregtech.api.util.GT_Utility;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.CraftingManager;
import net.minecraft.item.crafting.IRecipe;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
+import org.apache.commons.lang3.reflect.FieldUtils;
+import org.apache.commons.lang3.reflect.MethodUtils;
public class ZPMRubberChanges implements Runnable {
-
- @SuppressWarnings("unchecked")
- public void run() {
-
- List<IRecipe> bufferedRecipeList = null;
-
- try {
- bufferedRecipeList = (List<IRecipe>) FieldUtils.getDeclaredField(GT_ModHandler.class, "sBufferRecipeList", true).get(null);
- } catch (IllegalAccessException e) {
- e.printStackTrace();
- }
-
- HashSet<ItemStack> ZPMPlusComponents = new HashSet<>();
- OrePrefixes[] RubberGenerated = {plate};
-
- Arrays.stream(ItemList.values())
- .filter(item ->
- (item.toString().contains("ZPM")
- || item.toString().contains("UV")
- || item.toString().contains("UHV")
- || item.toString().contains("UEV"))
- && item.hasBeenSet())
- .forEach(item -> ZPMPlusComponents.add(item.get(1)));
-
-
- if (LoaderReference.dreamcraft) {
- addDreamcraftItemListItems(ZPMPlusComponents);
- }
-
- for (ItemStack component : ZPMPlusComponents) {
- GT_Log.out.print(component.getDisplayName() + " ");
- }
-
- replaceAllRecipes(ZPMPlusComponents, RubberGenerated, bufferedRecipeList);
-
-
- }
-
-
- private static void replaceAllRecipes(Collection<ItemStack> ZPMPlusComponents, OrePrefixes[] RubberGenerated, List<IRecipe> bufferedRecipeList){
+
+ @SuppressWarnings("unchecked")
+ public void run() {
+
+ List<IRecipe> bufferedRecipeList = null;
+
+ try {
+ bufferedRecipeList =
+ (List<IRecipe>) FieldUtils.getDeclaredField(GT_ModHandler.class, "sBufferRecipeList", true)
+ .get(null);
+ } catch (IllegalAccessException e) {
+ e.printStackTrace();
+ }
+
+ HashSet<ItemStack> ZPMPlusComponents = new HashSet<>();
+ OrePrefixes[] RubberGenerated = {plate};
+
+ Arrays.stream(ItemList.values())
+ .filter(item -> (item.toString().contains("ZPM")
+ || item.toString().contains("UV")
+ || item.toString().contains("UHV")
+ || item.toString().contains("UEV"))
+ && item.hasBeenSet())
+ .forEach(item -> ZPMPlusComponents.add(item.get(1)));
+
+ if (LoaderReference.dreamcraft) {
+ addDreamcraftItemListItems(ZPMPlusComponents);
+ }
+
+ for (ItemStack component : ZPMPlusComponents) {
+ GT_Log.out.print(component.getDisplayName() + " ");
+ }
+
+ replaceAllRecipes(ZPMPlusComponents, RubberGenerated, bufferedRecipeList);
+ }
+
+ private static void replaceAllRecipes(
+ Collection<ItemStack> ZPMPlusComponents, OrePrefixes[] RubberGenerated, List<IRecipe> bufferedRecipeList) {
for (GT_Recipe_AssemblyLine sAssemblylineRecipe : GT_Recipe_AssemblyLine.sAssemblylineRecipes) {
for (ItemStack stack : ZPMPlusComponents) {
@@ -93,194 +88,299 @@ public class ZPMRubberChanges implements Runnable {
}
}
}
-
+
for (ItemStack stack : ZPMPlusComponents) {
- Predicate recipeFilter = obj -> obj instanceof GT_Shaped_Recipe && GT_Utility.areStacksEqual(((GT_Shaped_Recipe) obj).getRecipeOutput(), stack, true);
+ Predicate recipeFilter = obj -> obj instanceof GT_Shaped_Recipe
+ && GT_Utility.areStacksEqual(((GT_Shaped_Recipe) obj).getRecipeOutput(), stack, true);
rewriteCraftingRecipes(bufferedRecipeList, RubberGenerated, recipeFilter);
}
-/*
+ /*
for (ItemStack stack : LuVMachines) {
Predicate recipeFilter = obj -> obj instanceof GT_Shaped_Recipe && GT_Utility.areStacksEqual(((GT_Shaped_Recipe) obj).getRecipeOutput(), stack, true);
rewriteCraftingRecipes(bufferedRecipeList, LuVMaterialsGenerated, recipeFilter);
}*/
}
-
- private static void addDreamcraftItemListItems(Collection ZPMPlusComponents){
+
+ private static void addDreamcraftItemListItems(Collection ZPMPlusComponents) {
try {
Class customItemListClass = Class.forName("com.dreammaster.gthandler.CustomItemList");
Method hasnotBeenSet = MethodUtils.getAccessibleMethod(customItemListClass, "hasBeenSet");
Method get = MethodUtils.getAccessibleMethod(customItemListClass, "get", long.class, Object[].class);
- for (Enum customItemList : (Enum[]) FieldUtils.getField(customItemListClass, "$VALUES", true).get(null)) {
+ for (Enum customItemList : (Enum[])
+ FieldUtils.getField(customItemListClass, "$VALUES", true).get(null)) {
if ((customItemList.toString().contains("ZPM")
- || customItemList.toString().contains("UV")
- || customItemList.toString().contains("UHV")
- || customItemList.toString().contains("UEV")
- ) && (boolean) hasnotBeenSet.invoke(customItemList))
- ZPMPlusComponents.add((ItemStack) get.invoke(customItemList, 1, new Object[0]));
+ || customItemList.toString().contains("UV")
+ || customItemList.toString().contains("UHV")
+ || customItemList.toString().contains("UEV"))
+ && (boolean) hasnotBeenSet.invoke(customItemList))
+ ZPMPlusComponents.add((ItemStack) get.invoke(customItemList, 1, new Object[0]));
}
} catch (IllegalAccessException | ClassNotFoundException | InvocationTargetException e) {
e.printStackTrace();
}
}
-
- private static void rewriteCraftingRecipes(List<IRecipe> bufferedRecipeList, OrePrefixes[] RubberGenerated, Predicate recipeFilter){
- for (OrePrefixes prefixes : RubberGenerated) {
-
- Consumer recipeAction = (obj) -> {
- ZPMRubberChanges.doStacksCointainAndReplace(((GT_Shaped_Recipe) obj).getInput(),
- GT_OreDictUnificator.get(prefixes, Materials.Silicone, 1), true,
- WerkstoffMaterialPool.PTMEGElastomer.get(prefixes));
- ZPMRubberChanges.doStacksCointainAndReplace(((GT_Shaped_Recipe) obj).getInput(),
- GT_OreDictUnificator.get(prefixes, Materials.StyreneButadieneRubber, 1), true,
- WerkstoffMaterialPool.PTMEGElastomer.get(prefixes));
- };
-
-
-
-
- /*
- || ZPMRubberChanges.doStacksCointainAndReplace(((GT_Shaped_Recipe) obj).getInput(),
- GT_OreDictUnificator.get(prefixes, Materials.StyreneButadieneRubber, 1), true,
- WerkstoffMaterialPool.PTMEGElastomer.get(prefixes));*/
-
-
- CraftingManager.getInstance().getRecipeList().stream().filter(recipeFilter).forEach(recipeAction);
- bufferedRecipeList.stream().filter(recipeFilter).forEach(recipeAction);
- }
- }
-
- private static void rewriteMachineRecipes(ItemStack stack, OrePrefixes[] RubberGenerated, GT_Recipe recipe) {
- if (ZPMRubberChanges.doStacksCointainAndReplace(recipe.mInputs, stack, false)) {
- for (OrePrefixes prefixes : RubberGenerated) {
- ZPMRubberChanges.doStacksCointainAndReplace(recipe.mInputs, GT_OreDictUnificator.get(prefixes, Materials.Silicone, 1), true, WerkstoffMaterialPool.PTMEGElastomer.get(prefixes));
- ZPMRubberChanges.doStacksCointainAndReplace(recipe.mOutputs, GT_OreDictUnificator.get(prefixes, Materials.Silicon, 1), true, WerkstoffMaterialPool.PTMEGElastomer.get(prefixes));
-
- ZPMRubberChanges.doStacksCointainAndReplace(recipe.mInputs, GT_OreDictUnificator.get(prefixes, Materials.StyreneButadieneRubber, 1), true, WerkstoffMaterialPool.PTMEGElastomer.get(prefixes));
- ZPMRubberChanges.doStacksCointainAndReplace(recipe.mOutputs, GT_OreDictUnificator.get(prefixes, Materials.StyreneButadieneRubber, 1), true, WerkstoffMaterialPool.PTMEGElastomer.get(prefixes));
- }
- ZPMRubberChanges.doStacksCointainAndReplace(recipe.mFluidInputs, Materials.Silicone.getMolten(1), true, WerkstoffMaterialPool.PTMEGElastomer.getMolten(1).getFluid());
- ZPMRubberChanges.doStacksCointainAndReplace(recipe.mFluidOutputs, Materials.Silicone.getMolten(1), true, WerkstoffMaterialPool.PTMEGElastomer.getMolten(1).getFluid());
-
- ZPMRubberChanges.doStacksCointainAndReplace(recipe.mFluidInputs, Materials.StyreneButadieneRubber.getMolten(1), true, WerkstoffMaterialPool.PTMEGElastomer.getMolten(1).getFluid());
- ZPMRubberChanges.doStacksCointainAndReplace(recipe.mFluidOutputs, Materials.StyreneButadieneRubber.getMolten(1), true, WerkstoffMaterialPool.PTMEGElastomer.getMolten(1).getFluid());
- }
- if (ZPMRubberChanges.doStacksCointainAndReplace(recipe.mOutputs, stack, false)) {
- for (OrePrefixes prefixes : RubberGenerated) {
- ZPMRubberChanges.doStacksCointainAndReplace(recipe.mInputs, GT_OreDictUnificator.get(prefixes, Materials.Silicone, 1), true, WerkstoffMaterialPool.PTMEGElastomer.get(prefixes));
- ZPMRubberChanges.doStacksCointainAndReplace(recipe.mOutputs, GT_OreDictUnificator.get(prefixes, Materials.Silicone, 1), true, WerkstoffMaterialPool.PTMEGElastomer.get(prefixes));
-
- ZPMRubberChanges.doStacksCointainAndReplace(recipe.mInputs, GT_OreDictUnificator.get(prefixes, Materials.StyreneButadieneRubber, 1), true, WerkstoffMaterialPool.PTMEGElastomer.get(prefixes));
- ZPMRubberChanges.doStacksCointainAndReplace(recipe.mOutputs, GT_OreDictUnificator.get(prefixes, Materials.StyreneButadieneRubber, 1), true, WerkstoffMaterialPool.PTMEGElastomer.get(prefixes));
- }
- ZPMRubberChanges.doStacksCointainAndReplace(recipe.mFluidInputs, Materials.Silicone.getMolten(1), true, WerkstoffMaterialPool.PTMEGElastomer.getMolten(1).getFluid());
- ZPMRubberChanges.doStacksCointainAndReplace(recipe.mFluidOutputs, Materials.Silicone.getMolten(1), true, WerkstoffMaterialPool.PTMEGElastomer.getMolten(1).getFluid());
-
- ZPMRubberChanges.doStacksCointainAndReplace(recipe.mFluidInputs, Materials.StyreneButadieneRubber.getMolten(1), true, WerkstoffMaterialPool.PTMEGElastomer.getMolten(1).getFluid());
- ZPMRubberChanges.doStacksCointainAndReplace(recipe.mFluidOutputs, Materials.StyreneButadieneRubber.getMolten(1), true, WerkstoffMaterialPool.PTMEGElastomer.getMolten(1).getFluid());
- }
- }
-
- private static void rewriteAsslineRecipes(ItemStack stack, OrePrefixes[] RubberGenerated, GT_Recipe.GT_Recipe_AssemblyLine recipe){
- GT_Log.out.print("In rewriteAsslineRecipes!\n");
- for (OrePrefixes prefixes : RubberGenerated) {
- GT_Log.out.print("In rewriteAsslineRecipes Pt. 2!\n");
- //GT_Log.out.print(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Silicone, 1).getDisplayName() + " WOWWOO");
- if (ZPMRubberChanges.doStacksCointainAndReplace(recipe.mInputs, stack, false)) {
-
- GT_Log.out.print(Arrays.toString(recipe.mInputs));
-
- ZPMRubberChanges.doStacksCointainAndReplace(recipe.mInputs, GT_OreDictUnificator.get(prefixes, Materials.Silicone, 1), true, WerkstoffMaterialPool.PTMEGElastomer.get(prefixes));
- ZPMRubberChanges.doStacksCointainAndReplace(new Object[]{recipe.mOutput}, GT_OreDictUnificator.get(prefixes, Materials.Silicone, 1), true, WerkstoffMaterialPool.PTMEGElastomer.get(prefixes));
-
- ZPMRubberChanges.doStacksCointainAndReplace(recipe.mInputs, GT_OreDictUnificator.get(prefixes, Materials.StyreneButadieneRubber, 1), true, WerkstoffMaterialPool.PTMEGElastomer.get(prefixes));
- ZPMRubberChanges.doStacksCointainAndReplace(new Object[]{recipe.mOutput}, GT_OreDictUnificator.get(prefixes, Materials.StyreneButadieneRubber, 1), true, WerkstoffMaterialPool.PTMEGElastomer.get(prefixes));
- }
- if (ZPMRubberChanges.doStacksCointainAndReplace(new Object[]{recipe.mOutput}, stack, false)) {
- ZPMRubberChanges.doStacksCointainAndReplace(recipe.mInputs, GT_OreDictUnificator.get(prefixes, Materials.Silicone, 1), true, WerkstoffMaterialPool.PTMEGElastomer.get(prefixes));
- ZPMRubberChanges.doStacksCointainAndReplace(new Object[]{recipe.mOutput}, GT_OreDictUnificator.get(prefixes, Materials.Silicone, 1), true, WerkstoffMaterialPool.PTMEGElastomer.get(prefixes));
-
- ZPMRubberChanges.doStacksCointainAndReplace(recipe.mInputs, GT_OreDictUnificator.get(prefixes, Materials.StyreneButadieneRubber, 1), true, WerkstoffMaterialPool.PTMEGElastomer.get(prefixes));
- ZPMRubberChanges.doStacksCointainAndReplace(new Object[]{recipe.mOutput}, GT_OreDictUnificator.get(prefixes, Materials.StyreneButadieneRubber, 1), true, WerkstoffMaterialPool.PTMEGElastomer.get(prefixes));
- }
- }
- if (ZPMRubberChanges.doStacksCointainAndReplace(recipe.mInputs, stack, false)) {
- ZPMRubberChanges.doStacksCointainAndReplace(recipe.mFluidInputs, Materials.Silicone.getMolten(1), true, WerkstoffMaterialPool.PTMEGElastomer.getMolten(1).getFluid());
-
- ZPMRubberChanges.doStacksCointainAndReplace(recipe.mFluidInputs, Materials.StyreneButadieneRubber.getMolten(1), true, WerkstoffMaterialPool.PTMEGElastomer.getMolten(1).getFluid());
- }
- if (ZPMRubberChanges.doStacksCointainAndReplace(new Object[]{recipe.mOutput}, stack, false)) {
- ZPMRubberChanges.doStacksCointainAndReplace(recipe.mFluidInputs, Materials.StyreneButadieneRubber.getMolten(1), true, WerkstoffMaterialPool.PTMEGElastomer.getMolten(1).getFluid());
- }
- }
-
- private static ItemStack[] replaceArrayWith(ItemStack[] stackArray, Materials source, Werkstoff target) {
- for (int i = 0; i < stackArray.length; i++) {
- ItemStack stack = stackArray[i];
- if (!BW_Util.checkStackAndPrefix(stack))
- continue;
- stackArray[i] = replaceStackWith(stack, source, target);
- }
- return stackArray;
- }
-
- private static ItemStack replaceStackWith(ItemStack stack, Materials source, Werkstoff target) {
- ItemData ass = GT_OreDictUnificator.getAssociation(stack);
- if (ass.mMaterial.mMaterial.equals(source))
- if (target.hasItemType(ass.mPrefix))
- stack = target.get(ass.mPrefix, stack.stackSize);
- return stack;
- }
-
-
- private static boolean doStacksCointainAndReplace(FluidStack[] stacks, FluidStack stack, boolean replace, Fluid... replacement) {
- boolean replaced = false;
- for (int i = 0; i < stacks.length; i++) {
- if (GT_Utility.areFluidsEqual(stack, stacks[i]))
- if (!replace)
- return true;
- else {
- int amount = stacks[i].amount;
- stacks[i] = new FluidStack(replacement[0], amount);
- replaced = true;
- }
- }
- return replaced;
- }
-
-
- private static boolean doStacksCointainAndReplace(Object[] stacks, ItemStack stack, boolean replace, ItemStack... replacement) {
- //GT_Log.out.print("In doStacksCointainAndReplace!\n");
- boolean replaced = false;
- for (int i = 0; i < stacks.length; i++) {
- if (!GT_Utility.isStackValid(stacks[i])) {
- if (stacks[i] instanceof ArrayList && ((ArrayList)stacks[i]).size() > 0) {
- if (GT_Utility.areStacksEqual(stack, (ItemStack) ((ArrayList)stacks[i]).get(0), true))
- if (!replace)
- return true;
- else {
- int amount = ((ItemStack) ((ArrayList)stacks[i]).get(0)).stackSize;
- stacks[i] = new ArrayList<>();
- ((ArrayList)stacks[i]).add(BW_Util.setStackSize(replacement[0], amount));
- replaced = true;
-
- GT_Log.out.print("Replaced recipe!: " + stack.getDisplayName() + " ");
- }
-
- } else
- continue;
- } else if (GT_Utility.areStacksEqual(stack, (ItemStack) stacks[i], true))
- if (!replace)
- return true;
- else {
- int amount = ((ItemStack) stacks[i]).stackSize;
- stacks[i] = BW_Util.setStackSize(replacement[0], amount);
- replaced = true;
- }
- }
- return replaced;
- }
-
-
-
+ private static void rewriteCraftingRecipes(
+ List<IRecipe> bufferedRecipeList, OrePrefixes[] RubberGenerated, Predicate recipeFilter) {
+ for (OrePrefixes prefixes : RubberGenerated) {
+
+ Consumer recipeAction = (obj) -> {
+ ZPMRubberChanges.doStacksCointainAndReplace(
+ ((GT_Shaped_Recipe) obj).getInput(),
+ GT_OreDictUnificator.get(prefixes, Materials.Silicone, 1),
+ true,
+ WerkstoffMaterialPool.PTMEGElastomer.get(prefixes));
+ ZPMRubberChanges.doStacksCointainAndReplace(
+ ((GT_Shaped_Recipe) obj).getInput(),
+ GT_OreDictUnificator.get(prefixes, Materials.StyreneButadieneRubber, 1),
+ true,
+ WerkstoffMaterialPool.PTMEGElastomer.get(prefixes));
+ };
+
+ /*
+ || ZPMRubberChanges.doStacksCointainAndReplace(((GT_Shaped_Recipe) obj).getInput(),
+ GT_OreDictUnificator.get(prefixes, Materials.StyreneButadieneRubber, 1), true,
+ WerkstoffMaterialPool.PTMEGElastomer.get(prefixes));*/
+
+ CraftingManager.getInstance().getRecipeList().stream()
+ .filter(recipeFilter)
+ .forEach(recipeAction);
+ bufferedRecipeList.stream().filter(recipeFilter).forEach(recipeAction);
+ }
+ }
+
+ private static void rewriteMachineRecipes(ItemStack stack, OrePrefixes[] RubberGenerated, GT_Recipe recipe) {
+ if (ZPMRubberChanges.doStacksCointainAndReplace(recipe.mInputs, stack, false)) {
+ for (OrePrefixes prefixes : RubberGenerated) {
+ ZPMRubberChanges.doStacksCointainAndReplace(
+ recipe.mInputs,
+ GT_OreDictUnificator.get(prefixes, Materials.Silicone, 1),
+ true,
+ WerkstoffMaterialPool.PTMEGElastomer.get(prefixes));
+ ZPMRubberChanges.doStacksCointainAndReplace(
+ recipe.mOutputs,
+ GT_OreDictUnificator.get(prefixes, Materials.Silicon, 1),
+ true,
+ WerkstoffMaterialPool.PTMEGElastomer.get(prefixes));
+
+ ZPMRubberChanges.doStacksCointainAndReplace(
+ recipe.mInputs,
+ GT_OreDictUnificator.get(prefixes, Materials.StyreneButadieneRubber, 1),
+ true,
+ WerkstoffMaterialPool.PTMEGElastomer.get(prefixes));
+ ZPMRubberChanges.doStacksCointainAndReplace(
+ recipe.mOutputs,
+ GT_OreDictUnificator.get(prefixes, Materials.StyreneButadieneRubber, 1),
+ true,
+ WerkstoffMaterialPool.PTMEGElastomer.get(prefixes));
+ }
+ ZPMRubberChanges.doStacksCointainAndReplace(
+ recipe.mFluidInputs,
+ Materials.Silicone.getMolten(1),
+ true,
+ WerkstoffMaterialPool.PTMEGElastomer.getMolten(1).getFluid());
+ ZPMRubberChanges.doStacksCointainAndReplace(
+ recipe.mFluidOutputs,
+ Materials.Silicone.getMolten(1),
+ true,
+ WerkstoffMaterialPool.PTMEGElastomer.getMolten(1).getFluid());
+
+ ZPMRubberChanges.doStacksCointainAndReplace(
+ recipe.mFluidInputs,
+ Materials.StyreneButadieneRubber.getMolten(1),
+ true,
+ WerkstoffMaterialPool.PTMEGElastomer.getMolten(1).getFluid());
+ ZPMRubberChanges.doStacksCointainAndReplace(
+ recipe.mFluidOutputs,
+ Materials.StyreneButadieneRubber.getMolten(1),
+ true,
+ WerkstoffMaterialPool.PTMEGElastomer.getMolten(1).getFluid());
+ }
+ if (ZPMRubberChanges.doStacksCointainAndReplace(recipe.mOutputs, stack, false)) {
+ for (OrePrefixes prefixes : RubberGenerated) {
+ ZPMRubberChanges.doStacksCointainAndReplace(
+ recipe.mInputs,
+ GT_OreDictUnificator.get(prefixes, Materials.Silicone, 1),
+ true,
+ WerkstoffMaterialPool.PTMEGElastomer.get(prefixes));
+ ZPMRubberChanges.doStacksCointainAndReplace(
+ recipe.mOutputs,
+ GT_OreDictUnificator.get(prefixes, Materials.Silicone, 1),
+ true,
+ WerkstoffMaterialPool.PTMEGElastomer.get(prefixes));
+
+ ZPMRubberChanges.doStacksCointainAndReplace(
+ recipe.mInputs,
+ GT_OreDictUnificator.get(prefixes, Materials.StyreneButadieneRubber, 1),
+ true,
+ WerkstoffMaterialPool.PTMEGElastomer.get(prefixes));
+ ZPMRubberChanges.doStacksCointainAndReplace(
+ recipe.mOutputs,
+ GT_OreDictUnificator.get(prefixes, Materials.StyreneButadieneRubber, 1),
+ true,
+ WerkstoffMaterialPool.PTMEGElastomer.get(prefixes));
+ }
+ ZPMRubberChanges.doStacksCointainAndReplace(
+ recipe.mFluidInputs,
+ Materials.Silicone.getMolten(1),
+ true,
+ WerkstoffMaterialPool.PTMEGElastomer.getMolten(1).getFluid());
+ ZPMRubberChanges.doStacksCointainAndReplace(
+ recipe.mFluidOutputs,
+ Materials.Silicone.getMolten(1),
+ true,
+ WerkstoffMaterialPool.PTMEGElastomer.getMolten(1).getFluid());
+
+ ZPMRubberChanges.doStacksCointainAndReplace(
+ recipe.mFluidInputs,
+ Materials.StyreneButadieneRubber.getMolten(1),
+ true,
+ WerkstoffMaterialPool.PTMEGElastomer.getMolten(1).getFluid());
+ ZPMRubberChanges.doStacksCointainAndReplace(
+ recipe.mFluidOutputs,
+ Materials.StyreneButadieneRubber.getMolten(1),
+ true,
+ WerkstoffMaterialPool.PTMEGElastomer.getMolten(1).getFluid());
+ }
+ }
+
+ private static void rewriteAsslineRecipes(
+ ItemStack stack, OrePrefixes[] RubberGenerated, GT_Recipe.GT_Recipe_AssemblyLine recipe) {
+ GT_Log.out.print("In rewriteAsslineRecipes!\n");
+ for (OrePrefixes prefixes : RubberGenerated) {
+ GT_Log.out.print("In rewriteAsslineRecipes Pt. 2!\n");
+ // GT_Log.out.print(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Silicone, 1).getDisplayName() + "
+ // WOWWOO");
+ if (ZPMRubberChanges.doStacksCointainAndReplace(recipe.mInputs, stack, false)) {
+
+ GT_Log.out.print(Arrays.toString(recipe.mInputs));
+
+ ZPMRubberChanges.doStacksCointainAndReplace(
+ recipe.mInputs,
+ GT_OreDictUnificator.get(prefixes, Materials.Silicone, 1),
+ true,
+ WerkstoffMaterialPool.PTMEGElastomer.get(prefixes));
+ ZPMRubberChanges.doStacksCointainAndReplace(
+ new Object[] {recipe.mOutput},
+ GT_OreDictUnificator.get(prefixes, Materials.Silicone, 1),
+ true,
+ WerkstoffMaterialPool.PTMEGElastomer.get(prefixes));
+
+ ZPMRubberChanges.doStacksCointainAndReplace(
+ recipe.mInputs,
+ GT_OreDictUnificator.get(prefixes, Materials.StyreneButadieneRubber, 1),
+ true,
+ WerkstoffMaterialPool.PTMEGElastomer.get(prefixes));
+ ZPMRubberChanges.doStacksCointainAndReplace(
+ new Object[] {recipe.mOutput},
+ GT_OreDictUnificator.get(prefixes, Materials.StyreneButadieneRubber, 1),
+ true,
+ WerkstoffMaterialPool.PTMEGElastomer.get(prefixes));
+ }
+ if (ZPMRubberChanges.doStacksCointainAndReplace(new Object[] {recipe.mOutput}, stack, false)) {
+ ZPMRubberChanges.doStacksCointainAndReplace(
+ recipe.mInputs,
+ GT_OreDictUnificator.get(prefixes, Materials.Silicone, 1),
+ true,
+ WerkstoffMaterialPool.PTMEGElastomer.get(prefixes));
+ ZPMRubberChanges.doStacksCointainAndReplace(
+ new Object[] {recipe.mOutput},
+ GT_OreDictUnificator.get(prefixes, Materials.Silicone, 1),
+ true,
+ WerkstoffMaterialPool.PTMEGElastomer.get(prefixes));
+
+ ZPMRubberChanges.doStacksCointainAndReplace(
+ recipe.mInputs,
+ GT_OreDictUnificator.get(prefixes, Materials.StyreneButadieneRubber, 1),
+ true,
+ WerkstoffMaterialPool.PTMEGElastomer.get(prefixes));
+ ZPMRubberChanges.doStacksCointainAndReplace(
+ new Object[] {recipe.mOutput},
+ GT_OreDictUnificator.get(prefixes, Materials.StyreneButadieneRubber, 1),
+ true,
+ WerkstoffMaterialPool.PTMEGElastomer.get(prefixes));
+ }
+ }
+ if (ZPMRubberChanges.doStacksCointainAndReplace(recipe.mInputs, stack, false)) {
+ ZPMRubberChanges.doStacksCointainAndReplace(
+ recipe.mFluidInputs,
+ Materials.Silicone.getMolten(1),
+ true,
+ WerkstoffMaterialPool.PTMEGElastomer.getMolten(1).getFluid());
+
+ ZPMRubberChanges.doStacksCointainAndReplace(
+ recipe.mFluidInputs,
+ Materials.StyreneButadieneRubber.getMolten(1),
+ true,
+ WerkstoffMaterialPool.PTMEGElastomer.getMolten(1).getFluid());
+ }
+ if (ZPMRubberChanges.doStacksCointainAndReplace(new Object[] {recipe.mOutput}, stack, false)) {
+ ZPMRubberChanges.doStacksCointainAndReplace(
+ recipe.mFluidInputs,
+ Materials.StyreneButadieneRubber.getMolten(1),
+ true,
+ WerkstoffMaterialPool.PTMEGElastomer.getMolten(1).getFluid());
+ }
+ }
+
+ private static ItemStack[] replaceArrayWith(ItemStack[] stackArray, Materials source, Werkstoff target) {
+ for (int i = 0; i < stackArray.length; i++) {
+ ItemStack stack = stackArray[i];
+ if (!BW_Util.checkStackAndPrefix(stack)) continue;
+ stackArray[i] = replaceStackWith(stack, source, target);
+ }
+ return stackArray;
+ }
+
+ private static ItemStack replaceStackWith(ItemStack stack, Materials source, Werkstoff target) {
+ ItemData ass = GT_OreDictUnificator.getAssociation(stack);
+ if (ass.mMaterial.mMaterial.equals(source))
+ if (target.hasItemType(ass.mPrefix)) stack = target.get(ass.mPrefix, stack.stackSize);
+ return stack;
+ }
+
+ private static boolean doStacksCointainAndReplace(
+ FluidStack[] stacks, FluidStack stack, boolean replace, Fluid... replacement) {
+ boolean replaced = false;
+ for (int i = 0; i < stacks.length; i++) {
+ if (GT_Utility.areFluidsEqual(stack, stacks[i]))
+ if (!replace) return true;
+ else {
+ int amount = stacks[i].amount;
+ stacks[i] = new FluidStack(replacement[0], amount);
+ replaced = true;
+ }
+ }
+ return replaced;
+ }
+
+ private static boolean doStacksCointainAndReplace(
+ Object[] stacks, ItemStack stack, boolean replace, ItemStack... replacement) {
+ // GT_Log.out.print("In doStacksCointainAndReplace!\n");
+ boolean replaced = false;
+ for (int i = 0; i < stacks.length; i++) {
+ if (!GT_Utility.isStackValid(stacks[i])) {
+ if (stacks[i] instanceof ArrayList && ((ArrayList) stacks[i]).size() > 0) {
+ if (GT_Utility.areStacksEqual(stack, (ItemStack) ((ArrayList) stacks[i]).get(0), true))
+ if (!replace) return true;
+ else {
+ int amount = ((ItemStack) ((ArrayList) stacks[i]).get(0)).stackSize;
+ stacks[i] = new ArrayList<>();
+ ((ArrayList) stacks[i]).add(BW_Util.setStackSize(replacement[0], amount));
+ replaced = true;
+
+ GT_Log.out.print("Replaced recipe!: " + stack.getDisplayName() + " ");
+ }
+
+ } else continue;
+ } else if (GT_Utility.areStacksEqual(stack, (ItemStack) stacks[i], true))
+ if (!replace) return true;
+ else {
+ int amount = ((ItemStack) stacks[i]).stackSize;
+ stacks[i] = BW_Util.setStackSize(replacement[0], amount);
+ replaced = true;
+ }
+ }
+ return replaced;
+ }
}
diff --git a/src/main/java/com/elisis/gtnhlanth/util/DescTextLocalization.java b/src/main/java/com/elisis/gtnhlanth/util/DescTextLocalization.java
index fc01d37ec4..222e0de59b 100644
--- a/src/main/java/com/elisis/gtnhlanth/util/DescTextLocalization.java
+++ b/src/main/java/com/elisis/gtnhlanth/util/DescTextLocalization.java
@@ -4,15 +4,16 @@ import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.StatCollector;
public class DescTextLocalization {
-
- public static final String BLUEPRINT_INFO = "Follow the" + EnumChatFormatting.BLUE + " Structure" + EnumChatFormatting.DARK_BLUE + "Lib" + EnumChatFormatting.GRAY + " hologram projector to build the main structure.";
- public static String[] addText(String preFix, int length){
+ public static final String BLUEPRINT_INFO =
+ "Follow the" + EnumChatFormatting.BLUE + " Structure" + EnumChatFormatting.DARK_BLUE + "Lib"
+ + EnumChatFormatting.GRAY + " hologram projector to build the main structure.";
+
+ public static String[] addText(String preFix, int length) {
String[] text = new String[length];
- for (int i = 0; i < length; i ++) {
+ for (int i = 0; i < length; i++) {
text[i] = StatCollector.translateToLocal(preFix + "." + i);
}
return text;
}
-
}
diff --git a/src/main/java/com/elisis/gtnhlanth/xmod/nei/DigesterHandler.java b/src/main/java/com/elisis/gtnhlanth/xmod/nei/DigesterHandler.java
index 0a7ed624e6..0f916ff948 100644
--- a/src/main/java/com/elisis/gtnhlanth/xmod/nei/DigesterHandler.java
+++ b/src/main/java/com/elisis/gtnhlanth/xmod/nei/DigesterHandler.java
@@ -10,18 +10,21 @@ import gregtech.nei.GT_NEI_DefaultHandler;
public class DigesterHandler extends GT_NEI_DefaultHandler {
- public DigesterHandler(GT_Recipe_Map recipeMap) {
- super(recipeMap);
- if (!NEI_Config.isAdded) {
- FMLInterModComms.sendRuntimeMessage(GT_Values.GT, "NEIPlugins", "register-crafting-handler", "gregtech@" + this.getRecipeName() + "@" + this.getOverlayIdentifier());
- GuiCraftingRecipe.craftinghandlers.add(this);
- GuiUsageRecipe.usagehandlers.add(this);
- }
- }
-
- @Override
+ public DigesterHandler(GT_Recipe_Map recipeMap) {
+ super(recipeMap);
+ if (!NEI_Config.isAdded) {
+ FMLInterModComms.sendRuntimeMessage(
+ GT_Values.GT,
+ "NEIPlugins",
+ "register-crafting-handler",
+ "gregtech@" + this.getRecipeName() + "@" + this.getOverlayIdentifier());
+ GuiCraftingRecipe.craftinghandlers.add(this);
+ GuiUsageRecipe.usagehandlers.add(this);
+ }
+ }
+
+ @Override
public TemplateRecipeHandler newInstance() {
return new DigesterHandler(this.mRecipeMap);
}
-
}
diff --git a/src/main/java/com/elisis/gtnhlanth/xmod/nei/DisstankHandler.java b/src/main/java/com/elisis/gtnhlanth/xmod/nei/DisstankHandler.java
index ffc396a3f4..81cb495a98 100644
--- a/src/main/java/com/elisis/gtnhlanth/xmod/nei/DisstankHandler.java
+++ b/src/main/java/com/elisis/gtnhlanth/xmod/nei/DisstankHandler.java
@@ -10,18 +10,21 @@ import gregtech.nei.GT_NEI_DefaultHandler;
public class DisstankHandler extends GT_NEI_DefaultHandler {
- public DisstankHandler(GT_Recipe_Map recipeMap) {
- super(recipeMap);
- if (!NEI_Config.isAdded) {
- FMLInterModComms.sendRuntimeMessage(GT_Values.GT, "NEIPlugins", "register-crafting-handler", "gregtech@" + this.getRecipeName() + "@" + this.getOverlayIdentifier());
- GuiCraftingRecipe.craftinghandlers.add(this);
- GuiUsageRecipe.usagehandlers.add(this);
- }
- }
-
- @Override
+ public DisstankHandler(GT_Recipe_Map recipeMap) {
+ super(recipeMap);
+ if (!NEI_Config.isAdded) {
+ FMLInterModComms.sendRuntimeMessage(
+ GT_Values.GT,
+ "NEIPlugins",
+ "register-crafting-handler",
+ "gregtech@" + this.getRecipeName() + "@" + this.getOverlayIdentifier());
+ GuiCraftingRecipe.craftinghandlers.add(this);
+ GuiUsageRecipe.usagehandlers.add(this);
+ }
+ }
+
+ @Override
public TemplateRecipeHandler newInstance() {
return new DisstankHandler(this.mRecipeMap);
}
-
}
diff --git a/src/main/java/com/elisis/gtnhlanth/xmod/nei/IMC.java b/src/main/java/com/elisis/gtnhlanth/xmod/nei/IMC.java
index 75def26854..91cf489418 100644
--- a/src/main/java/com/elisis/gtnhlanth/xmod/nei/IMC.java
+++ b/src/main/java/com/elisis/gtnhlanth/xmod/nei/IMC.java
@@ -5,7 +5,7 @@ import net.minecraft.nbt.NBTTagCompound;
public class IMC {
- public static void IMCSender() {
+ public static void IMCSender() {
sendHandler("com.elisis.gtnhlanth.xmod.nei.DigesterHandler", "gregtech:gt.blockmachines:10500");
sendHandler("com.elisis.gtnhlanth.xmod.nei.DisstankHandler", "gregtech:gt.blockmachines:10501");
@@ -33,5 +33,4 @@ public class IMC {
aNBT.setString("itemName", aStack);
FMLInterModComms.sendMessage("NotEnoughItems", "registerCatalystInfo", aNBT);
}
-
}
diff --git a/src/main/java/com/elisis/gtnhlanth/xmod/nei/NEI_Config.java b/src/main/java/com/elisis/gtnhlanth/xmod/nei/NEI_Config.java
index a25007e3bd..e678a85c36 100644
--- a/src/main/java/com/elisis/gtnhlanth/xmod/nei/NEI_Config.java
+++ b/src/main/java/com/elisis/gtnhlanth/xmod/nei/NEI_Config.java
@@ -1,32 +1,28 @@
package com.elisis.gtnhlanth.xmod.nei;
+import codechicken.nei.api.IConfigureNEI;
import com.elisis.gtnhlanth.Tags;
import com.elisis.gtnhlanth.loader.RecipeAdder;
-import codechicken.nei.api.IConfigureNEI;
-
public class NEI_Config implements IConfigureNEI {
-
- public static boolean isAdded = true;
- @Override
- public String getName() {
- return "GTNH: Lanthanides NEI";
- }
+ public static boolean isAdded = true;
- @Override
- public String getVersion() {
- return Tags.VERSION;
- }
+ @Override
+ public String getName() {
+ return "GTNH: Lanthanides NEI";
+ }
- @Override
- public void loadConfig() {
- isAdded = false;
- new DigesterHandler(RecipeAdder.instance.DigesterRecipes);
- new DisstankHandler(RecipeAdder.instance.DissolutionTankRecipes);
- isAdded = true;
-
- }
-
+ @Override
+ public String getVersion() {
+ return Tags.VERSION;
+ }
+ @Override
+ public void loadConfig() {
+ isAdded = false;
+ new DigesterHandler(RecipeAdder.instance.DigesterRecipes);
+ new DisstankHandler(RecipeAdder.instance.DissolutionTankRecipes);
+ isAdded = true;
+ }
}