diff options
| author | boubou19 <miisterunknown@gmail.com> | 2023-04-10 15:43:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-10 16:43:14 +0300 |
| commit | 94b42387dbd1e45f27a8cf89108892c7c3f08822 (patch) | |
| tree | 5dc7c206864f4a897a2d60923a5df94a2341ba49 | |
| parent | dcfad6c6de834f55484a3accc6389eb34c7876c2 (diff) | |
| download | GT5-Unofficial-94b42387dbd1e45f27a8cf89108892c7c3f08822.tar.gz GT5-Unofficial-94b42387dbd1e45f27a8cf89108892c7c3f08822.tar.bz2 GT5-Unofficial-94b42387dbd1e45f27a8cf89108892c7c3f08822.zip | |
Cleanup (#308)
* switch to GT mod enum instead
* move to GT5U Mods enum even more
* yeet recipes loaded when used outside NH
* buildscript update + GT5U version bump
* fix build
* spotless apply
* optimize import
* split recipes in different files
* remove newStuff config option
* load recipe files
* break down BioRecipeLoader into several files
Former-commit-id: 3ac362e197682f3db007d8b87f2341d777c6bdc0
116 files changed, 3251 insertions, 3863 deletions
diff --git a/build.gradle b/build.gradle index 7b1f6c4507..055dcee435 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1679040806 +//version: 1680120787 /* DO NOT CHANGE THIS FILE! Also, you may replace this file at any time if there is an update available. @@ -65,7 +65,7 @@ plugins { id 'org.jetbrains.kotlin.jvm' version '1.8.0' apply false id 'org.jetbrains.kotlin.kapt' version '1.8.0' apply false id 'com.google.devtools.ksp' version '1.8.0-1.0.9' apply false - id 'org.ajoberstar.grgit' version '4.1.1' // 4.1.1 is the last jvm8 supporting version ,unused, available for addon.gradle + id 'org.ajoberstar.grgit' version '4.1.1' // 4.1.1 is the last jvm8 supporting version, unused, available for addon.gradle id 'com.github.johnrengelman.shadow' version '7.1.2' apply false id 'com.palantir.git-version' version '0.13.0' apply false // 0.13.0 is the last jvm8 supporting version id 'de.undercouch.download' version '5.3.0' @@ -73,7 +73,7 @@ plugins { id 'com.diffplug.spotless' version '6.7.2' apply false id 'com.modrinth.minotaur' version '2.+' apply false id 'com.matthewprenger.cursegradle' version '1.4.0' apply false - id 'com.gtnewhorizons.retrofuturagradle' version '1.2.3' + id 'com.gtnewhorizons.retrofuturagradle' version '1.2.4' } boolean settingsupdated = verifySettingsGradle() settingsupdated = verifyGitAttributes() || settingsupdated @@ -160,6 +160,14 @@ java { } } +tasks.withType(JavaCompile).configureEach { + options.encoding = "UTF-8" +} + +tasks.withType(ScalaCompile).configureEach { + options.encoding = "UTF-8" +} + pluginManager.withPlugin('org.jetbrains.kotlin.jvm') { // If Kotlin is enabled in the project kotlin { @@ -397,8 +405,6 @@ minecraft { extraRunJvmArguments.add("-ea:${modGroup}") if (usesMixins.toBoolean() || forceEnableMixins.toBoolean()) { - extraTweakClasses.add("org.spongepowered.asm.launch.MixinTweaker") - if (usesMixinDebug.toBoolean()) { extraRunJvmArguments.addAll([ "-Dmixin.debug.countInjections=true", @@ -513,14 +519,6 @@ repositories { url = "http://jenkins.usrv.eu:8081/nexus/content/groups/public/" allowInsecureProtocol = true } - if (usesMixins.toBoolean() || forceEnableMixins.toBoolean()) { - if (usesMixinDebug.toBoolean()) { - maven { - name = "Fabric Maven" - url = "https://maven.fabricmc.net/" - } - } - } maven { name 'sonatype' url 'https://oss.sonatype.org/content/repositories/snapshots/' @@ -559,29 +557,49 @@ repositories { } } +def mixinProviderGroup = "io.github.legacymoddingmc" +def mixinProviderModule = "unimixins" +def mixinProviderVersion = "0.1.6" +def mixinProviderSpecNoClassifer = "${mixinProviderGroup}:${mixinProviderModule}:${mixinProviderVersion}" +def mixinProviderSpec = "${mixinProviderSpecNoClassifer}:dev" + dependencies { if (usesMixins.toBoolean()) { annotationProcessor('org.ow2.asm:asm-debug-all:5.0.3') annotationProcessor('com.google.guava:guava:24.1.1-jre') annotationProcessor('com.google.code.gson:gson:2.8.6') - annotationProcessor('com.gtnewhorizon:gtnhmixins:2.1.13:processor') + annotationProcessor(mixinProviderSpec) if (usesMixinDebug.toBoolean()) { runtimeOnlyNonPublishable('org.jetbrains:intellij-fernflower:1.2.1.16') } } - if (usesMixins.toBoolean() || forceEnableMixins.toBoolean()) { - implementation('com.gtnewhorizon:gtnhmixins:2.1.13') + if (usesMixins.toBoolean()) { + implementation(mixinProviderSpec) + } else if (forceEnableMixins.toBoolean()) { + runtimeOnlyNonPublishable(mixinProviderSpec) } } pluginManager.withPlugin('org.jetbrains.kotlin.kapt') { if (usesMixins.toBoolean()) { dependencies { - kapt('com.gtnewhorizon:gtnhmixins:2.1.13:processor') + kapt(mixinProviderSpec) } } } +// Replace old mixin mods with unimixins +// https://docs.gradle.org/8.0.2/userguide/resolution_rules.html#sec:substitution_with_classifier +configurations.all { + resolutionStrategy.dependencySubstitution { + substitute module('com.gtnewhorizon:gtnhmixins') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods") + substitute module('com.github.GTNewHorizons:Mixingasm') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods") + substitute module('com.github.GTNewHorizons:SpongePoweredMixin') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods") + substitute module('com.github.GTNewHorizons:SpongeMixins') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods") + substitute module('io.github.legacymoddingmc:unimixins') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Our previous unimixins upload was missing the dev classifier") + } +} + apply from: 'dependencies.gradle' def mixingConfigRefMap = 'mixins.' + modId + '.refmap.json' @@ -695,13 +713,13 @@ ext.java17PatchDependenciesCfg = configurations.create("java17PatchDependencies" } dependencies { - def lwjgl3ifyVersion = '1.2.2' + def lwjgl3ifyVersion = '1.3.3' def asmVersion = '9.4' if (modId != 'lwjgl3ify') { java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}") } if (modId != 'hodgepodge') { - java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.1.0') + java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.2.4') } java17PatchDependencies('net.minecraft:launchwrapper:1.15') {transitive = false} @@ -793,10 +811,6 @@ public abstract class RunHotswappableMinecraftTask extends RunMinecraftTask { !file.path.contains("2.9.4-nightly-20150209") // Remove lwjgl2 } this.classpath(project.java17DependenciesCfg) - - if (!(project.usesMixins.toBoolean() || project.forceEnableMixins.toBoolean())) { - this.extraArgs.addAll("--tweakClass", "org.spongepowered.asm.launch.MixinTweaker") - } } } @@ -1006,6 +1020,7 @@ idea { } compiler.javac { afterEvaluate { + javacAdditionalOptions = "-encoding utf8" moduleJavacAdditionalOptions = [ (project.name + ".main"): tasks.compileJava.options.compilerArgs.collect { '"' + it + '"' }.join(' ') ] @@ -1125,7 +1140,7 @@ if (modrinthProjectId.size() != 0 && System.getenv("MODRINTH_TOKEN") != null) { } } if (usesMixins.toBoolean()) { - addModrinthDep("required", "project", "gtnhmixins") + addModrinthDep("required", "project", "unimixins") } tasks.modrinth.dependsOn(build) tasks.publish.dependsOn(tasks.modrinth) @@ -1169,7 +1184,7 @@ if (curseForgeProjectId.size() != 0 && System.getenv("CURSEFORGE_TOKEN") != null } } if (usesMixins.toBoolean()) { - addCurseForgeRelation("requiredDependency", "gtnhmixins") + addCurseForgeRelation("requiredDependency", "unimixins") } tasks.curseforge.dependsOn(build) tasks.publish.dependsOn(tasks.curseforge) diff --git a/dependencies.gradle b/dependencies.gradle index 6a8c26e2e6..487bb6661a 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,7 +1,7 @@ // Add your dependencies here dependencies { - api("com.github.GTNewHorizons:GT5-Unofficial:5.09.42.43:dev") + api("com.github.GTNewHorizons:GT5-Unofficial:5.09.42.47:dev") api("com.github.GTNewHorizons:TecTech:5.0.85:dev") implementation("com.github.GTNewHorizons:TinkersConstruct:1.9.23-GTNH:dev") api("com.github.GTNewHorizons:Galacticraft:3.0.64-GTNH:dev") diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar Binary files differindex 943f0cbfa7..ccebba7710 100644 --- a/gradle/wrapper/gradle-wrapper.jar +++ b/gradle/wrapper/gradle-wrapper.jar diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fc10b601f7..bdc9a83b1e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists @@ -144,7 +144,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -152,7 +152,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/API/BioObjectAdder.java b/src/main/java/com/github/bartimaeusnek/bartworks/API/BioObjectAdder.java index a4a2c1b799..fb1e8c085f 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/API/BioObjectAdder.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/API/BioObjectAdder.java @@ -13,6 +13,8 @@ package com.github.bartimaeusnek.bartworks.API; +import static gregtech.api.enums.Mods.Gendustry; + import java.awt.*; import net.minecraft.item.EnumRarity; @@ -164,7 +166,7 @@ public final class BioObjectAdder { * postinit Phase) execute this. */ public static void regenerateBioFluids() { - FluidStack dnaFluid = LoaderReference.gendustry ? FluidRegistry.getFluidStack("liquiddna", 100) + FluidStack dnaFluid = Gendustry.isModLoaded() ? FluidRegistry.getFluidStack("liquiddna", 100) : Materials.Biomass.getFluid(100L); for (BioCulture B : BioCulture.BIO_CULTURE_ARRAY_LIST) { if (B.getFluidNotSet()) { diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/API/BioVatLogicAdder.java b/src/main/java/com/github/bartimaeusnek/bartworks/API/BioVatLogicAdder.java index 9202be7d18..fdfb020919 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/API/BioVatLogicAdder.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/API/BioVatLogicAdder.java @@ -14,6 +14,7 @@ package com.github.bartimaeusnek.bartworks.API; import static cpw.mods.fml.common.registry.GameRegistry.findBlock; +import static gregtech.api.enums.Mods.IndustrialCraft2; import java.util.HashMap; import java.util.HashSet; @@ -79,33 +80,33 @@ public final class BioVatLogicAdder { giveItemStackRadioHatchAbilites(ItemList.Depleted_Naquadah_4.get(1), Materials.Naquadah, 12, 10); giveItemStackRadioHatchAbilites( - GT_ModHandler.getModItem("IC2", "reactorMOXSimpledepleted", 1), + GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorMOXSimpledepleted", 1), Materials.Plutonium, 3, 10); giveItemStackRadioHatchAbilites( - GT_ModHandler.getModItem("IC2", "reactorMOXDualdepleted", 1), + GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorMOXDualdepleted", 1), Materials.Plutonium, 6, 10); giveItemStackRadioHatchAbilites( - GT_ModHandler.getModItem("IC2", "reactorMOXQuaddepleted", 1), + GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorMOXQuaddepleted", 1), Materials.Plutonium, 12, 10); giveItemStackRadioHatchAbilites( - GT_ModHandler.getModItem("IC2", "reactorUraniumSimpledepleted", 1), + GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorUraniumSimpledepleted", 1), Materials.Uranium, 3, 10); giveItemStackRadioHatchAbilites( - GT_ModHandler.getModItem("IC2", "reactorUraniumDualdepleted", 1), + GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorUraniumDualdepleted", 1), Materials.Uranium, 6, 10); giveItemStackRadioHatchAbilites( - GT_ModHandler.getModItem("IC2", "reactorUraniumQuaddepleted", 1), + GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorUraniumQuaddepleted", 1), Materials.Uranium, 12, 10); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/API/BorosilicateGlass.java b/src/main/java/com/github/bartimaeusnek/bartworks/API/BorosilicateGlass.java index 0242fd3650..3076455c70 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/API/BorosilicateGlass.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/API/BorosilicateGlass.java @@ -1,6 +1,10 @@ package com.github.bartimaeusnek.bartworks.API; -import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.lazy; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlockAdder; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlockAnyMeta; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlocksTiered; +import static gregtech.api.enums.Mods.BartWorks; import java.util.ArrayList; import java.util.List; @@ -44,12 +48,16 @@ public class BorosilicateGlass { } private static Block getGlassBlock() { - if (block == null) block = GameRegistry.findBlock("bartworks", "BW_GlasBlocks"); + if (block == null) { + block = GameRegistry.findBlock(BartWorks.ID, "BW_GlasBlocks"); + } return block; } private static Block getGlassBlock2() { - if (block2 == null) block2 = GameRegistry.findBlock("bartworks", "BW_GlasBlocks2"); + if (block2 == null) { + block2 = GameRegistry.findBlock(BartWorks.ID, "BW_GlasBlocks2"); + } return block2; } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/API/LoaderReference.java b/src/main/java/com/github/bartimaeusnek/bartworks/API/LoaderReference.java deleted file mode 100644 index acc2da9ede..0000000000 --- a/src/main/java/com/github/bartimaeusnek/bartworks/API/LoaderReference.java +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Copyright (c) 2018-2020 bartimaeusnek Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in the Software without restriction, - * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following - * conditions: The above copyright notice and this permission notice shall be included in all copies or substantial - * portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, - * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - -package com.github.bartimaeusnek.bartworks.API; - -import cpw.mods.fml.common.Loader; - -/** - * DO NOT CALL THIS IN THE CORE MOD! IT WILL __NOT__ WORK AND FUCK EVERYTHING UP! - */ -public class LoaderReference { - - private LoaderReference() {} - - public static boolean Natura; - public static boolean RandomThings; - public static boolean TConstruct; - public static boolean chisel; - public static boolean Railcraft; - public static boolean Ztones; - public static boolean witchery; - public static boolean GalaxySpace; - public static boolean GalacticraftCore; - public static boolean GalacticraftMars; - public static boolean Thaumcraft; - public static boolean miscutils; - public static boolean tectech; - public static boolean ExtraUtilities; - public static boolean RWG; - public static boolean galacticgreg; - public static boolean gendustry; - public static boolean croploadcore; - public static boolean Forestry; - public static boolean berriespp; - public static boolean dreamcraft; - public static boolean BloodArsenal; - public static boolean Botany; - public static boolean EnderIO; - public static boolean HardcoreEnderExpension; - public static boolean betterloadingscreen; - public static boolean TGregworks; - public static boolean ProjRedIllumination; - public static boolean Botania; - - public static void init() { - Natura = Loader.isModLoaded("Natura"); - RandomThings = Loader.isModLoaded("RandomThings"); - TConstruct = Loader.isModLoaded("TConstruct"); - chisel = Loader.isModLoaded("chisel"); - Railcraft = Loader.isModLoaded("Railcraft"); - Ztones = Loader.isModLoaded("Ztones"); - witchery = Loader.isModLoaded("witchery"); - GalaxySpace = Loader.isModLoaded("GalaxySpace"); - GalacticraftCore = Loader.isModLoaded("GalacticraftCore"); - GalacticraftMars = Loader.isModLoaded("GalacticraftMars"); - Thaumcraft = Loader.isModLoaded("Thaumcraft"); - miscutils = Loader.isModLoaded("miscutils"); - tectech = Loader.isModLoaded("tectech"); - ExtraUtilities = Loader.isModLoaded("ExtraUtilities"); - RWG = Loader.isModLoaded("RWG"); - galacticgreg = Loader.isModLoaded("galacticgreg"); - gendustry = Loader.isModLoaded("gendustry"); - croploadcore = Loader.isModLoaded("croploadcore"); - Forestry = Loader.isModLoaded("Forestry"); - berriespp = Loader.isModLoaded("berriespp"); - dreamcraft = Loader.isModLoaded("dreamcraft"); - BloodArsenal = Loader.isModLoaded("BloodArsenal"); - Botany = Loader.isModLoaded("Botany"); - EnderIO = Loader.isModLoaded("EnderIO"); - HardcoreEnderExpension = Loader.isModLoaded("HardcoreEnderExpension"); - betterloadingscreen = Loader.isModLoaded("betterloadingscreen"); - TGregworks = Loader.isModLoaded("TGregworks"); - ProjRedIllumination = Loader.isModLoaded("ProjRed|Illumination"); - Botania = Loader.isModLoaded("Botania"); - } -} diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/API/package-info.java b/src/main/java/com/github/bartimaeusnek/bartworks/API/package-info.java index bf495440e5..4bef7a0cad 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/API/package-info.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/API/package-info.java @@ -10,7 +10,8 @@ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. */ -@API(owner = "bartworks", apiVersion = API_REFERENCE.VERSION, provides = "bartworks API") +@API(owner = Mods.Names.BART_WORKS, apiVersion = API_REFERENCE.VERSION, provides = "bartworks API") package com.github.bartimaeusnek.bartworks.API; import cpw.mods.fml.common.API; +import gregtech.api.enums.Mods; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCore.java b/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCore.java index a747c95f7f..60202e102e 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCore.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCore.java @@ -14,6 +14,10 @@ package com.github.bartimaeusnek.bartworks.ASM; import static com.github.bartimaeusnek.bartworks.ASM.BWCoreTransformer.shouldTransform; +import static gregtech.api.enums.Mods.ExtraUtilities; +import static gregtech.api.enums.Mods.GTPlusPlus; +import static gregtech.api.enums.Mods.RWG; +import static gregtech.api.enums.Mods.Thaumcraft; import java.util.ArrayList; import java.util.List; @@ -68,10 +72,10 @@ public class BWCore extends DummyModContainer { @Override public List<ArtifactVersion> getDependants() { List<ArtifactVersion> ret = new ArrayList<>(); - ret.add(new DefaultArtifactVersion("ExtraUtilities", true)); - ret.add(new DefaultArtifactVersion("Thaumcraft", true)); - ret.add(new DefaultArtifactVersion("miscutils", true)); - ret.add(new DefaultArtifactVersion("RWG", true)); + ret.add(new DefaultArtifactVersion(ExtraUtilities.ID, true)); + ret.add(new DefaultArtifactVersion(Thaumcraft.ID, true)); + ret.add(new DefaultArtifactVersion(GTPlusPlus.ID, true)); + ret.add(new DefaultArtifactVersion(RWG.ID, true)); ret.add(new DefaultArtifactVersion(MainMod.MOD_ID, true)); ret.add(new DefaultArtifactVersion(BartWorksCrossmod.MOD_ID, true)); return ret; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCoreTransformer.java b/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCoreTransformer.java index 58d65ddec5..1605192572 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCoreTransformer.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCoreTransformer.java @@ -13,7 +13,26 @@ package com.github.bartimaeusnek.bartworks.ASM; -import static org.objectweb.asm.Opcodes.*; +import static org.objectweb.asm.Opcodes.ACC_PUBLIC; +import static org.objectweb.asm.Opcodes.ACONST_NULL; +import static org.objectweb.asm.Opcodes.ALOAD; +import static org.objectweb.asm.Opcodes.ARETURN; +import static org.objectweb.asm.Opcodes.GETFIELD; +import static org.objectweb.asm.Opcodes.GETSTATIC; +import static org.objectweb.asm.Opcodes.GOTO; +import static org.objectweb.asm.Opcodes.ICONST_0; +import static org.objectweb.asm.Opcodes.IFEQ; +import static org.objectweb.asm.Opcodes.IFNE; +import static org.objectweb.asm.Opcodes.IF_ICMPGE; +import static org.objectweb.asm.Opcodes.ILOAD; +import static org.objectweb.asm.Opcodes.INSTANCEOF; +import static org.objectweb.asm.Opcodes.INVOKESTATIC; +import static org.objectweb.asm.Opcodes.INVOKEVIRTUAL; +import static org.objectweb.asm.Opcodes.IREM; +import static org.objectweb.asm.Opcodes.IRETURN; +import static org.objectweb.asm.Opcodes.ISTORE; +import static org.objectweb.asm.Opcodes.POP; +import static org.objectweb.asm.Opcodes.SIPUSH; import java.util.Arrays; import java.util.List; @@ -22,7 +41,19 @@ import net.minecraft.launchwrapper.IClassTransformer; import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassWriter; -import org.objectweb.asm.tree.*; +import org.objectweb.asm.tree.AbstractInsnNode; +import org.objectweb.asm.tree.ClassNode; +import org.objectweb.asm.tree.FieldInsnNode; +import org.objectweb.asm.tree.InsnList; +import org.objectweb.asm.tree.InsnNode; +import org.objectweb.asm.tree.IntInsnNode; +import org.objectweb.asm.tree.JumpInsnNode; +import org.objectweb.asm.tree.LabelNode; +import org.objectweb.asm.tree.LdcInsnNode; +import org.objectweb.asm.tree.MethodInsnNode; +import org.objectweb.asm.tree.MethodNode; +import org.objectweb.asm.tree.TypeInsnNode; +import org.objectweb.asm.tree.VarInsnNode; public class BWCoreTransformer implements IClassTransformer { @@ -351,12 +382,6 @@ public class BWCoreTransformer implements IClassTransformer { } } - // case 6: { - // BWCore.BWCORE_LOG.info("Could find: " + - // BWCoreTransformer.CLASSESBEEINGTRANSFORMED[id]); - // ((IntInsnNode) methods.get(11).instructions.get(10)).operand = 10000; - // break scase; - // } default: { BWCore.BWCORE_LOG.info("Could not find: " + BWCoreTransformer.CLASSESBEEINGTRANSFORMED[id]); return basicClass; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java b/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java index 2a873977a9..f157c6c0e7 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java @@ -16,6 +16,8 @@ package com.github.bartimaeusnek.bartworks; import static com.github.bartimaeusnek.bartworks.common.loaders.BioRecipeLoader.runOnServerStarted; import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.removeIC2Recipes; import static gregtech.api.enums.GT_Values.VN; +import static gregtech.api.enums.Mods.BartWorks; +import static gregtech.api.enums.Mods.GTPlusPlus; import java.io.IOException; import java.util.Map; @@ -27,14 +29,28 @@ import net.minecraftforge.common.MinecraftForge; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import com.github.bartimaeusnek.bartworks.API.*; +import com.github.bartimaeusnek.bartworks.API.API_ConfigValues; +import com.github.bartimaeusnek.bartworks.API.API_REFERENCE; +import com.github.bartimaeusnek.bartworks.API.BioObjectAdder; +import com.github.bartimaeusnek.bartworks.API.BioVatLogicAdder; +import com.github.bartimaeusnek.bartworks.API.SideReference; import com.github.bartimaeusnek.bartworks.client.ClientEventHandler.TooltipEventHandler; import com.github.bartimaeusnek.bartworks.client.creativetabs.BioTab; import com.github.bartimaeusnek.bartworks.client.creativetabs.GT2Tab; import com.github.bartimaeusnek.bartworks.client.creativetabs.bartworksTab; import com.github.bartimaeusnek.bartworks.client.textures.PrefixTextureLinker; import com.github.bartimaeusnek.bartworks.common.configs.ConfigHandler; -import com.github.bartimaeusnek.bartworks.common.loaders.*; +import com.github.bartimaeusnek.bartworks.common.loaders.ArtificialMicaLine; +import com.github.bartimaeusnek.bartworks.common.loaders.BeforeGTPreload; +import com.github.bartimaeusnek.bartworks.common.loaders.BioCultureLoader; +import com.github.bartimaeusnek.bartworks.common.loaders.BioLabLoader; +import com.github.bartimaeusnek.bartworks.common.loaders.GTNHBlocks; +import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry; +import com.github.bartimaeusnek.bartworks.common.loaders.LocalisationLoader; +import com.github.bartimaeusnek.bartworks.common.loaders.RadioHatchMaterialLoader; +import com.github.bartimaeusnek.bartworks.common.loaders.RecipeLoader; +import com.github.bartimaeusnek.bartworks.common.loaders.RegisterServerCommands; +import com.github.bartimaeusnek.bartworks.common.loaders.StaticRecipeChangeLoaders; import com.github.bartimaeusnek.bartworks.common.net.BW_Network; import com.github.bartimaeusnek.bartworks.neiHandler.IMCForNEI; import com.github.bartimaeusnek.bartworks.server.EventHandler.ServerEventHandler; @@ -49,10 +65,16 @@ import com.github.bartimaeusnek.bartworks.util.log.DebugLog; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Mod; -import cpw.mods.fml.common.event.*; +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.FMLServerStartedEvent; +import cpw.mods.fml.common.event.FMLServerStartingEvent; import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.common.network.NetworkRegistry; import gregtech.api.GregTech_API; +import gregtech.api.enums.Mods; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Recipe; @@ -74,12 +96,12 @@ public final class MainMod { public static final String NAME = "BartWorks"; public static final String VERSION = "GRADLETOKEN_VERSION"; - public static final String MOD_ID = "bartworks"; + public static final String MOD_ID = Mods.Names.BART_WORKS; public static final String APIVERSION = "11"; public static final Logger LOGGER = LogManager.getLogger(MainMod.NAME); public static final CreativeTabs GT2 = new GT2Tab("GT2C"); public static final CreativeTabs BIO_TAB = new BioTab("BioTab"); - public static final CreativeTabs BWT = new bartworksTab("bartworks"); + public static final CreativeTabs BWT = new bartworksTab(BartWorks.ID); public static final IGuiHandler GH = new GuiHandler(); @Mod.Instance(MainMod.MOD_ID) @@ -98,16 +120,10 @@ public final class MainMod { MainMod.LOGGER.error("Something has loaded an old API. Please contact the Mod authors to update!"); } - LoaderReference.init(); // Check for ALL the mods. - - if (LoaderReference.miscutils) { + if (GTPlusPlus.isModLoaded()) { MainMod.LOGGER.info("Found GT++, continuing"); } - if (LoaderReference.dreamcraft) ConfigHandler.hardmode = true; - - ConfigHandler.hardmode = ConfigHandler.ezmode != ConfigHandler.hardmode; - if (API_ConfigValues.debugLog) { try { DebugLog.initDebugLog(preinit); @@ -116,21 +132,18 @@ public final class MainMod { } } - if (ConfigHandler.newStuff) { - WerkstoffLoader.setUp(); - } - - if (ConfigHandler.hardmode) MainMod.LOGGER.info(". . . ACTIVATED HARDMODE."); + WerkstoffLoader.setUp(); if (ConfigHandler.BioLab) { BioCultureLoader.run(); } - if (ConfigHandler.newStuff) { - Werkstoff.init(); - GregTech_API.sAfterGTPostload.add(new CircuitPartLoader()); - if (SideReference.Side.Client) GregTech_API.sBeforeGTLoad.add(new PrefixTextureLinker()); + Werkstoff.init(); + GregTech_API.sAfterGTPostload.add(new CircuitPartLoader()); + if (SideReference.Side.Client) { + GregTech_API.sBeforeGTLoad.add(new PrefixTextureLinker()); } + } @Mod.EventHandler @@ -142,10 +155,12 @@ public final class MainMod { MinecraftForge.EVENT_BUS.register(serverEventHandler); } FMLCommonHandler.instance().bus().register(serverEventHandler); - if (ConfigHandler.BioLab) BioLabLoader.run(); - if (ConfigHandler.newStuff) { - WerkstoffLoader.runInit(); + if (ConfigHandler.BioLab) { + BioLabLoader.run(); } + + WerkstoffLoader.runInit(); + ItemRegistry.run(); RecipeLoader.run(); IMCForNEI.IMCSender(); @@ -165,10 +180,10 @@ public final class MainMod { } ArtificialMicaLine.runArtificialMicaRecipe(); BioObjectAdder.regenerateBioFluids(); - if (ConfigHandler.newStuff) { - WerkstoffLoader.run(); - LocalisationLoader.localiseAll(); - } + + WerkstoffLoader.run(); + LocalisationLoader.localiseAll(); + RadioHatchMaterialLoader.run(); } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/BW_GT_ItemRenderer.java b/src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/BW_GT_ItemRenderer.java index b375a1c1b0..4a6561f9ef 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/BW_GT_ItemRenderer.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/BW_GT_ItemRenderer.java @@ -112,15 +112,6 @@ public class BW_GT_ItemRenderer implements IItemRenderer { tIcon.getIconWidth(), tIcon.getIconHeight(), 0.0625F); - // else { - // for (int i = 0; i < 4; i++) { - // ItemRenderer.renderItemIn2D(Tessellator.instance, - // 0.0F+i*2F,0.0F+i*2F,10.0F+i*2F,10.0F+i*2F, tIcon.getIconWidth(), tIcon.getIconHeight(),0.0625F); - // } - // } - // ItemRenderer.renderItemIn2D(Tessellator.instance, tIcon.getMaxU(), - // tIcon.getMinV(), tIcon.getMinU(), tIcon.getMaxV(), tIcon.getIconWidth(), tIcon.getIconHeight(), - // 0.0625F); } IIcon tOverlay = (IIcon) BW_Util.get2DCoordFrom1DArray(aMetaData, 1, 2, aItem.mIconList); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/BW_Renderer_Block_Ores.java b/src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/BW_Renderer_Block_Ores.java index c298b6a321..9e25535970 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/BW_Renderer_Block_Ores.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/BW_Renderer_Block_Ores.java @@ -13,7 +13,12 @@ package com.github.bartimaeusnek.bartworks.client.renderer; -import static gregtech.common.render.GT_Renderer_Block.*; +import static gregtech.common.render.GT_Renderer_Block.renderNegativeXFacing; +import static gregtech.common.render.GT_Renderer_Block.renderNegativeYFacing; +import static gregtech.common.render.GT_Renderer_Block.renderNegativeZFacing; +import static gregtech.common.render.GT_Renderer_Block.renderPositiveXFacing; +import static gregtech.common.render.GT_Renderer_Block.renderPositiveYFacing; +import static gregtech.common.render.GT_Renderer_Block.renderPositiveZFacing; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/RendererGlasBlock.java b/src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/RendererGlasBlock.java index 244d7e5c7c..de1d90a3f4 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/RendererGlasBlock.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/RendererGlasBlock.java @@ -72,8 +72,6 @@ public class RendererGlasBlock implements ISimpleBlockRenderingHandler { @Override public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - // renderer.setRenderBounds(0.001,0.001,0.001,0.999,0.999,0.999); - // renderer.setRenderBounds(0,0,0,1,1,1); if (block instanceof BW_GlasBlocks) { renderer.renderStandardBlock(ItemRegistry.bw_fake_glasses, x, y, z); renderer.renderStandardBlockWithColorMultiplier( diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java index 8d5e071bd3..46e63a89ec 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java @@ -53,8 +53,6 @@ public class ConfigHandler { public static boolean DEHPDirectSteam; public static boolean teslastaff; public static boolean classicMode; - public static boolean hardmode; - public static boolean ezmode; public static boolean GTppLogDisabler; public static boolean tooltips = true; @@ -131,23 +129,11 @@ public class ConfigHandler { "ID Offset for this mod. This Mod uses " + ConfigHandler.IDU + " IDs. DO NOT CHANGE IF YOU DONT KNOW WHAT THIS IS") .getInt(12600); - ConfigHandler.ezmode = ConfigHandler.c - .get( - "System", - "Mode switch", - false, - "If GTNH is Loaded, this will enable easy recipes, if not, it will enable harder recipes.") - .getBoolean(false); ConfigHandler.teslastaff = ConfigHandler.c.get( "System", "Enable Teslastaff", false, "Enables the Teslastaff, an Item used to destroy Electric Armors").getBoolean(false); - ConfigHandler.newStuff = !ConfigHandler.c.get( - "System", - "Disable non-original-GT-stuff", - false, - "This switch disables my new content, that is not part of the GT2 compat").getBoolean(false); ConfigHandler.BioLab = !ConfigHandler.c.get( "System", "Disable BioLab", diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/LabParts.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/LabParts.java index 3ae2981575..e8632c574c 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/LabParts.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/LabParts.java @@ -13,7 +13,9 @@ package com.github.bartimaeusnek.bartworks.common.items; -import static com.github.bartimaeusnek.bartworks.common.loaders.BioItemList.*; +import static com.github.bartimaeusnek.bartworks.common.loaders.BioItemList.getAllDNASampleFlasks; +import static com.github.bartimaeusnek.bartworks.common.loaders.BioItemList.getAllPetriDishes; +import static com.github.bartimaeusnek.bartworks.common.loaders.BioItemList.getAllPlasmidCells; import java.util.List; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ArtificialMicaLine.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ArtificialMicaLine.java index 60f7b1f30e..afc306280f 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ArtificialMicaLine.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ArtificialMicaLine.java @@ -1,9 +1,10 @@ package com.github.bartimaeusnek.bartworks.common.loaders; +import static gregtech.api.enums.Mods.NewHorizonsCoreMod; + import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; -import com.github.bartimaeusnek.bartworks.API.LoaderReference; import com.github.bartimaeusnek.bartworks.system.material.BW_GT_MaterialReference; import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; @@ -184,11 +185,13 @@ public class ArtificialMicaLine { 120, 0)); // Fluorophlogopite = 4Insulator Foil - if (LoaderReference.dreamcraft) GT_Values.RA.addBenderRecipe( - WerkstoffLoader.Fluorophlogopite.get(OrePrefixes.plate, 1), - GT_Utility.getIntegratedCircuit(1), - GT_ModHandler.getModItem("dreamcraft", "item.MicaInsulatorFoil", 4), - 10, - 600); + if (NewHorizonsCoreMod.isModLoaded()) { + GT_Values.RA.addBenderRecipe( + WerkstoffLoader.Fluorophlogopite.get(OrePrefixes.plate, 1), + GT_Utility.getIntegratedCircuit(1), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MicaInsulatorFoil", 4), + 10, + 600); + } } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BeforeGTPreload.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BeforeGTPreload.java index 7f10a18de0..cb08db3ba8 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BeforeGTPreload.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BeforeGTPreload.java @@ -13,6 +13,8 @@ package com.github.bartimaeusnek.bartworks.common.loaders; +import static gregtech.api.enums.Mods.BartWorks; + import java.lang.reflect.Field; import net.minecraft.block.Block; @@ -52,7 +54,7 @@ public class BeforeGTPreload implements Runnable { ModContainer gregtech = Loader.instance().activeModContainer(); boolean switchback = false; LoadController modController = null; - if (!Loader.instance().activeModContainer().getModId().equals("bartworks")) { + if (!Loader.instance().activeModContainer().getModId().equals(BartWorks.ID)) { Field fieldModController = FieldUtils.getDeclaredField(Loader.class, "modController", true); try { modController = (LoadController) fieldModController.get(Loader.instance()); @@ -63,7 +65,7 @@ public class BeforeGTPreload implements Runnable { assert modController != null; for (ModContainer mod : modController.getActiveModList()) { - if (mod.getModId().equals("bartworks")) { + if (mod.getModId().equals(BartWorks.ID)) { bartworks = mod; } if (bartworks != null) break; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioRecipeLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioRecipeLoader.java index d51b0f3c04..54e0d4633e 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioRecipeLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioRecipeLoader.java @@ -13,247 +13,32 @@ package com.github.bartimaeusnek.bartworks.common.loaders; -import java.util.List; +import static gregtech.api.enums.Mods.CropsPlusPlus; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; -import com.github.bartimaeusnek.bartworks.API.LoaderReference; -import com.github.bartimaeusnek.bartworks.common.configs.ConfigHandler; -import com.github.bartimaeusnek.bartworks.common.tileentities.multis.GT_TileEntity_BioVat; -import com.github.bartimaeusnek.bartworks.common.tileentities.tiered.GT_MetaTileEntity_BioLab; -import com.github.bartimaeusnek.bartworks.common.tileentities.tiered.GT_MetaTileEntity_RadioHatch; import com.github.bartimaeusnek.bartworks.util.BWRecipes; import com.github.bartimaeusnek.bartworks.util.BW_Util; -import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; -import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; public class BioRecipeLoader { - @SuppressWarnings("deprecation") public static void run() { + registerWaterBasedBioLabIncubations(); + registerBacterialVatRecipes(); + } - // DNAExtractionModule - GT_ModHandler.addCraftingRecipe( - BioItemList.mBioLabParts[0], - RecipeLoader.BITSD, - new Object[] { "TET", "CFC", "TST", 'T', - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 1L), 'E', - ItemList.Emitter_EV.get(1L), 'C', - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Aluminium, 1L), 'S', - ItemList.Sensor_EV.get(1L), 'F', ItemList.Field_Generator_EV.get(1L) }); - - // PCRThermoclyclingModule - GT_ModHandler.addCraftingRecipe( - BioItemList.mBioLabParts[1], - RecipeLoader.BITSD, - new Object[] { "NEN", "CFC", "NSN", 'N', - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Nichrome, 1L), 'E', - ItemList.Emitter_EV.get(1L), 'C', - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Aluminium, 1L), 'S', - ItemList.Sensor_EV.get(1L), 'F', ItemList.Field_Generator_EV.get(1L) }); - - // PlasmidSynthesisModule - GT_ModHandler.addCraftingRecipe( - BioItemList.mBioLabParts[2], - RecipeLoader.BITSD, - new Object[] { "SFE", "CPC", "NFN", 'N', - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Nichrome, 1L), 'C', - "circuit" + Materials.Data, 'F', ItemList.Field_Generator_EV.get(1L), 'E', - ItemList.Emitter_EV.get(1L), 'S', ItemList.Sensor_EV.get(1L), 'P', - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 1L), }); - // TransformationModule - GT_ModHandler.addCraftingRecipe( - BioItemList.mBioLabParts[3], - RecipeLoader.BITSD, - new Object[] { "SFE", "CPC", "NFN", 'N', - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Naquadah, 1L), 'C', - "circuit" + Materials.Master, 'F', ItemList.Field_Generator_LuV.get(1L), 'E', - ItemList.Emitter_LuV.get(1L), 'S', ItemList.Sensor_LuV.get(1L), 'P', - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Chrome, 1L), }); - - // ClonalCellularSynthesisModule - GT_ModHandler.addCraftingRecipe( - BioItemList.mBioLabParts[4], - RecipeLoader.BITSD, - new Object[] { "FEF", "CPC", "FSF", 'N', - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Naquadah, 1L), 'C', - "circuit" + Materials.Master, 'F', ItemList.Field_Generator_LuV.get(1L), 'E', - ItemList.Emitter_LuV.get(1L), 'S', ItemList.Sensor_LuV.get(1L), 'P', - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Chrome, 1L), }); - - List<ItemStack> oreCropVine = OreDictionary.getOres("cropVine", false); - if (LoaderReference.croploadcore && !oreCropVine.isEmpty()) for (ItemStack stack : oreCropVine) { - GT_Values.RA.addExtractorRecipe( - BW_Util.setStackSize(stack, 12), - BioItemList.getOther(1), - 500, - BW_Util.getMachineVoltageFromTier(3)); - } - else GT_Values.RA.addExtractorRecipe( - new ItemStack(Blocks.vine, 12), - BioItemList.getOther(1), - 500, - BW_Util.getMachineVoltageFromTier(3)); - - GT_Values.RA.addExtractorRecipe( - ItemList.Circuit_Chip_Stemcell.get(1L), - BioItemList.getOther(4), - 500, - BW_Util.getMachineVoltageFromTier(6)); - - FluidStack dnaFluid = LoaderReference.gendustry ? FluidRegistry.getFluidStack("liquiddna", 1000) - : Materials.Biomass.getFluid(1000L); - GT_Values.RA.addMixerRecipe( - GT_Utility.getIntegratedCircuit(17), - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Radon, 1L), - null, - null, - dnaFluid, - new FluidStack(FluidLoader.BioLabFluidMaterials[0], 2000), - Materials.Empty.getCells(1), - 500, - BW_Util.getMachineVoltageFromTier(3)); - - GT_Values.RA.addCentrifugeRecipe( - GT_Utility.getIntegratedCircuit(17), - null, - new FluidStack(BioCultureLoader.eColi.getFluid(), 1000), - new FluidStack(FluidLoader.BioLabFluidMaterials[1], 10), - BioItemList.getOther(4), - null, - null, - null, - null, - null, - new int[] { 1000 }, - 60 * 20, - BW_Util.getMachineVoltageFromTier(3)); - GT_Values.RA.addCentrifugeRecipe( - GT_Utility.getIntegratedCircuit(17), - null, - new FluidStack(FluidLoader.BioLabFluidMaterials[1], 1000), - new FluidStack(FluidLoader.BioLabFluidMaterials[3], 250), - null, - null, - null, - null, - null, - null, - null, - 60 * 20, - BW_Util.getMachineVoltageFromTier(3)); - GT_Values.RA.addCentrifugeRecipe( - GT_Utility.getIntegratedCircuit(17), - null, - new FluidStack(BioCultureLoader.CommonYeast.getFluid(), 1000), - new FluidStack(FluidLoader.BioLabFluidMaterials[2], 10), - null, - null, - null, - null, - null, - null, - null, - 60 * 20, - BW_Util.getMachineVoltageFromTier(3)); - - ItemStack[] Pistons = { ItemList.Electric_Piston_HV.get(1L), ItemList.Electric_Piston_EV.get(1L), - ItemList.Electric_Piston_IV.get(1L), ItemList.Electric_Piston_LuV.get(1L), - ItemList.Electric_Piston_ZPM.get(1L), ItemList.Electric_Piston_UV.get(1L) }; - ItemStack[] BioLab = new ItemStack[GT_Values.VN.length - 3]; - ItemStack[] RadioHatch = new ItemStack[GT_Values.VN.length - 3]; - Materials[] cables = { Materials.Gold, Materials.Aluminium, Materials.Tungsten, Materials.VanadiumGallium, - Materials.Naquadah, Materials.NaquadahAlloy, Materials.Superconductor }; - Materials[] hulls = { Materials.StainlessSteel, Materials.Titanium, Materials.TungstenSteel, Materials.Chrome, - Materials.Iridium, Materials.Osmium, Materials.Naquadah }; - Materials[] wireMat = { Materials.Kanthal, Materials.Nichrome, Materials.TungstenSteel, Materials.Naquadah, - Materials.NaquadahAlloy, Materials.Superconductor }; - Materials[] circuits = { Materials.Advanced, Materials.Data, Materials.Elite, Materials.Master, - Materials.Ultimate, Materials.Superconductor }; - for (int i = 3; i < GT_Values.VN.length - 1; i++) { - // 12625 - BioLab[(i - 3)] = new GT_MetaTileEntity_BioLab( - ConfigHandler.IDOffset + GT_Values.VN.length * 6 + i, - "bw.biolab" + GT_Values.VN[i], - GT_Values.VN[i] + " " + StatCollector.translateToLocal("tile.biolab.name"), - i).getStackForm(1L); - RadioHatch[(i - 3)] = new GT_MetaTileEntity_RadioHatch( - ConfigHandler.IDOffset + GT_Values.VN.length * 7 - 2 + i, - "bw.radiohatch" + GT_Values.VN[i], - GT_Values.VN[i] + " " + StatCollector.translateToLocal("tile.radiohatch.name"), - i).getStackForm(1L); - try { - ItemStack machinehull = ItemList.MACHINE_HULLS[i].get(1L); - GT_ModHandler.addCraftingRecipe( - BioLab[(i - 3)], - RecipeLoader.BITSD, - new Object[] { "PFP", "WCW", "OGO", 'F', - GT_OreDictUnificator.get(OrePrefixes.frameGt, hulls[(i - 3)], 1L), 'W', - GT_OreDictUnificator.get(OrePrefixes.wireGt01, wireMat[(i - 3)], 1L), 'P', - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Polytetrafluoroethylene, 1L), 'O', - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Polystyrene, 1L), 'G', - "circuit" + circuits[(i - 3)], 'C', machinehull }); - GT_ModHandler.addCraftingRecipe( - RadioHatch[(i - 3)], - RecipeLoader.BITSD, - new Object[] { "DPD", "DCD", "DKD", 'D', - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Lead, 1L), 'C', machinehull, - 'K', GT_OreDictUnificator.get(OrePrefixes.cableGt08, cables[(i - 3)], 1L), 'P', - Pistons[(i - 3)] }); - } catch (ArrayIndexOutOfBoundsException e) { - // e.printStackTrace(); - } - } - GT_ModHandler.addCraftingRecipe( - new GT_TileEntity_BioVat( - ConfigHandler.IDOffset + GT_Values.VN.length * 7, - "bw.biovat", - StatCollector.translateToLocal("tile.biovat.name")).getStackForm(1L), - RecipeLoader.BITSD, - new Object[] { "GCG", "KHK", "GCG", 'G', new ItemStack(ItemRegistry.bw_glasses[0], 1, 1), 'C', - "circuit" + Materials.Data, 'K', - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Silver, 1L), 'H', - ItemList.MACHINE_HULLS[3].get(1L) }); - - Materials[] sterilizers = { Materials.Ammonia, Materials.Chlorine, Materials.Ethanol, Materials.Methanol }; - for (Materials used : sterilizers) { - GT_Values.RA.addAutoclaveRecipe( - ItemList.Circuit_Parts_PetriDish.get(1L), - used.getGas(10L) != null ? used.getGas(8L) : used.getFluid(16L), - BioItemList.getPetriDish(null), - 10000, - 100, - BW_Util.getMachineVoltageFromTier(1)); - - GT_Values.RA.addAutoclaveRecipe( - new ItemStack(Items.glass_bottle), - used.getGas(10L) != null ? used.getGas(8L) : used.getFluid(16L), - BioItemList.getDNASampleFlask(null), - 10000, - 100, - BW_Util.getMachineVoltageFromTier(1)); - } - - GT_Values.RA.addLaserEngraverRecipe( - new ItemStack(Items.emerald), - GT_Utility.getIntegratedCircuit(17), - BioItemList.getPlasmidCell(null), - 100, - BW_Util.getMachineVoltageFromTier(1)); - + public static void registerWaterBasedBioLabIncubations() { FluidStack[] easyFluids = { Materials.Water.getFluid(1000L), FluidRegistry.getFluidStack("ic2distilledwater", 1000) }; for (FluidStack fluidStack : easyFluids) { @@ -329,15 +114,22 @@ public class BioRecipeLoader { 1500, BW_Util.getMachineVoltageFromTier(4), BW_Util.STANDART); + } + } - BWRecipes.instance.addBacterialVatRecipe( - new ItemStack[] { new ItemStack(Items.sugar, 64) }, - new FluidStack[] { new FluidStack(fluidStack, 100) }, - BioCultureLoader.CommonYeast, - new FluidStack[] { (LoaderReference.berriespp ? FluidRegistry.getFluidStack("potion.ghp", 1) - : Materials.Ethanol.getFluid(1L)) }, - 350, - BW_Util.getMachineVoltageFromTier(4)); + public static void registerWaterBasedBacterialVatRecipes() { + FluidStack[] easyFluids = { Materials.Water.getFluid(1000L), + FluidRegistry.getFluidStack("ic2distilledwater", 1000) }; + for (FluidStack fluidStack : easyFluids) { + if (CropsPlusPlus.isModLoaded()) { + BWRecipes.instance.addBacterialVatRecipe( + new ItemStack[] { new ItemStack(Items.sugar, 64) }, + new FluidStack[] { new FluidStack(fluidStack, 100) }, + BioCultureLoader.CommonYeast, + new FluidStack[] { FluidRegistry.getFluidStack("potion.ghp", 1) }, + 350, + BW_Util.getMachineVoltageFromTier(4)); + } BWRecipes.instance.addBacterialVatRecipe( new ItemStack[] { ItemList.Crop_Drop_Grapes.get(16) }, @@ -364,6 +156,10 @@ public class BioRecipeLoader { 600, BW_Util.getMachineVoltageFromTier(1)); } + } + + public static void registerBacterialVatRecipes() { + registerWaterBasedBacterialVatRecipes(); BWRecipes.instance.addBacterialVatRecipe( null, @@ -380,28 +176,6 @@ public class BioRecipeLoader { new FluidStack[] { new FluidStack(FluidLoader.fulvicAcid, 1000) }, 2748, BW_Util.getMachineVoltageFromTier(3)); - GT_Values.RA.addFluidHeaterRecipe( - GT_Utility.getIntegratedCircuit(10), - new FluidStack(FluidLoader.fulvicAcid, 1000), - new FluidStack(FluidLoader.heatedfulvicAcid, 1000), - 90, - BW_Util.getMachineVoltageFromTier(2)); - GT_Values.RA.addChemicalRecipe( - GT_Utility.getIntegratedCircuit(10), - null, - new FluidStack(FluidLoader.heatedfulvicAcid, 1000), - new FluidStack(FluidLoader.Kerogen, 1000), - null, - 75, - BW_Util.getMachineVoltageFromTier(2)); - GT_Values.RA.addPyrolyseRecipe( - Materials.Wood.getDust(10), - new FluidStack(FluidLoader.Kerogen, 1000), - 10, - null, - Materials.Oil.getFluid(1000), - 105, - BW_Util.getMachineVoltageFromTier(3)); } public static void runOnServerStarted() { diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ElectricImplosionCompressorRecipes.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ElectricImplosionCompressorRecipes.java index e4849333a3..cc072482f4 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ElectricImplosionCompressorRecipes.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ElectricImplosionCompressorRecipes.java @@ -2,13 +2,21 @@ package com.github.bartimaeusnek.bartworks.common.loaders; import static com.github.bartimaeusnek.bartworks.common.tileentities.multis.GT_TileEntity_ElectricImplosionCompressor.eicMap; import static gregtech.api.enums.GT_Values.M; +import static gregtech.api.enums.Mods.EternalSingularity; +import static gregtech.api.enums.Mods.GoodGenerator; +import static gregtech.api.enums.Mods.OpenComputers; +import static gregtech.api.enums.Mods.SuperSolarPanels; +import static gregtech.api.enums.Mods.UniversalSingularities; import static gregtech.api.util.GT_ModHandler.getModItem; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; -import cpw.mods.fml.common.Loader; -import gregtech.api.enums.*; +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.ItemList; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.TierEU; import gregtech.api.util.GT_OreDictUnificator; public class ElectricImplosionCompressorRecipes implements Runnable { @@ -36,40 +44,41 @@ public class ElectricImplosionCompressorRecipes implements Runnable { public void run() { // Custom electric implosion compressor recipes. Cannot be overclocked. - if (Loader.isModLoaded("eternalsingularity")) { + if (EternalSingularity.isModLoaded()) { addElectricImplosionRecipe( // IN. new ItemStack[] { GT_Values.NI }, new FluidStack[] { Materials.SpaceTime.getMolten(72L) }, // OUT. - new ItemStack[] { getModItem("eternalsingularity", "eternal_singularity", 1L) }, + new ItemStack[] { getModItem(EternalSingularity.ID, "eternal_singularity", 1L) }, new FluidStack[] { GT_Values.NF }, // Recipe stats. 100 * 20, (int) TierEU.RECIPE_UMV); - // Raw Exposed Optical Chip - addElectricImplosionRecipe( - // IN. - new ItemStack[] { ItemList.Circuit_Silicon_Wafer7.get(1L), - // Fluxed Electrum Singularity. - getModItem("universalsingularities", "universal.general.singularity", 1L, 20) }, - new FluidStack[] { GT_Values.NF }, - // OUT. - new ItemStack[] { ItemList.Circuit_Chip_Optical.get(16L) }, - new FluidStack[] { GT_Values.NF }, - 5 * 20, - (int) TierEU.RECIPE_UMV); + if (UniversalSingularities.isModLoaded()) + // Raw Exposed Optical Chip + addElectricImplosionRecipe( + // IN. + new ItemStack[] { ItemList.Circuit_Silicon_Wafer7.get(1L), + // Fluxed Electrum Singularity. + getModItem(UniversalSingularities.ID, "universal.general.singularity", 1L, 20) }, + new FluidStack[] { GT_Values.NF }, + // OUT. + new ItemStack[] { ItemList.Circuit_Chip_Optical.get(16L) }, + new FluidStack[] { GT_Values.NF }, + 5 * 20, + (int) TierEU.RECIPE_UMV); } addElectricImplosionRecipe( // IN. - new ItemStack[] { getModItem("GoodGenerator", "highDensityPlutoniumNugget", 5L) }, + new ItemStack[] { getModItem(GoodGenerator.ID, "highDensityPlutoniumNugget", 5L) }, new FluidStack[] { Materials.Infinity.getMolten(9L) }, // OUT. - new ItemStack[] { getModItem("GoodGenerator", "highDensityPlutonium", 1L) }, + new ItemStack[] { getModItem(GoodGenerator.ID, "highDensityPlutonium", 1L) }, new FluidStack[] { GT_Values.NF }, // Recipe stats. 1, @@ -77,10 +86,10 @@ public class ElectricImplosionCompressorRecipes implements Runnable { addElectricImplosionRecipe( // IN. - new ItemStack[] { getModItem("GoodGenerator", "highDensityUraniumNugget", 5L) }, + new ItemStack[] { getModItem(GoodGenerator.ID, "highDensityUraniumNugget", 5L) }, new FluidStack[] { Materials.Infinity.getMolten(9L) }, // OUT. - new ItemStack[] { getModItem("GoodGenerator", "highDensityUranium", 1L) }, + new ItemStack[] { getModItem(GoodGenerator.ID, "highDensityUranium", 1L) }, new FluidStack[] { GT_Values.NF }, // Recipe stats. 1, @@ -88,10 +97,10 @@ public class ElectricImplosionCompressorRecipes implements Runnable { addElectricImplosionRecipe( // IN. - new ItemStack[] { getModItem("GoodGenerator", "highDensityThoriumNugget", 5L) }, + new ItemStack[] { getModItem(GoodGenerator.ID, "highDensityThoriumNugget", 5L) }, new FluidStack[] { Materials.Infinity.getMolten(9L) }, // OUT. - new ItemStack[] { getModItem("GoodGenerator", "highDensityThorium", 1L) }, + new ItemStack[] { getModItem(GoodGenerator.ID, "highDensityThorium", 1L) }, new FluidStack[] { GT_Values.NF }, // Recipe stats. 1, @@ -145,8 +154,8 @@ public class ElectricImplosionCompressorRecipes implements Runnable { for (ItemStack circuit : circuits) { addElectricImplosionRecipe( new ItemStack[] { circuit.splitStack(circuitMultiplier), - getModItem("supersolarpanel", "solarsplitter", 1, 0), - getModItem("OpenComputers", "hologram2", circuitMultiplier, 0), + getModItem(SuperSolarPanels.ID, "solarsplitter", 1, 0), + getModItem(OpenComputers.ID, "hologram2", circuitMultiplier, 0), GT_OreDictUnificator.get(part, Materials.Universium, multiplier), }, new FluidStack[] { Materials.MagnetohydrodynamicallyConstrainedStarMatter .getMolten((long) partFraction * multiplier) }, diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/FluidLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/FluidLoader.java index 9bf41ba172..19d52696ff 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/FluidLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/FluidLoader.java @@ -13,6 +13,8 @@ package com.github.bartimaeusnek.bartworks.common.loaders; +import static gregtech.api.enums.Mods.Gendustry; + import java.awt.*; import java.util.Arrays; @@ -23,7 +25,6 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import com.github.bartimaeusnek.bartworks.API.LoaderReference; import com.github.bartimaeusnek.bartworks.API.SideReference; import com.github.bartimaeusnek.bartworks.client.renderer.RendererGlasBlock; import com.github.bartimaeusnek.bartworks.client.renderer.RendererSwitchingColorFluid; @@ -79,9 +80,7 @@ public class FluidLoader { FluidLoader.BioLabFluidCells[i] = fluidCells[i].get(); } - // BioCulture.BIO_CULTURE_ARRAY_LIST.get(0).setFluid(new GT_Fluid("_NULL", "molten.autogenerated", - // BW_Util.splitColorToRBGArray(BioCulture.BIO_CULTURE_ARRAY_LIST.get(0).getColorRGB()))); - FluidStack dnaFluid = LoaderReference.gendustry ? FluidRegistry.getFluidStack("liquiddna", 100) + FluidStack dnaFluid = Gendustry.isModLoaded() ? FluidRegistry.getFluidStack("liquiddna", 100) : Materials.Biomass.getFluid(100L); for (BioCulture B : BioCulture.BIO_CULTURE_ARRAY_LIST) { if (B.isBreedable()) { diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/GTNHBlocks.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/GTNHBlocks.java index 13aaa69461..081f8432e1 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/GTNHBlocks.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/GTNHBlocks.java @@ -13,8 +13,25 @@ package com.github.bartimaeusnek.bartworks.common.loaders; +import static gregtech.api.enums.Mods.BloodArsenal; +import static gregtech.api.enums.Mods.Botania; +import static gregtech.api.enums.Mods.Botany; +import static gregtech.api.enums.Mods.Chisel; +import static gregtech.api.enums.Mods.EnderIO; +import static gregtech.api.enums.Mods.ExtraUtilities; +import static gregtech.api.enums.Mods.GalaxySpace; +import static gregtech.api.enums.Mods.HardcoreEnderExpansion; +import static gregtech.api.enums.Mods.IndustrialCraft2; +import static gregtech.api.enums.Mods.Minecraft; +import static gregtech.api.enums.Mods.Natura; +import static gregtech.api.enums.Mods.Railcraft; +import static gregtech.api.enums.Mods.RandomThings; +import static gregtech.api.enums.Mods.TecTech; +import static gregtech.api.enums.Mods.TinkerConstruct; +import static gregtech.api.enums.Mods.Witchery; +import static gregtech.api.enums.Mods.ZTones; + import com.github.bartimaeusnek.bartworks.API.BioVatLogicAdder; -import com.github.bartimaeusnek.bartworks.API.LoaderReference; /** * Autogenerated run file, script Created on Wed Jan 2 19:11:07 2019 by boubou_19 and bartimaeusnek Executed on @@ -24,60 +41,109 @@ import com.github.bartimaeusnek.bartworks.API.LoaderReference; public class GTNHBlocks { public static void run() { - BioVatLogicAdder.BioVatGlass.addCustomGlass("minecraft", "glass", 0, 3); - BioVatLogicAdder.BioVatGlass.addCustomGlass("IC2", "blockAlloyGlass", 0, 4); - - if (LoaderReference.BloodArsenal) - BioVatLogicAdder.BioVatGlass.addCustomGlass("BloodArsenal", "blood_stained_glass", 0, 3); - if (LoaderReference.Botania) { - BioVatLogicAdder.BioVatGlass.addCustomGlass("Botania", "manaGlass", 0, 4); - BioVatLogicAdder.BioVatGlass.addCustomGlass("Botania", "manaGlassPane", 0, 4); - BioVatLogicAdder.BioVatGlass.addCustomGlass("Botania", "elfGlass", 0, 5); - BioVatLogicAdder.BioVatGlass.addCustomGlass("Botania", "elfGlassPane", 0, 5); - } - if (LoaderReference.Botany) BioVatLogicAdder.BioVatGlass.addCustomGlass("Botany", "stained", 0, 3); - if (LoaderReference.EnderIO) for (int i = 0; i <= 5; ++i) - BioVatLogicAdder.BioVatGlass.addCustomGlass("EnderIO", "blockFusedQuartz", i, 3); - - if (LoaderReference.ExtraUtilities) { - BioVatLogicAdder.BioVatGlass.addCustomGlass("ExtraUtilities", "decorativeBlock1", 9, 3); - for (int i = 0; i <= 11; ++i) - BioVatLogicAdder.BioVatGlass.addCustomGlass("ExtraUtilities", "decorativeBlock2", i, 3); - for (int i = 0; i <= 5; ++i) - BioVatLogicAdder.BioVatGlass.addCustomGlass("ExtraUtilities", "etherealglass", i, 3); - } - if (LoaderReference.GalaxySpace) - BioVatLogicAdder.BioVatGlass.addCustomGlass("GalaxySpace", "futureglass", 0, 3); - if (LoaderReference.HardcoreEnderExpension) - BioVatLogicAdder.BioVatGlass.addCustomGlass("HardcoreEnderExpension", "laboratory_glass", 0, 3); - - if (LoaderReference.Natura) - for (int i = 0; i <= 1; ++i) BioVatLogicAdder.BioVatGlass.addCustomGlass("Natura", "NetherGlass", i, 3); - - if (LoaderReference.RandomThings) - BioVatLogicAdder.BioVatGlass.addCustomGlass("RandomThings", "spectreGlass", 0, 3); - if (LoaderReference.TConstruct) BioVatLogicAdder.BioVatGlass.addCustomGlass("TConstruct", "GlassBlock", 0, 3); - if (LoaderReference.tectech) BioVatLogicAdder.BioVatGlass.addCustomGlass("tectech", "tile.quantumGlass", 0, 8); - - if (LoaderReference.chisel) BioVatLogicAdder.BioVatGlass.addCustomGlass("chisel", "glass2", 0, 3); - - for (int i = 0; i <= 15; ++i) { - BioVatLogicAdder.BioVatGlass.addCustomGlass("minecraft", "stained_glass", i, 3); - if (LoaderReference.GalaxySpace) - BioVatLogicAdder.BioVatGlass.addCustomGlass("GalaxySpace", "futureglasses", i, 3); - if (LoaderReference.Railcraft) BioVatLogicAdder.BioVatGlass.addCustomGlass("Railcraft", "glass", i, 3); - if (LoaderReference.TConstruct) - BioVatLogicAdder.BioVatGlass.addCustomGlass("TConstruct", "GlassBlock.StainedClear", i, 3); - if (LoaderReference.Ztones) BioVatLogicAdder.BioVatGlass.addCustomGlass("Ztones", "tile.glaxx", i, 3); - if (LoaderReference.chisel) { - BioVatLogicAdder.BioVatGlass.addCustomGlass("chisel", "glass", i, 3); - BioVatLogicAdder.BioVatGlass.addCustomGlass("chisel", "stained_glass_white", i, 3); - BioVatLogicAdder.BioVatGlass.addCustomGlass("chisel", "stained_glass_yellow", i, 3); - BioVatLogicAdder.BioVatGlass.addCustomGlass("chisel", "stained_glass_lightgray", i, 3); - BioVatLogicAdder.BioVatGlass.addCustomGlass("chisel", "stained_glass_brown", i, 3); - BioVatLogicAdder.BioVatGlass.addCustomGlass("chisel", "stained_glass_forestry", i, 3); + for (int i = 0; i < 16; i++) { + BioVatLogicAdder.BioVatGlass.addCustomGlass(Minecraft.ID, "stained_glass", i, 3); + } + + BioVatLogicAdder.BioVatGlass.addCustomGlass(IndustrialCraft2.ID, "blockAlloyGlass", 0, 4); + + if (BloodArsenal.isModLoaded()) { + BioVatLogicAdder.BioVatGlass.addCustomGlass(BloodArsenal.ID, "blood_stained_glass", 0, 3); + } + if (Botania.isModLoaded()) { + BioVatLogicAdder.BioVatGlass.addCustomGlass(Botania.ID, "manaGlass", 0, 4); + BioVatLogicAdder.BioVatGlass.addCustomGlass(Botania.ID, "manaGlassPane", 0, 4); + BioVatLogicAdder.BioVatGlass.addCustomGlass(Botania.ID, "elfGlass", 0, 5); + BioVatLogicAdder.BioVatGlass.addCustomGlass(Botania.ID, "elfGlassPane", 0, 5); + } + if (Botany.isModLoaded()) { + BioVatLogicAdder.BioVatGlass.addCustomGlass(Botany.ID, "stained", 0, 3); + } + + if (Chisel.isModLoaded()) { + BioVatLogicAdder.BioVatGlass.addCustomGlass(Chisel.ID, "glass2", 0, 3); + + for (int i = 0; i < 16; i++) { + BioVatLogicAdder.BioVatGlass.addCustomGlass(Chisel.ID, "glass", i, 3); + BioVatLogicAdder.BioVatGlass.addCustomGlass(Chisel.ID, "stained_glass_white", i, 3); + BioVatLogicAdder.BioVatGlass.addCustomGlass(Chisel.ID, "stained_glass_yellow", i, 3); + BioVatLogicAdder.BioVatGlass.addCustomGlass(Chisel.ID, "stained_glass_lightgray", i, 3); + BioVatLogicAdder.BioVatGlass.addCustomGlass(Chisel.ID, "stained_glass_brown", i, 3); + BioVatLogicAdder.BioVatGlass.addCustomGlass(Chisel.ID, "stained_glass_forestry", i, 3); + } + } + + if (EnderIO.isModLoaded()) { + for (int i = 0; i <= 5; ++i) { + BioVatLogicAdder.BioVatGlass.addCustomGlass(EnderIO.ID, "blockFusedQuartz", i, 3); + } + } + + if (ExtraUtilities.isModLoaded()) { + BioVatLogicAdder.BioVatGlass.addCustomGlass(ExtraUtilities.ID, "decorativeBlock1", 9, 3); + for (int i = 0; i < 12; ++i) { + BioVatLogicAdder.BioVatGlass.addCustomGlass(ExtraUtilities.ID, "decorativeBlock2", i, 3); + } + + for (int i = 0; i < 6; ++i) { + BioVatLogicAdder.BioVatGlass.addCustomGlass(ExtraUtilities.ID, "etherealglass", i, 3); + + } + } + + if (GalaxySpace.isModLoaded()) { + BioVatLogicAdder.BioVatGlass.addCustomGlass(GalaxySpace.ID, "futureglass", 0, 3); + for (int i = 0; i < 16; i++) { + BioVatLogicAdder.BioVatGlass.addCustomGlass(GalaxySpace.ID, "futureglasses", i, 3); + } + } + + if (HardcoreEnderExpansion.isModLoaded()) { + BioVatLogicAdder.BioVatGlass.addCustomGlass(HardcoreEnderExpansion.ID, "laboratory_glass", 0, 3); + } + + if (IndustrialCraft2.isModLoaded()) { + BioVatLogicAdder.BioVatGlass.addCustomGlass(Minecraft.ID, "glass", 0, 3); + } + + if (Natura.isModLoaded()) { + for (int i = 0; i <= 1; ++i) { + BioVatLogicAdder.BioVatGlass.addCustomGlass(Natura.ID, "NetherGlass", i, 3); + } + } + + if (Railcraft.isModLoaded()) { + for (int i = 0; i < 16; i++) { + BioVatLogicAdder.BioVatGlass.addCustomGlass(Railcraft.ID, "glass", i, 3); + } + } + + if (RandomThings.isModLoaded()) { + BioVatLogicAdder.BioVatGlass.addCustomGlass(RandomThings.ID, "spectreGlass", 0, 3); + } + + if (TinkerConstruct.isModLoaded()) { + BioVatLogicAdder.BioVatGlass.addCustomGlass(TinkerConstruct.ID, "GlassBlock", 0, 3); + + for (int i = 0; i < 16; i++) { + BioVatLogicAdder.BioVatGlass.addCustomGlass(TinkerConstruct.ID, "GlassBlock.StainedClear", i, 3); + } + } + + if (TecTech.isModLoaded()) { + BioVatLogicAdder.BioVatGlass.addCustomGlass(TecTech.ID, "tile.quantumGlass", 0, 8); + } + + if (Witchery.isModLoaded()) { + for (int i = 0; i < 16; i++) { + BioVatLogicAdder.BioVatGlass.addCustomGlass(Witchery.ID, "shadedglass", i, 3); + } + } + + if (ZTones.isModLoaded()) { + for (int i = 0; i < 16; i++) { + BioVatLogicAdder.BioVatGlass.addCustomGlass(ZTones.ID, "tile.glaxx", i, 3); } - if (LoaderReference.witchery) BioVatLogicAdder.BioVatGlass.addCustomGlass("witchery", "shadedglass", i, 3); } } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java index fca9c5ed52..2feeb4c038 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java @@ -15,7 +15,8 @@ package com.github.bartimaeusnek.bartworks.common.loaders; import static com.github.bartimaeusnek.bartworks.MainMod.BWT; import static com.github.bartimaeusnek.bartworks.MainMod.GT2; -import static com.github.bartimaeusnek.bartworks.common.configs.ConfigHandler.newStuff; +import static gregtech.api.enums.Mods.GalactiGreg; +import static gregtech.api.enums.Mods.TecTech; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -24,18 +25,42 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; -import com.github.bartimaeusnek.bartworks.API.LoaderReference; import com.github.bartimaeusnek.bartworks.MainMod; -import com.github.bartimaeusnek.bartworks.common.blocks.*; +import com.github.bartimaeusnek.bartworks.common.blocks.BW_Blocks; +import com.github.bartimaeusnek.bartworks.common.blocks.BW_GlasBlocks; +import com.github.bartimaeusnek.bartworks.common.blocks.BW_GlasBlocks2; +import com.github.bartimaeusnek.bartworks.common.blocks.BW_TileEntityContainer; +import com.github.bartimaeusnek.bartworks.common.blocks.BW_TileEntityContainer_MachineBlock; import com.github.bartimaeusnek.bartworks.common.configs.ConfigHandler; -import com.github.bartimaeusnek.bartworks.common.items.*; +import com.github.bartimaeusnek.bartworks.common.items.BW_ItemBlocks; +import com.github.bartimaeusnek.bartworks.common.items.BW_SimpleWindMeter; +import com.github.bartimaeusnek.bartworks.common.items.BW_Stonage_Rotors; +import com.github.bartimaeusnek.bartworks.common.items.Circuit_Programmer; +import com.github.bartimaeusnek.bartworks.common.items.GT_Destructopack_Item; +import com.github.bartimaeusnek.bartworks.common.items.GT_Rockcutter_Item; +import com.github.bartimaeusnek.bartworks.common.items.GT_Teslastaff_Item; +import com.github.bartimaeusnek.bartworks.common.items.SimpleIconItem; +import com.github.bartimaeusnek.bartworks.common.items.SimpleSubItemClass; import com.github.bartimaeusnek.bartworks.common.tileentities.classic.BW_RotorBlock; import com.github.bartimaeusnek.bartworks.common.tileentities.classic.BW_TileEntity_ExperimentalFloodGate; import com.github.bartimaeusnek.bartworks.common.tileentities.classic.BW_TileEntity_HeatedWaterPump; import com.github.bartimaeusnek.bartworks.common.tileentities.debug.CreativeScanner; -import com.github.bartimaeusnek.bartworks.common.tileentities.multis.*; -import com.github.bartimaeusnek.bartworks.common.tileentities.multis.mega.*; -import com.github.bartimaeusnek.bartworks.common.tileentities.tiered.*; +import com.github.bartimaeusnek.bartworks.common.tileentities.multis.GT_TileEntity_CircuitAssemblyLine; +import com.github.bartimaeusnek.bartworks.common.tileentities.multis.GT_TileEntity_DEHP; +import com.github.bartimaeusnek.bartworks.common.tileentities.multis.GT_TileEntity_ElectricImplosionCompressor; +import com.github.bartimaeusnek.bartworks.common.tileentities.multis.GT_TileEntity_HTGR; +import com.github.bartimaeusnek.bartworks.common.tileentities.multis.GT_TileEntity_THTR; +import com.github.bartimaeusnek.bartworks.common.tileentities.multis.mega.GT_TileEntity_MegaBlastFurnace; +import com.github.bartimaeusnek.bartworks.common.tileentities.multis.mega.GT_TileEntity_MegaChemicalReactor; +import com.github.bartimaeusnek.bartworks.common.tileentities.multis.mega.GT_TileEntity_MegaDistillTower; +import com.github.bartimaeusnek.bartworks.common.tileentities.multis.mega.GT_TileEntity_MegaOilCracker; +import com.github.bartimaeusnek.bartworks.common.tileentities.multis.mega.GT_TileEntity_MegaVacuumFreezer; +import com.github.bartimaeusnek.bartworks.common.tileentities.tiered.GT_MetaTileEntity_AcidGenerator; +import com.github.bartimaeusnek.bartworks.common.tileentities.tiered.GT_MetaTileEntity_CompressedFluidHatch; +import com.github.bartimaeusnek.bartworks.common.tileentities.tiered.GT_MetaTileEntity_Diode; +import com.github.bartimaeusnek.bartworks.common.tileentities.tiered.GT_MetaTileEntity_EnergyDistributor; +import com.github.bartimaeusnek.bartworks.common.tileentities.tiered.GT_MetaTileEntity_GiantOutputHatch; +import com.github.bartimaeusnek.bartworks.common.tileentities.tiered.GT_MetaTileEntity_HumongousInputHatch; import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; import com.github.bartimaeusnek.crossmod.galacticgreg.GT_TileEntity_VoidMiners; import com.github.bartimaeusnek.crossmod.tectech.tileentites.tiered.TT_MetaTileEntity_LowPowerLaserBox; @@ -218,24 +243,22 @@ public class ItemRegistry { public static ItemStack TecTechPipeEnergyLowPower; public static void run() { - if (newStuff) { - GameRegistry.registerBlock(ItemRegistry.bw_fake_glasses, "BW_FakeGlasBlock"); - GameRegistry.registerBlock(ItemRegistry.bw_fake_glasses2, "BW_FakeGlasBlocks2"); - GameRegistry.registerBlock(ItemRegistry.BW_BLOCKS[2], BW_ItemBlocks.class, "BW_Machinery_Casings"); - GameRegistry.registerItem(ItemRegistry.LEATHER_ROTOR, "BW_LeatherRotor"); - GameRegistry.registerItem(ItemRegistry.WOOL_ROTOR, "BW_WoolRotor"); - GameRegistry.registerItem(ItemRegistry.PAPER_ROTOR, "BW_PaperRotor"); - GameRegistry.registerItem(ItemRegistry.COMBINED_ROTOR, "BW_CombinedRotor"); - GameRegistry.registerItem(ItemRegistry.CRAFTING_PARTS, "craftingParts"); - GameRegistry.registerTileEntity(BW_RotorBlock.class, "BWRotorBlockTE"); - GameRegistry.registerBlock(ItemRegistry.ROTORBLOCK, BW_ItemBlocks.class, "BWRotorBlock"); - GameRegistry.registerTileEntity(BW_TileEntity_HeatedWaterPump.class, "BWHeatedWaterPumpTE"); - GameRegistry.registerBlock(ItemRegistry.PUMPBLOCK, BW_ItemBlocks.class, "BWHeatedWaterPumpBlock"); - GameRegistry.registerItem(ItemRegistry.PUMPPARTS, "BWPumpParts"); - GameRegistry.registerItem(ItemRegistry.WINDMETER, "BW_SimpleWindMeter"); - GameRegistry.registerTileEntity(BW_TileEntity_ExperimentalFloodGate.class, "BWExpReversePump"); - GameRegistry.registerBlock(ItemRegistry.EXPPUMP, BW_ItemBlocks.class, "BWExpReversePumpBlock"); - } + GameRegistry.registerBlock(ItemRegistry.bw_fake_glasses, "BW_FakeGlasBlock"); + GameRegistry.registerBlock(ItemRegistry.bw_fake_glasses2, "BW_FakeGlasBlocks2"); + GameRegistry.registerBlock(ItemRegistry.BW_BLOCKS[2], BW_ItemBlocks.class, "BW_Machinery_Casings"); + GameRegistry.registerItem(ItemRegistry.LEATHER_ROTOR, "BW_LeatherRotor"); + GameRegistry.registerItem(ItemRegistry.WOOL_ROTOR, "BW_WoolRotor"); + GameRegistry.registerItem(ItemRegistry.PAPER_ROTOR, "BW_PaperRotor"); + GameRegistry.registerItem(ItemRegistry.COMBINED_ROTOR, "BW_CombinedRotor"); + GameRegistry.registerItem(ItemRegistry.CRAFTING_PARTS, "craftingParts"); + GameRegistry.registerTileEntity(BW_RotorBlock.class, "BWRotorBlockTE"); + GameRegistry.registerBlock(ItemRegistry.ROTORBLOCK, BW_ItemBlocks.class, "BWRotorBlock"); + GameRegistry.registerTileEntity(BW_TileEntity_HeatedWaterPump.class, "BWHeatedWaterPumpTE"); + GameRegistry.registerBlock(ItemRegistry.PUMPBLOCK, BW_ItemBlocks.class, "BWHeatedWaterPumpBlock"); + GameRegistry.registerItem(ItemRegistry.PUMPPARTS, "BWPumpParts"); + GameRegistry.registerItem(ItemRegistry.WINDMETER, "BW_SimpleWindMeter"); + GameRegistry.registerTileEntity(BW_TileEntity_ExperimentalFloodGate.class, "BWExpReversePump"); + GameRegistry.registerBlock(ItemRegistry.EXPPUMP, BW_ItemBlocks.class, "BWExpReversePumpBlock"); // GT2 stuff GameRegistry.registerBlock(ItemRegistry.BW_BLOCKS[0], BW_ItemBlocks.class, "BW_ItemBlocks"); @@ -247,177 +270,172 @@ public class ItemRegistry { GameRegistry.registerItem(ItemRegistry.ROCKCUTTER_MV, ItemRegistry.ROCKCUTTER_MV.getUnlocalizedName()); GameRegistry.registerItem(ItemRegistry.ROCKCUTTER_HV, ItemRegistry.ROCKCUTTER_HV.getUnlocalizedName()); GameRegistry.registerItem(ItemRegistry.TAB, "tabIconGT2"); - if (newStuff) { - if (ConfigHandler.creativeScannerID != 0) new CreativeScanner( - ConfigHandler.creativeScannerID, - "Creative Debug Scanner", - "Creative Debug Scanner", - 20); - ItemRegistry.eic = new GT_TileEntity_ElectricImplosionCompressor( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 6, - "ElectricImplosionCompressor", - "Electric Implosion Compressor").getStackForm(1L); - // EIC depend on neutronium block to pass on structure updates - int bitmask = GregTech_API.sMachineIDs.getOrDefault(GregTech_API.sBlockMetal5, 0) | (1 << 2); - GregTech_API.registerMachineBlock(GregTech_API.sBlockMetal5, bitmask); - ItemRegistry.THTR = new GT_TileEntity_THTR( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 5, - "THTR", - "Thorium High Temperature Reactor").getStackForm(1L); - GT_TileEntity_THTR.THTRMaterials.registeraTHR_Materials(); - ItemRegistry.HTGR = new GT_TileEntity_HTGR( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 15 + 48, - "HTGR", - "High Temperature Gas-cooled Reactor").getStackForm(1L); - GT_TileEntity_HTGR.HTGRMaterials.registeraTHR_Materials(); - // ID ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 15 + 49 IS TAKEN !!! (12792) + if (ConfigHandler.creativeScannerID != 0) new CreativeScanner( + ConfigHandler.creativeScannerID, + "Creative Debug Scanner", + "Creative Debug Scanner", + 20); + ItemRegistry.eic = new GT_TileEntity_ElectricImplosionCompressor( + ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 6, + "ElectricImplosionCompressor", + "Electric Implosion Compressor").getStackForm(1L); + // EIC depend on neutronium block to pass on structure updates + int bitmask = GregTech_API.sMachineIDs.getOrDefault(GregTech_API.sBlockMetal5, 0) | (1 << 2); + GregTech_API.registerMachineBlock(GregTech_API.sBlockMetal5, bitmask); + ItemRegistry.THTR = new GT_TileEntity_THTR( + ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 5, + "THTR", + "Thorium High Temperature Reactor").getStackForm(1L); + GT_TileEntity_THTR.THTRMaterials.registeraTHR_Materials(); + ItemRegistry.HTGR = new GT_TileEntity_HTGR( + ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 15 + 48, + "HTGR", + "High Temperature Gas-cooled Reactor").getStackForm(1L); + GT_TileEntity_HTGR.HTGRMaterials.registeraTHR_Materials(); - GT_OreDictUnificator.add( - OrePrefixes.block, - Materials.BorosilicateGlass, - new ItemStack(ItemRegistry.bw_glasses[0], 1, 0)); - GT_OreDictUnificator.registerOre( - OrePrefixes.block, - Materials.NickelZincFerrite, - new ItemStack(ItemRegistry.BW_BLOCKS[2])); - for (int i = 0; i < GT_Values.VN.length - 1; i++) { - ItemRegistry.diode2A[i] = new GT_MetaTileEntity_Diode( - ConfigHandler.IDOffset + GT_Values.VN.length + 1 + i, - "diode" + "2A" + GT_Values.VN[i], - StatCollector.translateToLocal("tile.diode.name") + " 2A " + GT_Values.VN[i], - i).getStackForm(1L); - ItemRegistry.diode4A[i] = new GT_MetaTileEntity_Diode( - ConfigHandler.IDOffset + GT_Values.VN.length * 2 + 1 + i, - "diode" + "4A" + GT_Values.VN[i], - StatCollector.translateToLocal("tile.diode.name") + " 4A " + GT_Values.VN[i], - i).getStackForm(1L); - ItemRegistry.diode8A[i] = new GT_MetaTileEntity_Diode( - ConfigHandler.IDOffset + GT_Values.VN.length * 3 + 1 + i, - "diode" + "8A" + GT_Values.VN[i], - StatCollector.translateToLocal("tile.diode.name") + " 8A " + GT_Values.VN[i], - i).getStackForm(1L); - ItemRegistry.diode12A[i] = new GT_MetaTileEntity_Diode( - ConfigHandler.IDOffset + GT_Values.VN.length * 4 + 1 + i, - "diode" + "12A" + GT_Values.VN[i], - StatCollector.translateToLocal("tile.diode.name") + " 12A " + GT_Values.VN[i], - i).getStackForm(1L); - ItemRegistry.diode16A[i] = new GT_MetaTileEntity_Diode( - ConfigHandler.IDOffset + GT_Values.VN.length * 5 + 1 + i, - "diode" + "16A" + GT_Values.VN[i], - StatCollector.translateToLocal("tile.diode.name") + " 16A " + GT_Values.VN[i], - i).getStackForm(1L); - ItemRegistry.energyDistributor[i] = new GT_MetaTileEntity_EnergyDistributor( - ConfigHandler.IDOffset + 1 + i, - "energydistributor" + GT_Values.VN[i], - StatCollector.translateToLocal("tile.energydistributor.name") + " " + GT_Values.VN[i], - i).getStackForm(1L); - } - for (int i = 0; i < 3; i++) { - ItemRegistry.acidGens[i] = new GT_MetaTileEntity_AcidGenerator( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 - 2 + i, - "acidgenerator" + GT_Values.VN[i + 2], - StatCollector.translateToLocal("tile.acidgenerator.name") + " " + GT_Values.VN[i + 2], - i + 2).getStackForm(1); - } + // ID ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 15 + 49 IS TAKEN !!! (12792) + + GT_OreDictUnificator + .add(OrePrefixes.block, Materials.BorosilicateGlass, new ItemStack(ItemRegistry.bw_glasses[0], 1, 0)); + GT_OreDictUnificator + .registerOre(OrePrefixes.block, Materials.NickelZincFerrite, new ItemStack(ItemRegistry.BW_BLOCKS[2])); + for (int i = 0; i < GT_Values.VN.length - 1; i++) { + ItemRegistry.diode2A[i] = new GT_MetaTileEntity_Diode( + ConfigHandler.IDOffset + GT_Values.VN.length + 1 + i, + "diode" + "2A" + GT_Values.VN[i], + StatCollector.translateToLocal("tile.diode.name") + " 2A " + GT_Values.VN[i], + i).getStackForm(1L); + ItemRegistry.diode4A[i] = new GT_MetaTileEntity_Diode( + ConfigHandler.IDOffset + GT_Values.VN.length * 2 + 1 + i, + "diode" + "4A" + GT_Values.VN[i], + StatCollector.translateToLocal("tile.diode.name") + " 4A " + GT_Values.VN[i], + i).getStackForm(1L); + ItemRegistry.diode8A[i] = new GT_MetaTileEntity_Diode( + ConfigHandler.IDOffset + GT_Values.VN.length * 3 + 1 + i, + "diode" + "8A" + GT_Values.VN[i], + StatCollector.translateToLocal("tile.diode.name") + " 8A " + GT_Values.VN[i], + i).getStackForm(1L); + ItemRegistry.diode12A[i] = new GT_MetaTileEntity_Diode( + ConfigHandler.IDOffset + GT_Values.VN.length * 4 + 1 + i, + "diode" + "12A" + GT_Values.VN[i], + StatCollector.translateToLocal("tile.diode.name") + " 12A " + GT_Values.VN[i], + i).getStackForm(1L); + ItemRegistry.diode16A[i] = new GT_MetaTileEntity_Diode( + ConfigHandler.IDOffset + GT_Values.VN.length * 5 + 1 + i, + "diode" + "16A" + GT_Values.VN[i], + StatCollector.translateToLocal("tile.diode.name") + " 16A " + GT_Values.VN[i], + i).getStackForm(1L); + ItemRegistry.energyDistributor[i] = new GT_MetaTileEntity_EnergyDistributor( + ConfigHandler.IDOffset + 1 + i, + "energydistributor" + GT_Values.VN[i], + StatCollector.translateToLocal("tile.energydistributor.name") + " " + GT_Values.VN[i], + i).getStackForm(1L); + } + for (int i = 0; i < 3; i++) { + ItemRegistry.acidGens[i] = new GT_MetaTileEntity_AcidGenerator( + ConfigHandler.IDOffset + GT_Values.VN.length * 8 - 2 + i, + "acidgenerator" + GT_Values.VN[i + 2], + StatCollector.translateToLocal("tile.acidgenerator.name") + " " + GT_Values.VN[i + 2], + i + 2).getStackForm(1); + } - ItemRegistry.acidGensLV = new GT_MetaTileEntity_AcidGenerator( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 65, - "acidgenerator" + GT_Values.VN[1], - StatCollector.translateToLocal("tile.acidgenerator.name") + " " + GT_Values.VN[1], - +1).getStackForm(1L); + ItemRegistry.acidGensLV = new GT_MetaTileEntity_AcidGenerator( + ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 65, + "acidgenerator" + GT_Values.VN[1], + StatCollector.translateToLocal("tile.acidgenerator.name") + " " + GT_Values.VN[1], + +1).getStackForm(1L); - ItemRegistry.dehp = new GT_TileEntity_DEHP( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 1, - 1, - "DEHP", - "Deep Earth Heating Pump").getStackForm(1L); - ItemRegistry.megaMachines[0] = new GT_TileEntity_MegaBlastFurnace( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 2, - "MegaBlastFurnace", - StatCollector.translateToLocal("tile.bw.mbf.name")).getStackForm(1L); - ItemRegistry.megaMachines[1] = new GT_TileEntity_MegaVacuumFreezer( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 3, - "MegaVacuumFreezer", - StatCollector.translateToLocal("tile.bw.mvf.name")).getStackForm(1L); - ItemRegistry.cal = new GT_TileEntity_CircuitAssemblyLine( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 7, - "CircuitAssemblyLine", - "Circuit Assembly Line").getStackForm(1L); - ItemRegistry.compressedHatch = new GT_MetaTileEntity_CompressedFluidHatch( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 8, - "CompressedFluidHatch", - "Liquid Air Fluid Hatch").getStackForm(1L); - ItemRegistry.giantOutputHatch = new GT_MetaTileEntity_GiantOutputHatch( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 9, - "GiantOutputHatch", - "Giant Output Hatch").getStackForm(1L); - ItemRegistry.humongousInputHatch = new GT_MetaTileEntity_HumongousInputHatch( - ConfigHandler.IDOffset + GT_Values.VN.length * 9 + 55, - "HumongousInputHatch", - "Humongous Input Hatch").getStackForm(1L); - ItemRegistry.megaMachines[2] = new GT_TileEntity_MegaDistillTower( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 10, - "MegaDistillationTower", - "Mega Distillation Tower").getStackForm(1L); - ItemRegistry.megaMachines[3] = new GT_TileEntity_MegaChemicalReactor( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 638, - "MegaChemicalReactor", - "Mega Chemical Reactor").getStackForm(1L); - ItemRegistry.megaMachines[4] = new GT_TileEntity_MegaOilCracker( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 639, - "MegaOilCracker", - "Mega Oil Cracker").getStackForm(1L); + ItemRegistry.dehp = new GT_TileEntity_DEHP( + ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 1, + 1, + "DEHP", + "Deep Earth Heating Pump").getStackForm(1L); + ItemRegistry.megaMachines[0] = new GT_TileEntity_MegaBlastFurnace( + ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 2, + "MegaBlastFurnace", + StatCollector.translateToLocal("tile.bw.mbf.name")).getStackForm(1L); + ItemRegistry.megaMachines[1] = new GT_TileEntity_MegaVacuumFreezer( + ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 3, + "MegaVacuumFreezer", + StatCollector.translateToLocal("tile.bw.mvf.name")).getStackForm(1L); + ItemRegistry.cal = new GT_TileEntity_CircuitAssemblyLine( + ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 7, + "CircuitAssemblyLine", + "Circuit Assembly Line").getStackForm(1L); + ItemRegistry.compressedHatch = new GT_MetaTileEntity_CompressedFluidHatch( + ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 8, + "CompressedFluidHatch", + "Liquid Air Fluid Hatch").getStackForm(1L); + ItemRegistry.giantOutputHatch = new GT_MetaTileEntity_GiantOutputHatch( + ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 9, + "GiantOutputHatch", + "Giant Output Hatch").getStackForm(1L); + ItemRegistry.humongousInputHatch = new GT_MetaTileEntity_HumongousInputHatch( + ConfigHandler.IDOffset + GT_Values.VN.length * 9 + 55, + "HumongousInputHatch", + "Humongous Input Hatch").getStackForm(1L); + ItemRegistry.megaMachines[2] = new GT_TileEntity_MegaDistillTower( + ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 10, + "MegaDistillationTower", + "Mega Distillation Tower").getStackForm(1L); + ItemRegistry.megaMachines[3] = new GT_TileEntity_MegaChemicalReactor( + ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 638, + "MegaChemicalReactor", + "Mega Chemical Reactor").getStackForm(1L); + ItemRegistry.megaMachines[4] = new GT_TileEntity_MegaOilCracker( + ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 639, + "MegaOilCracker", + "Mega Oil Cracker").getStackForm(1L); - if (LoaderReference.galacticgreg) { - ItemRegistry.voidminer[2] = new GT_TileEntity_VoidMiners.VMUV( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 11, - "VoidMiner3", - "Void Miner III").getStackForm(1L); - ItemRegistry.voidminer[1] = new GT_TileEntity_VoidMiners.VMZPM( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 12, - "VoidMiner2", - "Void Miner II").getStackForm(1L); - ItemRegistry.voidminer[0] = new GT_TileEntity_VoidMiners.VMLUV( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 13, - "VoidMiner1", - "Void Miner I").getStackForm(1L); - } - if (LoaderReference.tectech) { - TecTechPipeEnergyLowPower = new TT_MetaTileEntity_Pipe_Energy_LowPower( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 14, - "pipe.lowpowerlaser", - "Low Power Laser Pipe").getStackForm(1L); - int startID = ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 15; - for (int amps = 32; amps <= 128; amps += 32) { - for (int tier = 4; tier < 8; tier++) { - TecTechLaserAdditions[0][amps / 32 - 1][tier - 4] = new TT_MetaTileEntity_LowPowerLaserBox( - startID++, - GT_Values.VN[tier] + "_LPLaser_Converter_" + amps, - GT_Values.VN[tier] + " " + amps + "A/t" + " Low Power Laser Converter", - tier, - amps).getStackForm(1L); - } + if (GalactiGreg.isModLoaded()) { + ItemRegistry.voidminer[2] = new GT_TileEntity_VoidMiners.VMUV( + ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 11, + "VoidMiner3", + "Void Miner III").getStackForm(1L); + ItemRegistry.voidminer[1] = new GT_TileEntity_VoidMiners.VMZPM( + ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 12, + "VoidMiner2", + "Void Miner II").getStackForm(1L); + ItemRegistry.voidminer[0] = new GT_TileEntity_VoidMiners.VMLUV( + ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 13, + "VoidMiner1", + "Void Miner I").getStackForm(1L); + } + if (TecTech.isModLoaded()) { + TecTechPipeEnergyLowPower = new TT_MetaTileEntity_Pipe_Energy_LowPower( + ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 14, + "pipe.lowpowerlaser", + "Low Power Laser Pipe").getStackForm(1L); + int startID = ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 15; + for (int amps = 32; amps <= 128; amps += 32) { + for (int tier = 4; tier < 8; tier++) { + TecTechLaserAdditions[0][amps / 32 - 1][tier - 4] = new TT_MetaTileEntity_LowPowerLaserBox( + startID++, + GT_Values.VN[tier] + "_LPLaser_Converter_" + amps, + GT_Values.VN[tier] + " " + amps + "A/t" + " Low Power Laser Converter", + tier, + amps).getStackForm(1L); } - for (int amps = 32; amps <= 128; amps += 32) { - for (int tier = 4; tier < 8; tier++) { - TecTechLaserAdditions[1][amps / 32 - 1][tier - 4] = new TT_MetaTileEntity_LowPowerLaserHatch( - startID++, - GT_Values.VN[tier] + "_LPLaser_Hatch_" + amps, - GT_Values.VN[tier] + " " + amps + "A/t" + " Low Power Laser Target Hatch", - tier, - amps).getStackForm(1L); - } + } + for (int amps = 32; amps <= 128; amps += 32) { + for (int tier = 4; tier < 8; tier++) { + TecTechLaserAdditions[1][amps / 32 - 1][tier - 4] = new TT_MetaTileEntity_LowPowerLaserHatch( + startID++, + GT_Values.VN[tier] + "_LPLaser_Hatch_" + amps, + GT_Values.VN[tier] + " " + amps + "A/t" + " Low Power Laser Target Hatch", + tier, + amps).getStackForm(1L); } - for (int amps = 32; amps <= 128; amps += 32) { - for (int tier = 4; tier < 8; tier++) { - TecTechLaserAdditions[2][amps / 32 - 1][tier - 4] = new TT_MetaTileEntity_LowPowerLaserDynamo( - startID++, - GT_Values.VN[tier] + "_LPLaser_Dynamo_" + amps, - GT_Values.VN[tier] + " " + amps + "A/t" + " Low Power Laser Source Hatch", - tier, - amps).getStackForm(1L); - } + } + for (int amps = 32; amps <= 128; amps += 32) { + for (int tier = 4; tier < 8; tier++) { + TecTechLaserAdditions[2][amps / 32 - 1][tier - 4] = new TT_MetaTileEntity_LowPowerLaserDynamo( + startID++, + GT_Values.VN[tier] + "_LPLaser_Dynamo_" + amps, + GT_Values.VN[tier] + " " + amps + "A/t" + " Low Power Laser Source Hatch", + tier, + amps).getStackForm(1L); } } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RadioHatchMaterialLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RadioHatchMaterialLoader.java index 5e92aa94eb..41fc6c8a23 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RadioHatchMaterialLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RadioHatchMaterialLoader.java @@ -1,5 +1,7 @@ package com.github.bartimaeusnek.bartworks.common.loaders; +import static gregtech.api.enums.Mods.IndustrialCraft2; + import com.github.bartimaeusnek.bartworks.system.material.BW_NonMeta_MaterialItems; import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; @@ -154,33 +156,33 @@ public class RadioHatchMaterialLoader { .addRadHatch(ItemList.Depleted_Naquadah_4.get(1), 140 / 10, 12, Materials.NaquadahEnriched.mRGBa); BWRecipes.instance.addRadHatch( - GT_ModHandler.getModItem("IC2", "reactorMOXSimpledepleted", 1), + GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorMOXSimpledepleted", 1), (int) Materials.Plutonium.getProtons() / 10, 3, Materials.Plutonium.mRGBa); BWRecipes.instance.addRadHatch( - GT_ModHandler.getModItem("IC2", "reactorMOXDualdepleted", 1), + GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorMOXDualdepleted", 1), (int) Materials.Plutonium.getProtons() / 10, 6, Materials.Plutonium.mRGBa); BWRecipes.instance.addRadHatch( - GT_ModHandler.getModItem("IC2", "reactorMOXQuaddepleted", 1), + GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorMOXQuaddepleted", 1), (int) Materials.Plutonium.getProtons() / 10, 12, Materials.Plutonium.mRGBa); BWRecipes.instance.addRadHatch( - GT_ModHandler.getModItem("IC2", "reactorUraniumSimpledepleted", 1), + GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorUraniumSimpledepleted", 1), (int) Materials.Uranium.getProtons() / 10, 3, Materials.Uranium.mRGBa); BWRecipes.instance.addRadHatch( - GT_ModHandler.getModItem("IC2", "reactorUraniumDualdepleted", 1), + GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorUraniumDualdepleted", 1), (int) Materials.Uranium.getProtons() / 10, 6, Materials.Uranium.mRGBa); BWRecipes.instance.addRadHatch( - GT_ModHandler.getModItem("IC2", "reactorUraniumQuaddepleted", 1), + GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorUraniumQuaddepleted", 1), (int) Materials.Uranium.getProtons() / 10, 12, Materials.Uranium.mRGBa); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RecipeLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RecipeLoader.java index d3c334d5dd..09cea4ef2b 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RecipeLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RecipeLoader.java @@ -13,1097 +13,47 @@ package com.github.bartimaeusnek.bartworks.common.loaders; -import static com.github.bartimaeusnek.bartworks.common.configs.ConfigHandler.newStuff; - -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; - -import com.github.bartimaeusnek.bartworks.API.LoaderReference; -import com.github.bartimaeusnek.bartworks.common.configs.ConfigHandler; -import com.github.bartimaeusnek.bartworks.common.tileentities.multis.*; -import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; -import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; -import com.github.bartimaeusnek.bartworks.util.BWRecipes; -import com.github.bartimaeusnek.bartworks.util.BW_Util; - -import gregtech.api.GregTech_API; -import gregtech.api.enums.*; -import gregtech.api.interfaces.ISubTagContainer; +import com.github.bartimaeusnek.bartworks.common.loaders.recipes.Assembler; +import com.github.bartimaeusnek.bartworks.common.loaders.recipes.AssemblyLine; +import com.github.bartimaeusnek.bartworks.common.loaders.recipes.Autoclave; +import com.github.bartimaeusnek.bartworks.common.loaders.recipes.Centrifuge; +import com.github.bartimaeusnek.bartworks.common.loaders.recipes.ChemicalBath; +import com.github.bartimaeusnek.bartworks.common.loaders.recipes.ChemicalReactor; +import com.github.bartimaeusnek.bartworks.common.loaders.recipes.CraftingRecipes; +import com.github.bartimaeusnek.bartworks.common.loaders.recipes.Electrolyzer; +import com.github.bartimaeusnek.bartworks.common.loaders.recipes.Extractor; +import com.github.bartimaeusnek.bartworks.common.loaders.recipes.FakeRecipes; +import com.github.bartimaeusnek.bartworks.common.loaders.recipes.FluidHeater; +import com.github.bartimaeusnek.bartworks.common.loaders.recipes.FluidSolidifier; +import com.github.bartimaeusnek.bartworks.common.loaders.recipes.FormingPress; +import com.github.bartimaeusnek.bartworks.common.loaders.recipes.LaserEngraver; +import com.github.bartimaeusnek.bartworks.common.loaders.recipes.Mixer; +import com.github.bartimaeusnek.bartworks.common.loaders.recipes.Pulverizer; +import com.github.bartimaeusnek.bartworks.common.loaders.recipes.PyrolyseOven; import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; -import ic2.core.Ic2Items; public class RecipeLoader { - protected static final long BITSD = GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE + public static final long BITSD = GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE; - @SuppressWarnings("deprecation") public static void run() { - - if (ConfigHandler.hardmode) { - /* - * GTNH "hardmode" Recipes - */ - - GT_Values.RA.addFluidSolidifierRecipe( - new ItemStack(Blocks.lapis_block), - Materials.Iron.getMolten(1296L), - new ItemStack(ItemRegistry.BW_BLOCKS[0], 1, 0), - 100, - BW_Util.getMachineVoltageFromTier(3)); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { new ItemStack(ItemRegistry.BW_BLOCKS[0], 1, 0), Materials.Lapis.getPlates(9), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 2L), - GT_Utility.getIntegratedCircuit(17) }, - FluidRegistry.getFluidStack("ic2coolant", 1000), - new ItemStack(ItemRegistry.BW_BLOCKS[0], 1, 1), - 100, - BW_Util.getMachineVoltageFromTier(3)); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { new ItemStack(ItemRegistry.BW_BLOCKS[0], 1, 1), Materials.Lapis.getBlocks(8), - GT_Utility.getIntegratedCircuit(17) }, - GT_Values.NF, - new ItemStack(ItemRegistry.BW_BLOCKS[1]), - 100, - BW_Util.getMachineVoltageFromTier(3)); - } else { - /* - * Vanilla Recipes - */ - - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { Materials.Lapis.getBlocks(8), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Basic, 1L), - GT_Utility.getIntegratedCircuit(17) }, - GT_Values.NF, - new ItemStack(ItemRegistry.BW_BLOCKS[1]), - 100, - BW_Util.getMachineVoltageFromTier(1)); - - GT_ModHandler.addCraftingRecipe( - new ItemStack(ItemRegistry.BW_BLOCKS[1]), - RecipeLoader.BITSD, - new Object[] { "LLL", "LCL", "LLL", 'L', Materials.Lapis.getBlocks(1), 'C', "circuitBasic" }); - - GT_Values.RA.addCutterRecipe( - new ItemStack(ItemRegistry.BW_BLOCKS[1]), - new ItemStack(ItemRegistry.BW_BLOCKS[0], 9, 1), - GT_Values.NI, - 100, - BW_Util.getMachineVoltageFromTier(1)); - GT_Values.RA.addCompressorRecipe( - new ItemStack(ItemRegistry.BW_BLOCKS[0], 9, 1), - new ItemStack(ItemRegistry.BW_BLOCKS[1]), - 100, - BW_Util.getMachineVoltageFromTier(1)); - GT_Values.RA.addCompressorRecipe( - new ItemStack(ItemRegistry.BW_BLOCKS[0], 9, 0), - new ItemStack(ItemRegistry.BW_BLOCKS[1]), - 100, - BW_Util.getMachineVoltageFromTier(1)); - GT_ModHandler.addShapelessCraftingRecipe( - new ItemStack(ItemRegistry.BW_BLOCKS[0], 1, 0), - RecipeLoader.BITSD, - new Object[] { new ItemStack(ItemRegistry.BW_BLOCKS[0], 1, 1) }); - GT_ModHandler.addShapelessCraftingRecipe( - new ItemStack(ItemRegistry.BW_BLOCKS[0], 1, 1), - RecipeLoader.BITSD, - new Object[] { new ItemStack(ItemRegistry.BW_BLOCKS[0], 1, 0) }); - } - - /* - * Common Recipes - */ - - GT_ModHandler.addCraftingRecipe( - new GT_TileEntity_LESU(ConfigHandler.IDOffset, "LESU", "L.E.S.U.").getStackForm(1L), - RecipeLoader.BITSD, - new Object[] { "CDC", "SBS", "CFC", 'C', ConfigHandler.hardmode ? "circuitAdvanced" : "circuitBasic", - 'D', ItemList.Cover_Screen.get(1L), 'S', - GT_OreDictUnificator.get( - OrePrefixes.cableGt12, - ConfigHandler.hardmode ? Materials.Platinum : Materials.AnnealedCopper, - 1L), - 'B', new ItemStack(ItemRegistry.BW_BLOCKS[1]), 'F', - ConfigHandler.hardmode ? ItemList.Field_Generator_HV.get(1L) - : ItemList.Field_Generator_LV.get(1L) }); - - GT_ModHandler.addCraftingRecipe( - new ItemStack(ItemRegistry.DESTRUCTOPACK), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { "CPC", "PLP", "CPC", 'C', "circuitAdvanced", 'P', - GT_OreDictUnificator.get( - ConfigHandler.hardmode ? OrePrefixes.plateDouble : OrePrefixes.plate, - Materials.Aluminium, - 1L), - 'L', new ItemStack(Items.lava_bucket) }); - - GT_ModHandler.addCraftingRecipe( - new ItemStack(ItemRegistry.DESTRUCTOPACK), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { "CPC", "PLP", "CPC", 'C', "circuitAdvanced", 'P', - GT_OreDictUnificator.get( - ConfigHandler.hardmode ? OrePrefixes.plateDouble : OrePrefixes.plate, - ConfigHandler.hardmode ? Materials.Steel : Materials.Iron, - 1L), - 'L', new ItemStack(Items.lava_bucket) }); - - GT_ModHandler.addCraftingRecipe( - new ItemStack(ItemRegistry.ROCKCUTTER_MV), - RecipeLoader.BITSD, - new Object[] { "DS ", "DP ", "DCB", 'D', - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Diamond, 1L), 'S', - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.TungstenSteel, 1L), 'P', - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 1L), 'C', "circuitGood", - 'B', ItemList.IC2_AdvBattery.get(1L) }); - - GT_ModHandler.addCraftingRecipe( - new ItemStack(ItemRegistry.ROCKCUTTER_LV), - RecipeLoader.BITSD, - new Object[] { "DS ", "DP ", "DCB", 'D', - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Diamond, 1L), 'S', - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Titanium, 1L), 'P', - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 1L), 'C', "circuitBasic", 'B', - ItemList.IC2_ReBattery.get(1L) }); - - GT_ModHandler.addCraftingRecipe( - new ItemStack(ItemRegistry.ROCKCUTTER_HV), - RecipeLoader.BITSD, - new Object[] { "DS ", "DP ", "DCB", 'D', - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Diamond, 1L), 'S', - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Iridium, 1L), 'P', - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 1L), 'C', "circuitAdvanced", 'B', - ItemList.IC2_EnergyCrystal.get(1L) }); - - if (ConfigHandler.teslastaff) GT_ModHandler.addCraftingRecipe( - new ItemStack(ItemRegistry.TESLASTAFF), - RecipeLoader.BITSD, - new Object[] { "BO ", "OP ", " P", 'O', - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Superconductor, 1L), 'B', - ItemList.Energy_LapotronicOrb.get(1L), 'P', "plateAlloyIridium", }); - - Fluid solderIndalloy = FluidRegistry.getFluid("molten.indalloy140") != null - ? FluidRegistry.getFluid("molten.indalloy140") - : FluidRegistry.getFluid("molten.solderingalloy"); - - if (newStuff) { - - GT_ModHandler.addCraftingRecipe( - new ItemStack(ItemRegistry.PUMPPARTS, 1, 0), // tube - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { " fG", " G ", "G ", 'G', ItemList.Circuit_Parts_Glass_Tube.get(1L) }); - GT_ModHandler.addCraftingRecipe( - new ItemStack(ItemRegistry.PUMPPARTS, 1, 1), // motor - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { "GLP", "LSd", "PfT", 'G', - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Steel, 1L), 'L', - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Steel, 1L), 'S', - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 1L), 'P', - new ItemStack(Blocks.piston), 'T', new ItemStack(ItemRegistry.PUMPPARTS, 1, 0) }); - GT_ModHandler.addCraftingRecipe( - new ItemStack(ItemRegistry.PUMPBLOCK, 1, 0), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { "IPI", "PMP", "ISI", 'I', - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 1L), 'P', - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Wood, 1L), 'M', - new ItemStack(ItemRegistry.PUMPPARTS, 1, 1), 'S', Ic2Items.ironFurnace }); - - if (!ConfigHandler.hardmode) GT_ModHandler.addCraftingRecipe( - ItemRegistry.dehp, - RecipeLoader.BITSD, - new Object[] { "GPG", "NCN", "GPG", 'G', - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.HSSE, 1L), 'P', - ItemList.Pump_IV.get(1L), 'N', - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Ultimate, 1L), 'C', - ItemList.MACHINE_HULLS[5], }); - else GT_Values.RA.addAssemblylineRecipe( - ItemList.Pump_IV.get(1L), - 72000, - new ItemStack[] { ItemList.Pump_IV.get(16), - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Ultimate, 32L), - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.HSSE, 16L), - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.HSSE, 16L), - ItemList.Field_Generator_LuV.get(8) }, - new FluidStack[] { new FluidStack(solderIndalloy, 32 * 144), - Materials.Polytetrafluoroethylene.getMolten(32 * 144) }, - ItemRegistry.dehp, - 5000, - BW_Util.getMachineVoltageFromTier(6)); - - GT_Values.RA.addAssemblerRecipe( - GT_ModHandler.getModItem("gregtech", "gt.blockmachines", 64, 1000), - GT_Utility.getIntegratedCircuit(17), - Materials.SolderingAlloy.getMolten(9216), - ItemRegistry.megaMachines[0], - 72000, - BW_Util.getMachineVoltageFromTier(3)); - GT_Values.RA.addAssemblerRecipe( - GT_ModHandler.getModItem("gregtech", "gt.blockmachines", 64, 1002), - GT_Utility.getIntegratedCircuit(17), - Materials.SolderingAlloy.getMolten(9216), - ItemRegistry.megaMachines[1], - 72000, - BW_Util.getMachineVoltageFromTier(3)); - GT_Values.RA.addAssemblerRecipe( - GT_ModHandler.getModItem("gregtech", "gt.blockmachines", 64, 1126), - GT_Utility.getIntegratedCircuit(17), - Materials.SolderingAlloy.getMolten(9216), - ItemRegistry.megaMachines[2], - 72000, - BW_Util.getMachineVoltageFromTier(3)); - GT_Values.RA.addAssemblerRecipe( - GT_ModHandler.getModItem("gregtech", "gt.blockmachines", 64, 1169), - GT_Utility.getIntegratedCircuit(17), - Materials.SolderingAlloy.getMolten(9216), - ItemRegistry.megaMachines[3], - 72000, - BW_Util.getMachineVoltageFromTier(3)); - GT_Values.RA.addAssemblerRecipe( - GT_ModHandler.getModItem("gregtech", "gt.blockmachines", 64, 1160), - GT_Utility.getIntegratedCircuit(17), - Materials.SolderingAlloy.getMolten(9216), - ItemRegistry.megaMachines[4], - 72000, - BW_Util.getMachineVoltageFromTier(3)); - - GT_Values.RA.addFluidSolidifierRecipe( - new ItemStack(ItemRegistry.bw_glasses[0], 1, 0), - Materials.Titanium.getMolten(1152), - new ItemStack(ItemRegistry.bw_glasses[0], 1, 1), - 800, - BW_Util.getMachineVoltageFromTier(3)); - GT_Values.RA.addFluidSolidifierRecipe( - new ItemStack(ItemRegistry.bw_glasses[0], 1, 0), - Materials.TungstenSteel.getMolten(1152), - new ItemStack(ItemRegistry.bw_glasses[0], 1, 2), - 800, - BW_Util.getMachineVoltageFromTier(4)); - FluidStack LuVMaterialFluid = ConfigHandler.newStuff ? WerkstoffLoader.LuVTierMaterial.getMolten(1152) - : Materials.Chrome.getMolten(1152); - GT_Values.RA.addFluidSolidifierRecipe( - new ItemStack(ItemRegistry.bw_glasses[0], 1, 0), - LuVMaterialFluid, - new ItemStack(ItemRegistry.bw_glasses[0], 1, 3), - 800, - BW_Util.getMachineVoltageFromTier(5)); - GT_Values.RA.addFluidSolidifierRecipe( - new ItemStack(ItemRegistry.bw_glasses[0], 1, 0), - Materials.Iridium.getMolten(1152), - new ItemStack(ItemRegistry.bw_glasses[0], 1, 4), - 800, - BW_Util.getMachineVoltageFromTier(6)); - GT_Values.RA.addFluidSolidifierRecipe( - new ItemStack(ItemRegistry.bw_glasses[0], 1, 0), - Materials.Osmium.getMolten(1152), - new ItemStack(ItemRegistry.bw_glasses[0], 1, 5), - 800, - BW_Util.getMachineVoltageFromTier(7)); - GT_Values.RA.addFluidSolidifierRecipe( - new ItemStack(ItemRegistry.bw_glasses[0], 1, 0), - Materials.Neutronium.getMolten(1152), - new ItemStack(ItemRegistry.bw_glasses[0], 1, 13), - 800, - BW_Util.getMachineVoltageFromTier(8)); - GT_Values.RA.addFluidSolidifierRecipe( - new ItemStack(ItemRegistry.bw_glasses[0], 1, 0), - Materials.CosmicNeutronium.getMolten(1152), - new ItemStack(ItemRegistry.bw_glasses[0], 1, 14), - 800, - BW_Util.getMachineVoltageFromTier(9)); - GT_Values.RA.addFluidSolidifierRecipe( - new ItemStack(ItemRegistry.bw_glasses[0], 1, 0), - Materials.Infinity.getMolten(1152), - new ItemStack(ItemRegistry.bw_glasses[0], 1, 15), - 800, - BW_Util.getMachineVoltageFromTier(10)); - GT_Values.RA.addFluidSolidifierRecipe( - new ItemStack(ItemRegistry.bw_glasses[0], 1, 0), - Materials.TranscendentMetal.getMolten(1152), - new ItemStack(ItemRegistry.bw_glasses[1], 1, 0), - 800, - BW_Util.getMachineVoltageFromTier(11)); - - for (int i = 0; i < Dyes.dyeBrown.getSizeOfFluidList(); ++i) { - GT_Values.RA.addChemicalBathRecipe( - new ItemStack(ItemRegistry.bw_glasses[0], 1, 0), - Dyes.dyeRed.getFluidDye(i, 36), - new ItemStack(ItemRegistry.bw_glasses[0], 1, 6), - null, - null, - null, - 64, - 2); - GT_Values.RA.addChemicalBathRecipe( - new ItemStack(ItemRegistry.bw_glasses[0], 1, 0), - Dyes.dyeGreen.getFluidDye(i, 36), - new ItemStack(ItemRegistry.bw_glasses[0], 1, 7), - null, - null, - null, - 64, - 2); - GT_Values.RA.addChemicalBathRecipe( - new ItemStack(ItemRegistry.bw_glasses[0], 1, 0), - Dyes.dyePurple.getFluidDye(i, 36), - new ItemStack(ItemRegistry.bw_glasses[0], 1, 8), - null, - null, - null, - 64, - 2); - GT_Values.RA.addChemicalBathRecipe( - new ItemStack(ItemRegistry.bw_glasses[0], 1, 0), - Dyes.dyeYellow.getFluidDye(i, 36), - new ItemStack(ItemRegistry.bw_glasses[0], 1, 9), - null, - null, - null, - 64, - 2); - GT_Values.RA.addChemicalBathRecipe( - new ItemStack(ItemRegistry.bw_glasses[0], 1, 0), - Dyes.dyeLime.getFluidDye(i, 36), - new ItemStack(ItemRegistry.bw_glasses[0], 1, 10), - null, - null, - null, - 64, - 2); - GT_Values.RA.addChemicalBathRecipe( - new ItemStack(ItemRegistry.bw_glasses[0], 1, 0), - Dyes.dyeBrown.getFluidDye(i, 36), - new ItemStack(ItemRegistry.bw_glasses[0], 1, 11), - null, - null, - null, - 64, - 2); - } - // and reverse recipes... cause im nice :P - GT_Values.RA.addPulveriserRecipe( - new ItemStack(ItemRegistry.bw_glasses[0], 1, 1), - new ItemStack[] { Materials.BorosilicateGlass.getDust(9), Materials.Titanium.getDust(8) }, - null, - 800, - BW_Util.getMachineVoltageFromTier(4)); - GT_Values.RA.addPulveriserRecipe( - new ItemStack(ItemRegistry.bw_glasses[0], 1, 2), - new ItemStack[] { Materials.BorosilicateGlass.getDust(9), Materials.TungstenSteel.getDust(8) }, - null, - 800, - BW_Util.getMachineVoltageFromTier(5)); - ItemStack LuVMaterialDust = ConfigHandler.newStuff - ? WerkstoffLoader.LuVTierMaterial.get(OrePrefixes.dust, 8) - : Materials.Chrome.getDust(8); - GT_Values.RA.addPulveriserRecipe( - new ItemStack(ItemRegistry.bw_glasses[0], 1, 3), - new ItemStack[] { Materials.BorosilicateGlass.getDust(9), LuVMaterialDust }, - null, - 800, - BW_Util.getMachineVoltageFromTier(6)); - GT_Values.RA.addPulveriserRecipe( - new ItemStack(ItemRegistry.bw_glasses[0], 1, 4), - new ItemStack[] { Materials.BorosilicateGlass.getDust(9), Materials.Iridium.getDust(8) }, - null, - 800, - BW_Util.getMachineVoltageFromTier(7)); - GT_Values.RA.addPulveriserRecipe( - new ItemStack(ItemRegistry.bw_glasses[0], 1, 5), - new ItemStack[] { Materials.BorosilicateGlass.getDust(9), Materials.Osmium.getDust(8) }, - null, - 800, - BW_Util.getMachineVoltageFromTier(8)); - GT_Values.RA.addPulveriserRecipe( - new ItemStack(ItemRegistry.bw_glasses[0], 1, 13), - new ItemStack[] { Materials.BorosilicateGlass.getDust(9), Materials.Neutronium.getDust(8) }, - null, - 800, - BW_Util.getMachineVoltageFromTier(9)); - GT_Values.RA.addPulveriserRecipe( - new ItemStack(ItemRegistry.bw_glasses[0], 1, 14), - new ItemStack[] { Materials.BorosilicateGlass.getDust(9), Materials.CosmicNeutronium.getDust(8) }, - null, - 800, - BW_Util.getMachineVoltageFromTier(10)); - GT_Values.RA.addPulveriserRecipe( - new ItemStack(ItemRegistry.bw_glasses[0], 1, 15), - new ItemStack[] { Materials.BorosilicateGlass.getDust(9), Materials.Infinity.getDust(8) }, - null, - 800, - BW_Util.getMachineVoltageFromTier(11)); - GT_Values.RA.addPulveriserRecipe( - new ItemStack(ItemRegistry.bw_glasses[1], 1, 0), - new ItemStack[] { Materials.BorosilicateGlass.getDust(9), Materials.TranscendentMetal.getDust(8) }, - null, - 800, - BW_Util.getMachineVoltageFromTier(12)); - - for (int i = 6; i < 11; i++) { - GT_Values.RA.addPulveriserRecipe( - new ItemStack(ItemRegistry.bw_glasses[0], 1, i), - new ItemStack[] { Materials.BorosilicateGlass.getDust(9) }, - null, - 400, - BW_Util.getMachineVoltageFromTier(1)); - GT_Values.RA.addChemicalBathRecipe( - new ItemStack(ItemRegistry.bw_glasses[0], 1, i), - Materials.Chlorine.getGas(50), - new ItemStack(ItemRegistry.bw_glasses[0], 1, 0), - null, - null, - null, - 64, - 2); - } - - GT_ModHandler.addCraftingRecipe( - new ItemStack(ItemRegistry.WINDMETER), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { "SWF", "Sf ", "Ss ", 'S', "stickWood", 'W', - new ItemStack(Blocks.wool, 1, Short.MAX_VALUE), 'F', new ItemStack(Items.string), }); - - Materials[] cables = { // Cable material used in the acid gen, diode and energy distributor below - Materials.Lead, // ULV - Materials.Tin, // LV - Materials.AnnealedCopper, // MV - Materials.Gold, // HV - Materials.Aluminium, // EV - Materials.Tungsten, // IV - Materials.VanadiumGallium, // LuV - Materials.Naquadah, // ZPM - Materials.NaquadahAlloy, // UV - Materials.SuperconductorUV // UHV - }; - - ISubTagContainer[] hulls = { // Plate material used in the acid gen, diode and energy distributor below - Materials.WroughtIron, // ULV - Materials.Steel, // LV - Materials.Aluminium, // MV - Materials.StainlessSteel, // HV - Materials.Titanium, // EV - Materials.TungstenSteel, // IV - WerkstoffLoader.LuVTierMaterial, // LuV - Materials.Iridium, // ZPM - Materials.Osmium, // UV - Materials.Naquadah // UHV - }; - - ItemStack[] bats = { ItemList.Battery_Hull_LV.get(1L), ItemList.Battery_Hull_MV.get(1L), - ItemList.Battery_Hull_HV.get(1L) }; - ItemStack[] chreac = { ItemList.Machine_MV_ChemicalReactor.get(1L), - ItemList.Machine_HV_ChemicalReactor.get(1L), ItemList.Machine_EV_ChemicalReactor.get(1L) }; - - for (int i = 0; i < 3; i++) { - Materials cable = cables[i + 2]; - ItemStack machinehull = ItemList.MACHINE_HULLS[i + 2].get(1L); - GT_ModHandler.addCraftingRecipe( - ItemRegistry.acidGens[i], - RecipeLoader.BITSD, - new Object[] { "HRH", "HCH", "HKH", 'H', bats[i], 'K', - GT_OreDictUnificator.get(OrePrefixes.cableGt01, cable, 1L), 'C', machinehull, 'R', - chreac[i] }); - } - - GT_ModHandler.addCraftingRecipe( - ItemRegistry.acidGensLV, - RecipeLoader.BITSD, - new Object[] { "HRH", "KCK", "HKH", 'H', ItemList.Battery_Hull_LV.get(1L), 'K', - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Tin, 1L), 'C', - ItemList.Hull_LV.get(1L), 'R', ItemList.Machine_LV_ChemicalReactor.get(1L), }); - - for (int i = 0; i < 9; i++) { - try { - Materials cable = cables[i]; - ItemStack hull = hulls[i] instanceof Materials - ? GT_OreDictUnificator.get(OrePrefixes.plate, hulls[i], 1L) - : ((Werkstoff) hulls[i]).get(OrePrefixes.plate); - ItemStack machinehull = ItemList.MACHINE_HULLS[i].get(1L); - - GT_ModHandler.addCraftingRecipe( - ItemRegistry.energyDistributor[i], - RecipeLoader.BITSD, - new Object[] { "PWP", "WCW", "PWP", 'W', - GT_OreDictUnificator.get(OrePrefixes.wireGt16, cable, 1L), 'P', hull, 'C', - machinehull }); - GT_ModHandler.addCraftingRecipe( - ItemRegistry.diode12A[i], - RecipeLoader.BITSD, - new Object[] { "WDW", "DCD", "PDP", 'D', - ItemList.Circuit_Parts_Diode.get(1L, ItemList.Circuit_Parts_DiodeSMD.get(1L)), 'W', - GT_OreDictUnificator.get(OrePrefixes.cableGt12, cable, 1L), 'P', hull, 'C', - machinehull }); - GT_ModHandler.addCraftingRecipe( - ItemRegistry.diode12A[i], - RecipeLoader.BITSD, - new Object[] { "WDW", "DCD", "PDP", 'D', - ItemList.Circuit_Parts_DiodeSMD.get(1L, ItemList.Circuit_Parts_Diode.get(1L)), 'W', - GT_OreDictUnificator.get(OrePrefixes.cableGt12, cable, 1L), 'P', hull, 'C', - machinehull }); - GT_ModHandler.addCraftingRecipe( - ItemRegistry.diode8A[i], - RecipeLoader.BITSD, - new Object[] { "WDW", "DCD", "PDP", 'D', - ItemList.Circuit_Parts_Diode.get(1L, ItemList.Circuit_Parts_DiodeSMD.get(1L)), 'W', - GT_OreDictUnificator.get(OrePrefixes.cableGt08, cable, 1L), 'P', hull, 'C', - machinehull }); - GT_ModHandler.addCraftingRecipe( - ItemRegistry.diode8A[i], - RecipeLoader.BITSD, - new Object[] { "WDW", "DCD", "PDP", 'D', - ItemList.Circuit_Parts_DiodeSMD.get(1L, ItemList.Circuit_Parts_Diode.get(1L)), 'W', - GT_OreDictUnificator.get(OrePrefixes.cableGt08, cable, 1L), 'P', hull, 'C', - machinehull }); - GT_ModHandler.addCraftingRecipe( - ItemRegistry.diode4A[i], - RecipeLoader.BITSD, - new Object[] { "WDW", "DCD", "PDP", 'D', - ItemList.Circuit_Parts_Diode.get(1L, ItemList.Circuit_Parts_DiodeSMD.get(1L)), 'W', - GT_OreDictUnificator.get(OrePrefixes.cableGt04, cable, 1L), 'P', hull, 'C', - machinehull }); - GT_ModHandler.addCraftingRecipe( - ItemRegistry.diode4A[i], - RecipeLoader.BITSD, - new Object[] { "WDW", "DCD", "PDP", 'D', - ItemList.Circuit_Parts_DiodeSMD.get(1L, ItemList.Circuit_Parts_Diode.get(1L)), 'W', - GT_OreDictUnificator.get(OrePrefixes.cableGt04, cable, 1L), 'P', hull, 'C', - machinehull }); - GT_ModHandler.addCraftingRecipe( - ItemRegistry.diode2A[i], - RecipeLoader.BITSD, - new Object[] { "WDW", "DCD", "PDP", 'D', - ItemList.Circuit_Parts_Diode.get(1L, ItemList.Circuit_Parts_DiodeSMD.get(1L)), 'W', - GT_OreDictUnificator.get(OrePrefixes.cableGt02, cable, 1L), 'P', hull, 'C', - machinehull }); - GT_ModHandler.addCraftingRecipe( - ItemRegistry.diode2A[i], - RecipeLoader.BITSD, - new Object[] { "WDW", "DCD", "PDP", 'D', - ItemList.Circuit_Parts_DiodeSMD.get(1L, ItemList.Circuit_Parts_Diode.get(1L)), 'W', - GT_OreDictUnificator.get(OrePrefixes.cableGt02, cable, 1L), 'P', hull, 'C', - machinehull }); - GT_ModHandler.addCraftingRecipe( - ItemRegistry.diode16A[i], - RecipeLoader.BITSD, - new Object[] { "WHW", "DCD", "PDP", 'H', ItemList.Circuit_Parts_Coil.get(1L), 'D', - ItemList.Circuit_Parts_Diode.get(1L, ItemList.Circuit_Parts_DiodeSMD.get(1L)), 'W', - GT_OreDictUnificator.get(OrePrefixes.wireGt16, cable, 1L), 'P', hull, 'C', - machinehull }); - GT_ModHandler.addCraftingRecipe( - ItemRegistry.diode16A[i], - RecipeLoader.BITSD, - new Object[] { "WHW", "DCD", "PDP", 'H', ItemList.Circuit_Parts_Coil.get(1L), 'D', - ItemList.Circuit_Parts_DiodeSMD.get(1L, ItemList.Circuit_Parts_Diode.get(1L)), 'W', - GT_OreDictUnificator.get(OrePrefixes.wireGt16, cable, 1L), 'P', hull, 'C', - machinehull }); - - } catch (ArrayIndexOutOfBoundsException e) { - // e.printStackTrace(); - } - } - - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.AnnealedCopper, 64L), - GT_Utility.getIntegratedCircuit(17) }, - Materials.Plastic.getMolten(1152L), - new ItemStack(ItemRegistry.BW_BLOCKS[2], 1, 1), - 20, - BW_Util.getMachineVoltageFromTier(3)); - - GT_ModHandler.addCraftingRecipe( - /* - * Loader.isModLoaded("tectech") ? new TT_TileEntity_ManualTrafo(ConfigHandler.IDOffset + - * GT_Values.VN.length * 6 + 1, "bw.manualtrafo", - * StatCollector.translateToLocal("tile.manutrafo.name")).getStackForm(1L) : - */ new GT_TileEntity_ManualTrafo( - ConfigHandler.IDOffset + GT_Values.VN.length * 6 + 1, - "bw.manualtrafo", - StatCollector.translateToLocal("tile.manutrafo.name")).getStackForm(1L), - RecipeLoader.BITSD, - new Object[] { "SCS", "CHC", "ZCZ", 'S', - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Titanium, 1L), 'C', - new ItemStack(ItemRegistry.BW_BLOCKS[2]), 'H', ItemList.Hull_HV.get(1L), 'Z', - "circuitAdvanced" }); - - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 1L), - Materials.Aluminium.getPlates(1), ItemList.Circuit_Board_Plastic.get(1L), - ItemList.Battery_RE_LV_Lithium.get(1L) }, - Materials.SolderingAlloy.getMolten(288L), - new ItemStack(ItemRegistry.CIRCUIT_PROGRAMMER), - 600, - BW_Util.getMachineVoltageFromTier(2)); - - GT_ModHandler.addCraftingRecipe( - new GT_TileEntity_Windmill( - ConfigHandler.IDOffset + GT_Values.VN.length * 6 + 2, - "bw.windmill", - StatCollector.translateToLocal("tile.bw.windmill.name")).getStackForm(1L), - RecipeLoader.BITSD, - new Object[] { "BHB", "WGW", "BWB", 'B', new ItemStack(Blocks.brick_block), 'W', - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Iron, 1L), 'H', - new ItemStack(Blocks.hopper), 'G', new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 2), }); - - String[] stones = { "stone", "stoneSmooth" }; - String[] granites = { "blockGranite", "stoneGranite", "Granite", "granite" }; - for (String granite : granites) { - for (String stone : stones) { - GT_ModHandler.addCraftingRecipe( - new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 0), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { "SSS", "DfD", " h ", 'S', stone, 'D', - new ItemStack(GregTech_API.sBlockGranites, 1, OreDictionary.WILDCARD_VALUE), }); - GT_ModHandler.addCraftingRecipe( - new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 1), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { "hDf", "SSS", 'S', stone, 'D', - new ItemStack(GregTech_API.sBlockGranites, 1, OreDictionary.WILDCARD_VALUE), }); - GT_ModHandler.addCraftingRecipe( - new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 0), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { "SSS", "DfD", " h ", 'S', stone, 'D', granite, }); - GT_ModHandler.addCraftingRecipe( - new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 1), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { "hDf", "SSS", 'S', stone, 'D', granite, }); - } - GT_ModHandler.addCraftingRecipe( - new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 2), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { "STS", "h f", "SBS", 'S', granite, 'T', - new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 0), 'B', - new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 1), }); - } - GT_ModHandler.addCraftingRecipe( - new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 2), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { "STS", "h f", "SBS", 'S', - new ItemStack(GregTech_API.sBlockGranites, 1, OreDictionary.WILDCARD_VALUE), 'T', - new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 0), 'B', - new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 1), }); - GT_ModHandler.addCraftingRecipe( - new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 3), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { "WLs", "WLh", "WLf", 'L', new ItemStack(Items.leather), 'W', "logWood", }); - GT_ModHandler.addCraftingRecipe( - new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 4), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { "WLs", "WLh", "WLf", 'L', new ItemStack(Blocks.carpet), 'W', "logWood", }); - GT_ModHandler.addCraftingRecipe( - new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 5), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { "WLs", "WLh", "WLf", 'L', new ItemStack(Items.paper), 'W', "logWood", }); - - GT_ModHandler.addCraftingRecipe( - new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 6), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { "WEs", "WZh", "WDf", 'E', new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 3), 'Z', - new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 4), 'D', - new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 5), 'W', "logWood", }); - - GT_ModHandler.addCraftingRecipe( - new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 6), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { "WEs", "WZh", "WDf", 'Z', new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 3), 'E', - new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 4), 'D', - new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 5), 'W', "logWood", }); - - GT_ModHandler.addCraftingRecipe( - new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 6), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { "WEs", "WZh", "WDf", 'D', new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 3), 'Z', - new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 4), 'E', - new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 5), 'W', "logWood", }); - - GT_ModHandler.addCraftingRecipe( - new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 6), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { "WEs", "WZh", "WDf", 'E', new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 3), 'D', - new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 4), 'Z', - new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 5), 'W', "logWood", }); - - GT_ModHandler.addCraftingRecipe( - new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 6), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { "WEs", "WZh", "WDf", 'Z', new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 3), 'D', - new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 4), 'E', - new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 5), 'W', "logWood", }); - - GT_ModHandler.addCraftingRecipe( - new ItemStack(ItemRegistry.LEATHER_ROTOR), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { "hPf", "PWP", "sPr", 'P', new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 3), 'W', - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Iron, 1L), }); - GT_ModHandler.addCraftingRecipe( - new ItemStack(ItemRegistry.WOOL_ROTOR), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { "hPf", "PWP", "sPr", 'P', new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 4), 'W', - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Iron, 1L), }); - GT_ModHandler.addCraftingRecipe( - new ItemStack(ItemRegistry.PAPER_ROTOR), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { "hPf", "PWP", "sPr", 'P', new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 5), 'W', - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Iron, 1L), }); - GT_ModHandler.addCraftingRecipe( - new ItemStack(ItemRegistry.COMBINED_ROTOR), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { "hPf", "PWP", "sPr", 'P', new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 6), 'W', - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Iron, 1L), }); - GT_ModHandler.addCraftingRecipe( - new ItemStack(ItemRegistry.ROTORBLOCK), - RecipeLoader.BITSD, - new Object[] { "WRW", "RGR", "WRW", 'R', - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Iron, 1L), 'W', "plankWood", 'G', - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Iron, 1L), }); - GT_TileEntity_THTR.THTRMaterials.registerTHR_Recipes(); - GT_ModHandler.addCraftingRecipe( - ItemRegistry.THTR, - RecipeLoader.BITSD, - new Object[] { "BZB", "BRB", "BZB", 'B', new ItemStack(GregTech_API.sBlockCasings3, 1, 12), 'R', - GT_ModHandler.getModItem("IC2", "blockGenerator", 1, 5), 'Z', "circuitUltimate" }); - GT_TileEntity_HTGR.HTGRMaterials.registerTHR_Recipes(); - GT_ModHandler.addCraftingRecipe( - ItemRegistry.HTGR, - RecipeLoader.BITSD, - new Object[] { "BZB", "BRB", "BZB", 'B', new ItemStack(GregTech_API.sBlockCasings8, 1, 5), 'R', - GT_ModHandler.getModItem("IC2", "blockGenerator", 1, 5), 'Z', "circuitSuperconductor" }); - - if (LoaderReference.galacticgreg) { - GT_Values.RA.addAssemblylineRecipe( - ItemList.OreDrill4.get(1L), - BW_Util.getMachineVoltageFromTier(6), - new Object[] { ItemList.OreDrill4.get(1L), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Europium, 9L), - Materials.Europium.getPlates(3), ItemList.Electric_Motor_LuV.get(9L), - ItemList.Sensor_LuV.get(9L), ItemList.Field_Generator_LuV.get(9L), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Europium, 36L) }, - new FluidStack[] { new FluidStack(solderIndalloy, 1440), - WerkstoffLoader.Neon.getFluidOrGas(20000), }, - ItemRegistry.voidminer[0].copy(), - 108000, - BW_Util.getMachineVoltageFromTier(6)); - } - - if (!LoaderReference.tectech) { - if (LoaderReference.galacticgreg) { - GT_Values.RA.addAssemblylineRecipe( - ItemRegistry.voidminer[0].copy(), - BW_Util.getMachineVoltageFromTier(7), - new Object[] { ItemRegistry.voidminer[0].copy(), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.BlackPlutonium, 9L), - Materials.BlackPlutonium.getPlates(3), ItemList.Electric_Motor_ZPM.get(9L), - ItemList.Sensor_ZPM.get(9L), ItemList.Field_Generator_ZPM.get(9L), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.BlackPlutonium, 36L) }, - new FluidStack[] { new FluidStack(solderIndalloy, 1440), - WerkstoffLoader.Krypton.getFluidOrGas(20000) }, - ItemRegistry.voidminer[1].copy(), - 216000, - BW_Util.getMachineVoltageFromTier(7)); - - GT_Values.RA.addAssemblylineRecipe( - ItemRegistry.voidminer[1].copy(), - BW_Util.getMachineVoltageFromTier(8), - new Object[] { ItemRegistry.voidminer[1].copy(), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 9L), - Materials.Neutronium.getPlates(3), ItemList.Electric_Motor_UV.get(9L), - ItemList.Sensor_UV.get(9L), ItemList.Field_Generator_UV.get(9L), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Neutronium, 36L) }, - new FluidStack[] { new FluidStack(solderIndalloy, 1440), - WerkstoffLoader.Oganesson.getFluidOrGas(20000) }, - ItemRegistry.voidminer[2].copy(), - 432000, - BW_Util.getMachineVoltageFromTier(8)); - } - GT_Values.RA.addAssemblylineRecipe( - ItemList.Machine_Multi_ImplosionCompressor.get(1L), - 24000, - new ItemStack[] { ItemList.Machine_Multi_ImplosionCompressor.get(1L), - Materials.Neutronium.getBlocks(5), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Osmium, 64), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Osmium, 64), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Superconductor, 64), - ItemList.Electric_Piston_UV.get(64), }, - new FluidStack[] { new FluidStack(solderIndalloy, 1440), Materials.Osmium.getMolten(1440), - Materials.Neutronium.getMolten(1440) }, - ItemRegistry.eic.copy(), - 240000, - BW_Util.getMachineVoltageFromTier(8)); - } else { - ItemStack[][] converters = ItemRegistry.TecTechLaserAdditions[0]; - ItemStack[][] input = ItemRegistry.TecTechLaserAdditions[1]; - ItemStack[][] dynamo = ItemRegistry.TecTechLaserAdditions[2]; - - ItemList[] emitters = { ItemList.Emitter_EV, ItemList.Emitter_IV, ItemList.Emitter_LuV, - ItemList.Emitter_ZPM }; - - ItemList[] sensors = { ItemList.Sensor_EV, ItemList.Sensor_IV, ItemList.Sensor_LuV, - ItemList.Sensor_ZPM }; - - OrePrefixes[] prefixes = { OrePrefixes.cableGt04, OrePrefixes.cableGt08, OrePrefixes.cableGt12, - OrePrefixes.cableGt16 }; - - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { ItemList.Circuit_Parts_GlassFiber.get(32), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 8), - WerkstoffLoader.CubicZirconia.get(OrePrefixes.gemExquisite, 2) }, - Materials.Polytetrafluoroethylene.getMolten(72), - new ItemStack( - ItemRegistry.TecTechPipeEnergyLowPower.getItem(), - 1, - ItemRegistry.TecTechPipeEnergyLowPower.getItemDamage()), - 200, - BW_Util.getMachineVoltageFromTier(4)); - - for (int j = 0; j < 4; j++) { - for (int i = 0; i < 4; i++) { - ItemStack converter = converters[j][i]; - ItemStack eInput = input[j][i]; - ItemStack eDynamo = dynamo[j][i]; - - int solderingAmount = Math.max(144 * i, 72) * (j + 1); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - new ItemStack( - ItemRegistry.TecTechPipeEnergyLowPower.getItem(), - ((j + 1) * 16), - ItemRegistry.TecTechPipeEnergyLowPower.getItemDamage()), - WerkstoffLoader.CubicZirconia.get(OrePrefixes.lens), - GT_OreDictUnificator.get(prefixes[j], cables[i + 4], 8), - emitters[i].get(2 * (j + 1)), sensors[i].get(2 * (j + 1)), - ItemList.TRANSFORMERS[4 + i].get(2 * (j + 1)), }, - Materials.SolderingAlloy.getMolten(solderingAmount), - converter, - 200 * (j + 1), - BW_Util.getMachineVoltageFromTier(4 + i)); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - new ItemStack( - ItemRegistry.TecTechPipeEnergyLowPower.getItem(), - ((j + 1) * 16), - ItemRegistry.TecTechPipeEnergyLowPower.getItemDamage()), - WerkstoffLoader.CubicZirconia.get(OrePrefixes.lens), - GT_OreDictUnificator.get(prefixes[j], cables[i + 4], 8), - sensors[i].get(2 * (j + 1)), ItemList.HATCHES_ENERGY[4 + i].get(2 * (j + 1)), }, - Materials.SolderingAlloy.getMolten(solderingAmount), - eInput, - 200 * (j + 1), - BW_Util.getMachineVoltageFromTier(4 + i)); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - new ItemStack( - ItemRegistry.TecTechPipeEnergyLowPower.getItem(), - ((j + 1) * 16), - ItemRegistry.TecTechPipeEnergyLowPower.getItemDamage()), - WerkstoffLoader.CubicZirconia.get(OrePrefixes.lens), - GT_OreDictUnificator.get(prefixes[j], cables[i + 4], 8), - emitters[i].get(2 * (j + 1)), - ItemList.HATCHES_DYNAMO[4 + i].get(2 * (j + 1)), }, - Materials.SolderingAlloy.getMolten(solderingAmount), - eDynamo, - 200 * (j + 1), - BW_Util.getMachineVoltageFromTier(4 + i)); - } - } - } - - GT_Recipe.GT_Recipe_Map.sAssemblerRecipes.add( - new BWRecipes.DynamicGTRecipe( - false, - new ItemStack[] { ItemList.Hatch_Input_HV.get(64), Materials.LiquidAir.getCells(1), - GT_Utility.getIntegratedCircuit(17) }, - new ItemStack[] { ItemRegistry.compressedHatch.copy() }, - null, - null, - null, - null, - 300, - BW_Util.getMachineVoltageFromTier(3), - 0)); - GT_Recipe.GT_Recipe_Map.sAssemblerRecipes.add( - new BWRecipes.DynamicGTRecipe( - false, - new ItemStack[] { ItemList.Hatch_Output_HV.get(64), GT_Utility.getIntegratedCircuit(17) }, - new ItemStack[] { ItemRegistry.giantOutputHatch.copy() }, - null, - null, - null, - null, - 300, - BW_Util.getMachineVoltageFromTier(3), - 0)); - - GT_Values.RA.addAssemblylineRecipe( - ItemList.Machine_LuV_CircuitAssembler.get(1L), - 24000, - new ItemStack[] { ItemList.Machine_LuV_CircuitAssembler.get(1L), ItemList.Robot_Arm_LuV.get(4L), - ItemList.Electric_Motor_LuV.get(4L), ItemList.Field_Generator_LuV.get(1L), - ItemList.Emitter_LuV.get(1L), ItemList.Sensor_LuV.get(1L), Materials.Chrome.getPlates(8) }, - new FluidStack[] { new FluidStack(solderIndalloy, 1440) }, - ItemRegistry.cal.copy(), - 24000, - BW_Util.getMachineVoltageFromTier(6)); - } - GT_Values.RA.addElectrolyzerRecipe( - WerkstoffLoader.Forsterit.get(OrePrefixes.dust, 7), - GT_Values.NI, - GT_Values.NF, - Materials.Oxygen.getGas(2000L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesium, 2L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1L), - GT_Values.NI, - GT_Values.NI, - GT_Values.NI, - GT_Values.NI, - null, - 200, - 90); - GT_Values.RA.addElectrolyzerRecipe( - WerkstoffLoader.RedZircon.get(OrePrefixes.dust, 6), - GT_Values.NI, - GT_Values.NF, - Materials.Oxygen.getGas(2000L), - WerkstoffLoader.Zirconium.get(OrePrefixes.dust, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1L), - GT_Values.NI, - GT_Values.NI, - GT_Values.NI, - GT_Values.NI, - null, - 250, - 90); - GT_Values.RA.addElectrolyzerRecipe( - WerkstoffLoader.Fayalit.get(OrePrefixes.dust, 7), - GT_Values.NI, - GT_Values.NF, - Materials.Oxygen.getGas(2000L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 2L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1L), - GT_Values.NI, - GT_Values.NI, - GT_Values.NI, - GT_Values.NI, - null, - 320, - 90); - GT_Values.RA.addElectrolyzerRecipe( - WerkstoffLoader.Prasiolite.get(OrePrefixes.dust, 16), - GT_Values.NI, - GT_Values.NF, - GT_Values.NF, - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 5L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1L), - GT_Values.NI, - GT_Values.NI, - GT_Values.NI, - GT_Values.NI, - null, - 580, - 90); - GT_Values.RA.addElectrolyzerRecipe( - WerkstoffLoader.Hedenbergit.get(OrePrefixes.dust, 10), - GT_Values.NI, - GT_Values.NF, - Materials.Oxygen.getGas(2000L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 2L), - GT_Values.NI, - GT_Values.NI, - GT_Values.NI, - null, - 300, - 90); - GT_Values.RA.addElectrolyzerRecipe( - WerkstoffLoader.FuchsitAL.get(OrePrefixes.dust, 21), - ItemList.Cell_Empty.get(2), - GT_Values.NF, - Materials.Oxygen.getGas(2000L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Potassium, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 3L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 3L), - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2), - GT_Values.NI, - GT_Values.NI, - null, - 390, - 120); - GT_Values.RA.addElectrolyzerRecipe( - WerkstoffLoader.FuchsitCR.get(OrePrefixes.dust, 21), - ItemList.Cell_Empty.get(2), - GT_Values.NF, - Materials.Oxygen.getGas(2000L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Potassium, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 3L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 3L), - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2), - GT_Values.NI, - GT_Values.NI, - null, - 460, - 120); - GT_Values.RA.addElectrolyzerRecipe( - WerkstoffLoader.VanadioOxyDravit.get(OrePrefixes.dust, 53), - ItemList.Cell_Empty.get(3), - GT_Values.NF, - Materials.Oxygen.getGas(19000L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Vanadium, 3L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnalium, 6L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 6), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Boron, 3), - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 3), - null, - 710, - 120); - GT_Values.RA.addElectrolyzerRecipe( - WerkstoffLoader.ChromoAluminoPovondrait.get(OrePrefixes.dust, 53), - ItemList.Cell_Empty.get(3), - GT_Values.NF, - Materials.Oxygen.getGas(19000L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 3L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnalium, 6L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 6), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Boron, 3), - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 3), - null, - 720, - 120); - GT_Values.RA.addElectrolyzerRecipe( - WerkstoffLoader.FluorBuergerit.get(OrePrefixes.dust, 50), - ItemList.Cell_Empty.get(3), - GT_Values.NF, - Materials.Oxygen.getGas(6000L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 3L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 6L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 6), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Boron, 3), - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Fluorine, 3), - null, - 730, - 120); - GT_Values.RA.addElectrolyzerRecipe( - WerkstoffLoader.Olenit.get(OrePrefixes.dust, 51), - ItemList.Cell_Empty.get(1), - GT_Values.NF, - Materials.Oxygen.getGas(1000L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 9L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 6L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Boron, 3), - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 1), - GT_Values.NI, - null, - 790, - 120); + new Assembler().run(); + new AssemblyLine().run(); + new Autoclave().run(); + new Centrifuge().run(); + new ChemicalBath().run(); + new ChemicalReactor().run(); + new CraftingRecipes().run(); + new Electrolyzer().run(); + new Extractor().run(); + new FakeRecipes().run(); + new FluidHeater().run(); + new FluidSolidifier().run(); + new FormingPress().run(); + new LaserEngraver().run(); + new Mixer().run(); + new Pulverizer().run(); + new PyrolyseOven().run(); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RegisterServerCommands.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RegisterServerCommands.java index 3f150f46f5..7fba74496e 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RegisterServerCommands.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RegisterServerCommands.java @@ -13,7 +13,12 @@ package com.github.bartimaeusnek.bartworks.common.loaders; -import com.github.bartimaeusnek.bartworks.common.commands.*; +import com.github.bartimaeusnek.bartworks.common.commands.ChangeConfig; +import com.github.bartimaeusnek.bartworks.common.commands.ClearCraftingCache; +import com.github.bartimaeusnek.bartworks.common.commands.GetWorkingDirectory; +import com.github.bartimaeusnek.bartworks.common.commands.PrintRecipeListToFile; +import com.github.bartimaeusnek.bartworks.common.commands.RunGC; +import com.github.bartimaeusnek.bartworks.common.commands.SummonRuin; import cpw.mods.fml.common.event.FMLServerStartingEvent; public class RegisterServerCommands { diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/StaticRecipeChangeLoaders.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/StaticRecipeChangeLoaders.java index 756d99351a..d392dd452f 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/StaticRecipeChangeLoaders.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/StaticRecipeChangeLoaders.java @@ -14,11 +14,23 @@ package com.github.bartimaeusnek.bartworks.common.loaders; import static com.github.bartimaeusnek.bartworks.common.tileentities.multis.GT_TileEntity_ElectricImplosionCompressor.eicMap; -import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.*; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.ANAEROBE_GAS; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.NOBLE_GAS; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.Oganesson; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.fluids; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.molten; import static gregtech.api.enums.GT_Values.VN; +import static gregtech.api.enums.Mods.TinkerConstruct; import java.lang.reflect.Field; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; import net.minecraft.init.Blocks; @@ -43,7 +55,11 @@ import com.gtnewhorizons.modularui.common.widget.ProgressBar; import cpw.mods.fml.common.registry.GameRegistry; import gnu.trove.map.hash.TObjectDoubleHashMap; -import gregtech.api.enums.*; +import gregtech.api.enums.Element; +import gregtech.api.enums.ItemList; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.SubTag; import gregtech.api.gui.modularui.GT_UITextures; import gregtech.api.objects.GT_ItemStack; import gregtech.api.util.GT_ModHandler; @@ -58,8 +74,8 @@ public class StaticRecipeChangeLoaders { private static TObjectDoubleHashMap<Materials> gtEbfGasRecipeConsumptionMultipliers = null; public static final List<ItemStack> whitelistForEBFNoGasRecipeDontCheckItemData = Arrays - .asList(GT_ModHandler.getModItem("TConstruct", "materials", 1L, 12) // Raw Aluminum -> Aluminium Ingot - // (coremod) + .asList(GT_ModHandler.getModItem(TinkerConstruct.ID, "materials", 1L, 12) // Raw Aluminum -> Aluminium Ingot + // (coremod) ); private StaticRecipeChangeLoaders() {} diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Assembler.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Assembler.java new file mode 100644 index 0000000000..7d803f154b --- /dev/null +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Assembler.java @@ -0,0 +1,224 @@ +package com.github.bartimaeusnek.bartworks.common.loaders.recipes; + +import static gregtech.api.enums.Mods.GregTech; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidRegistry; + +import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry; +import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; +import com.github.bartimaeusnek.bartworks.util.BWRecipes; +import com.github.bartimaeusnek.bartworks.util.BW_Util; + +import gregtech.api.GregTech_API; +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.ItemList; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GT_Utility; + +public class Assembler implements Runnable { + + @Override + public void run() { + Materials[] cables = { // Cable material used in the acid gen, diode and energy distributor below + Materials.Lead, // ULV + Materials.Tin, // LV + Materials.AnnealedCopper, // MV + Materials.Gold, // HV + Materials.Aluminium, // EV + Materials.Tungsten, // IV + Materials.VanadiumGallium, // LuV + Materials.Naquadah, // ZPM + Materials.NaquadahAlloy, // UV + Materials.SuperconductorUV // UHV + }; + + GT_Values.RA.addAssemblerRecipe( + new ItemStack[] { new ItemStack(ItemRegistry.BW_BLOCKS[0], 1, 0), Materials.Lapis.getPlates(9), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 2L), + GT_Utility.getIntegratedCircuit(17) }, + FluidRegistry.getFluidStack("ic2coolant", 1000), + new ItemStack(ItemRegistry.BW_BLOCKS[0], 1, 1), + 100, + BW_Util.getMachineVoltageFromTier(3)); + GT_Values.RA.addAssemblerRecipe( + new ItemStack[] { new ItemStack(ItemRegistry.BW_BLOCKS[0], 1, 1), Materials.Lapis.getBlocks(8), + GT_Utility.getIntegratedCircuit(17) }, + GT_Values.NF, + new ItemStack(ItemRegistry.BW_BLOCKS[1]), + 100, + BW_Util.getMachineVoltageFromTier(3)); + + GT_Values.RA.addAssemblerRecipe( + GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 1000), + GT_Utility.getIntegratedCircuit(17), + Materials.SolderingAlloy.getMolten(9216), + ItemRegistry.megaMachines[0], + 72000, + BW_Util.getMachineVoltageFromTier(3)); + GT_Values.RA.addAssemblerRecipe( + GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 1002), + GT_Utility.getIntegratedCircuit(17), + Materials.SolderingAlloy.getMolten(9216), + ItemRegistry.megaMachines[1], + 72000, + BW_Util.getMachineVoltageFromTier(3)); + GT_Values.RA.addAssemblerRecipe( + GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 1126), + GT_Utility.getIntegratedCircuit(17), + Materials.SolderingAlloy.getMolten(9216), + ItemRegistry.megaMachines[2], + 72000, + BW_Util.getMachineVoltageFromTier(3)); + GT_Values.RA.addAssemblerRecipe( + GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 1169), + GT_Utility.getIntegratedCircuit(17), + Materials.SolderingAlloy.getMolten(9216), + ItemRegistry.megaMachines[3], + 72000, + BW_Util.getMachineVoltageFromTier(3)); + GT_Values.RA.addAssemblerRecipe( + GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 1160), + GT_Utility.getIntegratedCircuit(17), + Materials.SolderingAlloy.getMolten(9216), + ItemRegistry.megaMachines[4], + 72000, + BW_Util.getMachineVoltageFromTier(3)); + + GT_Values.RA.addAssemblerRecipe( + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.AnnealedCopper, 64L), + GT_Utility.getIntegratedCircuit(17) }, + Materials.Plastic.getMolten(1152L), + new ItemStack(ItemRegistry.BW_BLOCKS[2], 1, 1), + 20, + BW_Util.getMachineVoltageFromTier(3)); + + GT_Values.RA.addAssemblerRecipe( + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 1L), + Materials.Aluminium.getPlates(1), ItemList.Circuit_Board_Plastic.get(1L), + ItemList.Battery_RE_LV_Lithium.get(1L) }, + Materials.SolderingAlloy.getMolten(288L), + new ItemStack(ItemRegistry.CIRCUIT_PROGRAMMER), + 600, + BW_Util.getMachineVoltageFromTier(2)); + + GT_Values.RA.addAssemblerRecipe( + new ItemStack[] { ItemList.Circuit_Parts_GlassFiber.get(32), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 8), + WerkstoffLoader.CubicZirconia.get(OrePrefixes.gemExquisite, 2) }, + Materials.Polytetrafluoroethylene.getMolten(72), + new ItemStack( + ItemRegistry.TecTechPipeEnergyLowPower.getItem(), + 1, + ItemRegistry.TecTechPipeEnergyLowPower.getItemDamage()), + 200, + BW_Util.getMachineVoltageFromTier(4)); + + ItemStack[][] converters = ItemRegistry.TecTechLaserAdditions[0]; + ItemStack[][] input = ItemRegistry.TecTechLaserAdditions[1]; + ItemStack[][] dynamo = ItemRegistry.TecTechLaserAdditions[2]; + + ItemList[] emitters = { ItemList.Emitter_EV, ItemList.Emitter_IV, ItemList.Emitter_LuV, ItemList.Emitter_ZPM }; + + ItemList[] sensors = { ItemList.Sensor_EV, ItemList.Sensor_IV, ItemList.Sensor_LuV, ItemList.Sensor_ZPM }; + + OrePrefixes[] prefixes = { OrePrefixes.cableGt04, OrePrefixes.cableGt08, OrePrefixes.cableGt12, + OrePrefixes.cableGt16 }; + + for (int j = 0; j < 4; j++) { + for (int i = 0; i < 4; i++) { + ItemStack converter = converters[j][i]; + ItemStack eInput = input[j][i]; + ItemStack eDynamo = dynamo[j][i]; + + int solderingAmount = Math.max(144 * i, 72) * (j + 1); + GT_Values.RA.addAssemblerRecipe( + new ItemStack[] { + new ItemStack( + ItemRegistry.TecTechPipeEnergyLowPower.getItem(), + ((j + 1) * 16), + ItemRegistry.TecTechPipeEnergyLowPower.getItemDamage()), + WerkstoffLoader.CubicZirconia.get(OrePrefixes.lens), + GT_OreDictUnificator.get(prefixes[j], cables[i + 4], 8), emitters[i].get(2 * (j + 1)), + sensors[i].get(2 * (j + 1)), ItemList.TRANSFORMERS[4 + i].get(2 * (j + 1)), }, + Materials.SolderingAlloy.getMolten(solderingAmount), + converter, + 200 * (j + 1), + BW_Util.getMachineVoltageFromTier(4 + i)); + GT_Values.RA.addAssemblerRecipe( + new ItemStack[] { + new ItemStack( + ItemRegistry.TecTechPipeEnergyLowPower.getItem(), + ((j + 1) * 16), + ItemRegistry.TecTechPipeEnergyLowPower.getItemDamage()), + WerkstoffLoader.CubicZirconia.get(OrePrefixes.lens), + GT_OreDictUnificator.get(prefixes[j], cables[i + 4], 8), sensors[i].get(2 * (j + 1)), + ItemList.HATCHES_ENERGY[4 + i].get(2 * (j + 1)), }, + Materials.SolderingAlloy.getMolten(solderingAmount), + eInput, + 200 * (j + 1), + BW_Util.getMachineVoltageFromTier(4 + i)); + GT_Values.RA.addAssemblerRecipe( + new ItemStack[] { + new ItemStack( + ItemRegistry.TecTechPipeEnergyLowPower.getItem(), + ((j + 1) * 16), + ItemRegistry.TecTechPipeEnergyLowPower.getItemDamage()), + WerkstoffLoader.CubicZirconia.get(OrePrefixes.lens), + GT_OreDictUnificator.get(prefixes[j], cables[i + 4], 8), emitters[i].get(2 * (j + 1)), + ItemList.HATCHES_DYNAMO[4 + i].get(2 * (j + 1)), }, + Materials.SolderingAlloy.getMolten(solderingAmount), + eDynamo, + 200 * (j + 1), + BW_Util.getMachineVoltageFromTier(4 + i)); + } + } + + GT_Recipe.GT_Recipe_Map.sAssemblerRecipes.add( + new BWRecipes.DynamicGTRecipe( + false, + new ItemStack[] { ItemList.Hatch_Input_HV.get(64), Materials.LiquidAir.getCells(1), + GT_Utility.getIntegratedCircuit(17) }, + new ItemStack[] { ItemRegistry.compressedHatch.copy() }, + null, + null, + null, + null, + 300, + BW_Util.getMachineVoltageFromTier(3), + 0)); + GT_Recipe.GT_Recipe_Map.sAssemblerRecipes.add( + new BWRecipes.DynamicGTRecipe( + false, + new ItemStack[] { ItemList.Hatch_Output_HV.get(64), GT_Utility.getIntegratedCircuit(17) }, + new ItemStack[] { ItemRegistry.giantOutputHatch.copy() }, + null, + null, + null, + null, + 300, + BW_Util.getMachineVoltageFromTier(3), + 0)); + + GT_Values.RA.addAssemblerRecipe( + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Lead, 6), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 1) }, + Materials.Concrete.getMolten(1296), + new ItemStack(GregTech_API.sBlockCasings3, 1, 12), + 40, + BW_Util.getMachineVoltageFromTier(5)); + + GT_Values.RA.addAssemblerRecipe( + new ItemStack[] { new ItemStack(GregTech_API.sBlockCasings3, 1, 12), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Europium, 6), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Europium, 24) }, + Materials.Lead.getMolten(864), + new ItemStack(GregTech_API.sBlockCasings8, 1, 5), + 200, + BW_Util.getMachineVoltageFromTier(6)); + } +} diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/AssemblyLine.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/AssemblyLine.java new file mode 100644 index 0000000000..2f96dabbe1 --- /dev/null +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/AssemblyLine.java @@ -0,0 +1,69 @@ +package com.github.bartimaeusnek.bartworks.common.loaders.recipes; + +import static gregtech.api.enums.Mods.GalactiGreg; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; + +import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry; +import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; +import com.github.bartimaeusnek.bartworks.util.BW_Util; + +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.ItemList; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.util.GT_OreDictUnificator; + +public class AssemblyLine implements Runnable { + + @Override + public void run() { + Fluid solderIndalloy = FluidRegistry.getFluid("molten.indalloy140") != null + ? FluidRegistry.getFluid("molten.indalloy140") + : FluidRegistry.getFluid("molten.solderingalloy"); + + GT_Values.RA.addAssemblylineRecipe( + ItemList.Pump_IV.get(1L), + 72000, + new ItemStack[] { ItemList.Pump_IV.get(16), + GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Ultimate, 32L), + GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.HSSE, 16L), + GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.HSSE, 16L), + ItemList.Field_Generator_LuV.get(8) }, + new FluidStack[] { new FluidStack(solderIndalloy, 32 * 144), + Materials.Polytetrafluoroethylene.getMolten(32 * 144) }, + ItemRegistry.dehp, + 5000, + BW_Util.getMachineVoltageFromTier(6)); + + if (GalactiGreg.isModLoaded()) { + GT_Values.RA.addAssemblylineRecipe( + ItemList.OreDrill4.get(1L), + BW_Util.getMachineVoltageFromTier(6), + new Object[] { ItemList.OreDrill4.get(1L), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Europium, 9L), + Materials.Europium.getPlates(3), ItemList.Electric_Motor_LuV.get(9L), + ItemList.Sensor_LuV.get(9L), ItemList.Field_Generator_LuV.get(9L), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Europium, 36L) }, + new FluidStack[] { new FluidStack(solderIndalloy, 1440), + WerkstoffLoader.Neon.getFluidOrGas(20000), }, + ItemRegistry.voidminer[0].copy(), + 108000, + BW_Util.getMachineVoltageFromTier(6)); + } + + GT_Values.RA.addAssemblylineRecipe( + ItemList.Machine_LuV_CircuitAssembler.get(1L), + 24000, + new ItemStack[] { ItemList.Machine_LuV_CircuitAssembler.get(1L), ItemList.Robot_Arm_LuV.get(4L), + ItemList.Electric_Motor_LuV.get(4L), ItemList.Field_Generator_LuV.get(1L), + ItemList.Emitter_LuV.get(1L), ItemList.Sensor_LuV.get(1L), Materials.Chrome.getPlates(8) }, + new FluidStack[] { new FluidStack(solderIndalloy, 1440) }, + ItemRegistry.cal.copy(), + 24000, + BW_Util.getMachineVoltageFromTier(6)); + } +} diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Autoclave.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Autoclave.java new file mode 100644 index 0000000000..3771a261ae --- /dev/null +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Autoclave.java @@ -0,0 +1,36 @@ +package com.github.bartimaeusnek.bartworks.common.loaders.recipes; + +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + +import com.github.bartimaeusnek.bartworks.common.loaders.BioItemList; +import com.github.bartimaeusnek.bartworks.util.BW_Util; + +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.ItemList; +import gregtech.api.enums.Materials; + +public class Autoclave implements Runnable { + + @Override + public void run() { + Materials[] sterilizers = { Materials.Ammonia, Materials.Chlorine, Materials.Ethanol, Materials.Methanol }; + for (Materials used : sterilizers) { + GT_Values.RA.addAutoclaveRecipe( + ItemList.Circuit_Parts_PetriDish.get(1L), + used.getGas(10L) != null ? used.getGas(8L) : used.getFluid(16L), + BioItemList.getPetriDish(null), + 10000, + 100, + BW_Util.getMachineVoltageFromTier(1)); + + GT_Values.RA.addAutoclaveRecipe( + new ItemStack(Items.glass_bottle), + used.getGas(10L) != null ? used.getGas(8L) : used.getFluid(16L), + BioItemList.getDNASampleFlask(null), + 10000, + 100, + BW_Util.getMachineVoltageFromTier(1)); + } + } +} diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Centrifuge.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Centrifuge.java new file mode 100644 index 0000000000..c80c708b5e --- /dev/null +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Centrifuge.java @@ -0,0 +1,177 @@ +package com.github.bartimaeusnek.bartworks.common.loaders.recipes; + +import static com.github.bartimaeusnek.bartworks.common.tileentities.multis.GT_TileEntity_HTGR.HTGRMaterials.MATERIALS_PER_FUEL; +import static com.github.bartimaeusnek.bartworks.common.tileentities.multis.GT_TileEntity_HTGR.HTGRMaterials.sHTGR_Fuel; + +import java.util.Arrays; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + +import com.github.bartimaeusnek.bartworks.common.loaders.BioCultureLoader; +import com.github.bartimaeusnek.bartworks.common.loaders.BioItemList; +import com.github.bartimaeusnek.bartworks.common.loaders.FluidLoader; +import com.github.bartimaeusnek.bartworks.common.tileentities.multis.GT_TileEntity_HTGR; +import com.github.bartimaeusnek.bartworks.common.tileentities.multis.GT_TileEntity_THTR; +import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; +import com.github.bartimaeusnek.bartworks.util.BW_Util; + +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GT_Utility; + +public class Centrifuge implements Runnable { + + @Override + public void run() { + + GT_Values.RA.addCentrifugeRecipe( + Materials.Thorium.getDust(1), + GT_Values.NI, + GT_Values.NF, + GT_Values.NF, + Materials.Thorium.getDust(1), + Materials.Thorium.getDust(1), + WerkstoffLoader.Thorium232.get(OrePrefixes.dust, 1), + WerkstoffLoader.Thorium232.get(OrePrefixes.dust, 1), + WerkstoffLoader.Thorium232.get(OrePrefixes.dust, 1), + GT_Values.NI, + new int[] { 800, 375, 22, 22, 5 }, + 10000, + BW_Util.getMachineVoltageFromTier(4)); + + ItemStack[] pellets = new ItemStack[6]; + Arrays.fill(pellets, new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 64, 4)); + + GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.addRecipe( + false, + new ItemStack[] { new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 1, 3), + GT_Utility.getIntegratedCircuit(17) }, + pellets, + null, + null, + null, + null, + 48000, + 30, + 0); + GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.addRecipe( + false, + new ItemStack[] { new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 1, 5), + GT_Utility.getIntegratedCircuit(17) }, + new ItemStack[] { new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 64, 6) }, + null, + null, + null, + null, + 48000, + 30, + 0); + GT_Values.RA.addCentrifugeRecipe( + new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 1, 6), + GT_Values.NI, + GT_Values.NF, + GT_Values.NF, + Materials.Lead.getDust(1), + GT_Values.NI, + GT_Values.NI, + GT_Values.NI, + GT_Values.NI, + GT_Values.NI, + new int[] { 300 }, + 1200, + 30); + int i = 0; + for (GT_TileEntity_HTGR.HTGRMaterials.Fuel_ fuel : sHTGR_Fuel) { + + GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.addRecipe( + false, + new ItemStack[] { new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i + 3), + GT_Utility.getIntegratedCircuit(17) }, + new ItemStack[] { new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 64, i + 4), + new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 64, i + 4), + new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 64, i + 4), + new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 64, i + 4) }, + null, + null, + null, + null, + 12000, + 30, + 0); + GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.addRecipe( + false, + new ItemStack[] { new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i + 5), + GT_Utility.getIntegratedCircuit(17) }, + new ItemStack[] { new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 64, i + 6) }, + null, + null, + null, + null, + 3000, + 30, + 0); + + GT_Values.RA.addCentrifugeRecipe( + new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i + 6), + GT_Values.NI, + GT_Values.NF, + fuel.recycledFluid, + fuel.recycledItems[0], + fuel.recycledItems[1], + fuel.recycledItems[2], + fuel.recycledItems[3], + fuel.recycledItems[4], + fuel.recycledItems[5], + fuel.recycleChances, + 1200, + 30); + i += MATERIALS_PER_FUEL; + } + + GT_Values.RA.addCentrifugeRecipe( + GT_Utility.getIntegratedCircuit(17), + null, + new FluidStack(BioCultureLoader.eColi.getFluid(), 1000), + new FluidStack(FluidLoader.BioLabFluidMaterials[1], 10), + BioItemList.getOther(4), + null, + null, + null, + null, + null, + new int[] { 1000 }, + 60 * 20, + BW_Util.getMachineVoltageFromTier(3)); + GT_Values.RA.addCentrifugeRecipe( + GT_Utility.getIntegratedCircuit(17), + null, + new FluidStack(FluidLoader.BioLabFluidMaterials[1], 1000), + new FluidStack(FluidLoader.BioLabFluidMaterials[3], 250), + null, + null, + null, + null, + null, + null, + null, + 60 * 20, + BW_Util.getMachineVoltageFromTier(3)); + GT_Values.RA.addCentrifugeRecipe( + GT_Utility.getIntegratedCircuit(17), + null, + new FluidStack(BioCultureLoader.CommonYeast.getFluid(), 1000), + new FluidStack(FluidLoader.BioLabFluidMaterials[2], 10), + null, + null, + null, + null, + null, + null, + null, + 60 * 20, + BW_Util.getMachineVoltageFromTier(3)); + } +} diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/ChemicalBath.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/ChemicalBath.java new file mode 100644 index 0000000000..15cd43e321 --- /dev/null +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/ChemicalBath.java @@ -0,0 +1,85 @@ +package com.github.bartimaeusnek.bartworks.common.loaders.recipes; + +import net.minecraft.item.ItemStack; + +import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry; + +import gregtech.api.enums.Dyes; +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.Materials; + +public class ChemicalBath implements Runnable { + + @Override + public void run() { + + for (int i = 0; i < Dyes.dyeBrown.getSizeOfFluidList(); ++i) { + GT_Values.RA.addChemicalBathRecipe( + new ItemStack(ItemRegistry.bw_glasses[0], 1, 0), + Dyes.dyeRed.getFluidDye(i, 36), + new ItemStack(ItemRegistry.bw_glasses[0], 1, 6), + null, + null, + null, + 64, + 2); + GT_Values.RA.addChemicalBathRecipe( + new ItemStack(ItemRegistry.bw_glasses[0], 1, 0), + Dyes.dyeGreen.getFluidDye(i, 36), + new ItemStack(ItemRegistry.bw_glasses[0], 1, 7), + null, + null, + null, + 64, + 2); + GT_Values.RA.addChemicalBathRecipe( + new ItemStack(ItemRegistry.bw_glasses[0], 1, 0), + Dyes.dyePurple.getFluidDye(i, 36), + new ItemStack(ItemRegistry.bw_glasses[0], 1, 8), + null, + null, + null, + 64, + 2); + GT_Values.RA.addChemicalBathRecipe( + new ItemStack(ItemRegistry.bw_glasses[0], 1, 0), + Dyes.dyeYellow.getFluidDye(i, 36), + new ItemStack(ItemRegistry.bw_glasses[0], 1, 9), + null, + null, + null, + 64, + 2); + GT_Values.RA.addChemicalBathRecipe( + new ItemStack(ItemRegistry.bw_glasses[0], 1, 0), + Dyes.dyeLime.getFluidDye(i, 36), + new ItemStack(ItemRegistry.bw_glasses[0], 1, 10), + null, + null, + null, + 64, + 2); + GT_Values.RA.addChemicalBathRecipe( + new ItemStack(ItemRegistry.bw_glasses[0], 1, 0), + Dyes.dyeBrown.getFluidDye(i, 36), + new ItemStack(ItemRegistry.bw_glasses[0], 1, 11), + null, + null, + null, + 64, + 2); + } + + for (int i = 6; i < 11; i++) { + GT_Values.RA.addChemicalBathRecipe( + new ItemStack(ItemRegistry.bw_glasses[0], 1, i), + Materials.Chlorine.getGas(50), + new ItemStack(ItemRegistry.bw_glasses[0], 1, 0), + null, + null, + null, + 64, + 2); + } + } +} diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/ChemicalReactor.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/ChemicalReactor.java new file mode 100644 index 0000000000..6361340fee --- /dev/null +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/ChemicalReactor.java @@ -0,0 +1,24 @@ +package com.github.bartimaeusnek.bartworks.common.loaders.recipes; + +import net.minecraftforge.fluids.FluidStack; + +import com.github.bartimaeusnek.bartworks.common.loaders.FluidLoader; +import com.github.bartimaeusnek.bartworks.util.BW_Util; + +import gregtech.api.enums.GT_Values; +import gregtech.api.util.GT_Utility; + +public class ChemicalReactor implements Runnable { + + @Override + public void run() { + GT_Values.RA.addChemicalRecipe( + GT_Utility.getIntegratedCircuit(10), + null, + new FluidStack(FluidLoader.heatedfulvicAcid, 1000), + new FluidStack(FluidLoader.Kerogen, 1000), + null, + 75, + BW_Util.getMachineVoltageFromTier(2)); + } +} diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/CraftingRecipes.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/CraftingRecipes.java new file mode 100644 index 0000000000..d56f77fa3c --- /dev/null +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/CraftingRecipes.java @@ -0,0 +1,519 @@ +package com.github.bartimaeusnek.bartworks.common.loaders.recipes; + +import static gregtech.api.enums.Mods.IndustrialCraft2; + +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; +import net.minecraftforge.oredict.OreDictionary; + +import com.github.bartimaeusnek.bartworks.common.configs.ConfigHandler; +import com.github.bartimaeusnek.bartworks.common.loaders.BioItemList; +import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry; +import com.github.bartimaeusnek.bartworks.common.loaders.RecipeLoader; +import com.github.bartimaeusnek.bartworks.common.tileentities.multis.GT_TileEntity_BioVat; +import com.github.bartimaeusnek.bartworks.common.tileentities.multis.GT_TileEntity_LESU; +import com.github.bartimaeusnek.bartworks.common.tileentities.multis.GT_TileEntity_ManualTrafo; +import com.github.bartimaeusnek.bartworks.common.tileentities.multis.GT_TileEntity_Windmill; +import com.github.bartimaeusnek.bartworks.common.tileentities.tiered.GT_MetaTileEntity_BioLab; +import com.github.bartimaeusnek.bartworks.common.tileentities.tiered.GT_MetaTileEntity_RadioHatch; +import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; +import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; + +import gregtech.api.GregTech_API; +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.ItemList; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.interfaces.ISubTagContainer; +import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GT_OreDictUnificator; +import ic2.core.Ic2Items; + +public class CraftingRecipes implements Runnable { + + @Override + public void run() { + + Materials[] cables = { // Cable material used in the acid gen, diode and energy distributor below + Materials.Lead, // ULV + Materials.Tin, // LV + Materials.AnnealedCopper, // MV + Materials.Gold, // HV + Materials.Aluminium, // EV + Materials.Tungsten, // IV + Materials.VanadiumGallium, // LuV + Materials.Naquadah, // ZPM + Materials.NaquadahAlloy, // UV + Materials.SuperconductorUV // UHV + }; + + ISubTagContainer[] hulls = { // Plate material used in the acid gen, diode and energy distributor below + Materials.WroughtIron, // ULV + Materials.Steel, // LV + Materials.Aluminium, // MV + Materials.StainlessSteel, // HV + Materials.Titanium, // EV + Materials.TungstenSteel, // IV + WerkstoffLoader.LuVTierMaterial, // LuV + Materials.Iridium, // ZPM + Materials.Osmium, // UV + Materials.Naquadah // UHV + }; + + ItemStack[] bats = { ItemList.Battery_Hull_LV.get(1L), ItemList.Battery_Hull_MV.get(1L), + ItemList.Battery_Hull_HV.get(1L) }; + ItemStack[] chreac = { ItemList.Machine_MV_ChemicalReactor.get(1L), ItemList.Machine_HV_ChemicalReactor.get(1L), + ItemList.Machine_EV_ChemicalReactor.get(1L) }; + + GT_ModHandler.addCraftingRecipe( + new GT_TileEntity_LESU(ConfigHandler.IDOffset, "LESU", "L.E.S.U.").getStackForm(1L), + RecipeLoader.BITSD, + new Object[] { "CDC", "SBS", "CFC", 'C', "circuitAdvanced", 'D', ItemList.Cover_Screen.get(1L), 'S', + GT_OreDictUnificator.get(OrePrefixes.cableGt12, Materials.Platinum, 1L), 'B', + new ItemStack(ItemRegistry.BW_BLOCKS[1]), 'F', ItemList.Field_Generator_HV.get(1L) }); + + GT_ModHandler.addCraftingRecipe( + new ItemStack(ItemRegistry.DESTRUCTOPACK), + GT_ModHandler.RecipeBits.NOT_REMOVABLE, + new Object[] { "CPC", "PLP", "CPC", 'C', "circuitAdvanced", 'P', + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Aluminium, 1L), 'L', + new ItemStack(Items.lava_bucket) }); + + GT_ModHandler.addCraftingRecipe( + new ItemStack(ItemRegistry.DESTRUCTOPACK), + GT_ModHandler.RecipeBits.NOT_REMOVABLE, + new Object[] { "CPC", "PLP", "CPC", 'C', "circuitAdvanced", 'P', + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Steel, 1L), 'L', + new ItemStack(Items.lava_bucket) }); + + GT_ModHandler.addCraftingRecipe( + new ItemStack(ItemRegistry.ROCKCUTTER_MV), + RecipeLoader.BITSD, + new Object[] { "DS ", "DP ", "DCB", 'D', + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Diamond, 1L), 'S', + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.TungstenSteel, 1L), 'P', + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 1L), 'C', "circuitGood", + 'B', ItemList.IC2_AdvBattery.get(1L) }); + + GT_ModHandler.addCraftingRecipe( + new ItemStack(ItemRegistry.ROCKCUTTER_LV), + RecipeLoader.BITSD, + new Object[] { "DS ", "DP ", "DCB", 'D', + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Diamond, 1L), 'S', + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Titanium, 1L), 'P', + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 1L), 'C', "circuitBasic", 'B', + ItemList.IC2_ReBattery.get(1L) }); + + GT_ModHandler.addCraftingRecipe( + new ItemStack(ItemRegistry.ROCKCUTTER_HV), + RecipeLoader.BITSD, + new Object[] { "DS ", "DP ", "DCB", 'D', + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Diamond, 1L), 'S', + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Iridium, 1L), 'P', + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 1L), 'C', "circuitAdvanced", 'B', + ItemList.IC2_EnergyCrystal.get(1L) }); + + if (ConfigHandler.teslastaff) { + GT_ModHandler.addCraftingRecipe( + new ItemStack(ItemRegistry.TESLASTAFF), + RecipeLoader.BITSD, + new Object[] { "BO ", "OP ", " P", 'O', + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUHV, 1L), 'B', + ItemList.Energy_LapotronicOrb.get(1L), 'P', "plateAlloyIridium", }); + } + + GT_ModHandler.addCraftingRecipe( + new ItemStack(ItemRegistry.PUMPPARTS, 1, 0), // tube + GT_ModHandler.RecipeBits.NOT_REMOVABLE, + new Object[] { " fG", " G ", "G ", 'G', ItemList.Circuit_Parts_Glass_Tube.get(1L) }); + GT_ModHandler.addCraftingRecipe( + new ItemStack(ItemRegistry.PUMPPARTS, 1, 1), // motor + GT_ModHandler.RecipeBits.NOT_REMOVABLE, + new Object[] { "GLP", "LSd", "PfT", 'G', + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Steel, 1L), 'L', + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Steel, 1L), 'S', + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 1L), 'P', + new ItemStack(Blocks.piston), 'T', new ItemStack(ItemRegistry.PUMPPARTS, 1, 0) }); + GT_ModHandler.addCraftingRecipe( + new ItemStack(ItemRegistry.PUMPBLOCK, 1, 0), + GT_ModHandler.RecipeBits.NOT_REMOVABLE, + new Object[] { "IPI", "PMP", "ISI", 'I', + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 1L), 'P', + GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Wood, 1L), 'M', + new ItemStack(ItemRegistry.PUMPPARTS, 1, 1), 'S', Ic2Items.ironFurnace }); + + GT_ModHandler.addCraftingRecipe( + new ItemStack(ItemRegistry.WINDMETER), + GT_ModHandler.RecipeBits.NOT_REMOVABLE, + new Object[] { "SWF", "Sf ", "Ss ", 'S', "stickWood", 'W', + new ItemStack(Blocks.wool, 1, Short.MAX_VALUE), 'F', new ItemStack(Items.string), }); + + for (int i = 0; i < 3; i++) { + Materials cable = cables[i + 2]; + ItemStack machinehull = ItemList.MACHINE_HULLS[i + 2].get(1L); + GT_ModHandler.addCraftingRecipe( + ItemRegistry.acidGens[i], + RecipeLoader.BITSD, + new Object[] { "HRH", "HCH", "HKH", 'H', bats[i], 'K', + GT_OreDictUnificator.get(OrePrefixes.cableGt01, cable, 1L), 'C', machinehull, 'R', + chreac[i] }); + } + + GT_ModHandler.addCraftingRecipe( + ItemRegistry.acidGensLV, + RecipeLoader.BITSD, + new Object[] { "HRH", "KCK", "HKH", 'H', ItemList.Battery_Hull_LV.get(1L), 'K', + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Tin, 1L), 'C', + ItemList.Hull_LV.get(1L), 'R', ItemList.Machine_LV_ChemicalReactor.get(1L), }); + + for (int i = 0; i < 9; i++) { + try { + Materials cable = cables[i]; + ItemStack hull = hulls[i] instanceof Materials + ? GT_OreDictUnificator.get(OrePrefixes.plate, hulls[i], 1L) + : ((Werkstoff) hulls[i]).get(OrePrefixes.plate); + ItemStack machinehull = ItemList.MACHINE_HULLS[i].get(1L); + + GT_ModHandler.addCraftingRecipe( + ItemRegistry.energyDistributor[i], + RecipeLoader.BITSD, + new Object[] { "PWP", "WCW", "PWP", 'W', + GT_OreDictUnificator.get(OrePrefixes.wireGt16, cable, 1L), 'P', hull, 'C', + machinehull }); + GT_ModHandler.addCraftingRecipe( + ItemRegistry.diode12A[i], + RecipeLoader.BITSD, + new Object[] { "WDW", "DCD", "PDP", 'D', + ItemList.Circuit_Parts_Diode.get(1L, ItemList.Circuit_Parts_DiodeSMD.get(1L)), 'W', + GT_OreDictUnificator.get(OrePrefixes.cableGt12, cable, 1L), 'P', hull, 'C', + machinehull }); + GT_ModHandler.addCraftingRecipe( + ItemRegistry.diode12A[i], + RecipeLoader.BITSD, + new Object[] { "WDW", "DCD", "PDP", 'D', + ItemList.Circuit_Parts_DiodeSMD.get(1L, ItemList.Circuit_Parts_Diode.get(1L)), 'W', + GT_OreDictUnificator.get(OrePrefixes.cableGt12, cable, 1L), 'P', hull, 'C', + machinehull }); + GT_ModHandler.addCraftingRecipe( + ItemRegistry.diode8A[i], + RecipeLoader.BITSD, + new Object[] { "WDW", "DCD", "PDP", 'D', + ItemList.Circuit_Parts_Diode.get(1L, ItemList.Circuit_Parts_DiodeSMD.get(1L)), 'W', + GT_OreDictUnificator.get(OrePrefixes.cableGt08, cable, 1L), 'P', hull, 'C', + machinehull }); + GT_ModHandler.addCraftingRecipe( + ItemRegistry.diode8A[i], + RecipeLoader.BITSD, + new Object[] { "WDW", "DCD", "PDP", 'D', + ItemList.Circuit_Parts_DiodeSMD.get(1L, ItemList.Circuit_Parts_Diode.get(1L)), 'W', + GT_OreDictUnificator.get(OrePrefixes.cableGt08, cable, 1L), 'P', hull, 'C', + machinehull }); + GT_ModHandler.addCraftingRecipe( + ItemRegistry.diode4A[i], + RecipeLoader.BITSD, + new Object[] { "WDW", "DCD", "PDP", 'D', + ItemList.Circuit_Parts_Diode.get(1L, ItemList.Circuit_Parts_DiodeSMD.get(1L)), 'W', + GT_OreDictUnificator.get(OrePrefixes.cableGt04, cable, 1L), 'P', hull, 'C', + machinehull }); + GT_ModHandler.addCraftingRecipe( + ItemRegistry.diode4A[i], + RecipeLoader.BITSD, + new Object[] { "WDW", "DCD", "PDP", 'D', + ItemList.Circuit_Parts_DiodeSMD.get(1L, ItemList.Circuit_Parts_Diode.get(1L)), 'W', + GT_OreDictUnificator.get(OrePrefixes.cableGt04, cable, 1L), 'P', hull, 'C', + machinehull }); + GT_ModHandler.addCraftingRecipe( + ItemRegistry.diode2A[i], + RecipeLoader.BITSD, + new Object[] { "WDW", "DCD", "PDP", 'D', + ItemList.Circuit_Parts_Diode.get(1L, ItemList.Circuit_Parts_DiodeSMD.get(1L)), 'W', + GT_OreDictUnificator.get(OrePrefixes.cableGt02, cable, 1L), 'P', hull, 'C', + machinehull }); + GT_ModHandler.addCraftingRecipe( + ItemRegistry.diode2A[i], + RecipeLoader.BITSD, + new Object[] { "WDW", "DCD", "PDP", 'D', + ItemList.Circuit_Parts_DiodeSMD.get(1L, ItemList.Circuit_Parts_Diode.get(1L)), 'W', + GT_OreDictUnificator.get(OrePrefixes.cableGt02, cable, 1L), 'P', hull, 'C', + machinehull }); + GT_ModHandler.addCraftingRecipe( + ItemRegistry.diode16A[i], + RecipeLoader.BITSD, + new Object[] { "WHW", "DCD", "PDP", 'H', ItemList.Circuit_Parts_Coil.get(1L), 'D', + ItemList.Circuit_Parts_Diode.get(1L, ItemList.Circuit_Parts_DiodeSMD.get(1L)), 'W', + GT_OreDictUnificator.get(OrePrefixes.wireGt16, cable, 1L), 'P', hull, 'C', + machinehull }); + GT_ModHandler.addCraftingRecipe( + ItemRegistry.diode16A[i], + RecipeLoader.BITSD, + new Object[] { "WHW", "DCD", "PDP", 'H', ItemList.Circuit_Parts_Coil.get(1L), 'D', + ItemList.Circuit_Parts_DiodeSMD.get(1L, ItemList.Circuit_Parts_Diode.get(1L)), 'W', + GT_OreDictUnificator.get(OrePrefixes.wireGt16, cable, 1L), 'P', hull, 'C', + machinehull }); + + } catch (ArrayIndexOutOfBoundsException ignored) { + + } + + } + + String[] stones = { "stone", "stoneSmooth" }; + String[] granites = { "blockGranite", "stoneGranite", "Granite", "granite" }; + for (String granite : granites) { + for (String stone : stones) { + GT_ModHandler.addCraftingRecipe( + new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 0), + GT_ModHandler.RecipeBits.NOT_REMOVABLE, + new Object[] { "SSS", "DfD", " h ", 'S', stone, 'D', + new ItemStack(GregTech_API.sBlockGranites, 1, OreDictionary.WILDCARD_VALUE), }); + GT_ModHandler.addCraftingRecipe( + new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 1), + GT_ModHandler.RecipeBits.NOT_REMOVABLE, + new Object[] { "hDf", "SSS", 'S', stone, 'D', + new ItemStack(GregTech_API.sBlockGranites, 1, OreDictionary.WILDCARD_VALUE), }); + GT_ModHandler.addCraftingRecipe( + new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 0), + GT_ModHandler.RecipeBits.NOT_REMOVABLE, + new Object[] { "SSS", "DfD", " h ", 'S', stone, 'D', granite, }); + GT_ModHandler.addCraftingRecipe( + new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 1), + GT_ModHandler.RecipeBits.NOT_REMOVABLE, + new Object[] { "hDf", "SSS", 'S', stone, 'D', granite, }); + } + GT_ModHandler.addCraftingRecipe( + new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 2), + GT_ModHandler.RecipeBits.NOT_REMOVABLE, + new Object[] { "STS", "h f", "SBS", 'S', granite, 'T', + new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 0), 'B', + new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 1), }); + } + + GT_ModHandler.addCraftingRecipe( + new GT_TileEntity_ManualTrafo( + ConfigHandler.IDOffset + GT_Values.VN.length * 6 + 1, + "bw.manualtrafo", + StatCollector.translateToLocal("tile.manutrafo.name")).getStackForm(1L), + RecipeLoader.BITSD, + new Object[] { "SCS", "CHC", "ZCZ", 'S', + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Titanium, 1L), 'C', + new ItemStack(ItemRegistry.BW_BLOCKS[2]), 'H', ItemList.Hull_HV.get(1L), 'Z', + "circuitAdvanced" }); + + GT_ModHandler.addCraftingRecipe( + new GT_TileEntity_Windmill( + ConfigHandler.IDOffset + GT_Values.VN.length * 6 + 2, + "bw.windmill", + StatCollector.translateToLocal("tile.bw.windmill.name")).getStackForm(1L), + RecipeLoader.BITSD, + new Object[] { "BHB", "WGW", "BWB", 'B', new ItemStack(Blocks.brick_block), 'W', + GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Iron, 1L), 'H', + new ItemStack(Blocks.hopper), 'G', new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 2), }); + + GT_ModHandler.addCraftingRecipe( + new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 2), + GT_ModHandler.RecipeBits.NOT_REMOVABLE, + new Object[] { "STS", "h f", "SBS", 'S', + new ItemStack(GregTech_API.sBlockGranites, 1, OreDictionary.WILDCARD_VALUE), 'T', + new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 0), 'B', + new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 1), }); + GT_ModHandler.addCraftingRecipe( + new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 3), + GT_ModHandler.RecipeBits.NOT_REMOVABLE, + new Object[] { "WLs", "WLh", "WLf", 'L', new ItemStack(Items.leather), 'W', "logWood", }); + GT_ModHandler.addCraftingRecipe( + new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 4), + GT_ModHandler.RecipeBits.NOT_REMOVABLE, + new Object[] { "WLs", "WLh", "WLf", 'L', new ItemStack(Blocks.carpet), 'W', "logWood", }); + GT_ModHandler.addCraftingRecipe( + new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 5), + GT_ModHandler.RecipeBits.NOT_REMOVABLE, + new Object[] { "WLs", "WLh", "WLf", 'L', new ItemStack(Items.paper), 'W', "logWood", }); + + GT_ModHandler.addCraftingRecipe( + new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 6), + GT_ModHandler.RecipeBits.NOT_REMOVABLE, + new Object[] { "WEs", "WZh", "WDf", 'E', new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 3), 'Z', + new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 4), 'D', + new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 5), 'W', "logWood", }); + + GT_ModHandler.addCraftingRecipe( + new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 6), + GT_ModHandler.RecipeBits.NOT_REMOVABLE, + new Object[] { "WEs", "WZh", "WDf", 'Z', new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 3), 'E', + new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 4), 'D', + new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 5), 'W', "logWood", }); + + GT_ModHandler.addCraftingRecipe( + new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 6), + GT_ModHandler.RecipeBits.NOT_REMOVABLE, + new Object[] { "WEs", "WZh", "WDf", 'D', new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 3), 'Z', + new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 4), 'E', + new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 5), 'W', "logWood", }); + + GT_ModHandler.addCraftingRecipe( + new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 6), + GT_ModHandler.RecipeBits.NOT_REMOVABLE, + new Object[] { "WEs", "WZh", "WDf", 'E', new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 3), 'D', + new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 4), 'Z', + new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 5), 'W', "logWood", }); + + GT_ModHandler.addCraftingRecipe( + new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 6), + GT_ModHandler.RecipeBits.NOT_REMOVABLE, + new Object[] { "WEs", "WZh", "WDf", 'Z', new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 3), 'D', + new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 4), 'E', + new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 5), 'W', "logWood", }); + + GT_ModHandler.addCraftingRecipe( + new ItemStack(ItemRegistry.LEATHER_ROTOR), + GT_ModHandler.RecipeBits.NOT_REMOVABLE, + new Object[] { "hPf", "PWP", "sPr", 'P', new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 3), 'W', + GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Iron, 1L), }); + GT_ModHandler.addCraftingRecipe( + new ItemStack(ItemRegistry.WOOL_ROTOR), + GT_ModHandler.RecipeBits.NOT_REMOVABLE, + new Object[] { "hPf", "PWP", "sPr", 'P', new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 4), 'W', + GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Iron, 1L), }); + GT_ModHandler.addCraftingRecipe( + new ItemStack(ItemRegistry.PAPER_ROTOR), + GT_ModHandler.RecipeBits.NOT_REMOVABLE, + new Object[] { "hPf", "PWP", "sPr", 'P', new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 5), 'W', + GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Iron, 1L), }); + GT_ModHandler.addCraftingRecipe( + new ItemStack(ItemRegistry.COMBINED_ROTOR), + GT_ModHandler.RecipeBits.NOT_REMOVABLE, + new Object[] { "hPf", "PWP", "sPr", 'P', new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 6), 'W', + GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Iron, 1L), }); + GT_ModHandler.addCraftingRecipe( + new ItemStack(ItemRegistry.ROTORBLOCK), + RecipeLoader.BITSD, + new Object[] { "WRW", "RGR", "WRW", 'R', GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Iron, 1L), + 'W', "plankWood", 'G', GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Iron, 1L), }); + + GT_ModHandler.addCraftingRecipe( + ItemRegistry.THTR, + RecipeLoader.BITSD, + new Object[] { "BZB", "BRB", "BZB", 'B', new ItemStack(GregTech_API.sBlockCasings3, 1, 12), 'R', + GT_ModHandler.getModItem(IndustrialCraft2.ID, "blockGenerator", 1, 5), 'Z', + "circuitUltimate" }); + + GT_ModHandler.addCraftingRecipe( + ItemRegistry.HTGR, + RecipeLoader.BITSD, + new Object[] { "BZB", "BRB", "BZB", 'B', new ItemStack(GregTech_API.sBlockCasings8, 1, 5), 'R', + GT_ModHandler.getModItem(IndustrialCraft2.ID, "blockGenerator", 1, 5), 'Z', + "circuitSuperconductor" }); + + // DNAExtractionModule + GT_ModHandler.addCraftingRecipe( + BioItemList.mBioLabParts[0], + RecipeLoader.BITSD, + new Object[] { "TET", "CFC", "TST", 'T', + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 1L), 'E', + ItemList.Emitter_EV.get(1L), 'C', + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Aluminium, 1L), 'S', + ItemList.Sensor_EV.get(1L), 'F', ItemList.Field_Generator_EV.get(1L) }); + + // PCRThermoclyclingModule + GT_ModHandler.addCraftingRecipe( + BioItemList.mBioLabParts[1], + RecipeLoader.BITSD, + new Object[] { "NEN", "CFC", "NSN", 'N', + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Nichrome, 1L), 'E', + ItemList.Emitter_EV.get(1L), 'C', + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Aluminium, 1L), 'S', + ItemList.Sensor_EV.get(1L), 'F', ItemList.Field_Generator_EV.get(1L) }); + + // PlasmidSynthesisModule + GT_ModHandler.addCraftingRecipe( + BioItemList.mBioLabParts[2], + RecipeLoader.BITSD, + new Object[] { "SFE", "CPC", "NFN", 'N', + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Nichrome, 1L), 'C', + "circuit" + Materials.Data, 'F', ItemList.Field_Generator_EV.get(1L), 'E', + ItemList.Emitter_EV.get(1L), 'S', ItemList.Sensor_EV.get(1L), 'P', + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 1L), }); + // TransformationModule + GT_ModHandler.addCraftingRecipe( + BioItemList.mBioLabParts[3], + RecipeLoader.BITSD, + new Object[] { "SFE", "CPC", "NFN", 'N', + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Naquadah, 1L), 'C', + "circuit" + Materials.Master, 'F', ItemList.Field_Generator_LuV.get(1L), 'E', + ItemList.Emitter_LuV.get(1L), 'S', ItemList.Sensor_LuV.get(1L), 'P', + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Chrome, 1L), }); + + // ClonalCellularSynthesisModule + GT_ModHandler.addCraftingRecipe( + BioItemList.mBioLabParts[4], + RecipeLoader.BITSD, + new Object[] { "FEF", "CPC", "FSF", 'N', + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Naquadah, 1L), 'C', + "circuit" + Materials.Master, 'F', ItemList.Field_Generator_LuV.get(1L), 'E', + ItemList.Emitter_LuV.get(1L), 'S', ItemList.Sensor_LuV.get(1L), 'P', + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Chrome, 1L), }); + + GT_ModHandler.addCraftingRecipe( + new GT_TileEntity_BioVat( + ConfigHandler.IDOffset + GT_Values.VN.length * 7, + "bw.biovat", + StatCollector.translateToLocal("tile.biovat.name")).getStackForm(1L), + RecipeLoader.BITSD, + new Object[] { "GCG", "KHK", "GCG", 'G', new ItemStack(ItemRegistry.bw_glasses[0], 1, 1), 'C', + "circuit" + Materials.Data, 'K', + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Silver, 1L), 'H', + ItemList.MACHINE_HULLS[3].get(1L) }); + + ItemStack[] Pistons2 = { ItemList.Electric_Piston_HV.get(1L), ItemList.Electric_Piston_EV.get(1L), + ItemList.Electric_Piston_IV.get(1L), ItemList.Electric_Piston_LuV.get(1L), + ItemList.Electric_Piston_ZPM.get(1L), ItemList.Electric_Piston_UV.get(1L) }; + ItemStack[] BioLab2 = new ItemStack[GT_Values.VN.length - 3]; + ItemStack[] RadioHatch2 = new ItemStack[GT_Values.VN.length - 3]; + Materials[] cables2 = { Materials.Gold, Materials.Aluminium, Materials.Tungsten, Materials.VanadiumGallium, + Materials.Naquadah, Materials.NaquadahAlloy, Materials.SuperconductorUHV }; + Materials[] hulls2 = { Materials.StainlessSteel, Materials.Titanium, Materials.TungstenSteel, Materials.Chrome, + Materials.Iridium, Materials.Osmium, Materials.Naquadah }; + Materials[] wireMat2 = { Materials.Kanthal, Materials.Nichrome, Materials.TungstenSteel, Materials.Naquadah, + Materials.NaquadahAlloy, Materials.SuperconductorUHV }; + Materials[] circuits2 = { Materials.Advanced, Materials.Data, Materials.Elite, Materials.Master, + Materials.Ultimate, Materials.SuperconductorUHV }; + + for (int i = 3; i < GT_Values.VN.length - 1; i++) { + // 12625 + BioLab2[(i - 3)] = new GT_MetaTileEntity_BioLab( + ConfigHandler.IDOffset + GT_Values.VN.length * 6 + i, + "bw.biolab" + GT_Values.VN[i], + GT_Values.VN[i] + " " + StatCollector.translateToLocal("tile.biolab.name"), + i).getStackForm(1L); + RadioHatch2[(i - 3)] = new GT_MetaTileEntity_RadioHatch( + ConfigHandler.IDOffset + GT_Values.VN.length * 7 - 2 + i, + "bw.radiohatch" + GT_Values.VN[i], + GT_Values.VN[i] + " " + StatCollector.translateToLocal("tile.radiohatch.name"), + i).getStackForm(1L); + try { + ItemStack machinehull = ItemList.MACHINE_HULLS[i].get(1L); + GT_ModHandler.addCraftingRecipe( + BioLab2[(i - 3)], + RecipeLoader.BITSD, + new Object[] { "PFP", "WCW", "OGO", 'F', + GT_OreDictUnificator.get(OrePrefixes.frameGt, hulls2[(i - 3)], 1L), 'W', + GT_OreDictUnificator.get(OrePrefixes.wireGt01, wireMat2[(i - 3)], 1L), 'P', + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Polytetrafluoroethylene, 1L), 'O', + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Polystyrene, 1L), 'G', + "circuit" + circuits2[(i - 3)], 'C', machinehull }); + GT_ModHandler.addCraftingRecipe( + RadioHatch2[(i - 3)], + RecipeLoader.BITSD, + new Object[] { "DPD", "DCD", "DKD", 'D', + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Lead, 1L), 'C', machinehull, + 'K', GT_OreDictUnificator.get(OrePrefixes.cableGt08, cables2[(i - 3)], 1L), 'P', + Pistons2[(i - 3)] }); + } catch (ArrayIndexOutOfBoundsException ignored) { + + } + } + + } +} diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Electrolyzer.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Electrolyzer.java new file mode 100644 index 0000000000..f9dbbaa53d --- /dev/null +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Electrolyzer.java @@ -0,0 +1,170 @@ +package com.github.bartimaeusnek.bartworks.common.loaders.recipes; + +import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; + +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.ItemList; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.util.GT_OreDictUnificator; + +public class Electrolyzer implements Runnable { + + @Override + public void run() { + GT_Values.RA.addElectrolyzerRecipe( + WerkstoffLoader.Forsterit.get(OrePrefixes.dust, 7), + GT_Values.NI, + GT_Values.NF, + Materials.Oxygen.getGas(2000L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesium, 2L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1L), + GT_Values.NI, + GT_Values.NI, + GT_Values.NI, + GT_Values.NI, + null, + 200, + 90); + GT_Values.RA.addElectrolyzerRecipe( + WerkstoffLoader.RedZircon.get(OrePrefixes.dust, 6), + GT_Values.NI, + GT_Values.NF, + Materials.Oxygen.getGas(2000L), + WerkstoffLoader.Zirconium.get(OrePrefixes.dust, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1L), + GT_Values.NI, + GT_Values.NI, + GT_Values.NI, + GT_Values.NI, + null, + 250, + 90); + GT_Values.RA.addElectrolyzerRecipe( + WerkstoffLoader.Fayalit.get(OrePrefixes.dust, 7), + GT_Values.NI, + GT_Values.NF, + Materials.Oxygen.getGas(2000L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 2L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1L), + GT_Values.NI, + GT_Values.NI, + GT_Values.NI, + GT_Values.NI, + null, + 320, + 90); + GT_Values.RA.addElectrolyzerRecipe( + WerkstoffLoader.Prasiolite.get(OrePrefixes.dust, 16), + GT_Values.NI, + GT_Values.NF, + GT_Values.NF, + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 5L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1L), + GT_Values.NI, + GT_Values.NI, + GT_Values.NI, + GT_Values.NI, + null, + 580, + 90); + GT_Values.RA.addElectrolyzerRecipe( + WerkstoffLoader.Hedenbergit.get(OrePrefixes.dust, 10), + GT_Values.NI, + GT_Values.NF, + Materials.Oxygen.getGas(2000L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 2L), + GT_Values.NI, + GT_Values.NI, + GT_Values.NI, + null, + 300, + 90); + GT_Values.RA.addElectrolyzerRecipe( + WerkstoffLoader.FuchsitAL.get(OrePrefixes.dust, 21), + ItemList.Cell_Empty.get(2), + GT_Values.NF, + Materials.Oxygen.getGas(2000L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Potassium, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 3L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 3L), + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2), + GT_Values.NI, + GT_Values.NI, + null, + 390, + 120); + GT_Values.RA.addElectrolyzerRecipe( + WerkstoffLoader.FuchsitCR.get(OrePrefixes.dust, 21), + ItemList.Cell_Empty.get(2), + GT_Values.NF, + Materials.Oxygen.getGas(2000L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Potassium, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 3L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 3L), + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2), + GT_Values.NI, + GT_Values.NI, + null, + 460, + 120); + GT_Values.RA.addElectrolyzerRecipe( + WerkstoffLoader.VanadioOxyDravit.get(OrePrefixes.dust, 53), + ItemList.Cell_Empty.get(3), + GT_Values.NF, + Materials.Oxygen.getGas(19000L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Vanadium, 3L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnalium, 6L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 6), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Boron, 3), + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 3), + null, + 710, + 120); + GT_Values.RA.addElectrolyzerRecipe( + WerkstoffLoader.ChromoAluminoPovondrait.get(OrePrefixes.dust, 53), + ItemList.Cell_Empty.get(3), + GT_Values.NF, + Materials.Oxygen.getGas(19000L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 3L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnalium, 6L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 6), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Boron, 3), + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 3), + null, + 720, + 120); + GT_Values.RA.addElectrolyzerRecipe( + WerkstoffLoader.FluorBuergerit.get(OrePrefixes.dust, 50), + ItemList.Cell_Empty.get(3), + GT_Values.NF, + Materials.Oxygen.getGas(6000L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 3L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 6L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 6), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Boron, 3), + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Fluorine, 3), + null, + 730, + 120); + GT_Values.RA.addElectrolyzerRecipe( + WerkstoffLoader.Olenit.get(OrePrefixes.dust, 51), + ItemList.Cell_Empty.get(1), + GT_Values.NF, + Materials.Oxygen.getGas(1000L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 9L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 6L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Boron, 3), + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 1), + GT_Values.NI, + null, + 790, + 120); + } +} diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Extractor.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Extractor.java new file mode 100644 index 0000000000..2505c369e2 --- /dev/null +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Extractor.java @@ -0,0 +1,37 @@ +package com.github.bartimaeusnek.bartworks.common.loaders.recipes; + +import static gregtech.api.enums.Mods.CropLoadCore; + +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; + +import com.github.bartimaeusnek.bartworks.common.loaders.BioItemList; +import com.github.bartimaeusnek.bartworks.util.BW_Util; + +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.ItemList; + +public class Extractor implements Runnable { + + @Override + public void run() { + List<ItemStack> oreCropVine = OreDictionary.getOres("cropVine", false); + if (CropLoadCore.isModLoaded() && !oreCropVine.isEmpty()) { + for (ItemStack stack : oreCropVine) { + GT_Values.RA.addExtractorRecipe( + BW_Util.setStackSize(stack, 12), + BioItemList.getOther(1), + 500, + BW_Util.getMachineVoltageFromTier(3)); + } + } + + GT_Values.RA.addExtractorRecipe( + ItemList.Circuit_Chip_Stemcell.get(1L), + BioItemList.getOther(4), + 500, + BW_Util.getMachineVoltageFromTier(6)); + } +} diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/FakeRecipes.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/FakeRecipes.java new file mode 100644 index 0000000000..1df03d10f2 --- /dev/null +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/FakeRecipes.java @@ -0,0 +1,11 @@ +package com.github.bartimaeusnek.bartworks.common.loaders.recipes; + +import com.github.bartimaeusnek.bartworks.common.tileentities.multis.GT_TileEntity_HTGR; + +public class FakeRecipes implements Runnable { + + @Override + public void run() { + GT_TileEntity_HTGR.HTGRMaterials.register_fake_THR_Recipes(); + } +} diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/FluidHeater.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/FluidHeater.java new file mode 100644 index 0000000000..6d23bdfb91 --- /dev/null +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/FluidHeater.java @@ -0,0 +1,22 @@ +package com.github.bartimaeusnek.bartworks.common.loaders.recipes; + +import net.minecraftforge.fluids.FluidStack; + +import com.github.bartimaeusnek.bartworks.common.loaders.FluidLoader; +import com.github.bartimaeusnek.bartworks.util.BW_Util; + +import gregtech.api.enums.GT_Values; +import gregtech.api.util.GT_Utility; + +public class FluidHeater implements Runnable { + + @Override + public void run() { + GT_Values.RA.addFluidHeaterRecipe( + GT_Utility.getIntegratedCircuit(10), + new FluidStack(FluidLoader.fulvicAcid, 1000), + new FluidStack(FluidLoader.heatedfulvicAcid, 1000), + 90, + BW_Util.getMachineVoltageFromTier(2)); + } +} diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/FluidSolidifier.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/FluidSolidifier.java new file mode 100644 index 0000000000..be00d552de --- /dev/null +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/FluidSolidifier.java @@ -0,0 +1,80 @@ +package com.github.bartimaeusnek.bartworks.common.loaders.recipes; + +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; + +import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry; +import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; +import com.github.bartimaeusnek.bartworks.util.BW_Util; + +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.Materials; + +public class FluidSolidifier implements Runnable { + + @Override + public void run() { + GT_Values.RA.addFluidSolidifierRecipe( + new ItemStack(Blocks.lapis_block), + Materials.Iron.getMolten(1296L), + new ItemStack(ItemRegistry.BW_BLOCKS[0], 1, 0), + 100, + BW_Util.getMachineVoltageFromTier(3)); + + GT_Values.RA.addFluidSolidifierRecipe( + new ItemStack(ItemRegistry.bw_glasses[0], 1, 0), + Materials.Titanium.getMolten(1152), + new ItemStack(ItemRegistry.bw_glasses[0], 1, 1), + 800, + BW_Util.getMachineVoltageFromTier(3)); + GT_Values.RA.addFluidSolidifierRecipe( + new ItemStack(ItemRegistry.bw_glasses[0], 1, 0), + Materials.TungstenSteel.getMolten(1152), + new ItemStack(ItemRegistry.bw_glasses[0], 1, 2), + 800, + BW_Util.getMachineVoltageFromTier(4)); + + GT_Values.RA.addFluidSolidifierRecipe( + new ItemStack(ItemRegistry.bw_glasses[0], 1, 0), + WerkstoffLoader.LuVTierMaterial.getMolten(1152), + new ItemStack(ItemRegistry.bw_glasses[0], 1, 3), + 800, + BW_Util.getMachineVoltageFromTier(5)); + GT_Values.RA.addFluidSolidifierRecipe( + new ItemStack(ItemRegistry.bw_glasses[0], 1, 0), + Materials.Iridium.getMolten(1152), + new ItemStack(ItemRegistry.bw_glasses[0], 1, 4), + 800, + BW_Util.getMachineVoltageFromTier(6)); + GT_Values.RA.addFluidSolidifierRecipe( + new ItemStack(ItemRegistry.bw_glasses[0], 1, 0), + Materials.Osmium.getMolten(1152), + new ItemStack(ItemRegistry.bw_glasses[0], 1, 5), + 800, + BW_Util.getMachineVoltageFromTier(7)); + GT_Values.RA.addFluidSolidifierRecipe( + new ItemStack(ItemRegistry.bw_glasses[0], 1, 0), + Materials.Neutronium.getMolten(1152), + new ItemStack(ItemRegistry.bw_glasses[0], 1, 13), + 800, + BW_Util.getMachineVoltageFromTier(8)); + GT_Values.RA.addFluidSolidifierRecipe( + new ItemStack(ItemRegistry.bw_glasses[0], 1, 0), + Materials.CosmicNeutronium.getMolten(1152), + new ItemStack(ItemRegistry.bw_glasses[0], 1, 14), + 800, + BW_Util.getMachineVoltageFromTier(9)); + GT_Values.RA.addFluidSolidifierRecipe( + new ItemStack(ItemRegistry.bw_glasses[0], 1, 0), + Materials.Infinity.getMolten(1152), + new ItemStack(ItemRegistry.bw_glasses[0], 1, 15), + 800, + BW_Util.getMachineVoltageFromTier(10)); + GT_Values.RA.addFluidSolidifierRecipe( + new ItemStack(ItemRegistry.bw_glasses[0], 1, 0), + Materials.TranscendentMetal.getMolten(1152), + new ItemStack(ItemRegistry.bw_glasses[1], 1, 0), + 800, + BW_Util.getMachineVoltageFromTier(11)); + } +} diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/FormingPress.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/FormingPress.java new file mode 100644 index 0000000000..744b18a175 --- /dev/null +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/FormingPress.java @@ -0,0 +1,60 @@ +package com.github.bartimaeusnek.bartworks.common.loaders.recipes; + +import static com.github.bartimaeusnek.bartworks.common.tileentities.multis.GT_TileEntity_HTGR.HTGRMaterials.MATERIALS_PER_FUEL; +import static com.github.bartimaeusnek.bartworks.common.tileentities.multis.GT_TileEntity_HTGR.HTGRMaterials.sHTGR_Fuel; + +import net.minecraft.item.ItemStack; + +import com.github.bartimaeusnek.bartworks.common.tileentities.multis.GT_TileEntity_HTGR; +import com.github.bartimaeusnek.bartworks.common.tileentities.multis.GT_TileEntity_THTR; + +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.Materials; + +public class FormingPress implements Runnable { + + @Override + public void run() { + GT_Values.RA.addFormingPressRecipe( + new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials), + Materials.Graphite.getDust(64), + new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 1, 1), + 40, + 30); + GT_Values.RA.addFormingPressRecipe( + new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 1, 1), + Materials.Silicon.getDust(64), + new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 1, 2), + 40, + 30); + GT_Values.RA.addFormingPressRecipe( + new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 1, 2), + Materials.Graphite.getDust(64), + new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 1, 3), + 40, + 30); + + int i = 0; + for (GT_TileEntity_HTGR.HTGRMaterials.Fuel_ fuel : sHTGR_Fuel) { + GT_Values.RA.addFormingPressRecipe( + new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i), + Materials.Carbon.getDust(64), + new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i + 1), + 40, + 30); + GT_Values.RA.addFormingPressRecipe( + new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i + 1), + Materials.Silicon.getDust(64), + new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i + 2), + 40, + 30); + GT_Values.RA.addFormingPressRecipe( + new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i + 2), + Materials.Graphite.getDust(64), + new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i + 3), + 40, + 30); + i += MATERIALS_PER_FUEL; + } + } +} diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/LaserEngraver.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/LaserEngraver.java new file mode 100644 index 0000000000..7b647d79af --- /dev/null +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/LaserEngraver.java @@ -0,0 +1,24 @@ +package com.github.bartimaeusnek.bartworks.common.loaders.recipes; + +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + +import com.github.bartimaeusnek.bartworks.common.loaders.BioItemList; +import com.github.bartimaeusnek.bartworks.util.BW_Util; + +import gregtech.api.enums.GT_Values; +import gregtech.api.util.GT_Utility; + +public class LaserEngraver implements Runnable { + + @Override + public void run() { + GT_Values.RA.addLaserEngraverRecipe( + new ItemStack(Items.emerald), + GT_Utility.getIntegratedCircuit(17), + BioItemList.getPlasmidCell(null), + 100, + BW_Util.getMachineVoltageFromTier(1)); + + } +} diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Mixer.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Mixer.java new file mode 100644 index 0000000000..4cf4f691c1 --- /dev/null +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Mixer.java @@ -0,0 +1,64 @@ +package com.github.bartimaeusnek.bartworks.common.loaders.recipes; + +import static com.github.bartimaeusnek.bartworks.common.tileentities.multis.GT_TileEntity_HTGR.HTGRMaterials.MATERIALS_PER_FUEL; +import static com.github.bartimaeusnek.bartworks.common.tileentities.multis.GT_TileEntity_HTGR.HTGRMaterials.sHTGR_Fuel; +import static gregtech.api.enums.Mods.Gendustry; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; + +import com.github.bartimaeusnek.bartworks.common.loaders.FluidLoader; +import com.github.bartimaeusnek.bartworks.common.tileentities.multis.GT_TileEntity_HTGR; +import com.github.bartimaeusnek.bartworks.common.tileentities.multis.GT_TileEntity_THTR; +import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; +import com.github.bartimaeusnek.bartworks.util.BW_Util; + +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GT_Utility; + +public class Mixer implements Runnable { + + @Override + public void run() { + GT_Values.RA.addMixerRecipe( + WerkstoffLoader.Thorium232.get(OrePrefixes.dust, 10), + Materials.Uranium235.getDust(1), + GT_Utility.getIntegratedCircuit(2), + null, + null, + null, + new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials), + 400, + 30); + + int i = 0; + for (GT_TileEntity_HTGR.HTGRMaterials.Fuel_ fuel : sHTGR_Fuel) { + GT_Values.RA.addMixerRecipe( + new ItemStack[] { fuel.mainItem, fuel.secondaryItem, GT_Utility.getIntegratedCircuit(1) }, + null, + new ItemStack[] { new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i) }, + null, + 400, + 30); + i += MATERIALS_PER_FUEL; + } + + if (Gendustry.isModLoaded()) { + GT_Values.RA.addMixerRecipe( + GT_Utility.getIntegratedCircuit(17), + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Radon, 1L), + null, + null, + FluidRegistry.getFluidStack("liquiddna", 1000), + new FluidStack(FluidLoader.BioLabFluidMaterials[0], 2000), + Materials.Empty.getCells(1), + 500, + BW_Util.getMachineVoltageFromTier(3)); + } + + } +} diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Pulverizer.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Pulverizer.java new file mode 100644 index 0000000000..35c99413e4 --- /dev/null +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Pulverizer.java @@ -0,0 +1,82 @@ +package com.github.bartimaeusnek.bartworks.common.loaders.recipes; + +import net.minecraft.item.ItemStack; + +import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry; +import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; +import com.github.bartimaeusnek.bartworks.util.BW_Util; + +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; + +public class Pulverizer implements Runnable { + + @Override + public void run() { + GT_Values.RA.addPulveriserRecipe( + new ItemStack(ItemRegistry.bw_glasses[0], 1, 1), + new ItemStack[] { Materials.BorosilicateGlass.getDust(9), Materials.Titanium.getDust(8) }, + null, + 800, + BW_Util.getMachineVoltageFromTier(4)); + GT_Values.RA.addPulveriserRecipe( + new ItemStack(ItemRegistry.bw_glasses[0], 1, 2), + new ItemStack[] { Materials.BorosilicateGlass.getDust(9), Materials.TungstenSteel.getDust(8) }, + null, + 800, + BW_Util.getMachineVoltageFromTier(5)); + GT_Values.RA.addPulveriserRecipe( + new ItemStack(ItemRegistry.bw_glasses[0], 1, 3), + new ItemStack[] { Materials.BorosilicateGlass.getDust(9), + WerkstoffLoader.LuVTierMaterial.get(OrePrefixes.dust, 8) }, + null, + 800, + BW_Util.getMachineVoltageFromTier(6)); + GT_Values.RA.addPulveriserRecipe( + new ItemStack(ItemRegistry.bw_glasses[0], 1, 4), + new ItemStack[] { Materials.BorosilicateGlass.getDust(9), Materials.Iridium.getDust(8) }, + null, + 800, + BW_Util.getMachineVoltageFromTier(7)); + GT_Values.RA.addPulveriserRecipe( + new ItemStack(ItemRegistry.bw_glasses[0], 1, 5), + new ItemStack[] { Materials.BorosilicateGlass.getDust(9), Materials.Osmium.getDust(8) }, + null, + 800, + BW_Util.getMachineVoltageFromTier(8)); + GT_Values.RA.addPulveriserRecipe( + new ItemStack(ItemRegistry.bw_glasses[0], 1, 13), + new ItemStack[] { Materials.BorosilicateGlass.getDust(9), Materials.Neutronium.getDust(8) }, + null, + 800, + BW_Util.getMachineVoltageFromTier(9)); + GT_Values.RA.addPulveriserRecipe( + new ItemStack(ItemRegistry.bw_glasses[0], 1, 14), + new ItemStack[] { Materials.BorosilicateGlass.getDust(9), Materials.CosmicNeutronium.getDust(8) }, + null, + 800, + BW_Util.getMachineVoltageFromTier(10)); + GT_Values.RA.addPulveriserRecipe( + new ItemStack(ItemRegistry.bw_glasses[0], 1, 15), + new ItemStack[] { Materials.BorosilicateGlass.getDust(9), Materials.Infinity.getDust(8) }, + null, + 800, + BW_Util.getMachineVoltageFromTier(11)); + GT_Values.RA.addPulveriserRecipe( + new ItemStack(ItemRegistry.bw_glasses[1], 1, 0), + new ItemStack[] { Materials.BorosilicateGlass.getDust(9), Materials.TranscendentMetal.getDust(8) }, + null, + 800, + BW_Util.getMachineVoltageFromTier(12)); + + for (int i = 6; i < 11; i++) { + GT_Values.RA.addPulveriserRecipe( + new ItemStack(ItemRegistry.bw_glasses[0], 1, i), + new ItemStack[] { Materials.BorosilicateGlass.getDust(9) }, + null, + 400, + BW_Util.getMachineVoltageFromTier(1)); + } + } +} diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/PyrolyseOven.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/PyrolyseOven.java new file mode 100644 index 0000000000..812b90bfb8 --- /dev/null +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/PyrolyseOven.java @@ -0,0 +1,24 @@ +package com.github.bartimaeusnek.bartworks.common.loaders.recipes; + +import net.minecraftforge.fluids.FluidStack; + +import com.github.bartimaeusnek.bartworks.common.loaders.FluidLoader; +import com.github.bartimaeusnek.bartworks.util.BW_Util; + +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.Materials; + +public class PyrolyseOven implements Runnable { + + @Override + public void run() { + GT_Values.RA.addPyrolyseRecipe( + Materials.Wood.getDust(10), + new FluidStack(FluidLoader.Kerogen, 1000), + 10, + null, + Materials.Oil.getFluid(1000), + 105, + BW_Util.getMachineVoltageFromTier(3)); + } +} diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/net/RendererPacket.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/net/RendererPacket.java index 0cfb24d44c..af79cbc208 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/net/RendererPacket.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/net/RendererPacket.java @@ -63,21 +63,6 @@ public class RendererPacket extends GT_Packet { .array(); } - // /** - // * only use in a debug enviroment, does not do anything on its own. - // * @param buffer - // */ - // public void decodetest (byte[] buffer){ - // this.coords=new - // Coords(ByteBuffer.wrap(buffer).getInt(0),ByteBuffer.wrap(buffer).getShort(4),ByteBuffer.wrap(buffer).getInt(6),ByteBuffer.wrap(buffer).getInt(10)); - // int[] rgb = {ByteBuffer.wrap(buffer).get(14)-Byte.MIN_VALUE, - // ByteBuffer.wrap(buffer).get(15)-Byte.MIN_VALUE, ByteBuffer.wrap(buffer).get(16)-Byte.MIN_VALUE}; - // this.integer= BW_Util.getColorFromRGBArray(rgb); - // this.removal=ByteBuffer.wrap(buffer).get(17); - // - // byte checksum = (byte) (coords.x%25+coords.y%25+coords.z%25+coords.wID%25+integer%25+removal); - // } - @Override public GT_Packet decode(ByteArrayDataInput dataInput) { diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/classic/BW_TileEntity_ExperimentalFloodGate.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/classic/BW_TileEntity_ExperimentalFloodGate.java index e735a93dc9..a04d70f6aa 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/classic/BW_TileEntity_ExperimentalFloodGate.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/classic/BW_TileEntity_ExperimentalFloodGate.java @@ -13,7 +13,11 @@ package com.github.bartimaeusnek.bartworks.common.tileentities.classic; -import static net.minecraftforge.common.util.ForgeDirection.*; +import static net.minecraftforge.common.util.ForgeDirection.DOWN; +import static net.minecraftforge.common.util.ForgeDirection.EAST; +import static net.minecraftforge.common.util.ForgeDirection.NORTH; +import static net.minecraftforge.common.util.ForgeDirection.SOUTH; +import static net.minecraftforge.common.util.ForgeDirection.WEST; import java.util.Comparator; import java.util.PriorityQueue; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/classic/BW_TileEntity_HeatedWaterPump.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/classic/BW_TileEntity_HeatedWaterPump.java index 8641a78adf..c977453f68 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/classic/BW_TileEntity_HeatedWaterPump.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/classic/BW_TileEntity_HeatedWaterPump.java @@ -25,7 +25,13 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityFurnace; import net.minecraft.util.StatCollector; import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidEvent; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; +import net.minecraftforge.fluids.IFluidTank; import com.github.bartimaeusnek.bartworks.API.ITileAddsInformation; import com.github.bartimaeusnek.bartworks.API.ITileDropsContent; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/classic/BW_TileEntity_InfinityTank.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/classic/BW_TileEntity_InfinityTank.java index d3160d14a7..32f214a941 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/classic/BW_TileEntity_InfinityTank.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/classic/BW_TileEntity_InfinityTank.java @@ -19,7 +19,12 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidEvent; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; +import net.minecraftforge.fluids.IFluidTank; import gregtech.api.util.GT_Utility; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/classic/BW_TileEntity_LESU_Redux.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/classic/BW_TileEntity_LESU_Redux.java deleted file mode 100644 index b9b8ba24b3..0000000000 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/classic/BW_TileEntity_LESU_Redux.java +++ /dev/null @@ -1,488 +0,0 @@ -/// * -// * Copyright (c) 2019 bartimaeusnek -// * -// * Permission is hereby granted, free of charge, to any person obtaining a copy -// * of this software and associated documentation files (the "Software"), to deal -// * in the Software without restriction, including without limitation the rights -// * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// * copies of the Software, and to permit persons to whom the Software is -// * furnished to do so, subject to the following conditions: -// * -// * The above copyright notice and this permission notice shall be included in all -// * copies or substantial portions of the Software. -// * -// * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -// * SOFTWARE. -// */ -// -// package com.github.bartimaeusnek.bartworks.common.tileentities.classic; -// -// import com.github.bartimaeusnek.bartworks.API.ITileAddsInformation; -// import com.github.bartimaeusnek.bartworks.API.ITileDropsContent; -// import com.github.bartimaeusnek.bartworks.API.ITileHasDifferentTextureSides; -// import com.github.bartimaeusnek.bartworks.MainMod; -// import com.github.bartimaeusnek.bartworks.common.configs.ConfigHandler; -// import com.github.bartimaeusnek.bartworks.util.ChatColorHelper; -// import com.github.bartimaeusnek.bartworks.util.ConnectedBlocksChecker; -// import cpw.mods.fml.common.FMLCommonHandler; -// import cpw.mods.fml.relauncher.Side; -// import gregtech.api.interfaces.tileentity.IEnergyConnected; -// import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -// import gregtech.api.objects.XSTR; -// import net.minecraft.block.Block; -// import net.minecraft.client.renderer.texture.IIconRegister; -// import net.minecraft.entity.player.EntityPlayer; -// import net.minecraft.inventory.IInventory; -// import net.minecraft.item.ItemStack; -// import net.minecraft.tileentity.TileEntity; -// import net.minecraft.util.StatCollector; -// import net.minecraft.world.World; -// import net.minecraft.world.biome.BiomeGenBase; -// import net.minecraftforge.fluids.IFluidHandler; -// -// import java.nio.ByteBuffer; -// import java.util.ArrayList; -// -// -// public class BW_TileEntity_LESU_Redux extends TileEntity implements ITileHasDifferentTextureSides, -// ITileAddsInformation, ITileDropsContent, IEnergyConnected { -// -// public ConnectedBlocksChecker connectedcells; -// public ItemStack[] circuits = new ItemStack[5]; -// private long[] storage; -// private long input; -// private long output; -// ByteBuffer eu; -// -// @Override -// public String[] getInfoData() { -// ArrayList<String> e = new ArrayList<>(); -// String[] dsc = StatCollector.translateToLocal("tooltip.tile.lesu.0.name").split(";"); -// for (int i = 0; i < dsc.length; i++) { -// e.add(dsc[i]); -// } -// e.add(StatCollector.translateToLocal("tooltip.tile.lesu.1.name") + " " + ConfigHandler.energyPerCell + "EU"); -// dsc = StatCollector.translateToLocal("tooltip.tile.lesu.2.name").split(";"); -// for (int i = 0; i < dsc.length; i++) { -// e.add(dsc[i]); -// } -// e.add(ChatColorHelper.RED + StatCollector.translateToLocal("tooltip.tile.lesu.3.name")); -// e.add(StatCollector.translateToLocal("tooltip.bw.1.name") + ChatColorHelper.DARKGREEN + " BartWorks"); -// return e.toArray(new String[0]); -// } -// -// @Override -// public void registerBlockIcons(IIconRegister par1IconRegister) { -// par1IconRegister.registerIcon(MainMod.MOD_ID + ":LESU_CASING_" + i); -// } -// -// @Override -// public long injectEnergyUnits(byte aSide, long aVoltage, long aAmperage) { -// if (inputEnergyFrom(aSide)){ -// -// } -// return 0; -// } -// -// @Override -// public boolean inputEnergyFrom(byte b) { -// return true; -// } -// -// @Override -// public boolean outputsEnergyTo(byte b) { -// return false; -// } -// -// @Override -// public byte getColorization() { -// return 0; -// } -// -// @Override -// public byte setColorization(byte b) { -// return 0; -// } -// -// @Override -// public World getWorld() { -// return null; -// } -// -// @Override -// public int getXCoord() { -// return 0; -// } -// -// @Override -// public short getYCoord() { -// return 0; -// } -// -// @Override -// public int getZCoord() { -// return 0; -// } -// -// @Override -// public boolean isServerSide() { -// return !isClientSide(); -// } -// -// @Override -// public boolean isClientSide() { -// if (getWorld() != null) -// return getWorld().isRemote; -// return FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT; -// } -// -// @Override -// public int getRandomNumber(int i) { -// return new XSTR().nextInt(i); -// } -// -// @Override -// public TileEntity getTileEntity(int i, int i1, int i2) { -// return null; -// } -// -// @Override -// public TileEntity getTileEntityOffset(int i, int i1, int i2) { -// return null; -// } -// -// @Override -// public TileEntity getTileEntityAtSide(byte b) { -// return null; -// } -// -// @Override -// public TileEntity getTileEntityAtSideAndDistance(byte b, int i) { -// return null; -// } -// -// @Override -// public IInventory getIInventory(int i, int i1, int i2) { -// return null; -// } -// -// @Override -// public IInventory getIInventoryOffset(int i, int i1, int i2) { -// return null; -// } -// -// @Override -// public IInventory getIInventoryAtSide(byte b) { -// return null; -// } -// -// @Override -// public IInventory getIInventoryAtSideAndDistance(byte b, int i) { -// return null; -// } -// -// @Override -// public IFluidHandler getITankContainer(int i, int i1, int i2) { -// return null; -// } -// -// @Override -// public IFluidHandler getITankContainerOffset(int i, int i1, int i2) { -// return null; -// } -// -// @Override -// public IFluidHandler getITankContainerAtSide(byte b) { -// return null; -// } -// -// @Override -// public IFluidHandler getITankContainerAtSideAndDistance(byte b, int i) { -// return null; -// } -// -// @Override -// public IGregTechTileEntity getIGregTechTileEntity(int i, int i1, int i2) { -// return null; -// } -// -// @Override -// public IGregTechTileEntity getIGregTechTileEntityOffset(int i, int i1, int i2) { -// return null; -// } -// -// @Override -// public IGregTechTileEntity getIGregTechTileEntityAtSide(byte b) { -// return null; -// } -// -// @Override -// public IGregTechTileEntity getIGregTechTileEntityAtSideAndDistance(byte b, int i) { -// return null; -// } -// -// @Override -// public Block getBlock(int i, int i1, int i2) { -// return null; -// } -// -// @Override -// public Block getBlockOffset(int i, int i1, int i2) { -// return null; -// } -// -// @Override -// public Block getBlockAtSide(byte b) { -// return null; -// } -// -// @Override -// public Block getBlockAtSideAndDistance(byte b, int i) { -// return null; -// } -// -// @Override -// public byte getMetaID(int i, int i1, int i2) { -// return 0; -// } -// -// @Override -// public byte getMetaIDOffset(int i, int i1, int i2) { -// return 0; -// } -// -// @Override -// public byte getMetaIDAtSide(byte b) { -// return 0; -// } -// -// @Override -// public byte getMetaIDAtSideAndDistance(byte b, int i) { -// return 0; -// } -// -// @Override -// public byte getLightLevel(int i, int i1, int i2) { -// return 0; -// } -// -// @Override -// public byte getLightLevelOffset(int i, int i1, int i2) { -// return 0; -// } -// -// @Override -// public byte getLightLevelAtSide(byte b) { -// return 0; -// } -// -// @Override -// public byte getLightLevelAtSideAndDistance(byte b, int i) { -// return 0; -// } -// -// @Override -// public boolean getOpacity(int i, int i1, int i2) { -// return false; -// } -// -// @Override -// public boolean getOpacityOffset(int i, int i1, int i2) { -// return false; -// } -// -// @Override -// public boolean getOpacityAtSide(byte b) { -// return false; -// } -// -// @Override -// public boolean getOpacityAtSideAndDistance(byte b, int i) { -// return false; -// } -// -// @Override -// public boolean getSky(int i, int i1, int i2) { -// return false; -// } -// -// @Override -// public boolean getSkyOffset(int i, int i1, int i2) { -// return false; -// } -// -// @Override -// public boolean getSkyAtSide(byte b) { -// return false; -// } -// -// @Override -// public boolean getSkyAtSideAndDistance(byte b, int i) { -// return false; -// } -// -// @Override -// public boolean getAir(int i, int i1, int i2) { -// return false; -// } -// -// @Override -// public boolean getAirOffset(int i, int i1, int i2) { -// return false; -// } -// -// @Override -// public boolean getAirAtSide(byte b) { -// return false; -// } -// -// @Override -// public boolean getAirAtSideAndDistance(byte b, int i) { -// return false; -// } -// -// @Override -// public BiomeGenBase getBiome() { -// return null; -// } -// -// @Override -// public BiomeGenBase getBiome(int i, int i1) { -// return null; -// } -// -// @Override -// public int getOffsetX(byte b, int i) { -// return 0; -// } -// -// @Override -// public short getOffsetY(byte b, int i) { -// return 0; -// } -// -// @Override -// public int getOffsetZ(byte b, int i) { -// return 0; -// } -// -// @Override -// public boolean isDead() { -// return false; -// } -// -// @Override -// public void sendBlockEvent(byte b, byte b1) { -// -// } -// -// @Override -// public long getTimer() { -// return 0; -// } -// -// @Override -// public void setLightValue(byte b) { -// -// } -// -// @Override -// public boolean isInvalidTileEntity() { -// return false; -// } -// -// @Override -// public boolean openGUI(EntityPlayer entityPlayer, int i) { -// return false; -// } -// -// @Override -// public boolean openGUI(EntityPlayer entityPlayer) { -// return false; -// } -// -// @Override -// public int[] getAccessibleSlotsFromSide(int p_94128_1_) { -// return new int[0]; -// } -// -// @Override -// public boolean canInsertItem(int p_102007_1_, ItemStack p_102007_2_, int p_102007_3_) { -// return false; -// } -// -// @Override -// public boolean canExtractItem(int p_102008_1_, ItemStack p_102008_2_, int p_102008_3_) { -// return false; -// } -// -// @Override -// public int getSizeInventory() { -// return 0; -// } -// -// @Override -// public ItemStack getStackInSlot(int p_70301_1_) { -// return null; -// } -// -// @Override -// public ItemStack decrStackSize(int p_70298_1_, int p_70298_2_) { -// return null; -// } -// -// @Override -// public ItemStack getStackInSlotOnClosing(int p_70304_1_) { -// return null; -// } -// -// @Override -// public void setInventorySlotContents(int p_70299_1_, ItemStack p_70299_2_) { -// -// } -// -// @Override -// public String getInventoryName() { -// return null; -// } -// -// @Override -// public boolean hasCustomInventoryName() { -// return false; -// } -// -// @Override -// public int getInventoryStackLimit() { -// return 0; -// } -// -// @Override -// public boolean isUseableByPlayer(EntityPlayer p_70300_1_) { -// return false; -// } -// -// @Override -// public void openInventory() { -// -// } -// -// @Override -// public void closeInventory() { -// -// } -// -// @Override -// public boolean isItemValidForSlot(int p_94041_1_, ItemStack p_94041_2_) { -// return false; -// } -// -// @Override -// public int[] getDropSlots() { -// return new int[0]; -// } -// } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_BioVat.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_BioVat.java index c5f85fc6df..ecba268096 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_BioVat.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_BioVat.java @@ -15,9 +15,17 @@ package com.github.bartimaeusnek.bartworks.common.tileentities.multis; import static com.github.bartimaeusnek.bartworks.util.BW_Tooltip_Reference.MULTIBLOCK_ADDED_BY_BARTWORKS; import static com.github.bartimaeusnek.bartworks.util.BW_Util.ofGlassTiered; -import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.isAir; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlockAnyMeta; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; import static gregtech.api.enums.GT_Values.V; -import static gregtech.api.enums.Textures.BlockIcons.*; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_DISTILLATION_TOWER; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_DISTILLATION_TOWER_ACTIVE; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_DISTILLATION_TOWER_ACTIVE_GLOW; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_DISTILLATION_TOWER_GLOW; import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; import java.util.ArrayList; @@ -47,7 +55,11 @@ import com.github.bartimaeusnek.bartworks.common.items.LabParts; import com.github.bartimaeusnek.bartworks.common.loaders.FluidLoader; import com.github.bartimaeusnek.bartworks.common.net.RendererPacket; import com.github.bartimaeusnek.bartworks.common.tileentities.tiered.GT_MetaTileEntity_RadioHatch; -import com.github.bartimaeusnek.bartworks.util.*; +import com.github.bartimaeusnek.bartworks.util.BWRecipes; +import com.github.bartimaeusnek.bartworks.util.BW_Util; +import com.github.bartimaeusnek.bartworks.util.BioCulture; +import com.github.bartimaeusnek.bartworks.util.Coords; +import com.github.bartimaeusnek.bartworks.util.MathUtils; import com.gtnewhorizon.structurelib.alignment.IAlignmentLimits; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.StructureDefinition; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_CircuitAssemblyLine.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_CircuitAssemblyLine.java index 98d1189639..8f46893b89 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_CircuitAssemblyLine.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_CircuitAssemblyLine.java @@ -17,9 +17,16 @@ import static com.github.bartimaeusnek.bartworks.util.BW_Tooltip_Reference.ADDED import static com.github.bartimaeusnek.bartworks.util.BW_Util.ofGlassTieredMixed; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.*; +import static gregtech.api.enums.GT_HatchElement.Energy; +import static gregtech.api.enums.GT_HatchElement.InputBus; +import static gregtech.api.enums.GT_HatchElement.InputHatch; +import static gregtech.api.enums.GT_HatchElement.Maintenance; +import static gregtech.api.enums.GT_HatchElement.OutputBus; import static gregtech.api.enums.SoundResource.IC2_MACHINES_MAGNETIZER_LOOP; -import static gregtech.api.enums.Textures.BlockIcons.*; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE_ACTIVE; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE_ACTIVE_GLOW; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE_GLOW; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import java.util.ArrayList; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_ElectricImplosionCompressor.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_ElectricImplosionCompressor.java index c4e89b4105..b1f35e7329 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_ElectricImplosionCompressor.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_ElectricImplosionCompressor.java @@ -15,9 +15,15 @@ package com.github.bartimaeusnek.bartworks.common.tileentities.multis; import static com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry.BW_BLOCKS; import static com.github.bartimaeusnek.bartworks.util.BW_Tooltip_Reference.MULTIBLOCK_ADDED_BY_BARTWORKS; -import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.isAir; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; import static gregtech.api.enums.GT_Values.V; -import static gregtech.api.enums.Textures.BlockIcons.*; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_IMPLOSION_COMPRESSOR; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_IMPLOSION_COMPRESSOR_ACTIVE; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_IMPLOSION_COMPRESSOR_ACTIVE_GLOW; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_IMPLOSION_COMPRESSOR_GLOW; import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; import java.util.ArrayList; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_HTGR.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_HTGR.java index a29eebb947..baa7013d8c 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_HTGR.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_HTGR.java @@ -10,7 +10,10 @@ package com.github.bartimaeusnek.bartworks.common.tileentities.multis; import static com.github.bartimaeusnek.bartworks.util.BW_Tooltip_Reference.MULTIBLOCK_ADDED_VIA_BARTWORKS; -import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; import static gregtech.api.enums.GT_Values.AuthorKuba; import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; @@ -47,7 +50,10 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_EnhancedMul import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_OutputBus; import gregtech.api.render.TextureFactory; -import gregtech.api.util.*; +import gregtech.api.util.GT_LanguageManager; +import gregtech.api.util.GT_Multiblock_Tooltip_Builder; +import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GT_Utility; public class GT_TileEntity_HTGR extends GT_MetaTileEntity_EnhancedMultiBlockBase<GT_TileEntity_HTGR> { @@ -130,7 +136,7 @@ public class GT_TileEntity_HTGR extends GT_MetaTileEntity_EnhancedMultiBlockBase false, true).useModularUI(true); private static final int HELIUM_NEEDED = 730000; - private static final int powerUsage = BW_Util.getMachineVoltageFromTier(6); + public static final int powerUsage = BW_Util.getMachineVoltageFromTier(6); private static final int maxcapacity = 720000; private static final int mincapacity = maxcapacity / 10; private int HeliumSupply; @@ -480,7 +486,7 @@ public class GT_TileEntity_HTGR extends GT_MetaTileEntity_EnhancedMultiBlockBase } } - static class Fuel_ { + public static class Fuel_ { public String sName; public String sEnglish; @@ -516,15 +522,15 @@ public class GT_TileEntity_HTGR extends GT_MetaTileEntity_EnhancedMultiBlockBase } } - static final Base_[] sHTGR_Bases = new Base_[] { new Base_("HTGRFuelMixture", "HTGR fuel mixture"), + public static final Base_[] sHTGR_Bases = new Base_[] { new Base_("HTGRFuelMixture", "HTGR fuel mixture"), new Base_("BISOPebbleCompound", "BISO pebble compound"), new Base_("TRISOPebbleCompound", "TRISO pebble compound"), new Base_("TRISOBall", "TRISO ball"), new Base_("TRISOPebble", "TRISO pebble"), new Base_("BurnedOutTRISOBall", "Burned out TRISO Ball"), new Base_("BurnedOutTRISOPebble", "Burned out TRISO Pebble"), }; - static final int MATERIALS_PER_FUEL = sHTGR_Bases.length; + public static final int MATERIALS_PER_FUEL = sHTGR_Bases.length; static final int USABLE_FUEL_INDEX = 4; static final int BURNED_OUT_FUEL_INDEX = 5; - static final Fuel_[] sHTGR_Fuel = new Fuel_[] { + public static final Fuel_[] sHTGR_Fuel = new Fuel_[] { new Fuel_( "Thorium", "Thorium", @@ -557,7 +563,7 @@ public class GT_TileEntity_HTGR extends GT_MetaTileEntity_EnhancedMultiBlockBase Materials.Plutonium.getDust(1) }, new int[] { 9900 / 4, 9900 / 4, 9900 / 4, 5000 / 4, 5000 / 4 }, "Multiplies coolant by 2"), }; - static final CustomHTGRSimpleSubItemClass aHTGR_Materials; + public static final CustomHTGRSimpleSubItemClass aHTGR_Materials; static final ArrayList<LangEntry_> aHTGR_Localizations = new ArrayList<>(); static { @@ -584,69 +590,11 @@ public class GT_TileEntity_HTGR extends GT_MetaTileEntity_EnhancedMultiBlockBase GameRegistry.registerItem(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, "bw.HTGRMaterials"); } - public static void registerTHR_Recipes() { - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { new ItemStack(GregTech_API.sBlockCasings3, 1, 12), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Europium, 6), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Europium, 24) }, - Materials.Lead.getMolten(864), - new ItemStack(GregTech_API.sBlockCasings8, 1, 5), - 200, - BW_Util.getMachineVoltageFromTier(6)); + public static void register_fake_THR_Recipes() { + int i = 0; for (Fuel_ fuel : sHTGR_Fuel) { - GT_Values.RA.addMixerRecipe( - new ItemStack[] { fuel.mainItem, fuel.secondaryItem, GT_Utility.getIntegratedCircuit(1) }, - null, - new ItemStack[] { new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i) }, - null, - 400, - 30); - GT_Values.RA.addFormingPressRecipe( - new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i), - Materials.Carbon.getDust(64), - new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i + 1), - 40, - 30); - GT_Values.RA.addFormingPressRecipe( - new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i + 1), - Materials.Silicon.getDust(64), - new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i + 2), - 40, - 30); - GT_Values.RA.addFormingPressRecipe( - new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i + 2), - Materials.Graphite.getDust(64), - new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i + 3), - 40, - 30); - GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.addRecipe( - false, - new ItemStack[] { new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i + 3), - GT_Utility.getIntegratedCircuit(17) }, - new ItemStack[] { new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 64, i + 4), - new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 64, i + 4), - new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 64, i + 4), - new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 64, i + 4) }, - null, - null, - null, - null, - 12000, - 30, - 0); - GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.addRecipe( - false, - new ItemStack[] { new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i + 5), - GT_Utility.getIntegratedCircuit(17) }, - new ItemStack[] { new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 64, i + 6) }, - null, - null, - null, - null, - 3000, - 30, - 0); + fakeRecipeMap.addFakeRecipe( false, new ItemStack[] { new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 64, i + 4) }, @@ -657,21 +605,8 @@ public class GT_TileEntity_HTGR extends GT_MetaTileEntity_EnhancedMultiBlockBase 72000, powerUsage, 0); - GT_Values.RA.addCentrifugeRecipe( - new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i + 6), - GT_Values.NI, - GT_Values.NF, - fuel.recycledFluid, - fuel.recycledItems[0], - fuel.recycledItems[1], - fuel.recycledItems[2], - fuel.recycledItems[3], - fuel.recycledItems[4], - fuel.recycledItems[5], - fuel.recycleChances, - 1200, - 30); - i += sHTGR_Bases.length; + + i += MATERIALS_PER_FUEL; } } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_ManualTrafo.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_ManualTrafo.java index caa178b893..abf205bcb0 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_ManualTrafo.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_ManualTrafo.java @@ -15,9 +15,14 @@ package com.github.bartimaeusnek.bartworks.common.tileentities.multis; import static com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry.BW_BLOCKS; import static com.github.bartimaeusnek.bartworks.util.BW_Tooltip_Reference.MULTIBLOCK_ADDED_BY_BARTWORKS; -import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; import static gregtech.api.enums.GT_Values.V; -import static gregtech.api.enums.Textures.BlockIcons.*; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ACTIVE; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ACTIVE_GLOW; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_GLOW; import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_THTR.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_THTR.java index 4616dfabf8..89218b7d36 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_THTR.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_THTR.java @@ -14,11 +14,12 @@ package com.github.bartimaeusnek.bartworks.common.tileentities.multis; import static com.github.bartimaeusnek.bartworks.util.BW_Tooltip_Reference.MULTIBLOCK_ADDED_BY_BARTWORKS; -import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; -import java.util.Arrays; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -26,7 +27,6 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import com.github.bartimaeusnek.bartworks.common.items.SimpleSubItemClass; -import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; import com.github.bartimaeusnek.bartworks.util.BW_Util; import com.github.bartimaeusnek.bartworks.util.MathUtils; import com.gtnewhorizon.structurelib.alignment.IAlignmentLimits; @@ -35,9 +35,7 @@ import com.gtnewhorizon.structurelib.structure.StructureDefinition; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.GregTech_API; -import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; @@ -46,8 +44,6 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_EnhancedMul import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; import gregtech.api.render.TextureFactory; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; public class GT_TileEntity_THTR extends GT_MetaTileEntity_EnhancedMultiBlockBase<GT_TileEntity_THTR> { @@ -388,7 +384,7 @@ public class GT_TileEntity_THTR extends GT_MetaTileEntity_EnhancedMultiBlockBase public static class THTRMaterials { - static final SimpleSubItemClass aTHTR_Materials = new SimpleSubItemClass( + public static final SimpleSubItemClass aTHTR_Materials = new SimpleSubItemClass( "BISOPelletCompound", // 0 "BISOPelletBall", // 1 "TRISOPelletCompound", // 2 @@ -403,97 +399,5 @@ public class GT_TileEntity_THTR extends GT_MetaTileEntity_EnhancedMultiBlockBase public static void registeraTHR_Materials() { GameRegistry.registerItem(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, "bw.THTRMaterials"); } - - public static void registerTHR_Recipes() { - GT_Values.RA.addCentrifugeRecipe( - Materials.Thorium.getDust(1), - GT_Values.NI, - GT_Values.NF, - GT_Values.NF, - Materials.Thorium.getDust(1), - Materials.Thorium.getDust(1), - WerkstoffLoader.Thorium232.get(OrePrefixes.dust, 1), - WerkstoffLoader.Thorium232.get(OrePrefixes.dust, 1), - WerkstoffLoader.Thorium232.get(OrePrefixes.dust, 1), - GT_Values.NI, - new int[] { 800, 375, 22, 22, 5 }, - 10000, - BW_Util.getMachineVoltageFromTier(4)); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Lead, 6), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 1) }, - Materials.Concrete.getMolten(1296), - new ItemStack(GregTech_API.sBlockCasings3, 1, 12), - 40, - BW_Util.getMachineVoltageFromTier(5)); - GT_Values.RA.addMixerRecipe( - WerkstoffLoader.Thorium232.get(OrePrefixes.dust, 10), - Materials.Uranium235.getDust(1), - GT_Utility.getIntegratedCircuit(2), - null, - null, - null, - new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials), - 400, - 30); - GT_Values.RA.addFormingPressRecipe( - new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials), - Materials.Graphite.getDust(64), - new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 1, 1), - 40, - 30); - GT_Values.RA.addFormingPressRecipe( - new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 1, 1), - Materials.Silicon.getDust(64), - new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 1, 2), - 40, - 30); - GT_Values.RA.addFormingPressRecipe( - new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 1, 2), - Materials.Graphite.getDust(64), - new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 1, 3), - 40, - 30); - ItemStack[] pellets = new ItemStack[6]; - Arrays.fill(pellets, new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 64, 4)); - GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.addRecipe( - false, - new ItemStack[] { new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 1, 3), - GT_Utility.getIntegratedCircuit(17) }, - pellets, - null, - null, - null, - null, - 48000, - 30, - 0); - GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.addRecipe( - false, - new ItemStack[] { new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 1, 5), - GT_Utility.getIntegratedCircuit(17) }, - new ItemStack[] { new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 64, 6) }, - null, - null, - null, - null, - 48000, - 30, - 0); - GT_Values.RA.addCentrifugeRecipe( - new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 1, 6), - GT_Values.NI, - GT_Values.NF, - GT_Values.NF, - Materials.Lead.getDust(1), - GT_Values.NI, - GT_Values.NI, - GT_Values.NI, - GT_Values.NI, - GT_Values.NI, - new int[] { 300 }, - 1200, - 30); - } } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_Windmill.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_Windmill.java index 8c54264fb7..8988165dd9 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_Windmill.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_Windmill.java @@ -14,7 +14,12 @@ package com.github.bartimaeusnek.bartworks.common.tileentities.multis; import static com.github.bartimaeusnek.bartworks.util.BW_Tooltip_Reference.MULTIBLOCK_ADDED_BY_BARTWORKS; -import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlockAnyMeta; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofTileAdder; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; import static gregtech.api.enums.GT_Values.V; import java.util.ArrayList; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaBlastFurnace.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaBlastFurnace.java index aec315d67c..c0fe57a7cb 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaBlastFurnace.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaBlastFurnace.java @@ -18,13 +18,27 @@ import static com.github.bartimaeusnek.bartworks.util.RecipeFinderForParallel.ge import static com.github.bartimaeusnek.bartworks.util.RecipeFinderForParallel.handleParallelRecipe; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; import static com.gtnewhorizon.structurelib.structure.StructureUtility.withChannel; -import static gregtech.api.enums.GT_HatchElement.*; +import static gregtech.api.enums.GT_HatchElement.InputBus; +import static gregtech.api.enums.GT_HatchElement.InputHatch; +import static gregtech.api.enums.GT_HatchElement.Maintenance; +import static gregtech.api.enums.GT_HatchElement.Muffler; +import static gregtech.api.enums.GT_HatchElement.OutputBus; +import static gregtech.api.enums.GT_HatchElement.OutputHatch; import static gregtech.api.enums.GT_Values.V; -import static gregtech.api.enums.Textures.BlockIcons.*; +import static gregtech.api.enums.Mods.TecTech; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ACTIVE; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ACTIVE_GLOW; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_GLOW; +import static gregtech.api.enums.Textures.BlockIcons.casingTexturePages; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import static gregtech.api.util.GT_StructureUtility.ofCoil; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; +import java.util.Objects; import java.util.stream.Collectors; import net.minecraft.entity.player.EntityPlayer; @@ -35,7 +49,6 @@ import net.minecraft.util.StatCollector; import net.minecraftforge.fluids.FluidStack; import com.github.bartimaeusnek.bartworks.API.BorosilicateGlass; -import com.github.bartimaeusnek.bartworks.API.LoaderReference; import com.github.bartimaeusnek.bartworks.common.configs.ConfigHandler; import com.github.bartimaeusnek.bartworks.util.BW_Util; import com.github.bartimaeusnek.bartworks.util.Pair; @@ -50,10 +63,16 @@ import cpw.mods.fml.common.Optional; import gregtech.api.GregTech_API; import gregtech.api.enums.HeatingCoilLevel; import gregtech.api.enums.Materials; +import gregtech.api.enums.Mods; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.*; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock; import gregtech.api.render.TextureFactory; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; import gregtech.api.util.GT_OverclockCalculator; @@ -62,7 +81,7 @@ import gregtech.api.util.GT_Utility; @Optional.Interface( iface = "com.github.bartimaeusnek.crossmod.tectech.TecTechEnabledMulti", - modid = "tectech", + modid = Mods.Names.TECTECH, striprefs = true) public class GT_TileEntity_MegaBlastFurnace extends GT_TileEntity_MegaMultiBlockBase<GT_TileEntity_MegaBlastFurnace> implements ISurvivalConstructable { @@ -295,7 +314,7 @@ public class GT_TileEntity_MegaBlastFurnace extends GT_TileEntity_MegaMultiBlock public boolean checkRecipe(ItemStack itemStack) { ItemStack[] tInputs = null; FluidStack[] tFluids = this.getStoredFluids().toArray(new FluidStack[0]); - long nominalV = LoaderReference.tectech ? TecTechUtils.getnominalVoltageTT(this) + long nominalV = TecTech.isModLoaded() ? TecTechUtils.getnominalVoltageTT(this) : BW_Util.getnominalVoltage(this); byte tTier = (byte) Math.max(1, Math.min(GT_Utility.getTier(nominalV), V.length - 1)); @@ -467,7 +486,7 @@ public class GT_TileEntity_MegaBlastFurnace extends GT_TileEntity_MegaMultiBlock @Override public boolean checkMachine(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) { - if (LoaderReference.tectech) { + if (TecTech.isModLoaded()) { this.getTecTechEnergyMultis().clear(); this.getTecTechEnergyTunnels().clear(); } @@ -486,7 +505,7 @@ public class GT_TileEntity_MegaBlastFurnace extends GT_TileEntity_MegaMultiBlock if (mMaintenanceHatches.size() != 1) return false; - if (LoaderReference.tectech && this.glasTier < 8) + if (TecTech.isModLoaded() && this.glasTier < 8) if (!areLazorsLowPowa() || areThingsNotProperlyTiered(this.getTecTechEnergyTunnels()) || areThingsNotProperlyTiered(this.getTecTechEnergyMultis())) return false; @@ -494,7 +513,7 @@ public class GT_TileEntity_MegaBlastFurnace extends GT_TileEntity_MegaMultiBlock if (this.glasTier < 8 && !this.mEnergyHatches.isEmpty()) for (GT_MetaTileEntity_Hatch_Energy hatchEnergy : this.mEnergyHatches) if (this.glasTier < hatchEnergy.mTier) return false; - long nominalV = LoaderReference.tectech ? TecTechUtils.getnominalVoltageTT(this) + long nominalV = TecTech.isModLoaded() ? TecTechUtils.getnominalVoltageTT(this) : BW_Util.getnominalVoltage(this); this.mHeatingCapacity = (int) getCoilLevel().getHeat() + 100 * (BW_Util.getTier(nominalV) - 2); @@ -502,7 +521,7 @@ public class GT_TileEntity_MegaBlastFurnace extends GT_TileEntity_MegaMultiBlock } @SuppressWarnings("rawtypes") - @Optional.Method(modid = "tectech") + @Optional.Method(modid = Mods.Names.TECTECH) private boolean areThingsNotProperlyTiered(Collection collection) { if (!collection.isEmpty()) for (Object tecTechEnergyMulti : collection) if (((GT_MetaTileEntity_TieredMachineBlock) tecTechEnergyMulti).mTier > this.glasTier) return true; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaChemicalReactor.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaChemicalReactor.java index 5f25c28018..29b405cb4f 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaChemicalReactor.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaChemicalReactor.java @@ -16,10 +16,21 @@ package com.github.bartimaeusnek.bartworks.common.tileentities.multis.mega; import static com.github.bartimaeusnek.bartworks.util.BW_Tooltip_Reference.MULTIBLOCK_ADDED_BY_BARTWORKS; import static com.github.bartimaeusnek.bartworks.util.RecipeFinderForParallel.getMultiOutput; import static com.github.bartimaeusnek.bartworks.util.RecipeFinderForParallel.handleParallelRecipe; -import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; -import static gregtech.api.enums.GT_HatchElement.*; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; +import static gregtech.api.enums.GT_HatchElement.InputBus; +import static gregtech.api.enums.GT_HatchElement.InputHatch; +import static gregtech.api.enums.GT_HatchElement.Maintenance; +import static gregtech.api.enums.GT_HatchElement.OutputBus; +import static gregtech.api.enums.GT_HatchElement.OutputHatch; import static gregtech.api.enums.GT_Values.V; -import static gregtech.api.enums.Textures.BlockIcons.*; +import static gregtech.api.enums.Mods.TecTech; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR_ACTIVE; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR_ACTIVE_GLOW; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR_GLOW; +import static gregtech.api.enums.Textures.BlockIcons.casingTexturePages; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import java.util.ArrayList; @@ -33,7 +44,6 @@ import net.minecraft.util.StatCollector; import net.minecraftforge.fluids.FluidStack; import com.github.bartimaeusnek.bartworks.API.BorosilicateGlass; -import com.github.bartimaeusnek.bartworks.API.LoaderReference; import com.github.bartimaeusnek.bartworks.common.configs.ConfigHandler; import com.github.bartimaeusnek.bartworks.util.BW_Util; import com.github.bartimaeusnek.bartworks.util.Pair; @@ -45,6 +55,7 @@ import com.gtnewhorizon.structurelib.structure.StructureDefinition; import cpw.mods.fml.common.Optional; import gregtech.api.GregTech_API; +import gregtech.api.enums.Mods; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; @@ -58,7 +69,7 @@ import gregtech.api.util.GT_Utility; @Optional.Interface( iface = "com.github.bartimaeusnek.crossmod.tectech.TecTechEnabledMulti", - modid = "tectech", + modid = Mods.Names.TECTECH, striprefs = true) public class GT_TileEntity_MegaChemicalReactor extends GT_TileEntity_MegaMultiBlockBase<GT_TileEntity_MegaChemicalReactor> implements ISurvivalConstructable { @@ -152,7 +163,7 @@ public class GT_TileEntity_MegaChemicalReactor ArrayList<ItemStack> outputItems = new ArrayList<>(); ArrayList<FluidStack> outputFluids = new ArrayList<>(); - long nominalV = LoaderReference.tectech ? TecTechUtils.getnominalVoltageTT(this) + long nominalV = TecTech.isModLoaded() ? TecTechUtils.getnominalVoltageTT(this) : BW_Util.getnominalVoltage(this); byte tTier = (byte) Math.max(1, Math.min(GT_Utility.getTier(nominalV), V.length - 1)); @@ -232,7 +243,7 @@ public class GT_TileEntity_MegaChemicalReactor @Override public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) { glasTier = 0; - if (LoaderReference.tectech) { + if (TecTech.isModLoaded()) { this.getTecTechEnergyMultis().clear(); this.getTecTechEnergyTunnels().clear(); } @@ -241,7 +252,7 @@ public class GT_TileEntity_MegaChemicalReactor if (mMaintenanceHatches.size() != 1) return false; - if (LoaderReference.tectech && this.glasTier < 8) + if (TecTech.isModLoaded() && this.glasTier < 8) if (!areLazorsLowPowa() || areThingsNotProperlyTiered(this.getTecTechEnergyTunnels()) || areThingsNotProperlyTiered(this.getTecTechEnergyMultis())) return false; @@ -297,7 +308,7 @@ public class GT_TileEntity_MegaChemicalReactor } @SuppressWarnings("rawtypes") - @Optional.Method(modid = "tectech") + @Optional.Method(modid = Mods.Names.TECTECH) private boolean areThingsNotProperlyTiered(Collection collection) { if (!collection.isEmpty()) for (Object tecTechEnergyMulti : collection) if (((GT_MetaTileEntity_TieredMachineBlock) tecTechEnergyMulti).mTier > this.glasTier) return true; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaDistillTower.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaDistillTower.java index a45fd705c4..074fdb49d2 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaDistillTower.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaDistillTower.java @@ -16,10 +16,20 @@ package com.github.bartimaeusnek.bartworks.common.tileentities.multis.mega; import static com.github.bartimaeusnek.bartworks.util.BW_Tooltip_Reference.MULTIBLOCK_ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS; import static com.github.bartimaeusnek.bartworks.util.RecipeFinderForParallel.getMultiOutput; import static com.github.bartimaeusnek.bartworks.util.RecipeFinderForParallel.handleParallelRecipe; -import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; -import static gregtech.api.enums.GT_HatchElement.*; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; +import static gregtech.api.enums.GT_HatchElement.InputBus; +import static gregtech.api.enums.GT_HatchElement.InputHatch; +import static gregtech.api.enums.GT_HatchElement.Maintenance; +import static gregtech.api.enums.GT_HatchElement.OutputBus; +import static gregtech.api.enums.GT_HatchElement.OutputHatch; import static gregtech.api.enums.GT_Values.V; -import static gregtech.api.enums.Textures.BlockIcons.*; +import static gregtech.api.enums.Mods.TecTech; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_DISTILLATION_TOWER; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_DISTILLATION_TOWER_ACTIVE; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_DISTILLATION_TOWER_ACTIVE_GLOW; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_DISTILLATION_TOWER_GLOW; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import java.util.ArrayList; @@ -33,7 +43,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.StatCollector; import net.minecraftforge.fluids.FluidStack; -import com.github.bartimaeusnek.bartworks.API.LoaderReference; import com.github.bartimaeusnek.bartworks.common.configs.ConfigHandler; import com.github.bartimaeusnek.bartworks.util.BW_Util; import com.github.bartimaeusnek.bartworks.util.Pair; @@ -47,6 +56,7 @@ import com.gtnewhorizon.structurelib.structure.StructureDefinition; import cpw.mods.fml.common.Optional; import gregtech.api.GregTech_API; import gregtech.api.enums.GT_Values; +import gregtech.api.enums.Mods; import gregtech.api.enums.Textures; import gregtech.api.interfaces.IHatchElement; import gregtech.api.interfaces.ITexture; @@ -61,7 +71,7 @@ import gregtech.api.util.GT_Utility; @Optional.Interface( iface = "com.github.bartimaeusnek.crossmod.tectech.TecTechEnabledMulti", - modid = "tectech", + modid = Mods.Names.TECTECH, striprefs = true) public class GT_TileEntity_MegaDistillTower extends GT_TileEntity_MegaMultiBlockBase<GT_TileEntity_MegaDistillTower> implements ISurvivalConstructable { @@ -284,7 +294,7 @@ public class GT_TileEntity_MegaDistillTower extends GT_TileEntity_MegaMultiBlock @Override public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) { - if (LoaderReference.tectech) { + if (TecTech.isModLoaded()) { this.getTecTechEnergyMultis().clear(); this.getTecTechEnergyTunnels().clear(); } @@ -410,7 +420,7 @@ public class GT_TileEntity_MegaDistillTower extends GT_TileEntity_MegaMultiBlock } } - long nominalV = LoaderReference.tectech ? TecTechUtils.getnominalVoltageTT(this) + long nominalV = TecTech.isModLoaded() ? TecTechUtils.getnominalVoltageTT(this) : BW_Util.getnominalVoltage(this); byte tTier = (byte) Math.max(0, Math.min(GT_Utility.getTier(nominalV), V.length - 1)); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaMultiBlockBase.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaMultiBlockBase.java index abe44efdc7..806aeaf4ca 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaMultiBlockBase.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaMultiBlockBase.java @@ -2,6 +2,7 @@ package com.github.bartimaeusnek.bartworks.common.tileentities.multis.mega; import static gregtech.api.enums.GT_HatchElement.Energy; import static gregtech.api.enums.GT_Values.V; +import static gregtech.api.enums.Mods.TecTech; import java.util.ArrayList; import java.util.Collection; @@ -14,7 +15,6 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import com.github.bartimaeusnek.bartworks.API.LoaderReference; import com.github.bartimaeusnek.bartworks.util.BW_Tooltip_Reference; import com.github.bartimaeusnek.bartworks.util.BW_Util; import com.github.bartimaeusnek.bartworks.util.MegaUtils; @@ -28,16 +28,21 @@ import com.gtnewhorizon.structurelib.structure.AutoPlaceEnvironment; import com.gtnewhorizon.structurelib.structure.IStructureElement; import cpw.mods.fml.common.Optional; +import gregtech.api.enums.Mods; import gregtech.api.interfaces.IHatchElement; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.*; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_EnhancedMultiBlockBase; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase; import gregtech.api.util.GT_Utility; import gregtech.api.util.IGT_HatchAdder; @Optional.Interface( iface = "com.github.bartimaeusnek.crossmod.tectech.TecTechEnabledMulti", - modid = "tectech", + modid = Mods.Names.TECTECH, striprefs = true) public abstract class GT_TileEntity_MegaMultiBlockBase<T extends GT_TileEntity_MegaMultiBlockBase<T>> extends GT_MetaTileEntity_EnhancedMultiBlockBase<T> implements TecTechEnabledMulti { @@ -75,7 +80,7 @@ public abstract class GT_TileEntity_MegaMultiBlockBase<T extends GT_TileEntity_M } @SuppressWarnings("rawtypes") - @Optional.Method(modid = "tectech") + @Optional.Method(modid = Mods.Names.TECTECH) boolean areLazorsLowPowa() { Collection collection = this.getTecTechEnergyTunnels(); if (!collection.isEmpty()) for (Object tecTechEnergyMulti : collection) @@ -84,34 +89,34 @@ public abstract class GT_TileEntity_MegaMultiBlockBase<T extends GT_TileEntity_M } @Override - @Optional.Method(modid = "tectech") + @Optional.Method(modid = Mods.Names.TECTECH) public List<GT_MetaTileEntity_Hatch_Energy> getVanillaEnergyHatches() { return this.mEnergyHatches; } @Override @SuppressWarnings({ "rawtypes", "unchecked" }) - @Optional.Method(modid = "tectech") + @Optional.Method(modid = Mods.Names.TECTECH) public List getTecTechEnergyTunnels() { return TTTunnels; } @Override @SuppressWarnings({ "rawtypes", "unchecked" }) - @Optional.Method(modid = "tectech") + @Optional.Method(modid = Mods.Names.TECTECH) public List getTecTechEnergyMultis() { return TTMultiAmp; } @Override public boolean drainEnergyInput(long aEU) { - if (LoaderReference.tectech) return TecTechUtils.drainEnergyMEBFTecTech(this, aEU); + if (TecTech.isModLoaded()) return TecTechUtils.drainEnergyMEBFTecTech(this, aEU); return MegaUtils.drainEnergyMegaVanilla(this, aEU); } @Override public long getMaxInputVoltage() { - if (LoaderReference.tectech) return TecTechUtils.getMaxInputVoltage(this); + if (TecTech.isModLoaded()) return TecTechUtils.getMaxInputVoltage(this); return super.getMaxInputVoltage(); } @@ -129,7 +134,7 @@ public abstract class GT_TileEntity_MegaMultiBlockBase<T extends GT_TileEntity_M @Override public String[] getInfoData() { - return LoaderReference.tectech ? this.getInfoDataArray(this) : super.getInfoData(); + return TecTech.isModLoaded() ? this.getInfoDataArray(this) : super.getInfoData(); } @Override @@ -153,7 +158,7 @@ public abstract class GT_TileEntity_MegaMultiBlockBase<T extends GT_TileEntity_M } } - long nominalV = LoaderReference.tectech ? TecTechUtils.getnominalVoltageTT(this) + long nominalV = TecTech.isModLoaded() ? TecTechUtils.getnominalVoltageTT(this) : BW_Util.getnominalVoltage(this); String tName = BW_Util.getTierNameFromVoltage(nominalV); if (tName.equals("MAX+")) tName = EnumChatFormatting.OBFUSCATED + "MAX+"; @@ -217,7 +222,7 @@ public abstract class GT_TileEntity_MegaMultiBlockBase<T extends GT_TileEntity_M /** * Calculates the overclock for megas. Will set this.mMaxProgressTime and this.lEUt automatically - * + * * @deprecated Use GT_OverclockCalculator instead * * @param aEUt EUt of the recipe @@ -280,7 +285,7 @@ public abstract class GT_TileEntity_MegaMultiBlockBase<T extends GT_TileEntity_M /** * Calculates the overclock for megas. Will set this.mMaxProgressTime and this.lEUt automatically - * + * * @deprecated Use GT_OverclockCalculator instead * * @param aEUt EUt of the recipe @@ -293,7 +298,7 @@ public abstract class GT_TileEntity_MegaMultiBlockBase<T extends GT_TileEntity_M /** * Calculates the overclock for megas. Will set this.mMaxProgressTime and this.lEUt automatically - * + * * @deprecated Use GT_OverclockCalculator instead * * @param aEUt EUt of the recipe @@ -307,7 +312,7 @@ public abstract class GT_TileEntity_MegaMultiBlockBase<T extends GT_TileEntity_M @Override public boolean addEnergyInputToMachineList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) { - if (LoaderReference.tectech) { + if (TecTech.isModLoaded()) { int tier = TecTechUtils.addEnergyInputToMachineList(this, aTileEntity, aBaseCasingIndex, energyTier); if (energyTier == -1) energyTier = tier; return tier != -1; @@ -379,7 +384,7 @@ public abstract class GT_TileEntity_MegaMultiBlockBase<T extends GT_TileEntity_M static { ImmutableList.Builder<Class<? extends IMetaTileEntity>> builder = ImmutableList .<Class<? extends IMetaTileEntity>>builder().addAll(Energy.mteClasses()); - if (LoaderReference.tectech) builder.add(GT_MetaTileEntity_Hatch_EnergyMulti.class); + if (TecTech.isModLoaded()) builder.add(GT_MetaTileEntity_Hatch_EnergyMulti.class); mteClasses = builder.build(); } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaOilCracker.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaOilCracker.java index 88121e2d85..32831a1898 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaOilCracker.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaOilCracker.java @@ -16,11 +16,20 @@ package com.github.bartimaeusnek.bartworks.common.tileentities.multis.mega; import static com.github.bartimaeusnek.bartworks.util.BW_Tooltip_Reference.MULTIBLOCK_ADDED_BY_BARTWORKS; import static com.github.bartimaeusnek.bartworks.util.RecipeFinderForParallel.getMultiOutput; import static com.github.bartimaeusnek.bartworks.util.RecipeFinderForParallel.handleParallelRecipe; -import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; -import static gregtech.api.enums.GT_HatchElement.*; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; +import static gregtech.api.enums.GT_HatchElement.InputHatch; +import static gregtech.api.enums.GT_HatchElement.Maintenance; +import static gregtech.api.enums.GT_HatchElement.OutputHatch; import static gregtech.api.enums.GT_Values.V; -import static gregtech.api.enums.Textures.BlockIcons.*; -import static gregtech.api.util.GT_StructureUtility.*; +import static gregtech.api.enums.Mods.TecTech; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_OIL_CRACKER; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_OIL_CRACKER_ACTIVE; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_OIL_CRACKER_ACTIVE_GLOW; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_OIL_CRACKER_GLOW; +import static gregtech.api.enums.Textures.BlockIcons.casingTexturePages; +import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; +import static gregtech.api.util.GT_StructureUtility.ofCoil; import java.util.ArrayList; import java.util.Collection; @@ -31,7 +40,6 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; import com.github.bartimaeusnek.bartworks.API.BorosilicateGlass; -import com.github.bartimaeusnek.bartworks.API.LoaderReference; import com.github.bartimaeusnek.bartworks.common.configs.ConfigHandler; import com.github.bartimaeusnek.bartworks.util.BW_Util; import com.github.bartimaeusnek.bartworks.util.Pair; @@ -44,6 +52,7 @@ import com.gtnewhorizon.structurelib.structure.StructureDefinition; import cpw.mods.fml.common.Optional; import gregtech.api.GregTech_API; import gregtech.api.enums.HeatingCoilLevel; +import gregtech.api.enums.Mods; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; @@ -59,7 +68,7 @@ import gregtech.api.util.GT_Utility; @Optional.Interface( iface = "com.github.bartimaeusnek.crossmod.tectech.TecTechEnabledMulti", - modid = "tectech", + modid = Mods.Names.TECTECH, striprefs = true) public class GT_TileEntity_MegaOilCracker extends GT_TileEntity_MegaMultiBlockBase<GT_TileEntity_MegaOilCracker> implements ISurvivalConstructable { @@ -189,7 +198,7 @@ public class GT_TileEntity_MegaOilCracker extends GT_TileEntity_MegaMultiBlockBa ArrayList<ItemStack> outputItems = new ArrayList<>(); ArrayList<FluidStack> outputFluids = new ArrayList<>(); - long nominalV = LoaderReference.tectech ? TecTechUtils.getnominalVoltageTT(this) + long nominalV = TecTech.isModLoaded() ? TecTechUtils.getnominalVoltageTT(this) : BW_Util.getnominalVoltage(this); byte tTier = (byte) Math.max(1, Math.min(GT_Utility.getTier(nominalV), V.length - 1)); @@ -280,7 +289,7 @@ public class GT_TileEntity_MegaOilCracker extends GT_TileEntity_MegaMultiBlockBa mOutputOnSide = -1; mMiddleInputHatches.clear(); - if (LoaderReference.tectech) { + if (TecTech.isModLoaded()) { this.getTecTechEnergyMultis().clear(); this.getTecTechEnergyTunnels().clear(); } @@ -289,7 +298,7 @@ public class GT_TileEntity_MegaOilCracker extends GT_TileEntity_MegaMultiBlockBa if (mMaintenanceHatches.size() != 1) return false; - if (LoaderReference.tectech && this.glasTier < 8) + if (TecTech.isModLoaded() && this.glasTier < 8) if (!areLazorsLowPowa() || areThingsNotProperlyTiered(this.getTecTechEnergyTunnels()) || areThingsNotProperlyTiered(this.getTecTechEnergyMultis())) return false; @@ -411,7 +420,7 @@ public class GT_TileEntity_MegaOilCracker extends GT_TileEntity_MegaMultiBlockBa } @SuppressWarnings("rawtypes") - @Optional.Method(modid = "tectech") + @Optional.Method(modid = Mods.Names.TECTECH) private boolean areThingsNotProperlyTiered(Collection collection) { if (!collection.isEmpty()) for (Object tecTechEnergyMulti : collection) if (((GT_MetaTileEntity_TieredMachineBlock) tecTechEnergyMulti).mTier > this.glasTier) return true; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaVacuumFreezer.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaVacuumFreezer.java index e691ea8f95..f201997851 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaVacuumFreezer.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaVacuumFreezer.java @@ -16,10 +16,21 @@ package com.github.bartimaeusnek.bartworks.common.tileentities.multis.mega; import static com.github.bartimaeusnek.bartworks.util.BW_Tooltip_Reference.MULTIBLOCK_ADDED_BY_BARTWORKS; import static com.github.bartimaeusnek.bartworks.util.RecipeFinderForParallel.getMultiOutput; import static com.github.bartimaeusnek.bartworks.util.RecipeFinderForParallel.handleParallelRecipe; -import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; -import static gregtech.api.enums.GT_HatchElement.*; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; +import static gregtech.api.enums.GT_HatchElement.InputBus; +import static gregtech.api.enums.GT_HatchElement.InputHatch; +import static gregtech.api.enums.GT_HatchElement.Maintenance; +import static gregtech.api.enums.GT_HatchElement.OutputBus; +import static gregtech.api.enums.GT_HatchElement.OutputHatch; import static gregtech.api.enums.GT_Values.V; -import static gregtech.api.enums.Textures.BlockIcons.*; +import static gregtech.api.enums.Mods.TecTech; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_VACUUM_FREEZER; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_VACUUM_FREEZER_ACTIVE; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_VACUUM_FREEZER_ACTIVE_GLOW; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_VACUUM_FREEZER_GLOW; +import static gregtech.api.enums.Textures.BlockIcons.casingTexturePages; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import java.util.ArrayList; @@ -31,7 +42,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; import net.minecraftforge.fluids.FluidStack; -import com.github.bartimaeusnek.bartworks.API.LoaderReference; import com.github.bartimaeusnek.bartworks.common.configs.ConfigHandler; import com.github.bartimaeusnek.bartworks.util.BW_Util; import com.github.bartimaeusnek.bartworks.util.Pair; @@ -43,6 +53,7 @@ import com.gtnewhorizon.structurelib.structure.StructureDefinition; import cpw.mods.fml.common.Optional; import gregtech.api.GregTech_API; +import gregtech.api.enums.Mods; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; @@ -54,7 +65,7 @@ import gregtech.api.util.GT_Utility; @Optional.Interface( iface = "com.github.bartimaeusnek.crossmod.tectech.TecTechEnabledMulti", - modid = "tectech", + modid = Mods.Names.TECTECH, striprefs = true) public class GT_TileEntity_MegaVacuumFreezer extends GT_TileEntity_MegaMultiBlockBase<GT_TileEntity_MegaVacuumFreezer> implements ISurvivalConstructable { @@ -219,7 +230,7 @@ public class GT_TileEntity_MegaVacuumFreezer extends GT_TileEntity_MegaMultiBloc ArrayList<ItemStack> outputItems = new ArrayList<>(); ArrayList<FluidStack> outputFluids = new ArrayList<>(); - long nominalV = LoaderReference.tectech ? TecTechUtils.getnominalVoltageTT(this) + long nominalV = TecTech.isModLoaded() ? TecTechUtils.getnominalVoltageTT(this) : BW_Util.getnominalVoltage(this); byte tTier = (byte) Math.max(1, Math.min(GT_Utility.getTier(nominalV), V.length - 1)); @@ -283,14 +294,14 @@ public class GT_TileEntity_MegaVacuumFreezer extends GT_TileEntity_MegaMultiBloc @Override public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) { - if (LoaderReference.tectech) { + if (TecTech.isModLoaded()) { this.getTecTechEnergyMultis().clear(); this.getTecTechEnergyTunnels().clear(); } this.mCasing = 0; if (!checkPiece(STRUCTURE_PIECE_MAIN, 7, 7, 0)) return false; return this.mMaintenanceHatches.size() == 1 - && (LoaderReference.tectech + && (TecTech.isModLoaded() ? (!this.getTecTechEnergyMultis().isEmpty() || !this.getTecTechEnergyTunnels().isEmpty() || !this.mEnergyHatches.isEmpty()) : !this.mEnergyHatches.isEmpty()) diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_BioLab.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_BioLab.java index db5d0dbfb3..6b02faa800 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_BioLab.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_BioLab.java @@ -13,19 +13,26 @@ package com.github.bartimaeusnek.bartworks.common.tileentities.tiered; +import static gregtech.api.enums.Mods.Gendustry; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import com.github.bartimaeusnek.bartworks.API.LoaderReference; import com.github.bartimaeusnek.bartworks.common.items.LabModule; import com.github.bartimaeusnek.bartworks.common.items.LabParts; import com.github.bartimaeusnek.bartworks.common.loaders.BioCultureLoader; import com.github.bartimaeusnek.bartworks.common.loaders.BioItemList; import com.github.bartimaeusnek.bartworks.common.loaders.FluidLoader; -import com.github.bartimaeusnek.bartworks.util.*; +import com.github.bartimaeusnek.bartworks.util.BWRecipes; +import com.github.bartimaeusnek.bartworks.util.BW_Tooltip_Reference; +import com.github.bartimaeusnek.bartworks.util.BW_Util; +import com.github.bartimaeusnek.bartworks.util.BioCulture; +import com.github.bartimaeusnek.bartworks.util.BioDNA; +import com.github.bartimaeusnek.bartworks.util.BioData; +import com.github.bartimaeusnek.bartworks.util.BioPlasmid; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -151,7 +158,7 @@ public class GT_MetaTileEntity_BioLab extends GT_MetaTileEntity_BasicMachine { public int checkRecipe(boolean skipOC) { int rTier = 3; - FluidStack dnaFluid = LoaderReference.gendustry ? FluidRegistry.getFluidStack("liquiddna", 1000) + FluidStack dnaFluid = Gendustry.isModLoaded() ? FluidRegistry.getFluidStack("liquiddna", 1000) : Materials.Biomass.getFluid(1000L); if (this.getSpecialSlot() != null && this.getSpecialSlot().getItem() instanceof LabModule) { diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/neiHandler/BW_NEI_BioVatHandler.java b/src/main/java/com/github/bartimaeusnek/bartworks/neiHandler/BW_NEI_BioVatHandler.java index 14ad95d48a..0540a1ebea 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/neiHandler/BW_NEI_BioVatHandler.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/neiHandler/BW_NEI_BioVatHandler.java @@ -13,7 +13,6 @@ package com.github.bartimaeusnek.bartworks.neiHandler; -import java.awt.*; import java.util.Collections; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/neiHandler/IMCForNEI.java b/src/main/java/com/github/bartimaeusnek/bartworks/neiHandler/IMCForNEI.java index 80f283d080..c814222bc2 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/neiHandler/IMCForNEI.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/neiHandler/IMCForNEI.java @@ -1,5 +1,7 @@ package com.github.bartimaeusnek.bartworks.neiHandler; +import static gregtech.api.enums.Mods.NotEnoughItems; + import net.minecraft.nbt.NBTTagCompound; import com.github.bartimaeusnek.bartworks.MainMod; @@ -38,7 +40,7 @@ public class IMCForNEI { aNBT.setInteger("handlerWidth", 166); aNBT.setInteger("maxRecipesPerPage", 2); aNBT.setInteger("yShift", 6); - FMLInterModComms.sendMessage("NotEnoughItems", "registerHandlerInfo", aNBT); + FMLInterModComms.sendMessage(NotEnoughItems.ID, "registerHandlerInfo", aNBT); } private static void sendCatalyst(String aName, String aStack, int aPriority) { @@ -46,7 +48,7 @@ public class IMCForNEI { aNBT.setString("handlerID", aName); aNBT.setString("itemName", aStack); aNBT.setInteger("priority", aPriority); - FMLInterModComms.sendMessage("NotEnoughItems", "registerCatalystInfo", aNBT); + FMLInterModComms.sendMessage(NotEnoughItems.ID, "registerCatalystInfo", aNBT); } private static void sendCatalyst(String aName, String aStack) { diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_GT_MaterialReference.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_GT_MaterialReference.java index 04be1f4129..8a4c4c7762 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_GT_MaterialReference.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_GT_MaterialReference.java @@ -12,7 +12,11 @@ */ package com.github.bartimaeusnek.bartworks.system.material; -import static com.github.bartimaeusnek.bartworks.system.material.Werkstoff.Types.*; +import static com.github.bartimaeusnek.bartworks.system.material.Werkstoff.Types.BIOLOGICAL; +import static com.github.bartimaeusnek.bartworks.system.material.Werkstoff.Types.COMPOUND; +import static com.github.bartimaeusnek.bartworks.system.material.Werkstoff.Types.ELEMENT; +import static com.github.bartimaeusnek.bartworks.system.material.Werkstoff.Types.ISOTOPE; +import static com.github.bartimaeusnek.bartworks.system.material.Werkstoff.Types.MIXTURE; import com.github.bartimaeusnek.bartworks.MainMod; import gregtech.api.enums.Materials; @@ -25,34 +29,25 @@ public class BW_GT_MaterialReference { public static Werkstoff Aluminium = new Werkstoff(Materials.Aluminium, ADD_CASINGS_ONLY, ELEMENT, 31_766 + 19); public static Werkstoff Americium = new Werkstoff(Materials.Americium, ADD_CASINGS_ONLY, ELEMENT, 31_766 + 103); public static Werkstoff Antimony = new Werkstoff(Materials.Antimony, ADD_CASINGS_ONLY, ELEMENT, 31_766 + 58); - // public static Werkstoff Argon = new Werkstoff(Materials.Argon, ADD_CASINGS_ONLY, ELEMENT, 31_766+24); public static Werkstoff Arsenic = new Werkstoff(Materials.Arsenic, ADD_CASINGS_ONLY, ELEMENT, 31_766 + 39); public static Werkstoff Barium = new Werkstoff(Materials.Barium, ADD_CASINGS_ONLY, ELEMENT, 31_766 + 63); public static Werkstoff Beryllium = new Werkstoff(Materials.Beryllium, ADD_CASINGS_ONLY, ELEMENT, 31_766 + 8); public static Werkstoff Bismuth = new Werkstoff(Materials.Bismuth, ADD_CASINGS_ONLY, ELEMENT, 31_766 + 90); public static Werkstoff Boron = new Werkstoff(Materials.Boron, ADD_CASINGS_ONLY, ELEMENT, 31_766 + 9); public static Werkstoff Caesium = new Werkstoff(Materials.Caesium, ADD_CASINGS_ONLY, ELEMENT, 31_766 + 62); - // public static Werkstoff Calcium = new Werkstoff(Materials.Calcium, ADD_CASINGS_ONLY, ELEMENT, 31_766+26); public static Werkstoff Carbon = new Werkstoff(Materials.Carbon, ADD_CASINGS_ONLY, ELEMENT, 31_766 + 10); public static Werkstoff Cadmium = new Werkstoff(Materials.Cadmium, ADD_CASINGS_ONLY, ELEMENT, 31_766 + 55); public static Werkstoff Cerium = new Werkstoff(Materials.Cerium, ADD_CASINGS_ONLY, ELEMENT, 31_766 + 65); - // public static Werkstoff Chlorine = new Werkstoff(Materials.Chlorine, ADD_CASINGS_ONLY, ELEMENT, 31_766+23); public static Werkstoff Chrome = new Werkstoff(Materials.Chrome, ADD_CASINGS_ONLY, ELEMENT, 31_766 + 30); public static Werkstoff Cobalt = new Werkstoff(Materials.Cobalt, ADD_CASINGS_ONLY, ELEMENT, 31_766 + 33); public static Werkstoff Copper = new Werkstoff(Materials.Copper, ADD_CASINGS_ONLY, ELEMENT, 31_766 + 35); - // public static Werkstoff Deuterium = new Werkstoff(Materials.Deuterium, ADD_CASINGS_ONLY, ELEMENT, 31_766+2); public static Werkstoff Dysprosium = new Werkstoff(Materials.Dysprosium, ADD_CASINGS_ONLY, ELEMENT, 31_766 + 73); - // public static Werkstoff Empty = new Werkstoff(Materials.Empty, ADD_CASINGS_ONLY, ELEMENT, 31_766+0); public static Werkstoff Erbium = new Werkstoff(Materials.Erbium, ADD_CASINGS_ONLY, ELEMENT, 31_766 + 75); public static Werkstoff Europium = new Werkstoff(Materials.Europium, ADD_CASINGS_ONLY, ELEMENT, 31_766 + 70); - // public static Werkstoff Fluorine = new Werkstoff(Materials.Fluorine, ADD_CASINGS_ONLY, ELEMENT, 31_766+14); public static Werkstoff Gadolinium = new Werkstoff(Materials.Gadolinium, ADD_CASINGS_ONLY, ELEMENT, 31_766 + 71); public static Werkstoff Gallium = new Werkstoff(Materials.Gallium, ADD_CASINGS_ONLY, ELEMENT, 31_766 + 37); public static Werkstoff Gold = new Werkstoff(Materials.Gold, ADD_CASINGS_ONLY, ELEMENT, 31_766 + 86); public static Werkstoff Holmium = new Werkstoff(Materials.Holmium, ADD_CASINGS_ONLY, ELEMENT, 31_766 + 74); - // public static Werkstoff Hydrogen = new Werkstoff(Materials.Hydrogen, ADD_CASINGS_ONLY, ELEMENT, 31_766+1); - // public static Werkstoff Helium = new Werkstoff(Materials.Helium, ADD_CASINGS_ONLY, ELEMENT, 31_766+4); - // public static Werkstoff Helium_3 = new Werkstoff(Materials.Helium_3, ADD_CASINGS_ONLY, ELEMENT, 31_766+5); public static Werkstoff Indium = new Werkstoff(Materials.Indium, ADD_CASINGS_ONLY, ELEMENT, 31_766 + 56); public static Werkstoff Iridium = new Werkstoff(Materials.Iridium, ADD_CASINGS_ONLY, ELEMENT, 31_766 + 84); public static Werkstoff Iron = new Werkstoff(Materials.Iron, ADD_CASINGS_ONLY, ELEMENT, 31_766 + 32); @@ -62,15 +57,12 @@ public class BW_GT_MaterialReference { public static Werkstoff Lutetium = new Werkstoff(Materials.Lutetium, ADD_CASINGS_ONLY, ELEMENT, 31_766 + 78); public static Werkstoff Magnesium = new Werkstoff(Materials.Magnesium, ADD_CASINGS_ONLY, ELEMENT, 31_766 + 18); public static Werkstoff Manganese = new Werkstoff(Materials.Manganese, ADD_CASINGS_ONLY, ELEMENT, 31_766 + 31); - // public static Werkstoff Mercury = new Werkstoff(Materials.Mercury, ADD_CASINGS_ONLY, ELEMENT, 31_766+87); public static Werkstoff Molybdenum = new Werkstoff(Materials.Molybdenum, ADD_CASINGS_ONLY, ELEMENT, 31_766 + 48); public static Werkstoff Neodymium = new Werkstoff(Materials.Neodymium, ADD_CASINGS_ONLY, ELEMENT, 31_766 + 67); public static Werkstoff Neutronium = new Werkstoff(Materials.Neutronium, ADD_CASINGS_ONLY, ELEMENT, 31_766 + 129); public static Werkstoff Nickel = new Werkstoff(Materials.Nickel, ADD_CASINGS_ONLY, ELEMENT, 31_766 + 34); public static Werkstoff Niobium = new Werkstoff(Materials.Niobium, ADD_CASINGS_ONLY, ELEMENT, 31_766 + 47); - // public static Werkstoff Nitrogen = new Werkstoff(Materials.Nitrogen, ADD_CASINGS_ONLY, ELEMENT, 31_766+12); public static Werkstoff Osmium = new Werkstoff(Materials.Osmium, ADD_CASINGS_ONLY, ELEMENT, 31_766 + 83); - // public static Werkstoff Oxygen = new Werkstoff(Materials.Oxygen, ADD_CASINGS_ONLY, ELEMENT, 31_766+13); public static Werkstoff Palladium = new Werkstoff(Materials.Palladium, ADD_CASINGS_ONLY, ELEMENT, 31_766 + 52); public static Werkstoff Phosphorus = new Werkstoff(Materials.Phosphorus, ADD_CASINGS_ONLY, ELEMENT, 31_766 + 21); public static Werkstoff Platinum = new Werkstoff(Materials.Platinum, ADD_CASINGS_ONLY, ELEMENT, 31_766 + 85); @@ -87,7 +79,6 @@ public class BW_GT_MaterialReference { ELEMENT, 31_766 + 66); public static Werkstoff Promethium = new Werkstoff(Materials.Promethium, ADD_CASINGS_ONLY, ELEMENT, 31_766 + 68); - // public static Werkstoff Radon = new Werkstoff(Materials.Radon, ADD_CASINGS_ONLY, ELEMENT, 31_766+93); public static Werkstoff Rubidium = new Werkstoff(Materials.Rubidium, ADD_CASINGS_ONLY, ELEMENT, 31_766 + 43); public static Werkstoff Samarium = new Werkstoff(Materials.Samarium, ADD_CASINGS_ONLY, ELEMENT, 31_766 + 69); public static Werkstoff Scandium = new Werkstoff(Materials.Scandium, ADD_CASINGS_ONLY, ELEMENT, 31_766 + 27); @@ -97,7 +88,6 @@ public class BW_GT_MaterialReference { public static Werkstoff Strontium = new Werkstoff(Materials.Strontium, ADD_CASINGS_ONLY, ELEMENT, 31_766 + 44); public static Werkstoff Sulfur = new Werkstoff(Materials.Sulfur, ADD_CASINGS_ONLY, ELEMENT, 31_766 + 22); public static Werkstoff Tantalum = new Werkstoff(Materials.Tantalum, ADD_CASINGS_ONLY, ELEMENT, 31_766 + 80); - // public static Werkstoff Tellurium = new Werkstoff(Materials.Tellurium, ADD_CASINGS_ONLY, ELEMENT, 31_766+59); public static Werkstoff Terbium = new Werkstoff(Materials.Terbium, ADD_CASINGS_ONLY, ELEMENT, 31_766 + 72); public static Werkstoff Thorium = new Werkstoff(Materials.Thorium, ADD_CASINGS_ONLY, ELEMENT, 31_766 + 96); public static Werkstoff Thulium = new Werkstoff(Materials.Thulium, ADD_CASINGS_ONLY, ELEMENT, 31_766 + 76); @@ -181,11 +171,6 @@ public class BW_GT_MaterialReference { public static Werkstoff Bronze = new Werkstoff(Materials.Bronze, ADD_CASINGS_ONLY, MIXTURE, 31_766 + 300); public static Werkstoff Wood = new Werkstoff(Materials.Wood, ADD_CASINGS_ONLY, BIOLOGICAL, 31_766 + 809); - // public static Werkstoff WoodSealed = new Werkstoff(Materials.WoodSealed, ADD_CASINGS_ONLY, - // BIOLOGICAL,31_766+889); - // public static Werkstoff Cheese = new Werkstoff(Materials.Cheese, new - // Werkstoff.GenerationFeatures().addCasings().addMetalItems().addMultipleIngotMetalWorkingItems().enforceUnification(), - // BIOLOGICAL,31_766+894); public static Werkstoff Steel = new Werkstoff(Materials.Steel, ADD_CASINGS_ONLY, COMPOUND, 31_766 + 305); public static Werkstoff Polytetrafluoroethylene = new Werkstoff( @@ -204,797 +189,4 @@ public class BW_GT_MaterialReference { public static void init() { MainMod.LOGGER.info("Load Elements from GT"); } - - // TODO: GT++ only? - - // public static Werkstoff Flerovium = new Werkstoff(Materials.Flerovium, <GenerationFeatures>, - // <TypeRef>,31_766+984); - - // public static Werkstoff HeeEndium = new Werkstoff(Materials.HeeEndium, <GenerationFeatures>, - // <TypeRef>,31_766+770); - // public static Werkstoff PlatinumGroupSludge = new Werkstoff(Materials.PlatinumGroupSludge, - // <GenerationFeatures>, <TypeRef>,31_766+241); - // public static Werkstoff Draconium = new Werkstoff(Materials.Draconium, <GenerationFeatures>, - // <TypeRef>,31_766+975); - // public static Werkstoff DraconiumAwakened = new Werkstoff(Materials.DraconiumAwakened, <GenerationFeatures>, - // <TypeRef>,31_766+976); - // public static Werkstoff Adamantium = new Werkstoff(Materials.Adamantium, <GenerationFeatures>, - // <TypeRef>,31_766+319); - // public static Werkstoff Alduorite = new Werkstoff(Materials.Alduorite, <GenerationFeatures>, - // <TypeRef>,31_766+485); - // public static Werkstoff Amber = new Werkstoff(Materials.Amber, <GenerationFeatures>, <TypeRef>,31_766+514); - // public static Werkstoff Angmallen = new Werkstoff(Materials.Angmallen, <GenerationFeatures>, - // <TypeRef>,31_766+958); - - // public static Werkstoff Atlarus = new Werkstoff(Materials.Atlarus, <GenerationFeatures>, - // <TypeRef>,31_766+965); - // public static Werkstoff Blizz = new Werkstoff(Materials.Blizz, <GenerationFeatures>, <TypeRef>,31_766+851); - // public static Werkstoff Blueschist = new Werkstoff(Materials.Blueschist, <GenerationFeatures>, - // <TypeRef>,31_766+852); - // public static Werkstoff Bluestone = new Werkstoff(Materials.Bluestone, <GenerationFeatures>, - // <TypeRef>,31_766+813); - // public static Werkstoff Carmot = new Werkstoff(Materials.Carmot, <GenerationFeatures>, <TypeRef>,31_766+962); - // public static Werkstoff Celenegil = new Werkstoff(Materials.Celenegil, <GenerationFeatures>, - // <TypeRef>,31_766+964); - // public static Werkstoff CertusQuartz = new Werkstoff(Materials.CertusQuartz, <GenerationFeatures>, - // <TypeRef>,31_766+516); - // public static Werkstoff Ceruclase = new Werkstoff(Materials.Ceruclase, <GenerationFeatures>, - // <TypeRef>,31_766+952); - // public static Werkstoff CobaltHexahydrate = new Werkstoff(Materials.CobaltHexahydrate, <GenerationFeatures>, - // <TypeRef>,31_766+853); - // public static Werkstoff ConstructionFoam = new Werkstoff(Materials.ConstructionFoam, <GenerationFeatures>, - // <TypeRef>,31_766+854); - // public static Werkstoff Chert = new Werkstoff(Materials.Chert, <GenerationFeatures>, <TypeRef>,31_766+857); - // public static Werkstoff CrudeOil = new Werkstoff(Materials.CrudeOil, <GenerationFeatures>, - // <TypeRef>,31_766+858); - // public static Werkstoff Dacite = new Werkstoff(Materials.Dacite, <GenerationFeatures>, <TypeRef>,31_766+859); - // public static Werkstoff DarkIron = new Werkstoff(Materials.DarkIron, <GenerationFeatures>, - // <TypeRef>,31_766+342); - // public static Werkstoff Desh = new Werkstoff(Materials.Desh, <GenerationFeatures>, <TypeRef>,31_766+884); - // public static Werkstoff Dilithium = new Werkstoff(Materials.Dilithium, <GenerationFeatures>, - // <TypeRef>,31_766+515); - // public static Werkstoff Duranium = new Werkstoff(Materials.Duranium, <GenerationFeatures>, - // <TypeRef>,31_766+328); - // public static Werkstoff Eclogite = new Werkstoff(Materials.Eclogite, <GenerationFeatures>, - // <TypeRef>,31_766+860); - // public static Werkstoff ElectrumFlux = new Werkstoff(Materials.ElectrumFlux, <GenerationFeatures>, - // <TypeRef>,31_766+320); - // public static Werkstoff Emery = new Werkstoff(Materials.Emery, <GenerationFeatures>, <TypeRef>,31_766+861); - // public static Werkstoff EnderiumBase = new Werkstoff(Materials.EnderiumBase, <GenerationFeatures>, - // <TypeRef>,31_766+380); - // public static Werkstoff Epidote = new Werkstoff(Materials.Epidote, <GenerationFeatures>, - // <TypeRef>,31_766+862); - // public static Werkstoff Eximite = new Werkstoff(Materials.Eximite, <GenerationFeatures>, - // <TypeRef>,31_766+959); - // public static Werkstoff FierySteel = new Werkstoff(Materials.FierySteel, <GenerationFeatures>, - // <TypeRef>,31_766+346); - // public static Werkstoff Firestone = new Werkstoff(Materials.Firestone, <GenerationFeatures>, - // <TypeRef>,31_766+347); - // public static Werkstoff FoolsRuby = new Werkstoff(Materials.FoolsRuby, <GenerationFeatures>, - // <TypeRef>,31_766+512); - // public static Werkstoff Force = new Werkstoff(Materials.Force, <GenerationFeatures>, <TypeRef>,31_766+521); - // public static Werkstoff Forcicium = new Werkstoff(Materials.Forcicium, <GenerationFeatures>, - // <TypeRef>,31_766+518); - // public static Werkstoff Forcillium = new Werkstoff(Materials.Forcillium, <GenerationFeatures>, - // <TypeRef>,31_766+519); - // public static Werkstoff Gabbro = new Werkstoff(Materials.Gabbro, <GenerationFeatures>, <TypeRef>,31_766+863); - // public static Werkstoff Glowstone = new Werkstoff(Materials.Glowstone, <GenerationFeatures>, - // <TypeRef>,31_766+811); - // public static Werkstoff Gneiss = new Werkstoff(Materials.Gneiss, <GenerationFeatures>, <TypeRef>,31_766+864); - // public static Werkstoff Graphite = new Werkstoff(Materials.Graphite, <GenerationFeatures>, - // <TypeRef>,31_766+865); - // public static Werkstoff Graphene = new Werkstoff(Materials.Graphene, <GenerationFeatures>, - // <TypeRef>,31_766+819); - // public static Werkstoff Greenschist = new Werkstoff(Materials.Greenschist, <GenerationFeatures>, - // <TypeRef>,31_766+866); - // public static Werkstoff Greenstone = new Werkstoff(Materials.Greenstone, <GenerationFeatures>, - // <TypeRef>,31_766+867); - // public static Werkstoff Greywacke = new Werkstoff(Materials.Greywacke, <GenerationFeatures>, - // <TypeRef>,31_766+897); - // public static Werkstoff Haderoth = new Werkstoff(Materials.Haderoth, <GenerationFeatures>, - // <TypeRef>,31_766+963); - // public static Werkstoff Hepatizon = new Werkstoff(Materials.Hepatizon, <GenerationFeatures>, - // <TypeRef>,31_766+957); - // public static Werkstoff HSLA = new Werkstoff(Materials.HSLA, <GenerationFeatures>, <TypeRef>,31_766+322); - // public static Werkstoff Ignatius = new Werkstoff(Materials.Ignatius, <GenerationFeatures>, - // <TypeRef>,31_766+950); - // public static Werkstoff Infuscolium = new Werkstoff(Materials.Infuscolium, <GenerationFeatures>, - // <TypeRef>,31_766+490); - // public static Werkstoff InfusedGold = new Werkstoff(Materials.InfusedGold, <GenerationFeatures>, - // <TypeRef>,31_766+323); - // public static Werkstoff InfusedAir = new Werkstoff(Materials.InfusedAir, <GenerationFeatures>, - // <TypeRef>,31_766+540); - // public static Werkstoff InfusedFire = new Werkstoff(Materials.InfusedFire, <GenerationFeatures>, - // <TypeRef>,31_766+541); - // public static Werkstoff InfusedEarth = new Werkstoff(Materials.InfusedEarth, <GenerationFeatures>, - // <TypeRef>,31_766+542); - // public static Werkstoff InfusedWater = new Werkstoff(Materials.InfusedWater, <GenerationFeatures>, - // <TypeRef>,31_766+543); - // public static Werkstoff InfusedEntropy = new Werkstoff(Materials.InfusedEntropy, <GenerationFeatures>, - // <TypeRef>,31_766+544); - // public static Werkstoff InfusedOrder = new Werkstoff(Materials.InfusedOrder, <GenerationFeatures>, - // <TypeRef>,31_766+545); - // public static Werkstoff Inolashite = new Werkstoff(Materials.Inolashite, <GenerationFeatures>, - // <TypeRef>,31_766+954); - // public static Werkstoff Jade = new Werkstoff(Materials.Jade, <GenerationFeatures>, <TypeRef>,31_766+537); - // public static Werkstoff Jasper = new Werkstoff(Materials.Jasper, <GenerationFeatures>, <TypeRef>,31_766+511); - // public static Werkstoff Kalendrite = new Werkstoff(Materials.Kalendrite, <GenerationFeatures>, - // <TypeRef>,31_766+953); - // public static Werkstoff Komatiite = new Werkstoff(Materials.Komatiite, <GenerationFeatures>, - // <TypeRef>,31_766+869); - // public static Werkstoff Lava = new Werkstoff(Materials.Lava, <GenerationFeatures>, <TypeRef>,31_766+700); - // public static Werkstoff Lemurite = new Werkstoff(Materials.Lemurite, <GenerationFeatures>, - // <TypeRef>,31_766+486); - // public static Werkstoff MeteoricIron = new Werkstoff(Materials.MeteoricIron, <GenerationFeatures>, - // <TypeRef>,31_766+340); - // public static Werkstoff MeteoricSteel = new Werkstoff(Materials.MeteoricSteel, <GenerationFeatures>, - // <TypeRef>,31_766+341); - // public static Werkstoff Meutoite = new Werkstoff(Materials.Meutoite, <GenerationFeatures>, - // <TypeRef>,31_766+487); - // public static Werkstoff Migmatite = new Werkstoff(Materials.Migmatite, <GenerationFeatures>, - // <TypeRef>,31_766+872); - - // public static Werkstoff NetherBrick = new Werkstoff(Materials.NetherBrick, <GenerationFeatures>, - // <TypeRef>,31_766+814); - // public static Werkstoff NetherQuartz = new Werkstoff(Materials.NetherQuartz, <GenerationFeatures>, - // <TypeRef>,31_766+522); - // public static Werkstoff NetherStar = new Werkstoff(Materials.NetherStar, <GenerationFeatures>, - // <TypeRef>,31_766+506); - // public static Werkstoff Oilsands = new Werkstoff(Materials.Oilsands, <GenerationFeatures>, - // <TypeRef>,31_766+878); - // public static Werkstoff Orichalcum = new Werkstoff(Materials.Orichalcum, <GenerationFeatures>, - // <TypeRef>,31_766+966); - // public static Werkstoff Oureclase = new Werkstoff(Materials.Oureclase, <GenerationFeatures>, - // <TypeRef>,31_766+961); - // public static Werkstoff Prometheum = new Werkstoff(Materials.Prometheum, <GenerationFeatures>, - // <TypeRef>,31_766+960); - // public static Werkstoff Quartzite = new Werkstoff(Materials.Quartzite, <GenerationFeatures>, - // <TypeRef>,31_766+523); - // public static Werkstoff Rhyolite = new Werkstoff(Materials.Rhyolite, <GenerationFeatures>, - // <TypeRef>,31_766+875); - // public static Werkstoff Rubracium = new Werkstoff(Materials.Rubracium, <GenerationFeatures>, - // <TypeRef>,31_766+488); - // public static Werkstoff Sanguinite = new Werkstoff(Materials.Sanguinite, <GenerationFeatures>, - // <TypeRef>,31_766+955); - // public static Werkstoff Siltstone = new Werkstoff(Materials.Siltstone, <GenerationFeatures>, - // <TypeRef>,31_766+876); - // public static Werkstoff Tartarite = new Werkstoff(Materials.Tartarite, <GenerationFeatures>, - // <TypeRef>,31_766+956); - // public static Werkstoff UUAmplifier = new Werkstoff(Materials.UUAmplifier, <GenerationFeatures>, - // <TypeRef>,31_766+721); - // public static Werkstoff UUMatter = new Werkstoff(Materials.UUMatter, <GenerationFeatures>, - // <TypeRef>,31_766+703); - // public static Werkstoff Void = new Werkstoff(Materials.Void, <GenerationFeatures>, <TypeRef>,31_766+970); - // public static Werkstoff Vulcanite = new Werkstoff(Materials.Vulcanite, <GenerationFeatures>, - // <TypeRef>,31_766+489); - // public static Werkstoff Vyroxeres = new Werkstoff(Materials.Vyroxeres, <GenerationFeatures>, - // <TypeRef>,31_766+951); - // public static Werkstoff BioFuel = new Werkstoff(Materials.BioFuel, <GenerationFeatures>, - // <TypeRef>,31_766+705); - // public static Werkstoff Biomass = new Werkstoff(Materials.Biomass, <GenerationFeatures>, - // <TypeRef>,31_766+704); - // public static CharcoalByproducts = new MaterialBuilder - - // public static Werkstoff Chili = new Werkstoff(Materials.Chili, <GenerationFeatures>, <TypeRef>,31_766+895); - // public static Werkstoff Chocolate = new Werkstoff(Materials.Chocolate, <GenerationFeatures>, - // <TypeRef>,31_766+886); - // public static Werkstoff CoalFuel = new Werkstoff(Materials.CoalFuel, <GenerationFeatures>, - // <TypeRef>,31_766+710); - // public static Werkstoff Cocoa = new Werkstoff(Materials.Cocoa, <GenerationFeatures>, <TypeRef>,31_766+887); - // public static Werkstoff Coffee = new Werkstoff(Materials.Coffee, <GenerationFeatures>, <TypeRef>,31_766+888); - // public static Werkstoff Creosote = new Werkstoff(Materials.Creosote, <GenerationFeatures>, - // <TypeRef>,31_766+712); - // public static Werkstoff Ethanol = new Werkstoff(Materials.Ethanol, <GenerationFeatures>, - // <TypeRef>,31_766+706); - // public static FermentedBiomass = new MaterialBuilder - // public static Werkstoff Fuel = new Werkstoff(Materials.Fuel, <GenerationFeatures>, <TypeRef>,31_766+708); - // public static Werkstoff Glue = new Werkstoff(Materials.Glue, <GenerationFeatures>, <TypeRef>,31_766+726); - // public static Werkstoff Gunpowder = new Werkstoff(Materials.Gunpowder, <GenerationFeatures>, - // <TypeRef>,31_766+800); - // public static Werkstoff FryingOilHot = new Werkstoff(Materials.FryingOilHot, <GenerationFeatures>, - // <TypeRef>,31_766+727); - // public static Werkstoff Honey = new Werkstoff(Materials.Honey, <GenerationFeatures>, <TypeRef>,31_766+725); - // public static Werkstoff Lubricant = new Werkstoff(Materials.Lubricant, <GenerationFeatures>, - // <TypeRef>,31_766+724); - // public static Werkstoff McGuffium239 = new Werkstoff(Materials.McGuffium239, <GenerationFeatures>, - // <TypeRef>,31_766+999); - // public static Werkstoff MeatRaw = new Werkstoff(Materials.MeatRaw, <GenerationFeatures>, - // <TypeRef>,31_766+892); - // public static Werkstoff MeatCooked = new Werkstoff(Materials.MeatCooked, <GenerationFeatures>, - // <TypeRef>,31_766+893); - // public static Werkstoff Milk = new Werkstoff(Materials.Milk, <GenerationFeatures>, <TypeRef>,31_766+885); - // public static Werkstoff Oil = new Werkstoff(Materials.Oil, <GenerationFeatures>, <TypeRef>,31_766+707); - // public static Werkstoff Paper = new Werkstoff(Materials.Paper, <GenerationFeatures>, <TypeRef>,31_766+879); - // public static Werkstoff RareEarth = new Werkstoff(Materials.RareEarth, <GenerationFeatures>, - // <TypeRef>,31_766+891); - // public static Werkstoff Reinforced = new Werkstoff(Materials.Reinforced, <GenerationFeatures>, - // <TypeRef>,31_766+383); - // public static Werkstoff SeedOil = new Werkstoff(Materials.SeedOil, <GenerationFeatures>, - // <TypeRef>,31_766+713); - // public static Werkstoff SeedOilHemp = new Werkstoff(Materials.SeedOilHemp, <GenerationFeatures>, - // <TypeRef>,31_766+722); - // public static Werkstoff SeedOilLin = new Werkstoff(Materials.SeedOilLin, <GenerationFeatures>, - // <TypeRef>,31_766+723); - // public static Werkstoff Stone = new Werkstoff(Materials.Stone, <GenerationFeatures>, <TypeRef>,31_766+299); - // public static Werkstoff Unstable = new Werkstoff(Materials.Unstable, <GenerationFeatures>, - // <TypeRef>,31_766+396); - // public static Vinegar = new MaterialBuilder - // public static Werkstoff Wheat = new Werkstoff(Materials.Wheat, <GenerationFeatures>, <TypeRef>,31_766+881); - // public static WoodGas = new MaterialBuilder - // public static WoodTar = new MaterialBuilder - // public static WoodVinegar = new MaterialBuilder - - // public static Werkstoff Sunnarium = new Werkstoff(Materials.Sunnarium, <GenerationFeatures>, - // <TypeRef>,31_766+318); - // public static Werkstoff Endstone = new Werkstoff(Materials.Endstone, <GenerationFeatures>, - // <TypeRef>,31_766+808); - // public static Werkstoff Netherrack = new Werkstoff(Materials.Netherrack, <GenerationFeatures>, - // <TypeRef>,31_766+807); - // public static Werkstoff Methane = new Werkstoff(Materials.Methane, <GenerationFeatures>, - // <TypeRef>,31_766+715); - // public static Werkstoff CarbonDioxide = new Werkstoff(Materials.CarbonDioxide, <GenerationFeatures>, - // <TypeRef>,31_766+497); - // public static Werkstoff NobleGases = new Werkstoff(Materials.NobleGases, <GenerationFeatures>, - // <TypeRef>,31_766+496); - // public static Werkstoff LiquidAir = new Werkstoff(Materials.LiquidAir, <GenerationFeatures>, - // <TypeRef>,31_766+495); - // public static Werkstoff LiquidNitrogen = new Werkstoff(Materials.LiquidNitrogen, <GenerationFeatures>, - // <TypeRef>,31_766+494); - // public static Werkstoff LiquidOxygen = new Werkstoff(Materials.LiquidOxygen, <GenerationFeatures>, - // <TypeRef>,31_766+493); - // public static Werkstoff Almandine = new Werkstoff(Materials.Almandine, <GenerationFeatures>, - // <TypeRef>,31_766+820); - // public static Werkstoff Andradite = new Werkstoff(Materials.Andradite, <GenerationFeatures>, - // <TypeRef>,31_766+821); - - // public static Werkstoff Asbestos = new Werkstoff(Materials.Asbestos, <GenerationFeatures>, - // <TypeRef>,31_766+946); - // public static Werkstoff Ash = new Werkstoff(Materials.Ash, <GenerationFeatures>, <TypeRef>,31_766+815); - // public static Werkstoff BandedIron = new Werkstoff(Materials.BandedIron, <GenerationFeatures>, - // <TypeRef>,31_766+917); - // public static Werkstoff BatteryAlloy = new Werkstoff(Materials.BatteryAlloy, <GenerationFeatures>, - // <TypeRef>,31_766+315); - // public static Werkstoff BlueTopaz = new Werkstoff(Materials.BlueTopaz, <GenerationFeatures>, - // <TypeRef>,31_766+513); - // public static Werkstoff Bone = new Werkstoff(Materials.Bone, <GenerationFeatures>, <TypeRef>,31_766+806); - - // public static Werkstoff BrownLimonite = new Werkstoff(Materials.BrownLimonite, <GenerationFeatures>, - // <TypeRef>,31_766+930); - // public static Werkstoff Calcite = new Werkstoff(Materials.Calcite, <GenerationFeatures>, - // <TypeRef>,31_766+823); - // public static Werkstoff Cassiterite = new Werkstoff(Materials.Cassiterite, <GenerationFeatures>, - // <TypeRef>,31_766+824); - // public static Werkstoff CassiteriteSand = new Werkstoff(Materials.CassiteriteSand, <GenerationFeatures>, - // <TypeRef>,31_766+937); - // public static Werkstoff Chalcopyrite = new Werkstoff(Materials.Chalcopyrite, <GenerationFeatures>, - // <TypeRef>,31_766+855); - // public static Werkstoff Charcoal = new Werkstoff(Materials.Charcoal, <GenerationFeatures>, - // <TypeRef>,31_766+536); - // public static Werkstoff Chromite = new Werkstoff(Materials.Chromite, <GenerationFeatures>, - // <TypeRef>,31_766+825); - // public static Werkstoff ChromiumDioxide = new Werkstoff(Materials.ChromiumDioxide, <GenerationFeatures>, - // <TypeRef>,31_766+361); - // public static Werkstoff Cinnabar = new Werkstoff(Materials.Cinnabar, <GenerationFeatures>, - // <TypeRef>,31_766+826); - // public static Werkstoff Water = new Werkstoff(Materials.Water, <GenerationFeatures>, <TypeRef>,31_766+701); - // public static Werkstoff Clay = new Werkstoff(Materials.Clay, <GenerationFeatures>, <TypeRef>,31_766+805); - // public static Werkstoff Coal = new Werkstoff(Materials.Coal, <GenerationFeatures>, <TypeRef>,31_766+535); - // public static Werkstoff Cobaltite = new Werkstoff(Materials.Cobaltite, <GenerationFeatures>, - // <TypeRef>,31_766+827); - // public static Werkstoff Cooperite = new Werkstoff(Materials.Cooperite, <GenerationFeatures>, - // <TypeRef>,31_766+828); - // public static Werkstoff Cupronickel = new Werkstoff(Materials.Cupronickel, <GenerationFeatures>, - // <TypeRef>,31_766+310); - // public static Werkstoff DarkAsh = new Werkstoff(Materials.DarkAsh, <GenerationFeatures>, - // <TypeRef>,31_766+816); - // public static Werkstoff DeepIron = new Werkstoff(Materials.DeepIron, <GenerationFeatures>, - // <TypeRef>,31_766+829); - // public static Werkstoff Diamond = new Werkstoff(Materials.Diamond, <GenerationFeatures>, - // <TypeRef>,31_766+500); - // public static Werkstoff Electrum = new Werkstoff(Materials.Electrum, <GenerationFeatures>, - // <TypeRef>,31_766+303); - // public static Werkstoff Emerald = new Werkstoff(Materials.Emerald, <GenerationFeatures>, - // <TypeRef>,31_766+501); - // public static Werkstoff Galena = new Werkstoff(Materials.Galena, <GenerationFeatures>, <TypeRef>,31_766+830); - // public static Werkstoff Garnierite = new Werkstoff(Materials.Garnierite, <GenerationFeatures>, - // <TypeRef>,31_766+906); - // public static Werkstoff Glyceryl = new Werkstoff(Materials.Glyceryl, <GenerationFeatures>, - // <TypeRef>,31_766+714); - // public static Werkstoff GreenSapphire = new Werkstoff(Materials.GreenSapphire, <GenerationFeatures>, - // <TypeRef>,31_766+504); - // public static Werkstoff Grossular = new Werkstoff(Materials.Grossular, <GenerationFeatures>, - // <TypeRef>,31_766+831); - // public static Werkstoff HolyWater = new Werkstoff(Materials.HolyWater, <GenerationFeatures>, - // <TypeRef>,31_766+729); - // public static Werkstoff Ice = new Werkstoff(Materials.Ice, <GenerationFeatures>, <TypeRef>,31_766+702); - // public static Werkstoff Ilmenite = new Werkstoff(Materials.Ilmenite, <GenerationFeatures>, - // <TypeRef>,31_766+918); - // public static Werkstoff Rutile = new Werkstoff(Materials.Rutile, <GenerationFeatures>, <TypeRef>,31_766+375); - // public static Werkstoff Bauxite = new Werkstoff(Materials.Bauxite, <GenerationFeatures>, - // <TypeRef>,31_766+822); - // public static Werkstoff Titaniumtetrachloride = new Werkstoff(Materials.Titaniumtetrachloride, - // <GenerationFeatures>, <TypeRef>,31_766+376); - // public static Werkstoff Magnesiumchloride = new Werkstoff(Materials.Magnesiumchloride, <GenerationFeatures>, - // <TypeRef>,31_766+377); - // public static Werkstoff Invar = new Werkstoff(Materials.Invar, <GenerationFeatures>, <TypeRef>,31_766+302); - // public static Werkstoff Kanthal = new Werkstoff(Materials.Kanthal, <GenerationFeatures>, - // <TypeRef>,31_766+312); - // public static Werkstoff Lazurite = new Werkstoff(Materials.Lazurite, <GenerationFeatures>, - // <TypeRef>,31_766+524); - // public static Werkstoff Magnalium = new Werkstoff(Materials.Magnalium, <GenerationFeatures>, - // <TypeRef>,31_766+313); - // public static Werkstoff Magnesite = new Werkstoff(Materials.Magnesite, <GenerationFeatures>, - // <TypeRef>,31_766+908); - // public static Werkstoff Magnetite = new Werkstoff(Materials.Magnetite, <GenerationFeatures>, - // <TypeRef>,31_766+870); - // public static Werkstoff Molybdenite = new Werkstoff(Materials.Molybdenite, <GenerationFeatures>, - // <TypeRef>,31_766+942); - // public static Werkstoff Nichrome = new Werkstoff(Materials.Nichrome, <GenerationFeatures>, - // <TypeRef>,31_766+311); - // public static Werkstoff NiobiumNitride = new Werkstoff(Materials.NiobiumNitride, <GenerationFeatures>, - // <TypeRef>,31_766+359); - // public static Werkstoff NiobiumTitanium = new Werkstoff(Materials.NiobiumTitanium, <GenerationFeatures>, - // <TypeRef>,31_766+360); - // public static Werkstoff NitroCarbon = new Werkstoff(Materials.NitroCarbon, <GenerationFeatures>, - // <TypeRef>,31_766+716); - // public static Werkstoff NitrogenDioxide = new Werkstoff(Materials.NitrogenDioxide, <GenerationFeatures>, - // <TypeRef>,31_766+717); - // public static Werkstoff Obsidian = new Werkstoff(Materials.Obsidian, <GenerationFeatures>, - // <TypeRef>,31_766+804); - // public static Werkstoff Phosphate = new Werkstoff(Materials.Phosphate, <GenerationFeatures>, - // <TypeRef>,31_766+833); - // public static Werkstoff PigIron = new Werkstoff(Materials.PigIron, <GenerationFeatures>, - // <TypeRef>,31_766+307); - - // public static Polydimethylsiloxane = new MaterialBuilder - // public static Werkstoff Silicone = new Werkstoff(Materials.Silicone, <GenerationFeatures>, - // <TypeRef>,31_766+471); - // public static Werkstoff Polycaprolactam = new Werkstoff(Materials.Polycaprolactam, <GenerationFeatures>, - // <TypeRef>,31_766+472); - - // public static Werkstoff Powellite = new Werkstoff(Materials.Powellite, <GenerationFeatures>, - // <TypeRef>,31_766+883); - // public static Werkstoff Pumice = new Werkstoff(Materials.Pumice, <GenerationFeatures>, <TypeRef>,31_766+926); - // public static Werkstoff Pyrite = new Werkstoff(Materials.Pyrite, <GenerationFeatures>, <TypeRef>,31_766+834); - // public static Werkstoff Pyrolusite = new Werkstoff(Materials.Pyrolusite, <GenerationFeatures>, - // <TypeRef>,31_766+943); - // public static Werkstoff Pyrope = new Werkstoff(Materials.Pyrope, <GenerationFeatures>, <TypeRef>,31_766+835); - // public static Werkstoff RockSalt = new Werkstoff(Materials.RockSalt, <GenerationFeatures>, - // <TypeRef>,31_766+944); - // public static Werkstoff Rubber = new Werkstoff(Materials.Rubber, <GenerationFeatures>, <TypeRef>,31_766+880); - // public static Werkstoff RawRubber = new Werkstoff(Materials.RawRubber, <GenerationFeatures>, - // <TypeRef>,31_766+896); - // public static Werkstoff Ruby = new Werkstoff(Materials.Ruby, <GenerationFeatures>, <TypeRef>,31_766+502); - // public static Werkstoff Salt = new Werkstoff(Materials.Salt, <GenerationFeatures>, <TypeRef>,31_766+817); - // public static Werkstoff Saltpeter = new Werkstoff(Materials.Saltpeter, <GenerationFeatures>, - // <TypeRef>,31_766+836); - // public static Werkstoff Sapphire = new Werkstoff(Materials.Sapphire, <GenerationFeatures>, - // <TypeRef>,31_766+503); - // public static Werkstoff Scheelite = new Werkstoff(Materials.Scheelite, <GenerationFeatures>, - // <TypeRef>,31_766+910); - // public static Werkstoff SiliconDioxide = new Werkstoff(Materials.SiliconDioxide, <GenerationFeatures>, - // <TypeRef>,31_766+837); - // public static Werkstoff Snow = new Werkstoff(Materials.Snow, <GenerationFeatures>, <TypeRef>,31_766+728); - // public static Werkstoff Sodalite = new Werkstoff(Materials.Sodalite, <GenerationFeatures>, - // <TypeRef>,31_766+525); - // public static Werkstoff SodiumPersulfate = new Werkstoff(Materials.SodiumPersulfate, <GenerationFeatures>, - // <TypeRef>,31_766+718); - // public static Werkstoff SodiumSulfide = new Werkstoff(Materials.SodiumSulfide, <GenerationFeatures>, - // <TypeRef>,31_766+719); - // public static Werkstoff HydricSulfide = new Werkstoff(Materials.HydricSulfide, <GenerationFeatures>, - // <TypeRef>,31_766+460); - // public static Werkstoff OilHeavy = new Werkstoff(Materials.OilHeavy, <GenerationFeatures>, - // <TypeRef>,31_766+730); - // public static Werkstoff OilMedium = new Werkstoff(Materials.OilMedium, <GenerationFeatures>, - // <TypeRef>,31_766+731); - // public static Werkstoff OilLight = new Werkstoff(Materials.OilLight, <GenerationFeatures>, - // <TypeRef>,31_766+732); - // public static Werkstoff NatruralGas = new Werkstoff(Materials.NatruralGas, <GenerationFeatures>, - // <TypeRef>,31_766+733); - // public static Werkstoff SulfuricGas = new Werkstoff(Materials.SulfuricGas, <GenerationFeatures>, - // <TypeRef>,31_766+734); - // public static Werkstoff Gas = new Werkstoff(Materials.Gas, <GenerationFeatures>, <TypeRef>,31_766+735); - // public static Werkstoff SulfuricNaphtha = new Werkstoff(Materials.SulfuricNaphtha, <GenerationFeatures>, - // <TypeRef>,31_766+736); - // public static Werkstoff SulfuricLightFuel = new Werkstoff(Materials.SulfuricLightFuel, <GenerationFeatures>, - // <TypeRef>,31_766+737); - // public static Werkstoff SulfuricHeavyFuel = new Werkstoff(Materials.SulfuricHeavyFuel, <GenerationFeatures>, - // <TypeRef>,31_766+738); - // public static Werkstoff Naphtha = new Werkstoff(Materials.Naphtha, <GenerationFeatures>, - // <TypeRef>,31_766+739); - // public static Werkstoff LightFuel = new Werkstoff(Materials.LightFuel, <GenerationFeatures>, - // <TypeRef>,31_766+740); - // public static Werkstoff HeavyFuel = new Werkstoff(Materials.HeavyFuel, <GenerationFeatures>, - // <TypeRef>,31_766+741); - // public static Werkstoff LPG = new Werkstoff(Materials.LPG, <GenerationFeatures>, <TypeRef>,31_766+742); - // public static FluidNaquadahFuel = new MaterialBuilder - // public static EnrichedNaquadria = new MaterialBuilder - // public static ReinforceGlass = new MaterialBuilder - // public static BioMediumRaw = new MaterialBuilder - // public static BioMediumSterilized = new MaterialBuilder - // public static Chlorobenzene = new MaterialBuild - // public static DilutedHydrochloricAcid = new MaterialBuild - // public static Pyrochlore = new MaterialBuild - // public static GrowthMediumRaw = new MaterialBuild - // public static GrowthMediumSterilized = new MaterialBuild - // public static FerriteMixture = new MaterialBuild - // public static NickelZincFerrite = new MaterialBuild - // public static Massicot = new MaterialBuild - // public static ArsenicTrioxide = new MaterialBuild - // public static CobaltOxide = new MaterialBuild - // public static Zincite = new MaterialBuild - // public static AntimonyTrioxide = new MaterialBuild - // public static CupricOxide = new MaterialBuild - // public static Ferrosilite = new MaterialBuild - // public static Magnesia = new MaterialBuild - // public static Quicklime = new MaterialBuild - // public static Potash = new MaterialBuild - // public static SodaAsh = new MaterialBuild - // public static Brick = new MaterialBuild - // public static Fireclay = new MaterialBuild - // public static BioDiesel = new MaterialBuild - // public static NitrationMixture = new MaterialBuild - // public static Glycerol = new MaterialBuild - // public static SodiumBisulfate = new MaterialBuild - // public static PolyphenyleneSulfide = new MaterialBuild - // public static Dichlorobenzene = new MaterialBuild - // public static Polystyrene = new MaterialBuild - // public static Styrene = new MaterialBuild - // public static Isoprene = new MaterialBuild - // public static Tetranitromethane = new MaterialBuild - // public static Ethenone = new MaterialBuild - // public static Ethane = new MaterialBuild - // public static Propane = new MaterialBuild - // public static Butane = new MaterialBuild - // public static Butene = new MaterialBuild - // public static Butadiene = new MaterialBuild - // public static RawStyreneButadieneRubber = new MaterialBuild - // public static StyreneButadieneRubber = new MaterialBuild - // public static Toluene = new MaterialBuild - // public static Epichlorohydrin = new MaterialBuild - // public static PolyvinylChloride = new MaterialBuild - // public static VinylChloride = new MaterialBuild - // public static SulfurDioxide = new MaterialBuild - // public static SulfurTrioxide = new MaterialBuild - // public static NitricAcid = new MaterialBuild - // public static Dimethylhydrazine = new MaterialBuild - // public static Chloramine = new MaterialBuild - // public static Dimethylamine = new MaterialBuild - // public static DinitrogenTetroxide = new MaterialBuild - // public static NitricOxide = new MaterialBuild - // public static Ammonia = new MaterialBuild - // public static Dimethyldichlorosilane = new MaterialBuild - // public static Chloromethane = new MaterialBuild - // public static PhosphorousPentoxide = new MaterialBuild - // public static Tetrafluoroethylene = new MaterialBuild - // public static HydrofluoricAcid = new MaterialBuild - // public static Chloroform = new MaterialBuild - // public static BisphenolA = new MaterialBuild - // public static AceticAcid = new MaterialBuild - // public static CalciumAcetateSolution = new MaterialBuild - // public static Acetone = new MaterialBuild - // public static Methanol = new MaterialBuild - // public static CarbonMonoxide = new MaterialBuild - // public static MetalMixture = new MaterialBuild - // public static Ethylene = new MaterialBuild - // public static Propene = new MaterialBuild - // public static VinylAcetate = new MaterialBuild - // public static PolyvinylAcetate = new MaterialBuild - // public static MethylAcetate = new MaterialBuild - // public static AllylChloride = new MaterialBuild - // public static HydrochloricAcid = new MaterialBuild - // public static HypochlorousAcid = new MaterialBuild - // public static SodiumHydroxide = new MaterialBuild - // public static Benzene = new MaterialBuild - // public static Phenol = new MaterialBuild - // public static Cumene = new MaterialBuild - // public static PhosphoricAcid = new MaterialBuild - // public static SaltWater = new MaterialBuild - // public static IronIIIChloride = new MaterialBuild - // public static LifeEssence = new MaterialBuild - // public static Werkstoff SolderingAlloy = new Werkstoff(Materials.SolderingAlloy, <GenerationFeatures>, - // <TypeRef>,31_766+314); - // public static Werkstoff GalliumArsenide = new Werkstoff(Materials.GalliumArsenide, <GenerationFeatures>, - // <TypeRef>,31_766+980); - // public static Werkstoff IndiumGalliumPhosphide = new Werkstoff(Materials.IndiumGalliumPhosphide, - // <GenerationFeatures>, <TypeRef>,31_766+981); - // public static Werkstoff Spessartine = new Werkstoff(Materials.Spessartine, <GenerationFeatures>, - // <TypeRef>,31_766+838); - // public static Werkstoff Sphalerite = new Werkstoff(Materials.Sphalerite, <GenerationFeatures>, - // <TypeRef>,31_766+839); - - // public static Werkstoff Stibnite = new Werkstoff(Materials.Stibnite, <GenerationFeatures>, - // <TypeRef>,31_766+945); - // public static Werkstoff SulfuricAcid = new Werkstoff(Materials.SulfuricAcid, <GenerationFeatures>, - // <TypeRef>,31_766+720); - // public static Werkstoff Tanzanite = new Werkstoff(Materials.Tanzanite, <GenerationFeatures>, - // <TypeRef>,31_766+508); - // public static Werkstoff Tetrahedrite = new Werkstoff(Materials.Tetrahedrite, <GenerationFeatures>, - // <TypeRef>,31_766+840); - // public static Werkstoff TinAlloy = new Werkstoff(Materials.TinAlloy, <GenerationFeatures>, - // <TypeRef>,31_766+363); - // public static Werkstoff Topaz = new Werkstoff(Materials.Topaz, <GenerationFeatures>, <TypeRef>,31_766+507); - // public static Werkstoff Tungstate = new Werkstoff(Materials.Tungstate, <GenerationFeatures>, - // <TypeRef>,31_766+841); - - // public static Werkstoff Uraninite = new Werkstoff(Materials.Uraninite, <GenerationFeatures>, - // <TypeRef>,31_766+922); - // public static Werkstoff Uvarovite = new Werkstoff(Materials.Uvarovite, <GenerationFeatures>, - // <TypeRef>,31_766+842); - // public static Werkstoff VanadiumGallium = new Werkstoff(Materials.VanadiumGallium, <GenerationFeatures>, - // <TypeRef>,31_766+357); - - // public static Werkstoff Wulfenite = new Werkstoff(Materials.Wulfenite, <GenerationFeatures>, - // <TypeRef>,31_766+882); - // public static Werkstoff YellowLimonite = new Werkstoff(Materials.YellowLimonite, <GenerationFeatures>, - // <TypeRef>,31_766+931); - // public static Werkstoff YttriumBariumCuprate = new Werkstoff(Materials.YttriumBariumCuprate, - // <GenerationFeatures>, <TypeRef>,31_766+358); - - // public static Werkstoff LiveRoot = new Werkstoff(Materials.LiveRoot, <GenerationFeatures>, - // <TypeRef>,31_766+832); - // public static Werkstoff IronWood = new Werkstoff(Materials.IronWood, <GenerationFeatures>, - // <TypeRef>,31_766+338); - // public static Werkstoff Glass = new Werkstoff(Materials.Glass, <GenerationFeatures>, <TypeRef>,31_766+890); - // public static Werkstoff BorosilicateGlass = new Werkstoff(Materials.BorosilicateGlass, - // Werkstoff.GenerationFeatures.DISABLED, Werkstoff.Types.COMPOUND, 31_766+611); - // public static Werkstoff Perlite = new Werkstoff(Materials.Perlite, <GenerationFeatures>, - // <TypeRef>,31_766+925); - // public static Werkstoff Borax = new Werkstoff(Materials.Borax, <GenerationFeatures>, <TypeRef>,31_766+941); - // public static Werkstoff Lignite = new Werkstoff(Materials.Lignite, <GenerationFeatures>, - // <TypeRef>,31_766+538); - // public static Werkstoff Olivine = new Werkstoff(Materials.Olivine, <GenerationFeatures>, - // <TypeRef>,31_766+505); - // public static Werkstoff Opal = new Werkstoff(Materials.Opal, <GenerationFeatures>, <TypeRef>,31_766+510); - // public static Werkstoff Amethyst = new Werkstoff(Materials.Amethyst, <GenerationFeatures>, - // <TypeRef>,31_766+509); - // public static Werkstoff Redstone = new Werkstoff(Materials.Redstone, <GenerationFeatures>, - // <TypeRef>,31_766+810); - // public static Werkstoff Lapis = new Werkstoff(Materials.Lapis, <GenerationFeatures>, <TypeRef>,31_766+526); - // public static Werkstoff Blaze = new Werkstoff(Materials.Blaze, <GenerationFeatures>, <TypeRef>,31_766+801); - // public static Werkstoff EnderPearl = new Werkstoff(Materials.EnderPearl, <GenerationFeatures>, - // <TypeRef>,31_766+532); - // public static Werkstoff EnderEye = new Werkstoff(Materials.EnderEye, <GenerationFeatures>, - // <TypeRef>,31_766+533); - // public static Werkstoff Flint = new Werkstoff(Materials.Flint, <GenerationFeatures>, <TypeRef>,31_766+802); - // public static Werkstoff Diatomite = new Werkstoff(Materials.Diatomite, <GenerationFeatures>, - // <TypeRef>,31_766+948); - // public static Werkstoff VolcanicAsh = new Werkstoff(Materials.VolcanicAsh, <GenerationFeatures>, - // <TypeRef>,31_766+940); - // public static Werkstoff Niter = new Werkstoff(Materials.Niter, <GenerationFeatures>, <TypeRef>,31_766+531); - // public static Werkstoff Pyrotheum = new Werkstoff(Materials.Pyrotheum, <GenerationFeatures>, - // <TypeRef>,31_766+843); - // public static Werkstoff Cryotheum = new Werkstoff(Materials.Cryotheum, <GenerationFeatures>, - // <TypeRef>,31_766+898); - // public static Werkstoff HydratedCoal = new Werkstoff(Materials.HydratedCoal, <GenerationFeatures>, - // <TypeRef>,31_766+818); - // public static Werkstoff Apatite = new Werkstoff(Materials.Apatite, <GenerationFeatures>, - // <TypeRef>,31_766+530); - // public static Werkstoff Alumite = new Werkstoff(Materials.Alumite, <GenerationFeatures>, - // <TypeRef>,31_766+400); - // public static Werkstoff Manyullyn = new Werkstoff(Materials.Manyullyn, <GenerationFeatures>, - // <TypeRef>,31_766+386); - // public static Werkstoff Steeleaf = new Werkstoff(Materials.Steeleaf, <GenerationFeatures>, - // <TypeRef>,31_766+339); - // public static Werkstoff Knightmetal = new Werkstoff(Materials.Knightmetal, <GenerationFeatures>, - // <TypeRef>,31_766+362); - - // public static Werkstoff NitroFuel = new Werkstoff(Materials.NitroFuel, <GenerationFeatures>, - // <TypeRef>,31_766+709); - // public static Werkstoff RedAlloy = new Werkstoff(Materials.RedAlloy, <GenerationFeatures>, - // <TypeRef>,31_766+308); - // public static Werkstoff CobaltBrass = new Werkstoff(Materials.CobaltBrass, <GenerationFeatures>, - // <TypeRef>,31_766+343); - // public static Werkstoff TricalciumPhosphate = new Werkstoff(Materials.TricalciumPhosphate, - // <GenerationFeatures>, <TypeRef>,31_766+534); - // public static Werkstoff Basalt = new Werkstoff(Materials.Basalt, <GenerationFeatures>, <TypeRef>,31_766+844); - // public static Werkstoff GarnetRed = new Werkstoff(Materials.GarnetRed, <GenerationFeatures>, - // <TypeRef>,31_766+527); - // public static Werkstoff GarnetYellow = new Werkstoff(Materials.GarnetYellow, <GenerationFeatures>, - // <TypeRef>,31_766+528); - // public static Werkstoff Marble = new Werkstoff(Materials.Marble, <GenerationFeatures>, <TypeRef>,31_766+845); - // public static Werkstoff Sugar = new Werkstoff(Materials.Sugar, <GenerationFeatures>, <TypeRef>,31_766+803); - // public static Werkstoff Thaumium = new Werkstoff(Materials.Thaumium, <GenerationFeatures>, - // <TypeRef>,31_766+330); - // public static Werkstoff Vinteum = new Werkstoff(Materials.Vinteum, <GenerationFeatures>, - // <TypeRef>,31_766+529); - // public static Werkstoff Redrock = new Werkstoff(Materials.Redrock, <GenerationFeatures>, - // <TypeRef>,31_766+846); - // public static Werkstoff PotassiumFeldspar = new Werkstoff(Materials.PotassiumFeldspar, <GenerationFeatures>, - // <TypeRef>,31_766+847); - // public static Werkstoff Biotite = new Werkstoff(Materials.Biotite, <GenerationFeatures>, - // <TypeRef>,31_766+848); - // public static Werkstoff GraniteBlack = new Werkstoff(Materials.GraniteBlack, <GenerationFeatures>, - // <TypeRef>,31_766+849); - // public static Werkstoff GraniteRed = new Werkstoff(Materials.GraniteRed, <GenerationFeatures>, - // <TypeRef>,31_766+850); - // public static Werkstoff Chrysotile = new Werkstoff(Materials.Chrysotile, <GenerationFeatures>, - // <TypeRef>,31_766+912); - // public static Werkstoff Realgar = new Werkstoff(Materials.Realgar, <GenerationFeatures>, - // <TypeRef>,31_766+913); - // public static Werkstoff VanadiumMagnetite = new Werkstoff(Materials.VanadiumMagnetite, <GenerationFeatures>, - // <TypeRef>,31_766+923); - // public static Werkstoff BasalticMineralSand = new Werkstoff(Materials.BasalticMineralSand, - // <GenerationFeatures>, <TypeRef>,31_766+935); - // public static Werkstoff GraniticMineralSand = new Werkstoff(Materials.GraniticMineralSand, - // <GenerationFeatures>, <TypeRef>,31_766+936); - // public static Werkstoff GarnetSand = new Werkstoff(Materials.GarnetSand, <GenerationFeatures>, - // <TypeRef>,31_766+938); - // public static Werkstoff QuartzSand = new Werkstoff(Materials.QuartzSand, <GenerationFeatures>, - // <TypeRef>,31_766+939); - // public static Werkstoff Bastnasite = new Werkstoff(Materials.Bastnasite, <GenerationFeatures>, - // <TypeRef>,31_766+905); - // public static Werkstoff Pentlandite = new Werkstoff(Materials.Pentlandite, <GenerationFeatures>, - // <TypeRef>,31_766+909); - // public static Werkstoff Spodumene = new Werkstoff(Materials.Spodumene, <GenerationFeatures>, - // <TypeRef>,31_766+920); - // public static Werkstoff Pollucite = new Werkstoff(Materials.Pollucite, <GenerationFeatures>, - // <TypeRef>,31_766+919); - // public static Werkstoff Tantalite = new Werkstoff(Materials.Tantalite, <GenerationFeatures>, - // <TypeRef>,31_766+921); - // public static Werkstoff Lepidolite = new Werkstoff(Materials.Lepidolite, <GenerationFeatures>, - // <TypeRef>,31_766+907); - // public static Werkstoff Glauconite = new Werkstoff(Materials.Glauconite, <GenerationFeatures>, - // <TypeRef>,31_766+933); - // public static Werkstoff GlauconiteSand = new Werkstoff(Materials.GlauconiteSand, <GenerationFeatures>, - // <TypeRef>,31_766+949); - // public static Werkstoff Vermiculite = new Werkstoff(Materials.Vermiculite, <GenerationFeatures>, - // <TypeRef>,31_766+932); - // public static Werkstoff Bentonite = new Werkstoff(Materials.Bentonite, <GenerationFeatures>, - // <TypeRef>,31_766+927); - // public static Werkstoff FullersEarth = new Werkstoff(Materials.FullersEarth, <GenerationFeatures>, - // <TypeRef>,31_766+928); - // public static Werkstoff Pitchblende = new Werkstoff(Materials.Pitchblende, <GenerationFeatures>, - // <TypeRef>,31_766+873); - // public static Werkstoff Monazite = new Werkstoff(Materials.Monazite, <GenerationFeatures>, - // <TypeRef>,31_766+520); - // public static Werkstoff Malachite = new Werkstoff(Materials.Malachite, <GenerationFeatures>, - // <TypeRef>,31_766+871); - // public static Werkstoff Mirabilite = new Werkstoff(Materials.Mirabilite, <GenerationFeatures>, - // <TypeRef>,31_766+900); - // public static Werkstoff Mica = new Werkstoff(Materials.Mica, <GenerationFeatures>, <TypeRef>,31_766+901); - // public static Werkstoff Trona = new Werkstoff(Materials.Trona, <GenerationFeatures>, <TypeRef>,31_766+903); - // public static Werkstoff Barite = new Werkstoff(Materials.Barite, <GenerationFeatures>, <TypeRef>,31_766+904); - // public static Werkstoff Gypsum = new Werkstoff(Materials.Gypsum, <GenerationFeatures>, <TypeRef>,31_766+934); - // public static Werkstoff Alunite = new Werkstoff(Materials.Alunite, <GenerationFeatures>, - // <TypeRef>,31_766+911); - // public static Werkstoff Dolomite = new Werkstoff(Materials.Dolomite, <GenerationFeatures>, - // <TypeRef>,31_766+914); - // public static Werkstoff Wollastonite = new Werkstoff(Materials.Wollastonite, <GenerationFeatures>, - // <TypeRef>,31_766+915); - // public static Werkstoff Zeolite = new Werkstoff(Materials.Zeolite, <GenerationFeatures>, - // <TypeRef>,31_766+916); - // public static Werkstoff Kyanite = new Werkstoff(Materials.Kyanite, <GenerationFeatures>, - // <TypeRef>,31_766+924); - // public static Werkstoff Kaolinite = new Werkstoff(Materials.Kaolinite, <GenerationFeatures>, - // <TypeRef>,31_766+929); - // public static Werkstoff Talc = new Werkstoff(Materials.Talc, <GenerationFeatures>, <TypeRef>,31_766+902); - // public static Werkstoff Soapstone = new Werkstoff(Materials.Soapstone, <GenerationFeatures>, - // <TypeRef>,31_766+877); - // public static Werkstoff Concrete = new Werkstoff(Materials.Concrete, <GenerationFeatures>, - // <TypeRef>,31_766+947); - // public static Werkstoff IronMagnetic = new Werkstoff(Materials.IronMagnetic, <GenerationFeatures>, - // <TypeRef>,31_766+354); - // public static Werkstoff SteelMagnetic = new Werkstoff(Materials.SteelMagnetic, <GenerationFeatures>, - // <TypeRef>,31_766+355); - // public static Werkstoff NeodymiumMagnetic = new Werkstoff(Materials.NeodymiumMagnetic, <GenerationFeatures>, - // <TypeRef>,31_766+356); - // public static Werkstoff SamariumMagnetic = new Werkstoff(Materials.SamariumMagnetic, <GenerationFeatures>, - // <TypeRef>,31_766+399); - - // public static DilutedSulfuricAcid = new MaterialBuilder(31_766+640) - // public static Werkstoff EpoxidFiberReinforced = new Werkstoff(Materials.EpoxidFiberReinforced, - // <GenerationFeatures>, <TypeRef>,31_766+610); - // public static PotassiumNitrade = new MaterialBuilder(59 - // public static ChromiumTrioxide = new MaterialBuilder(31_766+591) - // public static Nitrochlorobenzene = new MaterialBuilder(31_766+592) - // public static Dimethylbenzene = new MaterialBuilder(31_766+593) - // public static Potassiumdichromate = new MaterialBuilder(594 - // public static PhthalicAcid = new MaterialBuilder(31_766+595) - // public static Dichlorobenzidine = new MaterialBuilder(31_766+596) - // public static Diaminobenzidin = new MaterialBuilder(31_766+597) - // public static Diphenylisophthalate = new MaterialBuilder(59 - // public static Werkstoff Polybenzimidazole = new Werkstoff(Materials.Polybenzimidazole, <GenerationFeatures>, - // <TypeRef>, 31_766+599); - // public static NitrousOxide = new MaterialBuilder(31_766+993) - // public static AntiKnock = new MaterialBuilder(31_766+994) - // public static Octane = new MaterialBuilder(31_766+995) - // public static GasolineRaw = new MaterialBuilder(31_766+996) - // public static GasolineRegular = new MaterialBuilder(31_766+997) - // public static GasolinePremium = new MaterialBuilder(31_766+998) - // public static Werkstoff Electrotine = new Werkstoff(Materials.Electrotine, <GenerationFeatures>, - // <TypeRef>,31_766+812); - // public static Galgadorian = new Werkstoff(Materials.Galgadorian, <GenerationFeatures>, <TypeRef>,31_766+384); - // public static Werkstoff EnhancedGalgadorian = new Werkstoff(Materials.EnhancedGalgadorian, - // <GenerationFeatures>, <TypeRef>,31_766+385); - // public static Werkstoff BloodInfusedIron = new Werkstoff(Materials.BloodInfusedIron, <GenerationFeatures>, - // <TypeRef>,31_766+977); - // public static Werkstoff Shadow = new Werkstoff(Materials.Shadow, <GenerationFeatures>, <TypeRef>,31_766+368); - // public static Werkstoff Ledox = new Werkstoff(Materials.Ledox, <GenerationFeatures>, <TypeRef>,31_766+390); - // public static Werkstoff Quantium = new Werkstoff(Materials.Quantium, <GenerationFeatures>, - // <TypeRef>,31_766+391); - // public static Werkstoff Mytryl = new Werkstoff(Materials.Mytryl, <GenerationFeatures>, <TypeRef>,31_766+387); - // public static Werkstoff BlackPlutonium = new Werkstoff(Materials.BlackPlutonium, <GenerationFeatures>, - // <TypeRef>,31_766+388); - // public static Werkstoff CallistoIce = new Werkstoff(Materials.CallistoIce, <GenerationFeatures>, - // <TypeRef>,31_766+389); - // public static Werkstoff Duralumin = new Werkstoff(Materials.Duralumin, <GenerationFeatures>, - // <TypeRef>,31_766+392); - // public static Werkstoff Oriharukon = new Werkstoff(Materials.Oriharukon, <GenerationFeatures>, - // <TypeRef>,31_766+393); - // public static Werkstoff MysteriousCrystal = new Werkstoff(Materials.MysteriousCrystal, <GenerationFeatures>, - // <TypeRef>,31_766+398); - // public static Werkstoff RedstoneAlloy = new Werkstoff(Materials.RedstoneAlloy, <GenerationFeatures>, - // <TypeRef>,31_766+381); - // public static Werkstoff Soularium = new Werkstoff(Materials.Soularium, <GenerationFeatures>, - // <TypeRef>,31_766+379); - // public static Werkstoff ConductiveIron = new Werkstoff(Materials.ConductiveIron, <GenerationFeatures>, - // <TypeRef>,31_766+369); - // public static Werkstoff ElectricalSteel = new Werkstoff(Materials.ElectricalSteel, <GenerationFeatures>, - // <TypeRef>,31_766+365); - // public static Werkstoff EnergeticAlloy = new Werkstoff(Materials.EnergeticAlloy, <GenerationFeatures>, - // <TypeRef>,31_766+366); - // public static Werkstoff VibrantAlloy = new Werkstoff(Materials.VibrantAlloy, <GenerationFeatures>, - // <TypeRef>,31_766+367); - // public static Werkstoff PulsatingIron = new Werkstoff(Materials.PulsatingIron, <GenerationFeatures>, - // <TypeRef>,31_766+378); - // public static Werkstoff DarkSteel = new Werkstoff(Materials.DarkSteel, <GenerationFeatures>, - // <TypeRef>,31_766+364); - // public static Werkstoff EndSteel = new Werkstoff(Materials.EndSteel, <GenerationFeatures>, - // <TypeRef>,31_766+401); - // public static Werkstoff CrudeSteel = new Werkstoff(Materials.CrudeSteel, <GenerationFeatures>, - // <TypeRef>,31_766+402); - // public static Werkstoff CrystallineAlloy = new Werkstoff(Materials.CrystallineAlloy, <GenerationFeatures>, - // <TypeRef>,31_766+403); - // public static Werkstoff MelodicAlloy = new Werkstoff(Materials.MelodicAlloy, <GenerationFeatures>, - // <TypeRef>,31_766+404); - // public static Werkstoff StellarAlloy = new Werkstoff(Materials.StellarAlloy, <GenerationFeatures>, - // <TypeRef>,31_766+405); - // public static Werkstoff CrystallinePinkSlime = new Werkstoff(Materials.CrystallinePinkSlime, - // <GenerationFeatures>, <TypeRef>,31_766+406); - // public static Werkstoff EnergeticSilver = new Werkstoff(Materials.EnergeticSilver, <GenerationFeatures>, - // <TypeRef>,31_766+407); - // public static Werkstoff VividAlloy = new Werkstoff(Materials.VividAlloy, <GenerationFeatures>, - // <TypeRef>,31_766+408); - // public static Werkstoff Enderium = new Werkstoff(Materials.Enderium, <GenerationFeatures>, - // <TypeRef>,31_766+321); - // public static Werkstoff Mithril = new Werkstoff(Materials.Mithril, <GenerationFeatures>, - // <TypeRef>,31_766+331); - // public static Werkstoff BlueAlloy = new Werkstoff(Materials.BlueAlloy, <GenerationFeatures>, - // <TypeRef>,31_766+309); - // public static Werkstoff ShadowIron = new Werkstoff(Materials.ShadowIron, <GenerationFeatures>, - // <TypeRef>,31_766+336); - // public static Werkstoff ShadowSteel = new Werkstoff(Materials.ShadowSteel, <GenerationFeatures>, - // <TypeRef>,31_766+337); - // public static Werkstoff AstralSilver = new Werkstoff(Materials.AstralSilver, <GenerationFeatures>, - // <TypeRef>,31_766+333); - // public static Werkstoff InfinityCatalyst = new Werkstoff(Materials.InfinityCatalyst, <GenerationFeatures>, - // <TypeRef>, 31_766 + 394); - // public static Werkstoff Infinity = new Werkstoff(Materials.Infinity, <GenerationFeatures>, <TypeRef>, 31_766 + - // 397); - // public static Werkstoff Bedrockium = new Werkstoff(Materials.Bedrockium, <GenerationFeatures>, <TypeRef>, - // 31_766 + 395); - // public static Werkstoff Trinium = new Werkstoff(Materials.Trinium, <GenerationFeatures>, <TypeRef>, 31_766 + - // 868); - // public static Werkstoff Ichorium = new Werkstoff(Materials.Ichorium, <GenerationFeatures>, <TypeRef>, 31_766 + - // 978); - // public static Werkstoff CosmicNeutronium = new Werkstoff(Materials.CosmicNeutronium, <GenerationFeatures>, - // <TypeRef>, 31_766 + 982); - // public static Werkstoff Pentacadmiummagnesiumhexaoxid = new Werkstoff(Materials.Pentacadmiummagnesiumhexaoxid, - // <GenerationFeatures>, <TypeRef>, 31_766 + 987); - // public static Werkstoff Titaniumonabariumdecacoppereikosaoxid = new - // Werkstoff(Materials.Titaniumonabariumdecacoppereikosaoxid, <GenerationFeatures>, <TypeRef>, 31_766 + 988); - // public static Werkstoff Uraniumtriplatinid = new Werkstoff(Materials.Uraniumtriplatinid, <GenerationFeatures>, - // <TypeRef>, 31_766 + 989); - // public static Werkstoff Vanadiumtriindinid = new Werkstoff(Materials.Vanadiumtriindinid, <GenerationFeatures>, - // <TypeRef>, 31_766 + 990); - // public static Werkstoff Tetraindiumditindibariumtitaniumheptacoppertetrakaidekaoxid = new - // Werkstoff(Materials.Tetraindiumditindibariumtitaniumheptacoppertetrakaidekaoxid, <GenerationFeatures>, <TypeRef>, - // 31_766 + 991); - // public static Werkstoff Tetranaquadahdiindiumhexaplatiumosminid = new - // Werkstoff(Materials.Tetranaquadahdiindiumhexaplatiumosminid, <GenerationFeatures>, <TypeRef>, 31_766 + 992); - // public static Werkstoff Longasssuperconductornameforuvwire = new - // Werkstoff(Materials.Longasssuperconductornameforuvwire, <GenerationFeatures>, <TypeRef>, 31_766 + 986); - // public static Werkstoff Longasssuperconductornameforuhvwire = new - // Werkstoff(Materials.Longasssuperconductornameforuhvwire, <GenerationFeatures>, <TypeRef>, 31_766 + 985); } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_Items.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_Items.java index bbbdb36349..fde9c8e9ee 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_Items.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_Items.java @@ -126,9 +126,6 @@ public class BW_MetaGenerated_Items extends GT_MetaGenerated_Item implements IRa @Override @SuppressWarnings("unchecked") protected void addAdditionalToolTips(List aList, ItemStack aStack, EntityPlayer aPlayer) { - // String tooltip = GT_LanguageManager.getTranslation(this.getUnlocalizedName(aStack) + ".tooltip"); - // if (!tooltip.isEmpty()) - // aList.add(tooltip); if (this.orePrefixes == OrePrefixes.dustImpure || this.orePrefixes == OrePrefixes.dustPure) { aList.add(GT_LanguageManager.getTranslation("metaitem.01.tooltip.purify")); } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/BW_Meta_Items.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/BW_Meta_Items.java index b333812740..cc321e0fc0 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/BW_Meta_Items.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/BW_Meta_Items.java @@ -13,7 +13,11 @@ package com.github.bartimaeusnek.bartworks.system.material.CircuitGeneration; -import java.util.*; +import java.util.ArrayList; +import java.util.BitSet; +import java.util.HashSet; +import java.util.List; +import java.util.Objects; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -34,12 +38,20 @@ import com.github.bartimaeusnek.bartworks.util.BW_Util; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.GregTech_API; -import gregtech.api.enums.*; +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.SubTag; +import gregtech.api.enums.TC_Aspects; import gregtech.api.interfaces.IItemBehaviour; import gregtech.api.interfaces.IItemContainer; import gregtech.api.items.GT_MetaBase_Item; import gregtech.api.objects.ItemData; -import gregtech.api.util.*; +import gregtech.api.util.GT_Config; +import gregtech.api.util.GT_LanguageManager; +import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GT_Utility; public class BW_Meta_Items { @@ -114,8 +126,8 @@ public class BW_Meta_Items { tooltip = Materials.Ultimate.getToolTip(); break; case 8: - additionalOreDictData = Materials.Superconductor.toString(); - tooltip = Materials.Superconductor.getToolTip(); + additionalOreDictData = Materials.SuperconductorUHV.toString(); + tooltip = Materials.SuperconductorUHV.getToolTip(); break; case 9: additionalOreDictData = "Infinite"; @@ -207,8 +219,6 @@ public class BW_Meta_Items { 2, aIconRegister.registerIcon(MainMod.MOD_ID + ":WrapOverlay"), this.mIconList); - // aIconRegister.registerIcon("gregtech:" + (GT_Config.troll ? "troll" : this.getUnlocalizedName() + - // "/" + i)); } } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/CircuitPartLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/CircuitPartLoader.java index 5e5b0b0f4c..d7cf480668 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/CircuitPartLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/CircuitPartLoader.java @@ -13,7 +13,84 @@ package com.github.bartimaeusnek.bartworks.system.material.CircuitGeneration; -import static gregtech.api.enums.ItemList.*; +import static gregtech.api.enums.ItemList.Circuit_Board_Advanced; +import static gregtech.api.enums.ItemList.Circuit_Board_Basic; +import static gregtech.api.enums.ItemList.Circuit_Board_Bio; +import static gregtech.api.enums.ItemList.Circuit_Board_Bio_Ultra; +import static gregtech.api.enums.ItemList.Circuit_Board_Coated; +import static gregtech.api.enums.ItemList.Circuit_Board_Coated_Basic; +import static gregtech.api.enums.ItemList.Circuit_Board_Elite; +import static gregtech.api.enums.ItemList.Circuit_Board_Epoxy; +import static gregtech.api.enums.ItemList.Circuit_Board_Epoxy_Advanced; +import static gregtech.api.enums.ItemList.Circuit_Board_Fiberglass; +import static gregtech.api.enums.ItemList.Circuit_Board_Fiberglass_Advanced; +import static gregtech.api.enums.ItemList.Circuit_Board_Multifiberglass; +import static gregtech.api.enums.ItemList.Circuit_Board_Multifiberglass_Elite; +import static gregtech.api.enums.ItemList.Circuit_Board_Optical; +import static gregtech.api.enums.ItemList.Circuit_Board_Phenolic; +import static gregtech.api.enums.ItemList.Circuit_Board_Phenolic_Good; +import static gregtech.api.enums.ItemList.Circuit_Board_Plastic; +import static gregtech.api.enums.ItemList.Circuit_Board_Plastic_Advanced; +import static gregtech.api.enums.ItemList.Circuit_Board_Wetware; +import static gregtech.api.enums.ItemList.Circuit_Board_Wetware_Extreme; +import static gregtech.api.enums.ItemList.Circuit_Chip_BioCPU; +import static gregtech.api.enums.ItemList.Circuit_Chip_Biocell; +import static gregtech.api.enums.ItemList.Circuit_Chip_CPU; +import static gregtech.api.enums.ItemList.Circuit_Chip_CrystalCPU; +import static gregtech.api.enums.ItemList.Circuit_Chip_CrystalSoC; +import static gregtech.api.enums.ItemList.Circuit_Chip_CrystalSoC2; +import static gregtech.api.enums.ItemList.Circuit_Chip_HPIC; +import static gregtech.api.enums.ItemList.Circuit_Chip_ILC; +import static gregtech.api.enums.ItemList.Circuit_Chip_LPIC; +import static gregtech.api.enums.ItemList.Circuit_Chip_NAND; +import static gregtech.api.enums.ItemList.Circuit_Chip_NOR; +import static gregtech.api.enums.ItemList.Circuit_Chip_NPIC; +import static gregtech.api.enums.ItemList.Circuit_Chip_NanoCPU; +import static gregtech.api.enums.ItemList.Circuit_Chip_NeuroCPU; +import static gregtech.api.enums.ItemList.Circuit_Chip_Optical; +import static gregtech.api.enums.ItemList.Circuit_Chip_PIC; +import static gregtech.api.enums.ItemList.Circuit_Chip_PPIC; +import static gregtech.api.enums.ItemList.Circuit_Chip_QPIC; +import static gregtech.api.enums.ItemList.Circuit_Chip_QuantumCPU; +import static gregtech.api.enums.ItemList.Circuit_Chip_Ram; +import static gregtech.api.enums.ItemList.Circuit_Chip_Simple_SoC; +import static gregtech.api.enums.ItemList.Circuit_Chip_SoC; +import static gregtech.api.enums.ItemList.Circuit_Chip_SoC2; +import static gregtech.api.enums.ItemList.Circuit_Chip_Stemcell; +import static gregtech.api.enums.ItemList.Circuit_Chip_UHPIC; +import static gregtech.api.enums.ItemList.Circuit_Chip_ULPIC; +import static gregtech.api.enums.ItemList.Circuit_Integrated; +import static gregtech.api.enums.ItemList.Circuit_Integrated_Good; +import static gregtech.api.enums.ItemList.Circuit_Parts_Advanced; +import static gregtech.api.enums.ItemList.Circuit_Parts_CapacitorASMD; +import static gregtech.api.enums.ItemList.Circuit_Parts_CapacitorSMD; +import static gregtech.api.enums.ItemList.Circuit_Parts_CapacitorXSMD; +import static gregtech.api.enums.ItemList.Circuit_Parts_Chip_Bioware; +import static gregtech.api.enums.ItemList.Circuit_Parts_Crystal_Chip_Elite; +import static gregtech.api.enums.ItemList.Circuit_Parts_Crystal_Chip_Master; +import static gregtech.api.enums.ItemList.Circuit_Parts_Crystal_Chip_Wetware; +import static gregtech.api.enums.ItemList.Circuit_Parts_DiodeASMD; +import static gregtech.api.enums.ItemList.Circuit_Parts_DiodeSMD; +import static gregtech.api.enums.ItemList.Circuit_Parts_DiodeXSMD; +import static gregtech.api.enums.ItemList.Circuit_Parts_GlassFiber; +import static gregtech.api.enums.ItemList.Circuit_Parts_InductorASMD; +import static gregtech.api.enums.ItemList.Circuit_Parts_InductorSMD; +import static gregtech.api.enums.ItemList.Circuit_Parts_InductorXSMD; +import static gregtech.api.enums.ItemList.Circuit_Parts_PetriDish; +import static gregtech.api.enums.ItemList.Circuit_Parts_ResistorASMD; +import static gregtech.api.enums.ItemList.Circuit_Parts_ResistorSMD; +import static gregtech.api.enums.ItemList.Circuit_Parts_ResistorXSMD; +import static gregtech.api.enums.ItemList.Circuit_Parts_TransistorASMD; +import static gregtech.api.enums.ItemList.Circuit_Parts_TransistorSMD; +import static gregtech.api.enums.ItemList.Circuit_Parts_TransistorXSMD; +import static gregtech.api.enums.ItemList.Circuit_Parts_Vacuum_Tube; +import static gregtech.api.enums.ItemList.Circuit_Parts_Wiring_Advanced; +import static gregtech.api.enums.ItemList.Circuit_Parts_Wiring_Basic; +import static gregtech.api.enums.ItemList.Circuit_Parts_Wiring_Elite; +import static gregtech.api.enums.ItemList.Optical_Cpu_Containment_Housing; +import static gregtech.api.enums.ItemList.Optically_Compatible_Memory; +import static gregtech.api.enums.ItemList.Optically_Perfected_CPU; +import static gregtech.api.enums.ItemList.values; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/BWGTMetaItems.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/BWGTMetaItems.java index 24882d995c..0de9abaa4f 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/BWGTMetaItems.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/BWGTMetaItems.java @@ -61,9 +61,7 @@ public class BWGTMetaItems extends BW_MetaGenerated_Items { || ((material.getFluid(1) == null && material.getGas(1) == null) && (orePrefixes == OrePrefixes.capsule || orePrefixes == OrePrefixes.bottle)))) continue; - // for (Werkstoff werkstoff : Werkstoff.werkstoffHashSet) - // if (material.mDefaultLocalName.equalsIgnoreCase(werkstoff.getDefaultName())) - // continue materialloop; + if (OreDictionary .doesOreNameExist(this.orePrefixes.name() + material.mDefaultLocalName.replaceAll(" ", ""))) { hiddenThings.add(i); @@ -83,9 +81,7 @@ public class BWGTMetaItems extends BW_MetaGenerated_Items { || ((w.getFluid(1) == null && w.getGas(1) == null) && (orePrefixes == OrePrefixes.capsule || orePrefixes == OrePrefixes.bottle)))) continue; - // for (Werkstoff werkstoff : Werkstoff.werkstoffHashSet) - // if (w.mDefaultLocalName.equalsIgnoreCase(werkstoff.getDefaultName())) - // continue materialloop; + if (OreDictionary.doesOreNameExist(this.orePrefixes.name() + w.mDefaultLocalName.replaceAll(" ", ""))) { hiddenThings.add(i); continue; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/GTMetaItemEnhancer.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/GTMetaItemEnhancer.java index 3fa75568d8..32c88c9e56 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/GTMetaItemEnhancer.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/GTMetaItemEnhancer.java @@ -13,6 +13,8 @@ package com.github.bartimaeusnek.bartworks.system.material.GT_Enhancement; +import static gregtech.api.enums.Mods.Forestry; + import java.util.List; import java.util.stream.Collectors; @@ -23,8 +25,6 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; -import com.github.bartimaeusnek.bartworks.API.LoaderReference; - import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; @@ -39,7 +39,7 @@ public class GTMetaItemEnhancer { private GTMetaItemEnhancer() {} public static void init() { - if (!LoaderReference.Forestry) { + if (!Forestry.isModLoaded()) { return; } NoMetaValue = Materials.getMaterialsMap().values().stream().filter(m -> m.mMetaItemSubID == -1) @@ -55,11 +55,11 @@ public class GTMetaItemEnhancer { final FluidContainerRegistry.FluidContainerData emptyData = new FluidContainerRegistry.FluidContainerData( m.getMolten(144), new ItemStack(moltenCapsuls, 1, i), - GT_ModHandler.getModItem("Forestry", "refractoryEmpty", 1)); + GT_ModHandler.getModItem(Forestry.ID, "refractoryEmpty", 1)); FluidContainerRegistry.registerFluidContainer(emptyData); GT_Utility.addFluidContainerData(emptyData); GT_Values.RA.addFluidCannerRecipe( - GT_ModHandler.getModItem("Forestry", "refractoryEmpty", 1), + GT_ModHandler.getModItem(Forestry.ID, "refractoryEmpty", 1), new ItemStack(moltenCapsuls, 1, i), m.getMolten(144), GT_Values.NF); @@ -71,14 +71,14 @@ public class GTMetaItemEnhancer { } if (m.getFluid(1) == null && m.getGas(1) == null) continue; if (OreDictionary.doesOreNameExist("capsule" + m.mName)) continue; - addFluidData(m, GT_ModHandler.getModItem("Forestry", "waxCapsule", 1), capsuls, 1000, i, true); + addFluidData(m, GT_ModHandler.getModItem(Forestry.ID, "waxCapsule", 1), capsuls, 1000, i, true); // addFluidData(m, new ItemStack(Items.glass_bottle), bottles, 250, i, false); } for (int i = 0, valuesLength = NoMetaValue.size(); i < valuesLength; i++) { Materials m = NoMetaValue.get(i); if (m.getFluid(1) == null && m.getGas(1) == null) continue; if (OreDictionary.doesOreNameExist("capsule" + m.mName)) continue; - addFluidData(m, GT_ModHandler.getModItem("Forestry", "waxCapsule", 1), capsuls, 1000, i + 1001, true); + addFluidData(m, GT_ModHandler.getModItem(Forestry.ID, "waxCapsule", 1), capsuls, 1000, i + 1001, true); // addFluidData(m, new ItemStack(Items.glass_bottle), bottles, 250, i + 1001, false); } } @@ -101,7 +101,7 @@ public class GTMetaItemEnhancer { } public static void addAdditionalOreDictToForestry() { - if (!LoaderReference.Forestry) return; + if (!Forestry.isModLoaded()) return; OreDictionary.registerOre("capsuleWater", getForestryItem("waxCapsuleWater")); OreDictionary.registerOre("capsuleIce", getForestryItem("waxCapsuleIce")); OreDictionary.registerOre("capsuleHoney", getForestryItem("waxCapsuleHoney")); @@ -117,6 +117,6 @@ public class GTMetaItemEnhancer { } private static ItemStack getForestryItem(String itemName) { - return GT_ModHandler.getModItem("Forestry", itemName, 1); + return GT_ModHandler.getModItem(Forestry.ID, itemName, 1); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/LuVTierEnhancer.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/LuVTierEnhancer.java index 2e0db87aba..8f1010017c 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/LuVTierEnhancer.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/LuVTierEnhancer.java @@ -14,11 +14,23 @@ package com.github.bartimaeusnek.bartworks.system.material.GT_Enhancement; import static com.github.bartimaeusnek.bartworks.MainMod.MOD_ID; -import static gregtech.api.enums.OrePrefixes.*; +import static gregtech.api.enums.Mods.NewHorizonsCoreMod; +import static gregtech.api.enums.OrePrefixes.dust; +import static gregtech.api.enums.OrePrefixes.ingot; +import static gregtech.api.enums.OrePrefixes.plate; +import static gregtech.api.enums.OrePrefixes.plateDense; +import static gregtech.api.enums.OrePrefixes.plateDouble; +import static gregtech.api.enums.OrePrefixes.rotor; +import static gregtech.api.enums.OrePrefixes.stick; +import static gregtech.api.enums.OrePrefixes.stickLong; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.util.*; +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; @@ -31,7 +43,6 @@ import net.minecraftforge.fluids.FluidStack; import org.apache.commons.lang3.reflect.FieldUtils; import org.apache.commons.lang3.reflect.MethodUtils; -import com.github.bartimaeusnek.bartworks.API.LoaderReference; import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry; import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; @@ -42,9 +53,13 @@ import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.objects.ItemData; -import gregtech.api.util.*; +import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GT_Recipe; 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 gregtech.common.items.GT_MetaGenerated_Tool_01; @SuppressWarnings("ALL") @@ -86,7 +101,7 @@ public class LuVTierEnhancer implements Runnable { Arrays.stream(ItemList.values()).filter(item -> item.toString().contains("LuV") && item.hasBeenSet()) .forEach(item -> LuVMachines.add(item.get(1))); - if (LoaderReference.dreamcraft) { + if (NewHorizonsCoreMod.isModLoaded()) { addDreamcraftItemListItems(LuVMachines); } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/PlatinumSludgeOverHaul.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/PlatinumSludgeOverHaul.java index fadea47d5d..77bc39ba69 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/PlatinumSludgeOverHaul.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/PlatinumSludgeOverHaul.java @@ -13,22 +13,87 @@ package com.github.bartimaeusnek.bartworks.system.material.GT_Enhancement; -import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.*; -import static gregtech.api.enums.OrePrefixes.*; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.AcidicIridiumSolution; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.AcidicOsmiumSolution; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.AmmoniumChloride; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.AquaRegia; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.CalciumChloride; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.CrudeRhMetall; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.FormicAcid; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.HotRutheniumTetroxideSollution; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.IrLeachResidue; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.IrOsLeachResidue; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.IridiumChloride; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.IridiumDioxide; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.LeachResidue; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.OsmiumSolution; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.PDAmmonia; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.PDMetallicPowder; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.PDRawPowder; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.PDSalt; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.PGSDResidue; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.PGSDResidue2; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.PTConcentrate; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.PTMetallicPowder; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.PTRawPowder; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.PTResidue; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.PTSaltCrude; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.PTSaltRefined; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.PotassiumDisulfate; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.RHFilterCakeSolution; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.RHNitrate; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.RHSalt; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.RHSaltSolution; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.RHSulfate; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.RHSulfateSolution; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.ReRh; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.RhFilterCake; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.Rhodium; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.Ruthenium; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.RutheniumTetroxide; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.RutheniumTetroxideSollution; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.SodiumNitrate; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.SodiumRuthenate; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.Sodiumformate; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.Sodiumsulfate; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.ZincSulfate; +import static gregtech.api.enums.Mods.GTPlusPlus; +import static gregtech.api.enums.Mods.NewHorizonsCoreMod; +import static gregtech.api.enums.OrePrefixes.cell; +import static gregtech.api.enums.OrePrefixes.crateGtDust; +import static gregtech.api.enums.OrePrefixes.crushed; +import static gregtech.api.enums.OrePrefixes.crushedCentrifuged; +import static gregtech.api.enums.OrePrefixes.crushedPurified; +import static gregtech.api.enums.OrePrefixes.dust; +import static gregtech.api.enums.OrePrefixes.dustImpure; +import static gregtech.api.enums.OrePrefixes.dustPure; +import static gregtech.api.enums.OrePrefixes.dustRefined; +import static gregtech.api.enums.OrePrefixes.dustSmall; +import static gregtech.api.enums.OrePrefixes.dustTiny; +import static gregtech.api.enums.OrePrefixes.ingot; +import static gregtech.api.enums.OrePrefixes.nugget; import java.lang.reflect.Field; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.*; +import net.minecraft.item.crafting.CraftingManager; +import net.minecraft.item.crafting.FurnaceRecipes; +import net.minecraft.item.crafting.IRecipe; +import net.minecraft.item.crafting.ShapedRecipes; +import net.minecraft.item.crafting.ShapelessRecipes; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; import org.apache.commons.lang3.reflect.FieldUtils; -import com.github.bartimaeusnek.bartworks.API.LoaderReference; import com.github.bartimaeusnek.bartworks.MainMod; import com.github.bartimaeusnek.bartworks.system.material.BW_MetaGenerated_Items; import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; @@ -881,7 +946,7 @@ public class PlatinumSludgeOverHaul { if (obj instanceof ShapedRecipes || (obj instanceof ShapelessRecipes)) { inputName = "recipeOutput"; inputItemName = "recipeItems"; - } else if (LoaderReference.miscutils) { + } else if (GTPlusPlus.isModLoaded()) { try { if (Class.forName("gtPlusPlus.api.objects.minecraft.ShapedRecipe").isAssignableFrom(obj.getClass())) obj = CachedReflectionUtils.getField(obj.getClass(), "mRecipe").get(obj); @@ -992,7 +1057,7 @@ public class PlatinumSludgeOverHaul { if (GameRegistry.findUniqueIdentifierFor(stack.getItem()).modId.equals(BartWorksCrossmod.MOD_ID)) return true; - if (GameRegistry.findUniqueIdentifierFor(stack.getItem()).modId.equals("dreamcraft") + if (GameRegistry.findUniqueIdentifierFor(stack.getItem()).modId.equals(NewHorizonsCoreMod.ID) && !stack.getUnlocalizedName().contains("dust") && !stack.getUnlocalizedName().contains("Dust")) return true; @@ -1013,7 +1078,7 @@ public class PlatinumSludgeOverHaul { .contains(GT_OreDictUnificator.getAssociation(stack).mMaterial.mMaterial); } - if (LoaderReference.miscutils) { + if (GTPlusPlus.isModLoaded()) { try { if (Class.forName("gtPlusPlus.core.item.base.BaseItemComponent") .isAssignableFrom(stack.getItem().getClass()) diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/Werkstoff.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/Werkstoff.java index b04068521b..a71bfe8b92 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/Werkstoff.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/Werkstoff.java @@ -13,12 +13,24 @@ package com.github.bartimaeusnek.bartworks.system.material; +import static gregtech.api.enums.Mods.GalaxySpace; import static net.minecraft.util.EnumChatFormatting.DARK_PURPLE; import static net.minecraft.util.EnumChatFormatting.GREEN; import java.lang.reflect.InvocationTargetException; import java.nio.ByteBuffer; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; @@ -26,14 +38,23 @@ import net.minecraftforge.fluids.FluidStack; import com.github.bartimaeusnek.bartworks.MainMod; import com.github.bartimaeusnek.bartworks.common.loaders.StaticRecipeChangeLoaders; import com.github.bartimaeusnek.bartworks.system.oredict.OreDictHandler; -import com.github.bartimaeusnek.bartworks.util.*; +import com.github.bartimaeusnek.bartworks.util.BW_ColorUtil; +import com.github.bartimaeusnek.bartworks.util.BW_Util; +import com.github.bartimaeusnek.bartworks.util.MurmurHash3; +import com.github.bartimaeusnek.bartworks.util.NonNullWrappedHashMap; +import com.github.bartimaeusnek.bartworks.util.Pair; import com.github.bartimaeusnek.crossmod.BartWorksCrossmod; import com.github.bartimaeusnek.crossmod.tgregworks.MaterialsInjector; import com.github.bartimaeusnek.crossmod.thaumcraft.util.ThaumcraftHandler; import cpw.mods.fml.common.Loader; import gregtech.api.GregTech_API; -import gregtech.api.enums.*; +import gregtech.api.enums.FluidState; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.SubTag; +import gregtech.api.enums.TC_Aspects; +import gregtech.api.enums.TextureSet; import gregtech.api.interfaces.IColorModulationContainer; import gregtech.api.interfaces.ISubTagContainer; import gregtech.api.util.GT_LanguageManager; @@ -49,7 +70,7 @@ public class Werkstoff implements IColorModulationContainer, ISubTagContainer { public static final Map<String, String> modNameOverrides = new HashMap() { { - put("GalaxySpace", DARK_PURPLE + "GalaxySpace"); + put(GalaxySpace.ID, DARK_PURPLE + "GalaxySpace"); } }; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java index 643dc62c49..cd9bb7f200 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java @@ -15,10 +15,68 @@ package com.github.bartimaeusnek.bartworks.system.material; import static com.github.bartimaeusnek.bartworks.util.BW_Util.subscriptNumbers; import static com.github.bartimaeusnek.bartworks.util.BW_Util.superscriptNumbers; -import static gregtech.api.enums.OrePrefixes.*; +import static gregtech.api.enums.Mods.BetterLoadingScreen; +import static gregtech.api.enums.Mods.Forestry; +import static gregtech.api.enums.OrePrefixes.block; +import static gregtech.api.enums.OrePrefixes.bolt; +import static gregtech.api.enums.OrePrefixes.bottle; +import static gregtech.api.enums.OrePrefixes.capsule; +import static gregtech.api.enums.OrePrefixes.cell; +import static gregtech.api.enums.OrePrefixes.cellPlasma; +import static gregtech.api.enums.OrePrefixes.crushed; +import static gregtech.api.enums.OrePrefixes.crushedCentrifuged; +import static gregtech.api.enums.OrePrefixes.crushedPurified; +import static gregtech.api.enums.OrePrefixes.dust; +import static gregtech.api.enums.OrePrefixes.dustImpure; +import static gregtech.api.enums.OrePrefixes.dustPure; +import static gregtech.api.enums.OrePrefixes.dustSmall; +import static gregtech.api.enums.OrePrefixes.dustTiny; +import static gregtech.api.enums.OrePrefixes.foil; +import static gregtech.api.enums.OrePrefixes.gearGt; +import static gregtech.api.enums.OrePrefixes.gearGtSmall; +import static gregtech.api.enums.OrePrefixes.gem; +import static gregtech.api.enums.OrePrefixes.gemChipped; +import static gregtech.api.enums.OrePrefixes.gemExquisite; +import static gregtech.api.enums.OrePrefixes.gemFlawed; +import static gregtech.api.enums.OrePrefixes.gemFlawless; +import static gregtech.api.enums.OrePrefixes.ingot; +import static gregtech.api.enums.OrePrefixes.ingotDouble; +import static gregtech.api.enums.OrePrefixes.ingotHot; +import static gregtech.api.enums.OrePrefixes.ingotQuadruple; +import static gregtech.api.enums.OrePrefixes.ingotQuintuple; +import static gregtech.api.enums.OrePrefixes.ingotTriple; +import static gregtech.api.enums.OrePrefixes.lens; +import static gregtech.api.enums.OrePrefixes.nugget; +import static gregtech.api.enums.OrePrefixes.ore; +import static gregtech.api.enums.OrePrefixes.oreSmall; +import static gregtech.api.enums.OrePrefixes.plate; +import static gregtech.api.enums.OrePrefixes.plateDense; +import static gregtech.api.enums.OrePrefixes.plateDouble; +import static gregtech.api.enums.OrePrefixes.plateQuadruple; +import static gregtech.api.enums.OrePrefixes.plateQuintuple; +import static gregtech.api.enums.OrePrefixes.plateTriple; +import static gregtech.api.enums.OrePrefixes.ring; +import static gregtech.api.enums.OrePrefixes.rotor; +import static gregtech.api.enums.OrePrefixes.screw; +import static gregtech.api.enums.OrePrefixes.spring; +import static gregtech.api.enums.OrePrefixes.springSmall; +import static gregtech.api.enums.OrePrefixes.stick; +import static gregtech.api.enums.OrePrefixes.stickLong; +import static gregtech.api.enums.OrePrefixes.toolHeadHammer; +import static gregtech.api.enums.OrePrefixes.toolHeadSaw; +import static gregtech.api.enums.OrePrefixes.toolHeadWrench; +import static gregtech.api.enums.OrePrefixes.turbineBlade; +import static gregtech.api.enums.OrePrefixes.values; +import static gregtech.api.enums.OrePrefixes.wireFine; import java.lang.reflect.Field; -import java.util.*; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Objects; +import java.util.Set; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -29,7 +87,6 @@ import net.minecraftforge.oredict.OreDictionary; import org.apache.logging.log4j.Level; -import com.github.bartimaeusnek.bartworks.API.LoaderReference; import com.github.bartimaeusnek.bartworks.API.SideReference; import com.github.bartimaeusnek.bartworks.API.WerkstoffAdderRegistry; import com.github.bartimaeusnek.bartworks.MainMod; @@ -39,7 +96,20 @@ import com.github.bartimaeusnek.bartworks.system.material.CircuitGeneration.BW_C import com.github.bartimaeusnek.bartworks.system.material.GT_Enhancement.GTMetaItemEnhancer; import com.github.bartimaeusnek.bartworks.system.material.processingLoaders.AdditionalRecipes; import com.github.bartimaeusnek.bartworks.system.material.werkstoff_loaders.IWerkstoffRunnable; -import com.github.bartimaeusnek.bartworks.system.material.werkstoff_loaders.recipe.*; +import com.github.bartimaeusnek.bartworks.system.material.werkstoff_loaders.recipe.AspectLoader; +import com.github.bartimaeusnek.bartworks.system.material.werkstoff_loaders.recipe.BlockLoader; +import com.github.bartimaeusnek.bartworks.system.material.werkstoff_loaders.recipe.CasingLoader; +import com.github.bartimaeusnek.bartworks.system.material.werkstoff_loaders.recipe.CellLoader; +import com.github.bartimaeusnek.bartworks.system.material.werkstoff_loaders.recipe.CraftingMaterialLoader; +import com.github.bartimaeusnek.bartworks.system.material.werkstoff_loaders.recipe.CrushedLoader; +import com.github.bartimaeusnek.bartworks.system.material.werkstoff_loaders.recipe.DustLoader; +import com.github.bartimaeusnek.bartworks.system.material.werkstoff_loaders.recipe.GemLoader; +import com.github.bartimaeusnek.bartworks.system.material.werkstoff_loaders.recipe.MetalLoader; +import com.github.bartimaeusnek.bartworks.system.material.werkstoff_loaders.recipe.MoltenCellLoader; +import com.github.bartimaeusnek.bartworks.system.material.werkstoff_loaders.recipe.MultipleMetalLoader; +import com.github.bartimaeusnek.bartworks.system.material.werkstoff_loaders.recipe.OreLoader; +import com.github.bartimaeusnek.bartworks.system.material.werkstoff_loaders.recipe.SimpleMetalLoader; +import com.github.bartimaeusnek.bartworks.system.material.werkstoff_loaders.recipe.ToolLoader; import com.github.bartimaeusnek.bartworks.system.material.werkstoff_loaders.registration.AssociationLoader; import com.github.bartimaeusnek.bartworks.system.material.werkstoff_loaders.registration.BridgeMaterialsLoader; import com.github.bartimaeusnek.bartworks.system.material.werkstoff_loaders.registration.CasingRegistrator; @@ -54,7 +124,13 @@ import com.google.common.collect.HashBiMap; import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.common.ProgressManager; import cpw.mods.fml.common.registry.GameRegistry; -import gregtech.api.enums.*; +import gregtech.api.enums.Element; +import gregtech.api.enums.FluidState; +import gregtech.api.enums.ItemList; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.SubTag; +import gregtech.api.enums.TextureSet; import gregtech.api.fluid.GT_FluidFactory; import gregtech.api.interfaces.ISubTagContainer; import gregtech.api.util.GT_OreDictUnificator; @@ -1412,7 +1488,7 @@ public class WerkstoffLoader { DebugLog.log("Loading Recipes" + (System.nanoTime() - timepre)); Integer[] clsArr = new Integer[0]; int size = 0; - if (LoaderReference.betterloadingscreen) clsArr = CLSCompat.initCls(); + if (BetterLoadingScreen.isModLoaded()) clsArr = CLSCompat.initCls(); IWerkstoffRunnable[] werkstoffRunnables = new IWerkstoffRunnable[] { new ToolLoader(), new DustLoader(), new GemLoader(), new SimpleMetalLoader(), new CasingLoader(), new AspectLoader(), new OreLoader(), @@ -1430,7 +1506,7 @@ public class WerkstoffLoader { progressBar.step(""); continue; } - if (LoaderReference.betterloadingscreen) size = CLSCompat.invokeStepSize(werkstoff, clsArr, size); + if (BetterLoadingScreen.isModLoaded()) size = CLSCompat.invokeStepSize(werkstoff, clsArr, size); DebugLog.log("Werkstoff: " + werkstoff.getDefaultName() + " " + (System.nanoTime() - timepreone)); for (IWerkstoffRunnable runnable : werkstoffRunnables) { String loaderName = runnable.getClass().getSimpleName(); @@ -1444,7 +1520,9 @@ public class WerkstoffLoader { DebugLog.log("Loading New Circuits" + " " + (System.nanoTime() - timepreone)); BW_CircuitsLoader.initNewCircuits(); - if (LoaderReference.betterloadingscreen) CLSCompat.disableCls(); + if (BetterLoadingScreen.isModLoaded()) { + CLSCompat.disableCls(); + } progressBar.step("Load Additional Recipes"); AdditionalRecipes.run(); @@ -1596,15 +1674,14 @@ public class WerkstoffLoader { } if ((WerkstoffLoader.toGenerateGlobal & 0b10000) != 0) { WerkstoffLoader.items.put(cell, new BW_MetaGenerated_Items(cell)); - // WerkstoffLoader.items.put(bottle, new BW_MetaGenerated_Items(bottle)); - if (LoaderReference.Forestry) WerkstoffLoader.items.put(capsule, new BW_MetaGenerated_Items(capsule)); + if (Forestry.isModLoaded()) WerkstoffLoader.items.put(capsule, new BW_MetaGenerated_Items(capsule)); } if ((WerkstoffLoader.toGenerateGlobal & 0b100000) != 0) { WerkstoffLoader.items.put(cellPlasma, new BW_MetaGenerated_Items(cellPlasma)); } if ((WerkstoffLoader.toGenerateGlobal & 0b1000000) != 0) { WerkstoffLoader.items.put(OrePrefixes.cellMolten, new BW_MetaGenerated_Items(OrePrefixes.cellMolten)); - if (LoaderReference.Forestry) WerkstoffLoader.items + if (Forestry.isModLoaded()) WerkstoffLoader.items .put(OrePrefixes.capsuleMolten, new BW_MetaGenerated_Items(OrePrefixes.capsuleMolten)); } if ((WerkstoffLoader.toGenerateGlobal & 0b10000000) != 0) { diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/AdditionalRecipes.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/AdditionalRecipes.java index 14aa8fbc2d..1f2c9d9106 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/AdditionalRecipes.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/AdditionalRecipes.java @@ -14,7 +14,19 @@ package com.github.bartimaeusnek.bartworks.system.material.processingLoaders; import static com.github.bartimaeusnek.bartworks.util.BW_Util.CLEANROOM; -import static gregtech.api.enums.OrePrefixes.*; +import static gregtech.api.enums.Mods.Gendustry; +import static gregtech.api.enums.OrePrefixes.bolt; +import static gregtech.api.enums.OrePrefixes.cell; +import static gregtech.api.enums.OrePrefixes.crushed; +import static gregtech.api.enums.OrePrefixes.crushedPurified; +import static gregtech.api.enums.OrePrefixes.dust; +import static gregtech.api.enums.OrePrefixes.dustSmall; +import static gregtech.api.enums.OrePrefixes.gem; +import static gregtech.api.enums.OrePrefixes.gemChipped; +import static gregtech.api.enums.OrePrefixes.gemExquisite; +import static gregtech.api.enums.OrePrefixes.gemFlawed; +import static gregtech.api.enums.OrePrefixes.stick; +import static gregtech.api.enums.OrePrefixes.stickLong; import java.lang.reflect.Field; import java.util.Map; @@ -28,7 +40,6 @@ import net.minecraftforge.fluids.FluidStack; import org.apache.commons.lang3.reflect.FieldUtils; -import com.github.bartimaeusnek.bartworks.API.LoaderReference; import com.github.bartimaeusnek.bartworks.common.configs.ConfigHandler; import com.github.bartimaeusnek.bartworks.common.loaders.BioCultureLoader; import com.github.bartimaeusnek.bartworks.common.loaders.BioItemList; @@ -39,10 +50,19 @@ import com.github.bartimaeusnek.bartworks.system.material.CircuitGeneration.BW_M import com.github.bartimaeusnek.bartworks.system.material.GT_Enhancement.LuVTierEnhancer; import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; -import com.github.bartimaeusnek.bartworks.util.*; +import com.github.bartimaeusnek.bartworks.util.BWRecipes; +import com.github.bartimaeusnek.bartworks.util.BW_Util; +import com.github.bartimaeusnek.bartworks.util.BioCulture; +import com.github.bartimaeusnek.bartworks.util.BioDNA; +import com.github.bartimaeusnek.bartworks.util.BioData; +import com.github.bartimaeusnek.bartworks.util.BioPlasmid; import gregtech.api.GregTech_API; -import gregtech.api.enums.*; +import gregtech.api.enums.Element; +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.ItemList; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Recipe; @@ -60,7 +80,7 @@ public class AdditionalRecipes { private static void runBWRecipes() { if (ConfigHandler.BioLab) { - FluidStack[] dnaFluid = { LoaderReference.gendustry ? FluidRegistry.getFluidStack("liquiddna", 1000) + FluidStack[] dnaFluid = { Gendustry.isModLoaded() ? FluidRegistry.getFluidStack("liquiddna", 1000) : Materials.Biomass.getFluid(1000L) }; for (ItemStack stack : BioItemList.getAllPetriDishes()) { @@ -378,8 +398,6 @@ public class AdditionalRecipes { BW_Util.getMachineVoltageFromTier(5)); // Milk - // GT_Values.RA.addFusionReactorRecipe(WerkstoffLoader.Californium.getMolten(16), - // Materials.Milk.getFluid(12000), WerkstoffLoader.Oganesson.getFluidOrGas(16), 500, 49152, 600000000); GT_Values.RA.addCentrifugeRecipe( GT_Utility.getIntegratedCircuit(1), GT_Values.NI, diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/AspectLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/AspectLoader.java index 264ace8f96..f31945f154 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/AspectLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/AspectLoader.java @@ -13,9 +13,10 @@ package com.github.bartimaeusnek.bartworks.system.material.werkstoff_loaders.recipe; +import static gregtech.api.enums.Mods.Thaumcraft; + import java.util.Objects; -import com.github.bartimaeusnek.bartworks.API.LoaderReference; import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; import com.github.bartimaeusnek.bartworks.system.material.werkstoff_loaders.IWerkstoffRunnable; @@ -30,7 +31,10 @@ public class AspectLoader implements IWerkstoffRunnable { @Override public void run(Werkstoff werkstoff) { - if (!LoaderReference.Thaumcraft) return; + if (!Thaumcraft.isModLoaded()) { + return; + } + for (OrePrefixes enabledOrePrefixes : WerkstoffLoader.ENABLED_ORE_PREFIXES) { if (werkstoff.hasItemType(enabledOrePrefixes)) { if (enabledOrePrefixes.mMaterialAmount >= 3628800L || enabledOrePrefixes == OrePrefixes.ore) { diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/BlockLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/BlockLoader.java index 8a06acfc56..d8b5d87c19 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/BlockLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/BlockLoader.java @@ -13,7 +13,10 @@ package com.github.bartimaeusnek.bartworks.system.material.werkstoff_loaders.recipe; -import static gregtech.api.enums.OrePrefixes.*; +import static gregtech.api.enums.OrePrefixes.block; +import static gregtech.api.enums.OrePrefixes.cellMolten; +import static gregtech.api.enums.OrePrefixes.ingot; +import static gregtech.api.enums.OrePrefixes.plate; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/CasingLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/CasingLoader.java index e8063c1f6d..be8a2f95ad 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/CasingLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/CasingLoader.java @@ -13,7 +13,14 @@ package com.github.bartimaeusnek.bartworks.system.material.werkstoff_loaders.recipe; -import static gregtech.api.enums.OrePrefixes.*; +import static gregtech.api.enums.OrePrefixes.blockCasing; +import static gregtech.api.enums.OrePrefixes.blockCasingAdvanced; +import static gregtech.api.enums.OrePrefixes.gearGt; +import static gregtech.api.enums.OrePrefixes.gearGtSmall; +import static gregtech.api.enums.OrePrefixes.plank; +import static gregtech.api.enums.OrePrefixes.plate; +import static gregtech.api.enums.OrePrefixes.plateDouble; +import static gregtech.api.enums.OrePrefixes.screw; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/CellLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/CellLoader.java index ce3207484b..b128d7dac6 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/CellLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/CellLoader.java @@ -13,7 +13,10 @@ package com.github.bartimaeusnek.bartworks.system.material.werkstoff_loaders.recipe; -import static gregtech.api.enums.OrePrefixes.*; +import static gregtech.api.enums.Mods.Forestry; +import static gregtech.api.enums.OrePrefixes.capsule; +import static gregtech.api.enums.OrePrefixes.cell; +import static gregtech.api.enums.OrePrefixes.dust; import java.util.ArrayList; import java.util.HashMap; @@ -24,14 +27,17 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; -import com.github.bartimaeusnek.bartworks.API.LoaderReference; import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; import com.github.bartimaeusnek.bartworks.system.material.werkstoff_loaders.IWerkstoffRunnable; import com.github.bartimaeusnek.bartworks.util.BWRecipes; import com.github.bartimaeusnek.bartworks.util.Pair; -import gregtech.api.enums.*; +import gregtech.api.enums.Element; +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.ItemList; +import gregtech.api.enums.Materials; +import gregtech.api.enums.TextureSet; import gregtech.api.interfaces.ISubTagContainer; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; @@ -184,11 +190,11 @@ public class CellLoader implements IWerkstoffRunnable { GT_Values.NF, new FluidStack(Objects.requireNonNull(WerkstoffLoader.fluids.get(werkstoff)), 1000)); - if (LoaderReference.Forestry) { + if (Forestry.isModLoaded()) { FluidContainerRegistry.FluidContainerData emptyData = new FluidContainerRegistry.FluidContainerData( new FluidStack(Objects.requireNonNull(WerkstoffLoader.fluids.get(werkstoff)), 1000), werkstoff.get(capsule), - GT_ModHandler.getModItem("Forestry", "waxCapsule", 1), + GT_ModHandler.getModItem(Forestry.ID, "waxCapsule", 1), true); GT_Utility.addFluidContainerData(emptyData); FluidContainerRegistry.registerFluidContainer(emptyData); @@ -240,14 +246,7 @@ public class CellLoader implements IWerkstoffRunnable { if (!ElementSet) return; GT_OreDictUnificator.addAssociation(cell, werkstoffBridgeMaterial, werkstoff.get(cell), false); - // try { - // Field f = Materials.class.getDeclaredField("MATERIALS_MAP"); - // f.setAccessible(true); - // Map<String, Materials> MATERIALS_MAP = (Map<String, Materials>) f.get(null); - // MATERIALS_MAP.remove(werkstoffBridgeMaterial.mName); - // } catch (NoSuchFieldException | IllegalAccessException | ClassCastException e) { - // e.printStackTrace(); - // } + ItemStack scannerOutput = ItemList.Tool_DataOrb.get(1L); Behaviour_DataOrb.setDataTitle(scannerOutput, "Elemental-Scan"); Behaviour_DataOrb.setDataName(scannerOutput, werkstoff.getToolTip()); @@ -264,10 +263,6 @@ public class CellLoader implements IWerkstoffRunnable { (int) (werkstoffBridgeMaterial.getMass() * 8192L), 30, 0)); - // GT_Recipe.GT_Recipe_Map.sReplicatorFakeRecipes.addFakeRecipe(false, new BWRecipes.DynamicGTRecipe(false, - // new ItemStack[]{Materials.Empty.getCells(1)}, new ItemStack[]{werkstoff.get(cell)}, scannerOutput, null, - // new FluidStack[]{Materials.UUMatter.getFluid(werkstoffBridgeMaterial.getMass())}, null, (int) - // (werkstoffBridgeMaterial.getMass() * 512L), 30, 0)); } } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/CraftingMaterialLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/CraftingMaterialLoader.java index 539131810b..00a9915ca9 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/CraftingMaterialLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/CraftingMaterialLoader.java @@ -13,11 +13,24 @@ package com.github.bartimaeusnek.bartworks.system.material.werkstoff_loaders.recipe; -import static gregtech.api.enums.OrePrefixes.*; +import static gregtech.api.enums.OrePrefixes.bolt; +import static gregtech.api.enums.OrePrefixes.cellMolten; +import static gregtech.api.enums.OrePrefixes.dust; +import static gregtech.api.enums.OrePrefixes.dustSmall; +import static gregtech.api.enums.OrePrefixes.dustTiny; +import static gregtech.api.enums.OrePrefixes.gearGt; +import static gregtech.api.enums.OrePrefixes.gearGtSmall; +import static gregtech.api.enums.OrePrefixes.gem; +import static gregtech.api.enums.OrePrefixes.ingot; +import static gregtech.api.enums.OrePrefixes.plate; +import static gregtech.api.enums.OrePrefixes.ring; +import static gregtech.api.enums.OrePrefixes.rotor; +import static gregtech.api.enums.OrePrefixes.screw; +import static gregtech.api.enums.OrePrefixes.stick; +import static gregtech.api.enums.OrePrefixes.wireFine; import net.minecraft.item.ItemStack; -import com.github.bartimaeusnek.bartworks.common.configs.ConfigHandler; import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; import com.github.bartimaeusnek.bartworks.system.material.werkstoff_loaders.IWerkstoffRunnable; @@ -127,14 +140,11 @@ public class CraftingMaterialLoader implements IWerkstoffRunnable { werkstoff.get(gearGtSmall), (int) werkstoff.getStats().getMass(), 8 * tVoltageMultiplier); - if (ConfigHandler.hardmode) GT_ModHandler.addCraftingRecipe( + + GT_ModHandler.addCraftingRecipe( werkstoff.get(gearGtSmall), GT_Proxy.tBits, new Object[] { " S ", "hPx", " S ", 'S', werkstoff.get(stick), 'P', werkstoff.get(plate) }); - else GT_ModHandler.addCraftingRecipe( - werkstoff.get(gearGtSmall), - GT_Proxy.tBits, - new Object[] { "P ", " h ", 'P', werkstoff.get(plate) }); // Rotor GT_ModHandler.addCraftingRecipe( diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/CrushedLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/CrushedLoader.java index 7fa823d520..f3e2d1dba9 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/CrushedLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/CrushedLoader.java @@ -13,7 +13,17 @@ package com.github.bartimaeusnek.bartworks.system.material.werkstoff_loaders.recipe; -import static gregtech.api.enums.OrePrefixes.*; +import static gregtech.api.enums.OrePrefixes.crushed; +import static gregtech.api.enums.OrePrefixes.crushedCentrifuged; +import static gregtech.api.enums.OrePrefixes.crushedPurified; +import static gregtech.api.enums.OrePrefixes.dust; +import static gregtech.api.enums.OrePrefixes.dustImpure; +import static gregtech.api.enums.OrePrefixes.dustPure; +import static gregtech.api.enums.OrePrefixes.dustSmall; +import static gregtech.api.enums.OrePrefixes.gem; +import static gregtech.api.enums.OrePrefixes.ingot; +import static gregtech.api.enums.OrePrefixes.nugget; +import static gregtech.api.enums.OrePrefixes.ore; import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; import com.github.bartimaeusnek.bartworks.system.material.werkstoff_loaders.IWerkstoffRunnable; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/DustLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/DustLoader.java index cba5049dbe..dca73ad91b 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/DustLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/DustLoader.java @@ -13,7 +13,15 @@ package com.github.bartimaeusnek.bartworks.system.material.werkstoff_loaders.recipe; -import static gregtech.api.enums.OrePrefixes.*; +import static gregtech.api.enums.OrePrefixes.block; +import static gregtech.api.enums.OrePrefixes.cell; +import static gregtech.api.enums.OrePrefixes.dust; +import static gregtech.api.enums.OrePrefixes.dustSmall; +import static gregtech.api.enums.OrePrefixes.dustTiny; +import static gregtech.api.enums.OrePrefixes.gem; +import static gregtech.api.enums.OrePrefixes.ingot; +import static gregtech.api.enums.OrePrefixes.ingotHot; +import static gregtech.api.enums.OrePrefixes.nugget; import java.util.ArrayList; import java.util.HashMap; @@ -376,8 +384,6 @@ public class DustLoader implements IWerkstoffRunnable { null, (int) Math.max(werkstoff.getStats().getMass() / 40L, 1L) * werkstoff.getStats().getMeltingPoint()); - // GT_ModHandler.addRCBlastFurnaceRecipe(werkstoff.get(ingot), werkstoff.get(dust), - // werkstoff.getStats().getMeltingPoint()); } } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/GemLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/GemLoader.java index d8a8269888..3788f50a31 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/GemLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/GemLoader.java @@ -13,7 +13,19 @@ package com.github.bartimaeusnek.bartworks.system.material.werkstoff_loaders.recipe; -import static gregtech.api.enums.OrePrefixes.*; +import static gregtech.api.enums.OrePrefixes.block; +import static gregtech.api.enums.OrePrefixes.crushedPurified; +import static gregtech.api.enums.OrePrefixes.dust; +import static gregtech.api.enums.OrePrefixes.dustSmall; +import static gregtech.api.enums.OrePrefixes.dustTiny; +import static gregtech.api.enums.OrePrefixes.gem; +import static gregtech.api.enums.OrePrefixes.gemChipped; +import static gregtech.api.enums.OrePrefixes.gemExquisite; +import static gregtech.api.enums.OrePrefixes.gemFlawed; +import static gregtech.api.enums.OrePrefixes.gemFlawless; +import static gregtech.api.enums.OrePrefixes.lens; +import static gregtech.api.enums.OrePrefixes.ore; +import static gregtech.api.enums.OrePrefixes.plate; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/MoltenCellLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/MoltenCellLoader.java index 9b861c700d..0481c0872b 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/MoltenCellLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/MoltenCellLoader.java @@ -13,14 +13,31 @@ package com.github.bartimaeusnek.bartworks.system.material.werkstoff_loaders.recipe; -import static gregtech.api.enums.OrePrefixes.*; +import static gregtech.api.enums.Mods.Forestry; +import static gregtech.api.enums.OrePrefixes.block; +import static gregtech.api.enums.OrePrefixes.bolt; +import static gregtech.api.enums.OrePrefixes.capsuleMolten; +import static gregtech.api.enums.OrePrefixes.cellMolten; +import static gregtech.api.enums.OrePrefixes.dust; +import static gregtech.api.enums.OrePrefixes.dustSmall; +import static gregtech.api.enums.OrePrefixes.dustTiny; +import static gregtech.api.enums.OrePrefixes.gearGt; +import static gregtech.api.enums.OrePrefixes.gearGtSmall; +import static gregtech.api.enums.OrePrefixes.ingot; +import static gregtech.api.enums.OrePrefixes.nugget; +import static gregtech.api.enums.OrePrefixes.plate; +import static gregtech.api.enums.OrePrefixes.plateDouble; +import static gregtech.api.enums.OrePrefixes.ring; +import static gregtech.api.enums.OrePrefixes.rotor; +import static gregtech.api.enums.OrePrefixes.screw; +import static gregtech.api.enums.OrePrefixes.stick; +import static gregtech.api.enums.OrePrefixes.stickLong; import java.util.Objects; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; -import com.github.bartimaeusnek.bartworks.API.LoaderReference; import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; import com.github.bartimaeusnek.bartworks.system.material.werkstoff_loaders.IWerkstoffRunnable; @@ -84,9 +101,6 @@ public class MoltenCellLoader implements IWerkstoffRunnable { werkstoff.get(ingot), (int) werkstoff.getStats().getMass(), werkstoff.getStats().getMass() > 128 ? 64 : 30); - // GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Block.get(0), werkstoff.getMolten(144), - // werkstoff.get(block), (int) werkstoff.getStats().getMass(), werkstoff.getStats().getMass() > 128 ? 64 : - // 30); GT_Values.RA.addFluidSolidifierRecipe( ItemList.Shape_Mold_Nugget.get(0), werkstoff.getMolten(16), @@ -226,16 +240,16 @@ public class MoltenCellLoader implements IWerkstoffRunnable { GT_Values.NF, new FluidStack(Objects.requireNonNull(WerkstoffLoader.molten.get(werkstoff)), 144)); - if (!LoaderReference.Forestry) return; + if (!Forestry.isModLoaded()) return; final FluidContainerRegistry.FluidContainerData emptyData = new FluidContainerRegistry.FluidContainerData( new FluidStack(Objects.requireNonNull(WerkstoffLoader.molten.get(werkstoff)), 144), werkstoff.get(capsuleMolten), - GT_ModHandler.getModItem("Forestry", "refractoryEmpty", 1)); + GT_ModHandler.getModItem(Forestry.ID, "refractoryEmpty", 1)); FluidContainerRegistry.registerFluidContainer( werkstoff.getMolten(144), werkstoff.get(capsuleMolten), - GT_ModHandler.getModItem("Forestry", "refractoryEmpty", 1)); + GT_ModHandler.getModItem(Forestry.ID, "refractoryEmpty", 1)); GT_Utility.addFluidContainerData(emptyData); GT_Values.RA.addFluidCannerRecipe( werkstoff.get(capsuleMolten), diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/MultipleMetalLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/MultipleMetalLoader.java index 72cce06013..aba41181a4 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/MultipleMetalLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/MultipleMetalLoader.java @@ -13,7 +13,10 @@ package com.github.bartimaeusnek.bartworks.system.material.werkstoff_loaders.recipe; -import static gregtech.api.enums.OrePrefixes.*; +import static gregtech.api.enums.OrePrefixes.dust; +import static gregtech.api.enums.OrePrefixes.ingot; +import static gregtech.api.enums.OrePrefixes.plateDense; +import static gregtech.api.enums.OrePrefixes.plateDouble; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/OreLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/OreLoader.java index ab436d896b..f55169ece0 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/OreLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/OreLoader.java @@ -13,7 +13,11 @@ package com.github.bartimaeusnek.bartworks.system.material.werkstoff_loaders.recipe; -import static gregtech.api.enums.OrePrefixes.*; +import static gregtech.api.enums.OrePrefixes.crushed; +import static gregtech.api.enums.OrePrefixes.dust; +import static gregtech.api.enums.OrePrefixes.gem; +import static gregtech.api.enums.OrePrefixes.ingot; +import static gregtech.api.enums.OrePrefixes.ore; import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/SimpleMetalLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/SimpleMetalLoader.java index 19bc6ecfb7..923ce10ad7 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/SimpleMetalLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/SimpleMetalLoader.java @@ -13,7 +13,15 @@ package com.github.bartimaeusnek.bartworks.system.material.werkstoff_loaders.recipe; -import static gregtech.api.enums.OrePrefixes.*; +import static gregtech.api.enums.OrePrefixes.block; +import static gregtech.api.enums.OrePrefixes.dust; +import static gregtech.api.enums.OrePrefixes.dustSmall; +import static gregtech.api.enums.OrePrefixes.foil; +import static gregtech.api.enums.OrePrefixes.gem; +import static gregtech.api.enums.OrePrefixes.ingot; +import static gregtech.api.enums.OrePrefixes.plate; +import static gregtech.api.enums.OrePrefixes.stick; +import static gregtech.api.enums.OrePrefixes.stickLong; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/ToolLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/ToolLoader.java index 3c4ace4814..a239efb657 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/ToolLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/ToolLoader.java @@ -13,7 +13,21 @@ package com.github.bartimaeusnek.bartworks.system.material.werkstoff_loaders.recipe; -import static gregtech.api.enums.OrePrefixes.*; +import static gregtech.api.enums.OrePrefixes.bolt; +import static gregtech.api.enums.OrePrefixes.cellMolten; +import static gregtech.api.enums.OrePrefixes.gearGtSmall; +import static gregtech.api.enums.OrePrefixes.gem; +import static gregtech.api.enums.OrePrefixes.ingot; +import static gregtech.api.enums.OrePrefixes.plate; +import static gregtech.api.enums.OrePrefixes.plateDouble; +import static gregtech.api.enums.OrePrefixes.ring; +import static gregtech.api.enums.OrePrefixes.screw; +import static gregtech.api.enums.OrePrefixes.stick; +import static gregtech.api.enums.OrePrefixes.stickLong; +import static gregtech.api.enums.OrePrefixes.toolHeadHammer; +import static gregtech.api.enums.OrePrefixes.toolHeadSaw; +import static gregtech.api.enums.OrePrefixes.toolHeadWrench; +import static gregtech.api.enums.OrePrefixes.turbineBlade; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; @@ -560,10 +574,5 @@ public class ToolLoader implements IWerkstoffRunnable { ItemList.Electric_Motor_HV.get(1L), 'S', screw.get(Materials.StainlessSteel), 'P', plate.get(Materials.StainlessSteel), 'G', gearGtSmall.get(Materials.StainlessSteel), 'B', ItemList.Battery_RE_HV_Sodium.get(1L) }); - - // GT_ModHandler.addCraftingRecipe(GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(16,1, - // werkstoff.getBridgeMaterial(),werkstoff.getBridgeMaterial(),null), - // GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"IhI", - // "III", " I ", 'I', werkstoff.get(ingot)}); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/registration/BridgeMaterialsLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/registration/BridgeMaterialsLoader.java index 474ee3d936..46f546319d 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/registration/BridgeMaterialsLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/registration/BridgeMaterialsLoader.java @@ -13,19 +13,26 @@ package com.github.bartimaeusnek.bartworks.system.material.werkstoff_loaders.registration; -import static gregtech.api.enums.OrePrefixes.*; +import static gregtech.api.enums.Mods.Thaumcraft; +import static gregtech.api.enums.OrePrefixes.cell; +import static gregtech.api.enums.OrePrefixes.cellMolten; +import static gregtech.api.enums.OrePrefixes.dust; +import static gregtech.api.enums.OrePrefixes.values; import java.util.ArrayList; import net.minecraft.item.ItemStack; -import com.github.bartimaeusnek.bartworks.API.LoaderReference; import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; import com.github.bartimaeusnek.bartworks.system.material.werkstoff_loaders.IWerkstoffRunnable; import com.github.bartimaeusnek.bartworks.util.BWRecipes; import gregtech.api.enchants.Enchantment_Radioactivity; -import gregtech.api.enums.*; +import gregtech.api.enums.Element; +import gregtech.api.enums.ItemList; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.SubTag; import gregtech.api.util.GT_LanguageManager; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Recipe; @@ -113,17 +120,10 @@ public class BridgeMaterialsLoader implements IWerkstoffRunnable { break; } } - if (!ElementSet) continue; - // try { - // Field f = Materials.class.getDeclaredField("MATERIALS_MAP"); - // f.setAccessible(true); - // Map<String, Materials> MATERIALS_MAP = (Map<String, - // Materials>) f.get(null); - // MATERIALS_MAP.remove(werkstoffBridgeMaterial.mName); - // } catch (NoSuchFieldException | IllegalAccessException | - // ClassCastException e) { - // e.printStackTrace(); - // } + if (!ElementSet) { + continue; + } + if (werkstoff.hasItemType(dust)) { ItemStack scannerOutput = ItemList.Tool_DataOrb.get(1L); Behaviour_DataOrb.setDataTitle(scannerOutput, "Elemental-Scan"); @@ -141,11 +141,6 @@ public class BridgeMaterialsLoader implements IWerkstoffRunnable { (int) (werkstoffBridgeMaterial.getMass() * 8192L), 30, 0)); - // GT_Recipe.GT_Recipe_Map.sReplicatorFakeRecipes.addFakeRecipe(false, new - // BWRecipes.DynamicGTRecipe(false, null, new ItemStack[]{werkstoff.get(prefixes)}, - // scannerOutput, null, new - // FluidStack[]{Materials.UUMatter.getFluid(werkstoffBridgeMaterial.getMass())}, null, (int) - // (werkstoffBridgeMaterial.getMass() * 512L), 30, 0)); } } } @@ -168,7 +163,9 @@ public class BridgeMaterialsLoader implements IWerkstoffRunnable { werkstoffBridgeMaterial.mLocalizedName = GT_LanguageManager.addStringLocalization( "Material." + werkstoffBridgeMaterial.mName.toLowerCase(), werkstoffBridgeMaterial.mDefaultLocalName); - if (LoaderReference.Thaumcraft) werkstoffBridgeMaterial.mAspects = werkstoff.getGTWrappedTCAspects(); + if (Thaumcraft.isModLoaded()) { + werkstoffBridgeMaterial.mAspects = werkstoff.getGTWrappedTCAspects(); + } werkstoffBridgeMaterial.mMaterialInto = werkstoffBridgeMaterial; werkstoffBridgeMaterial.mHandleMaterial = werkstoff.contains(SubTag.BURNING) ? Materials.Blaze : werkstoff.contains(SubTag.MAGICAL) ? Materials.Thaumium diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/object/AbstractedStack.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/object/AbstractedStack.java index 1e83c8157f..86e5673ebf 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/object/AbstractedStack.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/object/AbstractedStack.java @@ -13,7 +13,12 @@ package com.github.bartimaeusnek.bartworks.system.object; -import java.io.*; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.Serializable; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/oregen/BW_OreLayer.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/oregen/BW_OreLayer.java index 71a41f466b..1efa707f2d 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/oregen/BW_OreLayer.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/oregen/BW_OreLayer.java @@ -27,7 +27,11 @@ import net.minecraft.world.World; import net.minecraft.world.chunk.IChunkProvider; import com.github.bartimaeusnek.bartworks.MainMod; -import com.github.bartimaeusnek.bartworks.system.material.*; +import com.github.bartimaeusnek.bartworks.system.material.BW_MetaGeneratedOreTE; +import com.github.bartimaeusnek.bartworks.system.material.BW_MetaGenerated_Ores; +import com.github.bartimaeusnek.bartworks.system.material.BW_MetaGenerated_SmallOres; +import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; +import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; import com.github.bartimaeusnek.bartworks.util.MurmurHash3; import com.github.bartimaeusnek.bartworks.util.Pair; import com.google.common.collect.ArrayListMultimap; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/oregen/BW_WorldGenRoss128b.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/oregen/BW_WorldGenRoss128b.java index c8b6459add..13cfc9c166 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/oregen/BW_WorldGenRoss128b.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/oregen/BW_WorldGenRoss128b.java @@ -13,9 +13,40 @@ package com.github.bartimaeusnek.bartworks.system.oregen; -import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.*; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.Arsenopyrite; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.Bismuthinit; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.Bismutite; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.Bornite; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.ChromoAluminoPovondrait; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.DescloiziteCUVO4; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.DescloiziteZNVO4; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.Djurleit; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.Fayalit; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.Ferberite; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.FluorBuergerit; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.Forsterit; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.FuchsitAL; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.FuchsitCR; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.Hedenbergit; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.Huebnerit; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.Loellingit; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.Olenit; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.RedZircon; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.Roquesit; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.Thorianit; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.VanadioOxyDravit; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.Wittichenit; import static com.github.bartimaeusnek.crossmod.galacticraft.GalacticraftProxy.uo_dimensionList; -import static gregtech.api.enums.Materials.*; +import static gregtech.api.enums.Materials.Bismuth; +import static gregtech.api.enums.Materials.Coal; +import static gregtech.api.enums.Materials.Diamond; +import static gregtech.api.enums.Materials.Graphite; +import static gregtech.api.enums.Materials.Lepidolite; +import static gregtech.api.enums.Materials.Scheelite; +import static gregtech.api.enums.Materials.Spodumene; +import static gregtech.api.enums.Materials.Stibnite; +import static gregtech.api.enums.Materials.Tetrahedrite; +import static gregtech.api.enums.Materials.Uraninite; import net.minecraft.block.Block; import net.minecraft.init.Blocks; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/oregen/BW_WorldGenRoss128ba.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/oregen/BW_WorldGenRoss128ba.java index 0566541d44..7636d0cd64 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/oregen/BW_WorldGenRoss128ba.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/oregen/BW_WorldGenRoss128ba.java @@ -13,9 +13,36 @@ package com.github.bartimaeusnek.bartworks.system.oregen; -import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.*; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.BArTiMaEuSNeK; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.Bornite; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.ChromoAluminoPovondrait; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.Djurleit; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.Fayalit; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.Ferberite; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.FluorBuergerit; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.Fluorspar; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.FuchsitAL; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.FuchsitCR; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.Hedenbergit; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.Huebnerit; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.Loellingit; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.Olenit; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.Prasiolite; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.RedZircon; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.Tiberium; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.VanadioOxyDravit; +import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.Wittichenit; import static com.github.bartimaeusnek.crossmod.galacticraft.GalacticraftProxy.uo_dimensionList; -import static gregtech.api.enums.Materials.*; +import static gregtech.api.enums.Materials.Amethyst; +import static gregtech.api.enums.Materials.Barite; +import static gregtech.api.enums.Materials.Galena; +import static gregtech.api.enums.Materials.Helium_3; +import static gregtech.api.enums.Materials.NaquadahEnriched; +import static gregtech.api.enums.Materials.Olivine; +import static gregtech.api.enums.Materials.SaltWater; +import static gregtech.api.enums.Materials.Scheelite; +import static gregtech.api.enums.Materials.Sphalerite; +import static gregtech.api.enums.Materials.Tetrahedrite; import net.minecraft.block.Block; import net.minecraft.util.StatCollector; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/util/BWRecipes.java b/src/main/java/com/github/bartimaeusnek/bartworks/util/BWRecipes.java index ecf31705be..116fd7f1ef 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/util/BWRecipes.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/util/BWRecipes.java @@ -16,7 +16,13 @@ package com.github.bartimaeusnek.bartworks.util; import static com.github.bartimaeusnek.bartworks.util.BW_Util.calculateSv; import static com.github.bartimaeusnek.bartworks.util.BW_Util.specialToByte; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Objects; import java.util.function.Supplier; import javax.annotation.Nonnegative; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/util/BW_Tooltip_Reference.java b/src/main/java/com/github/bartimaeusnek/bartworks/util/BW_Tooltip_Reference.java index c08c5d4077..75d8d4cc62 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/util/BW_Tooltip_Reference.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/util/BW_Tooltip_Reference.java @@ -13,7 +13,10 @@ package com.github.bartimaeusnek.bartworks.util; -import static net.minecraft.util.EnumChatFormatting.*; +import static net.minecraft.util.EnumChatFormatting.BLUE; +import static net.minecraft.util.EnumChatFormatting.DARK_BLUE; +import static net.minecraft.util.EnumChatFormatting.GRAY; +import static net.minecraft.util.EnumChatFormatting.GREEN; import java.util.function.Function; import java.util.function.Supplier; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/util/BW_Util.java b/src/main/java/com/github/bartimaeusnek/bartworks/util/BW_Util.java index eb0489edec..425098f702 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/util/BW_Util.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/util/BW_Util.java @@ -13,11 +13,22 @@ package com.github.bartimaeusnek.bartworks.util; -import static gregtech.api.enums.GT_Values.*; +import static gregtech.api.enums.GT_Values.D1; +import static gregtech.api.enums.GT_Values.E; +import static gregtech.api.enums.GT_Values.M; +import static gregtech.api.enums.GT_Values.V; +import static gregtech.api.enums.GT_Values.VN; +import static gregtech.api.enums.GT_Values.W; import java.lang.reflect.Array; import java.lang.reflect.Field; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; import java.util.function.BiConsumer; import java.util.function.Function; import java.util.stream.Collectors; @@ -60,7 +71,13 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase; import gregtech.api.objects.ItemData; -import gregtech.api.util.*; +import gregtech.api.util.GT_LanguageManager; +import gregtech.api.util.GT_Log; +import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GT_Shaped_Recipe; +import gregtech.api.util.GT_Utility; @SuppressWarnings({ "unused", "RedundantSuppression" }) public class BW_Util { diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/util/BioCulture.java b/src/main/java/com/github/bartimaeusnek/bartworks/util/BioCulture.java index 5ea53e62dd..c260b6d681 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/util/BioCulture.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/util/BioCulture.java @@ -165,13 +165,6 @@ public class BioCulture extends BioData implements IColorModulationContainer { this.color = color; } - // public static BioCulture createAndRegisterBioCulture(Color color, String name, long ID, BioPlasmid plasmid, - // BioDNA dDNA,EnumRarity rarity){ - // BioCulture ret =new BioCulture(color,name,ID,plasmid,dDNA,rarity); - // BIO_CULTURE_ARRAY_LIST.add(ret); - // return ret; - // } - public BioPlasmid getPlasmid() { return this.plasmid; } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/util/NoiseUtil/BartsNoise.java b/src/main/java/com/github/bartimaeusnek/bartworks/util/NoiseUtil/BartsNoise.java index 3595203ced..d8d338f977 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/util/NoiseUtil/BartsNoise.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/util/NoiseUtil/BartsNoise.java @@ -88,56 +88,6 @@ public class BartsNoise implements INoiseGen { public BartsNoise copy(long seed) { return new BartsNoise(this.octaves, this.frequency, this.amplitude, seed); } - // public static void main(String[] args) throws IOException { - // - // BartsNoise noiseGen1 = new BartsNoise(2,0.005F,1D,System.nanoTime()); - //// BartsNoise noiseGen2 = new BartsNoise(1,0.002F,-1D,System.nanoTime()); - //// BartsNoise noiseGen3 = new BartsNoise(1,0.002F,-1D,System.nanoTime()); - // - // noiseGen1.setUsePhase(false); - //// noiseGen2.setUsePhase(false); - //// noiseGen3.setUsePhase(false); - // - // - // BufferedImage image = new BufferedImage(640, 640, BufferedImage.TYPE_INT_RGB); - // - // for (int chunkX = 0; chunkX < 40; chunkX++) { - // for (int chunkZ = 0; chunkZ < 40; chunkZ++) { - // for (int x = 0; x < 16; ++x) { - // for (int z = 0; z < 16; ++z) { - // double d = noiseGen1.getNoise(x + chunkX * 16, z + chunkZ * 16) * 2D; - //// double d2 = noiseGen2.getNoise(x + chunkX * 16, z + chunkZ * 16) * 2D; - //// double d3 = (noiseGen3.getNoise(x + chunkX * 16, z + chunkZ * 16) - 0.5D); - //// d3 *= 2; - // double yDev; - //// if (d3 < 0.0D) { - //// yDev = d; - //// } else if (d3 > 1.0D) { - //// yDev = d2; - //// } else { - // yDev = d*4; - //// } - // yDev=wrap(yDev,1); - // image.setRGB(x + chunkX * 16,z + chunkZ * 16,new - // Color((float)(1f*yDev),(float)(1f*yDev),(float)(1f*yDev)).getRGB()); - // } - // } - // } - // } - // File file = new File("myimage.png"); - // ImageIO.write(image, "png", file); - //// BartsNoise redNoise = NoiseColor.Blue.getColoredNoise(); - //// redNoise.setOctaves(1); - //// redNoise.setFrequency(0.05F); - //// for (int i = 40; i < 50; i++) { - //// String line = ""; - //// for (int j = 0; j < 10; j++) { - //// double num = (redNoise.getNoise(i,j)-0.5D); - //// line += num+","; - //// } - //// System.out.println(line); - //// } - // } public double getCosNoise(double x, double y) { double pr = x * this.frequency; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/util/accessprioritylist/AccessPriorityList.java b/src/main/java/com/github/bartimaeusnek/bartworks/util/accessprioritylist/AccessPriorityList.java index 5afd78e1b6..25da35d027 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/util/accessprioritylist/AccessPriorityList.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/util/accessprioritylist/AccessPriorityList.java @@ -13,7 +13,13 @@ package com.github.bartimaeusnek.bartworks.util.accessprioritylist; -import java.util.*; +import java.util.Collection; +import java.util.Deque; +import java.util.Iterator; +import java.util.List; +import java.util.ListIterator; +import java.util.Set; +import java.util.Spliterator; import org.apache.commons.lang3.NotImplementedException; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/util/package-info.java b/src/main/java/com/github/bartimaeusnek/bartworks/util/package-info.java index 69f9b8fb64..8d9d539524 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/util/package-info.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/util/package-info.java @@ -10,8 +10,10 @@ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. */ -@API(owner = "bartworks", apiVersion = API_REFERENCE.VERSION, provides = "bartworks util") +@API(owner = Mods.Names.BART_WORKS, apiVersion = API_REFERENCE.VERSION, provides = "bartworks util") package com.github.bartimaeusnek.bartworks.util; import com.github.bartimaeusnek.bartworks.API.API_REFERENCE; + import cpw.mods.fml.common.API; +import gregtech.api.enums.Mods; diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/BartWorksCrossmod.java b/src/main/java/com/github/bartimaeusnek/crossmod/BartWorksCrossmod.java index 315d8a4592..d29299f13c 100644 --- a/src/main/java/com/github/bartimaeusnek/crossmod/BartWorksCrossmod.java +++ b/src/main/java/com/github/bartimaeusnek/crossmod/BartWorksCrossmod.java @@ -13,6 +13,10 @@ package com.github.bartimaeusnek.crossmod; +import static gregtech.api.enums.Mods.GTPlusPlus; +import static gregtech.api.enums.Mods.GalacticraftCore; +import static gregtech.api.enums.Mods.TecTech; + import java.io.StringReader; import net.minecraft.util.StringTranslate; @@ -21,12 +25,10 @@ import org.apache.commons.io.input.ReaderInputStream; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import com.github.bartimaeusnek.bartworks.API.LoaderReference; import com.github.bartimaeusnek.bartworks.MainMod; import com.github.bartimaeusnek.crossmod.GTpp.loader.RadioHatchCompat; import com.github.bartimaeusnek.crossmod.galacticraft.GalacticraftProxy; import com.github.bartimaeusnek.crossmod.tectech.TecTechResearchLoader; -import com.github.bartimaeusnek.crossmod.thaumcraft.CustomAspects; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.event.FMLInitializationEvent; @@ -58,46 +60,37 @@ public class BartWorksCrossmod { @Mod.EventHandler public void preInit(FMLPreInitializationEvent preinit) { - // if (LoaderReference.appliedenergistics2) - // new ItemSingleItemStorageCell("singleItemStorageCell"); - if (LoaderReference.GalacticraftCore) GalacticraftProxy.preInit(preinit); - if (LoaderReference.Thaumcraft) new CustomAspects(); + if (GalacticraftCore.isModLoaded()) { + GalacticraftProxy.preInit(preinit); + } } @Mod.EventHandler public void init(FMLInitializationEvent init) { - if (LoaderReference.GalacticraftCore) GalacticraftProxy.init(init); + if (GalacticraftCore.isModLoaded()) { + GalacticraftProxy.init(init); + } } @Mod.EventHandler public void postInit(FMLPostInitializationEvent init) { - if (LoaderReference.GalacticraftCore) GalacticraftProxy.postInit(init); - if (LoaderReference.miscutils) RadioHatchCompat.run(); - if (LoaderReference.tectech) TecTechResearchLoader.runResearches(); + if (GalacticraftCore.isModLoaded()) { + GalacticraftProxy.postInit(init); + } + if (GTPlusPlus.isModLoaded()) { + RadioHatchCompat.run(); + } + if (TecTech.isModLoaded()) { + TecTechResearchLoader.runResearches(); + } } - // @Mod.EventHandler - // public void onFMLMissingMappingsEvent(FMLMissingMappingsEvent event){ - // for (FMLMissingMappingsEvent.MissingMapping mapping : event.getAll()){ - // if (mapping.name.equalsIgnoreCase()) - // } - // } - - // @Mod.EventHandler - // public void onServerStarted(FMLServerStartedEvent event) { - // if (LoaderReference.EMT){ - // try { - // TCRecipeHandler.init(); - // } catch (IllegalAccessException | InvocationTargetException e) { - // e.printStackTrace(); - // } - // } - // } - @Mod.EventHandler public void onFMLServerStart(FMLServerStartingEvent event) { - if (LoaderReference.miscutils) for (Object s : RadioHatchCompat.TranslateSet) { - StringTranslate.inject(new ReaderInputStream(new StringReader((String) s))); + if (GTPlusPlus.isModLoaded()) { + for (Object s : RadioHatchCompat.TranslateSet) { + StringTranslate.inject(new ReaderInputStream(new StringReader((String) s))); + } } } } diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/GTpp/loader/RadioHatchCompat.java b/src/main/java/com/github/bartimaeusnek/crossmod/GTpp/loader/RadioHatchCompat.java index e40834da12..9ead533077 100644 --- a/src/main/java/com/github/bartimaeusnek/crossmod/GTpp/loader/RadioHatchCompat.java +++ b/src/main/java/com/github/bartimaeusnek/crossmod/GTpp/loader/RadioHatchCompat.java @@ -13,10 +13,20 @@ package com.github.bartimaeusnek.crossmod.GTpp.loader; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Queue; +import java.util.Set; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -116,7 +126,7 @@ public class RadioHatchCompat { for (ModContainer container : Loader.instance().getModList()) { if (gtpp != null && bartworks != null) break; else if (container.getModId().equalsIgnoreCase(BartWorksCrossmod.MOD_ID)) bartworks = container; - else if (container.getModId().equalsIgnoreCase("miscutils")) gtpp = container; + else if (container.getModId().equalsIgnoreCase(GTPlusPlus.ID)) gtpp = container; } for (Object mats : (Set) RadioHatchCompat.materialClass.getField("mMaterialMap").get(null)) { diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/ae2/ItemSingleItemStorageCell.java b/src/main/java/com/github/bartimaeusnek/crossmod/ae2/ItemSingleItemStorageCell.java deleted file mode 100644 index a55ca3cb31..0000000000 --- a/src/main/java/com/github/bartimaeusnek/crossmod/ae2/ItemSingleItemStorageCell.java +++ /dev/null @@ -1,126 +0,0 @@ -// package com.github.bartimaeusnek.crossmod.ae2; -// -// import appeng.api.AEApi; -// import appeng.api.config.FuzzyMode; -// import appeng.api.config.IncludeExclude; -// import appeng.api.implementations.items.IStorageCell; -// import appeng.api.storage.*; -// import appeng.api.storage.data.IAEItemStack; -// import appeng.core.localization.GuiText; -// import appeng.items.contents.CellUpgrades; -// import appeng.util.Platform; -// import com.github.bartimaeusnek.bartworks.common.items.SimpleSubItemClass; -// import com.github.bartimaeusnek.crossmod.BartWorksCrossmod; -// import cpw.mods.fml.common.registry.GameRegistry; -// import cpw.mods.fml.relauncher.Side; -// import cpw.mods.fml.relauncher.SideOnly; -// import net.minecraft.entity.player.EntityPlayer; -// import net.minecraft.inventory.IInventory; -// import net.minecraft.item.Item; -// import net.minecraft.item.ItemStack; -// -// import java.util.List; -// -// public class ItemSingleItemStorageCell extends SimpleSubItemClass implements IStorageCell { -// -// public ItemSingleItemStorageCell(String tex) { -// super(tex); -// Item thizz = this; -// GameRegistry.registerItem(this, BartWorksCrossmod.MOD_ID+this.iconString); -// } -// -// @Override -// @SideOnly(Side.CLIENT) -// public void addInformation(ItemStack stack, EntityPlayer p_77624_2_, List lines, boolean p_77624_4_) { -// IMEInventoryHandler<?> inventory = AEApi.instance().registries().cell().getCellInventory(stack, -// (ISaveProvider)null, StorageChannel.ITEMS); -// if (inventory instanceof ICellInventoryHandler) { -// ICellInventoryHandler handler = (ICellInventoryHandler)inventory; -// ICellInventory cellInventory = handler.getCellInv(); -// if (cellInventory != null) { -// lines.add(cellInventory.getUsedBytes() + " " + GuiText.Of.getLocal() + ' ' + -// cellInventory.getTotalBytes() + ' ' + GuiText.BytesUsed.getLocal()); -// lines.add(cellInventory.getStoredItemTypes() + " " + GuiText.Of.getLocal() + ' ' + -// cellInventory.getTotalItemTypes() + ' ' + GuiText.Types.getLocal()); -// if (handler.isPreformatted()) { -// String list = (handler.getIncludeExcludeMode() == IncludeExclude.WHITELIST ? GuiText.Included : -// GuiText.Excluded).getLocal(); -// if (handler.isFuzzy()) { -// lines.add(GuiText.Partitioned.getLocal() + " - " + list + ' ' + GuiText.Fuzzy.getLocal()); -// } else { -// lines.add(GuiText.Partitioned.getLocal() + " - " + list + ' ' + GuiText.Precise.getLocal()); -// } -// } -// } -// } -// } -// -// @Override -// public int getBytes(ItemStack itemStack) { -// return getTotalTypes(itemStack)*getBytesPerType(itemStack); -// } -// -// @Override -// public int BytePerType(ItemStack itemStack) { -// return 1; -// } -// -// @Override -// public int getBytesPerType(ItemStack itemStack) { -// return 1; -// } -// -// @Override -// public int getTotalTypes(ItemStack itemStack) { -// return 4096; -// } -// -// @Override -// public boolean isBlackListed(ItemStack itemStack, IAEItemStack iaeItemStack) { -// return iaeItemStack == null || iaeItemStack.getItem().getItemStackLimit() != 1; -// } -// -// @Override -// public boolean storableInStorageCell() { -// return true; -// } -// -// @Override -// public boolean isStorageCell(ItemStack itemStack) { -// return true; -// } -// -// @Override -// public double getIdleDrain() { -// return 4D; -// } -// -// @Override -// public boolean isEditable(ItemStack itemStack) { -// return true; -// } -// -// @Override -// public IInventory getUpgradesInventory(ItemStack itemStack) { -// return new CellUpgrades(itemStack, 2); -// } -// -// @Override -// public IInventory getConfigInventory(ItemStack itemStack) { -// return new CellUpgrades(itemStack,2); -// } -// @Override -// public FuzzyMode getFuzzyMode(ItemStack is) { -// String fz = Platform.openNbtData(is).getString("FuzzyMode"); -// -// try { -// return FuzzyMode.valueOf(fz); -// } catch (Throwable var4) { -// return FuzzyMode.IGNORE_ALL; -// } -// } -// @Override -// public void setFuzzyMode(ItemStack is, FuzzyMode fzMode) { -// Platform.openNbtData(is).setString("FuzzyMode", fzMode.name()); -// } -// } diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/galacticgreg/GT_TileEntity_VoidMiner_Base.java b/src/main/java/com/github/bartimaeusnek/crossmod/galacticgreg/GT_TileEntity_VoidMiner_Base.java index e95eaa92df..7c92690bf3 100644 --- a/src/main/java/com/github/bartimaeusnek/crossmod/galacticgreg/GT_TileEntity_VoidMiner_Base.java +++ b/src/main/java/com/github/bartimaeusnek/crossmod/galacticgreg/GT_TileEntity_VoidMiner_Base.java @@ -17,7 +17,11 @@ import static bloodasp.galacticgreg.registry.GalacticGregRegistry.getModContaine import static com.github.bartimaeusnek.bartworks.util.BW_Tooltip_Reference.MULTIBLOCK_ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS; import static gregtech.api.enums.GT_Values.VN; -import java.util.*; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; import java.util.function.Consumer; import java.util.function.Predicate; import java.util.stream.Collectors; diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/UniversalTeleportType.java b/src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/UniversalTeleportType.java index 0a030d8b7f..440b6d4dfa 100644 --- a/src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/UniversalTeleportType.java +++ b/src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/UniversalTeleportType.java @@ -13,6 +13,8 @@ package com.github.bartimaeusnek.crossmod.galacticraft; +import static gregtech.api.enums.Mods.GalacticraftMars; + import java.util.Random; import micdoodle8.mods.galacticraft.api.vector.Vector3; @@ -26,8 +28,6 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.world.World; import net.minecraft.world.WorldServer; -import com.github.bartimaeusnek.bartworks.API.LoaderReference; - public class UniversalTeleportType implements ITeleportType { @Override @@ -63,7 +63,7 @@ public class UniversalTeleportType implements ITeleportType { } EntityLanderBase elb; - if (LoaderReference.GalacticraftMars) elb = PlanetsHelperClass.getLanderType(player); + if (GalacticraftMars.isModLoaded()) elb = PlanetsHelperClass.getLanderType(player); else elb = new EntityLander(player); if (!newWorld.isRemote) { diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/atmosphere/BWAtmosphereManager.java b/src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/atmosphere/BWAtmosphereManager.java index efc3323195..59fcce82e3 100644 --- a/src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/atmosphere/BWAtmosphereManager.java +++ b/src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/atmosphere/BWAtmosphereManager.java @@ -13,7 +13,11 @@ package com.github.bartimaeusnek.crossmod.galacticraft.atmosphere; -import java.util.*; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody; import micdoodle8.mods.galacticraft.api.galaxies.GalaxyRegistry; diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/planets/ross128b/ChunkProviderRoss128b.java b/src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/planets/ross128b/ChunkProviderRoss128b.java index 89330e3d45..6a72570e5c 100644 --- a/src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/planets/ross128b/ChunkProviderRoss128b.java +++ b/src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/planets/ross128b/ChunkProviderRoss128b.java @@ -13,6 +13,7 @@ package com.github.bartimaeusnek.crossmod.galacticraft.planets.ross128b; +import static gregtech.api.enums.Mods.Thaumcraft; import static net.minecraftforge.event.terraingen.PopulateChunkEvent.Populate.EventType.ICE; import static net.minecraftforge.event.terraingen.PopulateChunkEvent.Populate.EventType.LAKE; @@ -35,7 +36,6 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.terraingen.PopulateChunkEvent; import net.minecraftforge.event.terraingen.TerrainGen; -import com.github.bartimaeusnek.bartworks.API.LoaderReference; import com.github.bartimaeusnek.bartworks.common.configs.ConfigHandler; import com.github.bartimaeusnek.bartworks.system.oregen.BW_WordGenerator; import com.github.bartimaeusnek.bartworks.system.worldgen.MapGenRuins; @@ -77,7 +77,7 @@ public class ChunkProviderRoss128b extends ChunkProviderGenerate { } else if (biomeGenBase.biomeID == BiomeGenBase.mushroomIslandShore.biomeID) { this.biomesForGeneration[i] = BiomeGenBase.stoneBeach; } - if (LoaderReference.Thaumcraft) { + if (Thaumcraft.isModLoaded()) { if (ThaumcraftHandler.isTaintBiome(biomeGenBase.biomeID)) this.biomesForGeneration[i] = BiomeGenBase.taiga; else if (ConfigHandler.disableMagicalForest diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/solarsystems/Ross128SolarSystem.java b/src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/solarsystems/Ross128SolarSystem.java index 1ce3a61058..83f0fff1a4 100644 --- a/src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/solarsystems/Ross128SolarSystem.java +++ b/src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/solarsystems/Ross128SolarSystem.java @@ -13,17 +13,23 @@ package com.github.bartimaeusnek.crossmod.galacticraft.solarsystems; +import static gregtech.api.enums.Mods.GalaxySpace; + import java.util.Arrays; import micdoodle8.mods.galacticraft.api.GalacticraftRegistry; -import micdoodle8.mods.galacticraft.api.galaxies.*; +import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody; +import micdoodle8.mods.galacticraft.api.galaxies.GalaxyRegistry; +import micdoodle8.mods.galacticraft.api.galaxies.Moon; +import micdoodle8.mods.galacticraft.api.galaxies.Planet; +import micdoodle8.mods.galacticraft.api.galaxies.SolarSystem; +import micdoodle8.mods.galacticraft.api.galaxies.Star; import micdoodle8.mods.galacticraft.api.vector.Vector3; import micdoodle8.mods.galacticraft.api.world.IAtmosphericGas; import micdoodle8.mods.galacticraft.core.GalacticraftCore; import net.minecraft.util.ResourceLocation; -import com.github.bartimaeusnek.bartworks.API.LoaderReference; import com.github.bartimaeusnek.bartworks.common.configs.ConfigHandler; import com.github.bartimaeusnek.crossmod.BartWorksCrossmod; import com.github.bartimaeusnek.crossmod.galacticraft.UniversalTeleportType; @@ -69,7 +75,7 @@ public class Ross128SolarSystem { new ResourceLocation(BartWorksCrossmod.MOD_ID + ":galacticraft/Ross128b/MapObjs/Ross128ba.png")); Ross128SolarSystem.Ross128ba.setDimensionInfo(ConfigHandler.ross128BAID, WorldProviderRoss128ba.class); Ross128SolarSystem.Ross128ba - .setTierRequired(LoaderReference.GalaxySpace ? Math.min(ConfigHandler.ross128btier + 2, 8) : 3); + .setTierRequired(GalaxySpace.isModLoaded() ? Math.min(ConfigHandler.ross128btier + 2, 8) : 3); GalaxyRegistry.registerSolarSystem(Ross128SolarSystem.Ross128System); GalaxyRegistry.registerPlanet(Ross128SolarSystem.Ross128b); diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/galaxySpace/tileEntity/DysonSwarmSunReplacement.java b/src/main/java/com/github/bartimaeusnek/crossmod/galaxySpace/tileEntity/DysonSwarmSunReplacement.java index b5d7e7cb5d..507496e8db 100644 --- a/src/main/java/com/github/bartimaeusnek/crossmod/galaxySpace/tileEntity/DysonSwarmSunReplacement.java +++ b/src/main/java/com/github/bartimaeusnek/crossmod/galaxySpace/tileEntity/DysonSwarmSunReplacement.java @@ -40,15 +40,12 @@ public class DysonSwarmSunReplacement extends MetaTileEntity { } public void toggle() { - if (!wasBuild) { - GalacticraftCore.solarSystemSol.getMainStar().setBodyIcon( - new ResourceLocation(GalacticraftCore.ASSET_PREFIX, "textures/gui/celestialbodies/moon.png")); - wasBuild = !wasBuild; - } else { - GalacticraftCore.solarSystemSol.getMainStar().setBodyIcon( - new ResourceLocation(GalacticraftCore.ASSET_PREFIX, "textures/gui/celestialbodies/sun.png")); - wasBuild = !wasBuild; - } + ResourceLocation resourceLocation = wasBuild + ? new ResourceLocation(GalacticraftCore.ASSET_PREFIX, "textures/gui/celestialbodies/sun.png") + : new ResourceLocation(GalacticraftCore.ASSET_PREFIX, "textures/gui/celestialbodies/moon.png"); + GalacticraftCore.solarSystemSol.getMainStar().setBodyIcon(resourceLocation); + wasBuild = !wasBuild; + } @Override diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/openComputers/TileEntity_GTDataServer.java b/src/main/java/com/github/bartimaeusnek/crossmod/openComputers/TileEntity_GTDataServer.java index 30c2b3b1d7..201d820e09 100644 --- a/src/main/java/com/github/bartimaeusnek/crossmod/openComputers/TileEntity_GTDataServer.java +++ b/src/main/java/com/github/bartimaeusnek/crossmod/openComputers/TileEntity_GTDataServer.java @@ -36,10 +36,11 @@ import com.google.common.collect.HashBiMap; import cpw.mods.fml.common.Optional; import gregtech.api.enums.ItemList; +import gregtech.api.enums.Mods; import gregtech.api.util.GT_Utility; import gregtech.common.items.behaviors.Behaviour_DataOrb; -@Optional.Interface(iface = "li.cil.oc.api.network.SimpleComponent", modid = "OpenComputers") +@Optional.Interface(iface = "li.cil.oc.api.network.SimpleComponent", modid = Mods.Names.OPEN_COMPUTERS) public class TileEntity_GTDataServer extends TileEntity implements ISidedInventory, ITileAddsInformation, ITileHasDifferentTextureSides, SimpleComponent { @@ -48,12 +49,12 @@ public class TileEntity_GTDataServer extends TileEntity private ItemStack[] mItems = new ItemStack[2]; private byte TickTimer; - @Optional.Method(modid = "OpenComputers") + @Optional.Method(modid = Mods.Names.OPEN_COMPUTERS) public String getComponentName() { return "GT-Data Server"; } - @Optional.Method(modid = "OpenComputers") + @Optional.Method(modid = Mods.Names.OPEN_COMPUTERS) @Callback public Object[] listData(Context context, Arguments args) { Set<String> ret = new HashSet<>(); @@ -63,7 +64,7 @@ public class TileEntity_GTDataServer extends TileEntity return ret.toArray(new String[0]); } - @Optional.Method(modid = "OpenComputers") + @Optional.Method(modid = Mods.Names.OPEN_COMPUTERS) @Callback public Object[] imprintOrb(Context context, Arguments args) { return new Object[] { false }; diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/tectech/TecTechResearchLoader.java b/src/main/java/com/github/bartimaeusnek/crossmod/tectech/TecTechResearchLoader.java index 67c0ea56f3..16b40531c5 100644 --- a/src/main/java/com/github/bartimaeusnek/crossmod/tectech/TecTechResearchLoader.java +++ b/src/main/java/com/github/bartimaeusnek/crossmod/tectech/TecTechResearchLoader.java @@ -13,11 +13,12 @@ package com.github.bartimaeusnek.crossmod.tectech; +import static gregtech.api.enums.Mods.GalactiGreg; + import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import com.github.bartimaeusnek.bartworks.API.LoaderReference; import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry; import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; import com.github.bartimaeusnek.bartworks.util.BW_Util; @@ -36,8 +37,7 @@ public class TecTechResearchLoader { ? FluidRegistry.getFluid("molten.indalloy140") : FluidRegistry.getFluid("molten.solderingalloy"); - if (LoaderReference.galacticgreg) { - + if (GalactiGreg.isModLoaded()) { TT_recipeAdder.addResearchableAssemblylineRecipe( ItemRegistry.voidminer[0].copy(), 1024000, @@ -82,7 +82,7 @@ public class TecTechResearchLoader { new Object[] { ItemList.Machine_Multi_ImplosionCompressor.get(1L), Materials.Neutronium.getBlocks(5), GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Osmium, 64), GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Osmium, 64), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Superconductor, 64), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUHV, 64), ItemList.Electric_Piston_UV.get(64), }, new FluidStack[] { new FluidStack(solderIndalloy, 1440), Materials.Osmium.getMolten(1440), Materials.Neutronium.getMolten(1440) }, @@ -90,33 +90,5 @@ public class TecTechResearchLoader { 240000, BW_Util.getMachineVoltageFromTier(8)); - // BartWorksCrossmod.LOGGER.info("Nerfing Assembly Lines >= LuV Recipes to run with TecTech!"); - // HashSet<GT_Recipe.GT_Recipe_AssemblyLine> toRem = new HashSet<>(); - // for (GT_Recipe.GT_Recipe_AssemblyLine recipe : GT_Recipe.GT_Recipe_AssemblyLine.sAssemblylineRecipes){ - // if (recipe.mEUt >= BW_Util.getTierVoltage(6) && !GT_Utility.areStacksEqual(recipe.mResearchItem, - // CustomItemList.UnusedStuff.get(1L))){ - // String modId = GameRegistry.findUniqueIdentifierFor(recipe.mOutput.getItem()).modId; - // if (!modId.equalsIgnoreCase("tectech")) - // if (!modId.equalsIgnoreCase("gregtech") || modId.equalsIgnoreCase("gregtech") && - // (recipe.mOutput.getItemDamage() < 15000 || recipe.mOutput.getItemDamage() > 16999)) - // toRem.add(recipe); - // } - // } - // HashSet<GT_Recipe> toRemVisualScanner = new HashSet<>(); - // HashSet<GT_Recipe> toRemVisualAssLine = new HashSet<>(); - // GT_Recipe.GT_Recipe_AssemblyLine.sAssemblylineRecipes.removeAll(toRem); - // - // for (GT_Recipe.GT_Recipe_AssemblyLine recipe : toRem){ - // GT_Recipe.GT_Recipe_Map.sAssemblylineVisualRecipes.mRecipeList.stream().filter(re -> - // GT_Utility.areStacksEqual(re.mOutputs[0],recipe.mOutput)).forEach(toRemVisualAssLine::add); - // GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.mRecipeList.stream().filter(re -> - // GT_Utility.areStacksEqual(re.mOutputs[0],recipe.mOutput)).forEach(toRemVisualScanner::add); - // TT_recipeAdder.addResearchableAssemblylineRecipe(recipe.mResearchItem, recipe.mResearchTime, - // recipe.mResearchTime/1000, recipe.mEUt, GT_Utility.getTier(recipe.mEUt)-2, recipe.mInputs, - // recipe.mFluidInputs, recipe.mOutput, recipe.mDuration, recipe.mEUt); - // } - // - // GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.mRecipeList.removeAll(toRemVisualScanner); - // GT_Recipe.GT_Recipe_Map.sAssemblylineVisualRecipes.mRecipeList.removeAll(toRemVisualAssLine); } } diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/tgregworks/MaterialsInjector.java b/src/main/java/com/github/bartimaeusnek/crossmod/tgregworks/MaterialsInjector.java index d9cf64f221..44903e58e5 100644 --- a/src/main/java/com/github/bartimaeusnek/crossmod/tgregworks/MaterialsInjector.java +++ b/src/main/java/com/github/bartimaeusnek/crossmod/tgregworks/MaterialsInjector.java @@ -1,5 +1,7 @@ package com.github.bartimaeusnek.crossmod.tgregworks; +import static gregtech.api.enums.Mods.TinkersGregworks; + import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -14,7 +16,6 @@ import vexatos.tgregworks.integration.TGregRegistry; import vexatos.tgregworks.item.ItemTGregPart; import vexatos.tgregworks.reference.Config; -import com.github.bartimaeusnek.bartworks.API.LoaderReference; import com.github.bartimaeusnek.bartworks.MainMod; import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; @@ -50,7 +51,7 @@ public class MaterialsInjector { @Mod.EventHandler public void init(FMLInitializationEvent init) { - if (LoaderReference.TGregworks) { + if (TinkersGregworks.isModLoaded()) { MaterialsInjector.preinit(); MaterialsInjector.run(); } diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/thaumcraft/CustomAspects.java b/src/main/java/com/github/bartimaeusnek/crossmod/thaumcraft/CustomAspects.java deleted file mode 100644 index 28d5ba07cc..0000000000 --- a/src/main/java/com/github/bartimaeusnek/crossmod/thaumcraft/CustomAspects.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (c) 2018-2020 bartimaeusnek Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in the Software without restriction, - * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following - * conditions: The above copyright notice and this permission notice shall be included in all copies or substantial - * portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, - * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - -package com.github.bartimaeusnek.crossmod.thaumcraft; - -public class CustomAspects { - // static Constructor aspectConstructor; - // static Object TRADE; - // static Object UNIVERSE; - // static Object SCIENCE; - // static Object[] tmpArray = new Object[3]; - // static{ - // try { - // aspectConstructor = ThaumcraftHandler.AspectAdder.mAspectClass.getConstructor(String.class,int.class, - // Array.newInstance(ThaumcraftHandler.AspectAdder.mAspectClass,1).getClass(), ResourceLocation.class,int.class); - // tmpArray[0] = Array.newInstance(ThaumcraftHandler.AspectAdder.mAspectClass,2); - // tmpArray[1] = Array.newInstance(ThaumcraftHandler.AspectAdder.mAspectClass,2); - // tmpArray[2] = Array.newInstance(ThaumcraftHandler.AspectAdder.mAspectClass,2); - // Array.set(tmpArray[0],0,ThaumcraftHandler.AspectAdder.mAspectClass.getField("EXCHANGE").get(null)); - // Array.set(tmpArray[0],1,ThaumcraftHandler.AspectAdder.mAspectClass.getField("GREED").get(null)); - // TRADE = aspectConstructor.newInstance("Artis",0x00FF00, tmpArray[0],new - // ResourceLocation(MainMod.MOD_ID+":Aspects/Artis.png"),1); - // Array.set(tmpArray[1],0,ThaumcraftHandler.AspectAdder.mAspectClass.getField("MAGIC").get(null)); - // Array.set(tmpArray[1],1,ThaumcraftHandler.AspectAdder.mAspectClass.getField("ELDRITCH").get(null)); - // UNIVERSE = aspectConstructor.newInstance("Universum",0x0000FF, tmpArray[1],new - // ResourceLocation(MainMod.MOD_ID+":Aspects/Universum.png"),1); - // Array.set(tmpArray[2],0,ThaumcraftHandler.AspectAdder.mAspectClass.getField("MAN").get(null)); - // Array.set(tmpArray[2],1,UNIVERSE); - // SCIENCE = aspectConstructor.newInstance("Scientia",0x00FFFF, tmpArray[2],new - // ResourceLocation(MainMod.MOD_ID+":Aspects/Scientia.png"),1); - // } catch (NoSuchMethodException | NoSuchFieldException | IllegalAccessException | InstantiationException | - // InvocationTargetException e) { - // e.printStackTrace(); - // } - // } -} |