From a5a444ebc4a2488ca850b3cf3eae3659a81659e2 Mon Sep 17 00:00:00 2001 From: Steelux <70096037+Steelux8@users.noreply.github.com> Date: Thu, 22 Dec 2022 18:20:15 +0000 Subject: Add the Quantum Force Transformer (Endgame Chemline Skipper) (#399) * First Code Implementation * First Textures Implementation * Texture Name Fixes * spotlessApply (#400) Co-authored-by: Steelux <70096037+Steelux8@users.noreply.github.com> Co-authored-by: GitHub GTNH Actions <> * Controller ID Fix * spotlessApply (#401) Co-authored-by: Steelux <70096037+Steelux8@users.noreply.github.com> Co-authored-by: GitHub GTNH Actions <> * Reworked Recipe Map, Started Rework on recipes * spotless * fix recipe to actually use eternal singularity, make sure we can have a null fluid output * add new blocks and some new textures * Spotless apply for branch Chem_Line_Skipper for #399 (#406) * fix material localization (#395) * fix material localization * spotlessApply * Revert the Nerf to Algae Farm Casing Cost (#397) - Changed the Algae Farm casing tier to the low tier it was supposed to be at, this time at MV and with no dirt. The casing is shared with the TGS, which was the reason for the nerf, but the controller can gate that multi; - Adjusted the controller recipe for the Farm to also be MV. * Fix Amount of Infinite Mutation Catalyst Output (#398) - Changed output from 1 to 5 catalysts, to match the input of 5 carriers. * Fix Sterile Farm Casing Recipe (No Tumbaga Pipe) (#402) * fix frame box and block cant localized (#404) * fix double plate and long rod cant localized (#405) * fix double plate and long rod cant localized * sa * spotlessApply Co-authored-by: iouter <62897714+iouter@users.noreply.github.com> Co-authored-by: Steelux <70096037+Steelux8@users.noreply.github.com> Co-authored-by: GitHub GTNH Actions <> * First Changes to Add Chemplant Catalysts * Spotless apply for branch Chem_Line_Skipper for #399 (#407) * fix material localization (#395) * fix material localization * spotlessApply * Revert the Nerf to Algae Farm Casing Cost (#397) - Changed the Algae Farm casing tier to the low tier it was supposed to be at, this time at MV and with no dirt. The casing is shared with the TGS, which was the reason for the nerf, but the controller can gate that multi; - Adjusted the controller recipe for the Farm to also be MV. * Fix Amount of Infinite Mutation Catalyst Output (#398) - Changed output from 1 to 5 catalysts, to match the input of 5 carriers. * Fix Sterile Farm Casing Recipe (No Tumbaga Pipe) (#402) * fix frame box and block cant localized (#404) * fix double plate and long rod cant localized (#405) * fix double plate and long rod cant localized * sa * spotlessApply Co-authored-by: iouter <62897714+iouter@users.noreply.github.com> Co-authored-by: Steelux <70096037+Steelux8@users.noreply.github.com> Co-authored-by: GitHub GTNH Actions <> * Multi Forms with Catalyst Housing and Recipes in NEI * spotless * Remove Mufflers and Pollution * New textures and make new casing to be used in the multi * Make a working recipe check, add a Fluid only output mode * Do not allow the ME Input Bus bug again. fixing it early * replace the current glass with a new one a real texture needs to be made * fix catalysts being able to be used in the input bus and fix recipes not start from a second input bus * Spotless apply for branch Chem_Line_Skipper for #399 (#412) * fix material localization (#395) * fix material localization * spotlessApply * Revert the Nerf to Algae Farm Casing Cost (#397) - Changed the Algae Farm casing tier to the low tier it was supposed to be at, this time at MV and with no dirt. The casing is shared with the TGS, which was the reason for the nerf, but the controller can gate that multi; - Adjusted the controller recipe for the Farm to also be MV. * Fix Amount of Infinite Mutation Catalyst Output (#398) - Changed output from 1 to 5 catalysts, to match the input of 5 carriers. * Fix Sterile Farm Casing Recipe (No Tumbaga Pipe) (#402) * fix frame box and block cant localized (#404) * fix double plate and long rod cant localized (#405) * fix double plate and long rod cant localized * sa * Update chemplant manual for TPV (#409) * Update chemplant manual for TPV * update BS Co-authored-by: Martin Robertz * fix crop manager log spam (#408) * Recipe fixes 2022/10/25 (#410) * Remove reflection from RTG Hatch (#411) * Fix Material Progression and Semifluid Gen Cost (#403) - Changed some materials used in GT++ material tier progression, because they require EBF coils above what is possible for the tier; - Changed fluid input on LV Semifluid Generator recipe from Bronze to Tin, since Bronze cannot be fluid extracted in LV; - Reduced the input count of items for those recipes, to bring it closer to the other generators. * spotlessApply Co-authored-by: iouter <62897714+iouter@users.noreply.github.com> Co-authored-by: Steelux <70096037+Steelux8@users.noreply.github.com> Co-authored-by: miozune Co-authored-by: Martin Robertz Co-authored-by: Guinea Wheek Co-authored-by: GitHub GTNH Actions <> * fix overclocking with 1 energy hatch * fix merging from master * allow tectech energy hatches * Update GT * NEI migration & cleanup Deprecate GTPP_Recipe_Map_Internal#sMappingsEx and delegate to GT_Recipe_Map#sMappings instead Remove recipe modification check * allow for parallel crafting in the QFT * Plasma consumption and their respective hatches * Initial Placeholders for QFT Recipes * spotless * get the fluids the correct way and make sure focusing requires neptunium * Boiler * New Plasma Recipes * Remove Unused Catalyst Code * Remove More Unused Code for Catalyst and Glass * Refactor Crafting and Focusing Tiers * spotlessApply (#441) Co-authored-by: Steelux <70096037+Steelux8@users.noreply.github.com> Co-authored-by: GitHub GTNH Actions <> * remove useless code, make the structure definition static and final. * it works. * address review * spotlessApply (#442) Co-authored-by: Steelux <70096037+Steelux8@users.noreply.github.com> Co-authored-by: GitHub GTNH Actions <> * there are no catalyst housing, no mufflers either. and no need to override more than needed * Crafting Casings Texture Update * address more reviews. also preemptive fix for constant neptunium consumption i am not doing more until tomorrow * Small cleanups * Programmed Circuit & Super Bus * I dare you use mName for shapes again. * Lower the number of fluid slots for multi mixer NEI * Updated Focusing Textures and Added Statics * Implementation of New Catalysts * Recipes for Everything * Spotless apply for branch Chem_Line_Skipper for #399 (#444) * make structure definition fields static (#443) * spotlessApply Co-authored-by: Glease <4586901+Glease@users.noreply.github.com> Co-authored-by: Steelux <70096037+Steelux8@users.noreply.github.com> Co-authored-by: GitHub GTNH Actions <> * add in a config option to change between animated and static textures * More Recipe Additions * spotless again * merge dev fixes. maybe this was it? this is hell * update how fluid mode works * update NEI * update gt dep * update gt version to the correct one. We need MUI god damnit * set animated textures on by default * BS+SA+fix * just a normal gt++ pr * Add Remaining Catalysts * FIXES * miozune request * update dependencies * add dense plates to be auto-genned * rework recipes of the QFT, make the recipe map accept it as a catalyst * add missed items to recipes * change around some recipes. fix NEI. fix some localization * do not set the recipe map for those hatches oops * hatches are pain * life a circle of pain * change the placement of the Fermium and Neptunium Hatch. add tooltip information about it * Add Kevlar recipe using bee comb Adds additional bonus and solely for kevlar * Fixed controller texture * do some fixes. updata dependencies * fix a small oopsie * wait what * Fix catalyst recipes * fix not building * quick spotless * Some tooltip fixes * Increase Fluid Input p/Tier on Recipe Tier Casings * Buff t1 costs * Increase Catalyst Costs to Near the QFT Cost * Some last bug fixes * Minimum energy hatches fix * Change last return statement * Spotless * Oil is not required in the QFT * Spotless again * prepare texture names for Sampsa * Sampsa's textures * Restore Old Unused Texture Changes * Update build.gradle * force field renderer and some fixes * forgot to make it render when working * make client side * remove uneeded things. add variables as local * fix parallels * spotless * fix parallels * quick thing to fix and prevent in the future * forgot to use the same item damage oops * fix to fluid mode. just edit the stacksize * use copyAmountUnsafe * update dependencies. fix overclocking * correct overclocking * lower amps you can use by 1/5th instead of 1/20th * Update dependencies.gradle * update BS * remove jitpack Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: BlueWeabo <76872108+BlueWeabo@users.noreply.github.com> Co-authored-by: iouter <62897714+iouter@users.noreply.github.com> Co-authored-by: miozune Co-authored-by: Martin Robertz Co-authored-by: Guinea Wheek Co-authored-by: Glease <4586901+Glease@users.noreply.github.com> Co-authored-by: Runakai1 --- src/main/java/gregtech/api/util/GTPP_Recipe.java | 23 + .../java/gtPlusPlus/core/config/ConfigHandler.java | 4 + .../gtPlusPlus/core/handler/COMPAT_HANDLER.java | 3 + .../core/item/base/BaseItemComponent.java | 3 +- .../core/item/base/plates/BaseItemPlateDense.java | 11 + .../core/item/chemistry/GenericChem.java | 40 + .../chemistry/general/ItemGenericChemBase.java | 15 +- src/main/java/gtPlusPlus/core/lib/CORE.java | 2 + .../java/gtPlusPlus/core/material/Material.java | 4 + .../core/material/MaterialGenerator.java | 2 + .../gtPlusPlus/core/recipe/RECIPES_Machines.java | 1030 ++++++---------- .../gtPlusPlus/core/util/minecraft/ItemUtils.java | 36 + src/main/java/gtPlusPlus/nei/NEI_GT_Config.java | 4 +- src/main/java/gtPlusPlus/nei/NEI_IMC_Sender.java | 6 +- .../xmod/gregtech/api/enums/GregtechItemList.java | 13 + .../xmod/gregtech/api/gui/GTPP_UITextures.java | 7 +- .../interfaces/internal/IGregtech_RecipeAdder.java | 16 +- .../common/blocks/GregtechMetaCasingBlocks2.java | 2 +- .../common/blocks/GregtechMetaCasingBlocks4.java | 6 +- .../common/blocks/GregtechMetaCasingBlocks5.java | 62 +- .../common/blocks/textures/TexturesGtBlock.java | 20 + .../multi/production/GT4Entity_AutoCrafter.java | 2 +- ...techMetaTileEntity_QuantumForceTransformer.java | 1245 ++++++++++++++++++++ .../xmod/gregtech/loaders/RecipeGen_Plates.java | 25 + .../loaders/recipe/RecipeLoader_ChemicalSkips.java | 640 ++++++++++ .../xmod/gregtech/recipes/GregtechRecipeAdder.java | 53 + .../gregtech/GregtechQuantumForceTransformer.java | 20 + .../resources/assets/miscutils/lang/en_US.lang | 19 +- .../assets/miscutils/textures/blocks/Blank.png | Bin 0 -> 120 bytes .../textures/blocks/CosmicFabricManipulator.png | Bin 0 -> 1131 bytes .../blocks/CosmicFabricManipulator.png.mcmeta | 6 + .../blocks/CosmicFabricManipulatorStatic.png | Bin 0 -> 492 bytes .../textures/blocks/CosmicFabricShieldingCore.png | Bin 0 -> 1222 bytes .../blocks/CosmicFabricShieldingCore.png.mcmeta | 6 + .../blocks/CosmicFabricShieldingCoreStatic.png | Bin 0 -> 645 bytes .../miscutils/textures/blocks/ForceFieldGlass.png | Bin 0 -> 249 bytes .../textures/blocks/InfinityInfusedManipulator.png | Bin 0 -> 1627 bytes .../blocks/InfinityInfusedManipulator.png.mcmeta | 6 + .../blocks/InfinityInfusedManipulatorStatic.png | Bin 0 -> 557 bytes .../blocks/InfinityInfusedShieldingCore.png | Bin 0 -> 1869 bytes .../blocks/InfinityInfusedShieldingCore.png.mcmeta | 6 + .../blocks/InfinityInfusedShieldingCoreStatic.png | Bin 0 -> 613 bytes .../miscutils/textures/blocks/Manipulator_Top.png | Bin 0 -> 511 bytes .../textures/blocks/NeutronPulseManipulator.png | Bin 0 -> 1309 bytes .../blocks/NeutronPulseManipulator.png.mcmeta | 6 + .../blocks/NeutronPulseManipulatorStatic.png | Bin 0 -> 492 bytes .../textures/blocks/NeutronShieldingCore.png | Bin 0 -> 1617 bytes .../blocks/NeutronShieldingCore.png.mcmeta | 6 + .../textures/blocks/NeutronShieldingCoreStatic.png | Bin 0 -> 607 bytes .../textures/blocks/SpaceTimeBendingCore.png | Bin 0 -> 2084 bytes .../blocks/SpaceTimeBendingCore.png.mcmeta | 6 + .../textures/blocks/SpaceTimeBendingCoreStatic.png | Bin 0 -> 624 bytes .../textures/blocks/SpaceTimeContinuumRipper.png | Bin 0 -> 1593 bytes .../blocks/SpaceTimeContinuumRipper.png.mcmeta | 6 + .../blocks/SpaceTimeContinuumRipperStatic.png | Bin 0 -> 562 bytes .../TileEntities/MACHINE_CASING_QFT_COIL.png | Bin 0 -> 11243 bytes .../MACHINE_CASING_QFT_COIL.png.mcmeta | 39 + .../MACHINE_CASING_QFT_COIL_STATIC.png | Bin 0 -> 688 bytes .../textures/blocks/TileEntities/machine_top.png | Bin 822 -> 531 bytes .../textures/blocks/rendering/ForceField.png | Bin 0 -> 3676 bytes .../items/science/general/MetaItem1/16.png | Bin 0 -> 524 bytes .../items/science/general/MetaItem1/17.png | Bin 0 -> 524 bytes .../items/science/general/MetaItem1/18.png | Bin 0 -> 524 bytes .../items/science/general/MetaItem1/19.png | Bin 0 -> 524 bytes .../items/science/general/MetaItem1/20.png | Bin 0 -> 524 bytes .../items/science/general/MetaItem1/21.png | Bin 0 -> 524 bytes .../items/science/general/MetaItem1/22.png | Bin 0 -> 524 bytes .../items/science/general/MetaItem1/23.png | Bin 0 -> 524 bytes .../items/science/general/MetaItem1/24.png | Bin 0 -> 524 bytes .../items/science/general/MetaItem1/25.png | Bin 0 -> 524 bytes .../items/science/general/MetaItem1/26.png | Bin 0 -> 524 bytes .../items/science/general/MetaItem1/27.png | Bin 0 -> 524 bytes 72 files changed, 2705 insertions(+), 695 deletions(-) create mode 100644 src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlateDense.java create mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_QuantumForceTransformer.java create mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_ChemicalSkips.java create mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechQuantumForceTransformer.java create mode 100644 src/main/resources/assets/miscutils/textures/blocks/Blank.png create mode 100644 src/main/resources/assets/miscutils/textures/blocks/CosmicFabricManipulator.png create mode 100644 src/main/resources/assets/miscutils/textures/blocks/CosmicFabricManipulator.png.mcmeta create mode 100644 src/main/resources/assets/miscutils/textures/blocks/CosmicFabricManipulatorStatic.png create mode 100644 src/main/resources/assets/miscutils/textures/blocks/CosmicFabricShieldingCore.png create mode 100644 src/main/resources/assets/miscutils/textures/blocks/CosmicFabricShieldingCore.png.mcmeta create mode 100644 src/main/resources/assets/miscutils/textures/blocks/CosmicFabricShieldingCoreStatic.png create mode 100644 src/main/resources/assets/miscutils/textures/blocks/ForceFieldGlass.png create mode 100644 src/main/resources/assets/miscutils/textures/blocks/InfinityInfusedManipulator.png create mode 100644 src/main/resources/assets/miscutils/textures/blocks/InfinityInfusedManipulator.png.mcmeta create mode 100644 src/main/resources/assets/miscutils/textures/blocks/InfinityInfusedManipulatorStatic.png create mode 100644 src/main/resources/assets/miscutils/textures/blocks/InfinityInfusedShieldingCore.png create mode 100644 src/main/resources/assets/miscutils/textures/blocks/InfinityInfusedShieldingCore.png.mcmeta create mode 100644 src/main/resources/assets/miscutils/textures/blocks/InfinityInfusedShieldingCoreStatic.png create mode 100644 src/main/resources/assets/miscutils/textures/blocks/Manipulator_Top.png create mode 100644 src/main/resources/assets/miscutils/textures/blocks/NeutronPulseManipulator.png create mode 100644 src/main/resources/assets/miscutils/textures/blocks/NeutronPulseManipulator.png.mcmeta create mode 100644 src/main/resources/assets/miscutils/textures/blocks/NeutronPulseManipulatorStatic.png create mode 100644 src/main/resources/assets/miscutils/textures/blocks/NeutronShieldingCore.png create mode 100644 src/main/resources/assets/miscutils/textures/blocks/NeutronShieldingCore.png.mcmeta create mode 100644 src/main/resources/assets/miscutils/textures/blocks/NeutronShieldingCoreStatic.png create mode 100644 src/main/resources/assets/miscutils/textures/blocks/SpaceTimeBendingCore.png create mode 100644 src/main/resources/assets/miscutils/textures/blocks/SpaceTimeBendingCore.png.mcmeta create mode 100644 src/main/resources/assets/miscutils/textures/blocks/SpaceTimeBendingCoreStatic.png create mode 100644 src/main/resources/assets/miscutils/textures/blocks/SpaceTimeContinuumRipper.png create mode 100644 src/main/resources/assets/miscutils/textures/blocks/SpaceTimeContinuumRipper.png.mcmeta create mode 100644 src/main/resources/assets/miscutils/textures/blocks/SpaceTimeContinuumRipperStatic.png create mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_QFT_COIL.png create mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_QFT_COIL.png.mcmeta create mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_QFT_COIL_STATIC.png create mode 100644 src/main/resources/assets/miscutils/textures/blocks/rendering/ForceField.png create mode 100644 src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/16.png create mode 100644 src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/17.png create mode 100644 src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/18.png create mode 100644 src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/19.png create mode 100644 src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/20.png create mode 100644 src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/21.png create mode 100644 src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/22.png create mode 100644 src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/23.png create mode 100644 src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/24.png create mode 100644 src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/25.png create mode 100644 src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/26.png create mode 100644 src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/27.png (limited to 'src/main') diff --git a/src/main/java/gregtech/api/util/GTPP_Recipe.java b/src/main/java/gregtech/api/util/GTPP_Recipe.java index a11cede13f..7bca0da4df 100644 --- a/src/main/java/gregtech/api/util/GTPP_Recipe.java +++ b/src/main/java/gregtech/api/util/GTPP_Recipe.java @@ -4,6 +4,7 @@ import static gregtech.api.enums.GT_Values.*; import com.gtnewhorizons.modularui.api.math.Pos2d; import com.gtnewhorizons.modularui.common.widget.ProgressBar; +import com.gtnewhorizons.modularui.common.widget.ProgressBar.Direction; import gregtech.api.gui.modularui.GT_UITextures; import gtPlusPlus.api.interfaces.IComparableRecipe; import gtPlusPlus.api.objects.Logger; @@ -201,6 +202,27 @@ public class GTPP_Recipe extends GT_Recipe implements IComparableRecipe { true) .useModularUI(true); + public static final GT_Recipe_Map sQuantumForceTransformerRecipes = new GT_Recipe_Map_LargeNEI( + new HashSet<>(20), + "gtpp.recipe.quantumforcesmelter", + "Quantum Force Transformer", + null, + RES_PATH_GUI + "basicmachines/LCRNEI", + 6, + 6, + 1, + 0, + 1, + "Tier: ", + 1, + E, + true, + true) + .useModularUI(true) + .setProgressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE, Direction.RIGHT) + .setUsualFluidInputCount(6) + .setUsualFluidOutputCount(6); + public static final GT_Recipe_Map sGeoThermalFuels = new GT_Recipe_Map( new HashSet<>(10), "gtpp.recipe.geothermalfuel", @@ -724,6 +746,7 @@ public class GTPP_Recipe extends GT_Recipe implements IComparableRecipe { .setProgressBar(GT_UITextures.PROGRESSBAR_MIXER, ProgressBar.Direction.CIRCULAR_CW) .setUsualFluidInputCount(6) .setUsualFluidOutputCount(6); + public static final GT_Recipe_Map sMultiblockChemicalDehydratorRecipes = new GT_Recipe_Map_LargeNEI( new HashSet<>(2000), "gtpp.recipe.multidehydrator", diff --git a/src/main/java/gtPlusPlus/core/config/ConfigHandler.java b/src/main/java/gtPlusPlus/core/config/ConfigHandler.java index d97fe6c0fc..9158233bea 100644 --- a/src/main/java/gtPlusPlus/core/config/ConfigHandler.java +++ b/src/main/java/gtPlusPlus/core/config/ConfigHandler.java @@ -595,6 +595,10 @@ public class ConfigHandler { pollutionReleasedByTierGeothermalGenerator, "coefficient applied to the base rate of the single block geothermal engines based on its tier (first is tier 0 aka ULV)") .getDoubleList(); + + // Visual + enableAnimatedTextures = config.getBoolean( + "enableAnimatedTextures", "visual", true, "Enables Animated GT++ Textures, Requires Restart"); config.save(); } } diff --git a/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java index 93f6df7595..e0ba67e0b0 100644 --- a/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java +++ b/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java @@ -39,6 +39,7 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaGarbageCollector; import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_FluidCanning; import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Recycling; +import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoader_ChemicalSkips; import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoader_GTNH; import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoader_GlueLine; import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoader_Nuclear; @@ -109,6 +110,7 @@ public class COMPAT_HANDLER { GregtechIndustrialWiremill.run(); GregtechIndustrialMassFabricator.run(); GregtechIndustrialBlastSmelter.run(); + GregtechQuantumForceTransformer.run(); GregtechSolarGenerators.run(); GregtechPowerSubStation.run(); GregtechDehydrator.run(); @@ -239,6 +241,7 @@ public class COMPAT_HANDLER { RecipeLoader_GTNH.generate(); RecipeLoader_Nuclear.generate(); RecipeLoader_GlueLine.generate(); + RecipeLoader_ChemicalSkips.generate(); // Add autogenerated Recipes from Item Components for (Set> m : MaterialGenerator.mRecipeMapsToGenerate) { for (RunnableWithInfo r : m) { diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java index 25877d250c..1f59ecf2b1 100644 --- a/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java @@ -426,10 +426,11 @@ public class BaseItemComponent extends Item { PLASMACELL("CellPlasma", " Plasma Cell", "cellPlasma", OrePrefixes.cellPlasma), CELL("Cell", " Cell", "cell", OrePrefixes.cell), NUGGET("Nugget", " Nugget", "nugget", OrePrefixes.nugget), - PLATEHEAVY("HeavyPlate", "Heavy@Plate", "plateHeavy", OrePrefixes.plateDense), + PLATEHEAVY("HeavyPlate", "Heavy@Plate", "plateHeavy", OrePrefixes.plateQuadruple), SPRING("Spring", " Spring", "spring", OrePrefixes.spring), SMALLSPRING("SmallSpring", "Small@Spring", "springSmall", OrePrefixes.springSmall), FINEWIRE("FineWire", "Fine@Wire", "wireFine", OrePrefixes.wireFine), + PLATEDENSE("PlateDense", "Dense@Plate", "plateDense", OrePrefixes.plateDense), ; private String COMPONENT_NAME; diff --git a/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlateDense.java b/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlateDense.java new file mode 100644 index 0000000000..580e028c00 --- /dev/null +++ b/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlateDense.java @@ -0,0 +1,11 @@ +package gtPlusPlus.core.item.base.plates; + +import gtPlusPlus.core.item.base.BaseItemComponent; +import gtPlusPlus.core.material.Material; + +public class BaseItemPlateDense extends BaseItemComponent { + + public BaseItemPlateDense(Material material) { + super(material, ComponentTypes.PLATEDENSE); + } +} diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java index 31e2492259..cabd9542f8 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java @@ -109,6 +109,20 @@ public class GenericChem extends ItemPackage { public static ItemStack mSolidAcidCatalyst; public static ItemStack mInfiniteMutationCatalyst; + // QFT Catalysts + public static ItemStack mPlatinumGroupCatalyst; + public static ItemStack mPlasticPolymerCatalyst; + public static ItemStack mRubberPolymerCatalyst; + public static ItemStack mAdhesionPromoterCatalyst; + public static ItemStack mTitaTungstenIndiumCatalyst; + public static ItemStack mRadioactivityCatalyst; + public static ItemStack mRareEarthGroupCatalyst; + public static ItemStack mSimpleNaquadahCatalyst; + public static ItemStack mAdvancedNaquadahCatalyst; + public static ItemStack mRawIntelligenceCatalyst; + public static ItemStack mUltimatePlasticCatalyst; + public static ItemStack mBiologicalIntelligenceCatalyst; + public static ItemStack mMillingBallAlumina; public static ItemStack mMillingBallSoapstone; @@ -156,6 +170,20 @@ public class GenericChem extends ItemPackage { mFormaldehydeCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 13, 1); mSolidAcidCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 14, 1); mInfiniteMutationCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 15, 1); + + // QFT Catalysts + mPlatinumGroupCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 16, 1); + mPlasticPolymerCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 17, 1); + mRubberPolymerCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 18, 1); + mAdhesionPromoterCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 19, 1); + mTitaTungstenIndiumCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 20, 1); + mRadioactivityCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 21, 1); + mRareEarthGroupCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 22, 1); + mSimpleNaquadahCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 23, 1); + mAdvancedNaquadahCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 24, 1); + mRawIntelligenceCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 25, 1); + mUltimatePlasticCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 26, 1); + mBiologicalIntelligenceCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 27, 1); } public void registerOreDict() { @@ -176,6 +204,18 @@ public class GenericChem extends ItemPackage { ItemUtils.addItemToOreDictionary(mFormaldehydeCatalyst, "catalystFormaldehyde"); ItemUtils.addItemToOreDictionary(mSolidAcidCatalyst, "catalystSolidAcid"); ItemUtils.addItemToOreDictionary(mInfiniteMutationCatalyst, "catalystInfiniteMutation"); + ItemUtils.addItemToOreDictionary(mPlatinumGroupCatalyst, "catalystPlatinumGroup"); + ItemUtils.addItemToOreDictionary(mPlasticPolymerCatalyst, "catalystPlasticPolymer"); + ItemUtils.addItemToOreDictionary(mRubberPolymerCatalyst, "catalystRubberPolymer"); + ItemUtils.addItemToOreDictionary(mAdhesionPromoterCatalyst, "catalystAdhesionPromoter"); + ItemUtils.addItemToOreDictionary(mTitaTungstenIndiumCatalyst, "catalystTitaTungstenIndium"); + ItemUtils.addItemToOreDictionary(mRadioactivityCatalyst, "catalystRadioactivity"); + ItemUtils.addItemToOreDictionary(mRareEarthGroupCatalyst, "catalystRareEarthGroup"); + ItemUtils.addItemToOreDictionary(mSimpleNaquadahCatalyst, "catalystSimpleNaquadah"); + ItemUtils.addItemToOreDictionary(mAdvancedNaquadahCatalyst, "catalystAdvancedNaquadah"); + ItemUtils.addItemToOreDictionary(mRawIntelligenceCatalyst, "catalystRawIntelligence"); + ItemUtils.addItemToOreDictionary(mUltimatePlasticCatalyst, "catalystUltimatePlastic"); + ItemUtils.addItemToOreDictionary(mBiologicalIntelligenceCatalyst, "catalystBiologicalIntelligence"); } @Override diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java b/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java index 35204999d1..b8a1bc4041 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java @@ -22,7 +22,7 @@ public class ItemGenericChemBase extends Item { protected final IIcon base[]; - private final int aMetaSize = 16; + private final int aMetaSize = 28; /* * 0 - Red Metal Catalyst //FeCu @@ -40,6 +40,19 @@ public class ItemGenericChemBase extends Item { * 12 - Potassium Hydroxide // KOH * 13 - Formaldehyde Catalyst //Fe16V1 * 14 - Solid Acid Catalyst //H2SO4 + * 15 - Infinite Mutation Catalyst (for Mutated Living Solder) + * 16 - Platinum Group Catalyst (for platline skip) + * 17 - Plastic Polymer Catalyst (for early plastics skip) + * 18 - Rubber Polymer Catalyst (for early rubbers skip) + * 19 - Adhesion Promoter Catalyst (for glue/solder skip) + * 20 - Tita-Tungsten Indium Catalyst (for titanium/tungsten/indium skip) + * 21 - Radioactivity Catalyst (for thorium/uranium/plutonium skip) + * 22 - Rare-Earth Group Catalyst (for monaline skip) + * 23 - Simple Naquadah Catalyst (for early naqline skip) + * 24 - Advanced Naquadah Catalyst (for late naqline skip) + * 25 - Raw Intelligence Catalyst (for stem cells skip) + * 26 - Ultimate Plasticizer Catalyst (for late plastics skip) + * 27 - Biological Intelligence Catalyst (for bio cells skip) */ public ItemGenericChemBase() { diff --git a/src/main/java/gtPlusPlus/core/lib/CORE.java b/src/main/java/gtPlusPlus/core/lib/CORE.java index afe36d8800..c4f6d4ad42 100644 --- a/src/main/java/gtPlusPlus/core/lib/CORE.java +++ b/src/main/java/gtPlusPlus/core/lib/CORE.java @@ -209,6 +209,7 @@ public class CORE { // Multiblocks public static boolean enableMultiblock_AlloyBlastSmelter = true; + public static boolean enableMultiblock_QuantumForceTransformer = true; public static boolean enableMultiblock_IndustrialCentrifuge = true; public static boolean enableMultiblock_IndustrialCokeOven = true; public static boolean enableMultiblock_IndustrialElectrolyzer = true; @@ -236,6 +237,7 @@ public class CORE { // Visuals public static boolean enableTreeFarmerParticles = true; public static boolean useGregtechTextures = true; + public static boolean enableAnimatedTextures = false; // Pollution public static int pollutionPerSecondMultiPackager = 40; diff --git a/src/main/java/gtPlusPlus/core/material/Material.java b/src/main/java/gtPlusPlus/core/material/Material.java index 105110fe80..fa3194a67b 100644 --- a/src/main/java/gtPlusPlus/core/material/Material.java +++ b/src/main/java/gtPlusPlus/core/material/Material.java @@ -1170,6 +1170,10 @@ public class Material { return getComponentByPrefix(OrePrefixes.plateDouble, stacksize); } + public final ItemStack getPlateDense(final int stacksize) { + return getComponentByPrefix(OrePrefixes.plateDense, stacksize); + } + public final ItemStack getGear(final int stacksize) { return getComponentByPrefix(OrePrefixes.gearGt, stacksize); } diff --git a/src/main/java/gtPlusPlus/core/material/MaterialGenerator.java b/src/main/java/gtPlusPlus/core/material/MaterialGenerator.java index d114fca3c0..27a9ea3750 100644 --- a/src/main/java/gtPlusPlus/core/material/MaterialGenerator.java +++ b/src/main/java/gtPlusPlus/core/material/MaterialGenerator.java @@ -21,6 +21,7 @@ import gtPlusPlus.core.item.base.ore.BaseItemImpureDust; import gtPlusPlus.core.item.base.ore.BaseItemPurifiedCrushedOre; import gtPlusPlus.core.item.base.ore.BaseItemPurifiedDust; import gtPlusPlus.core.item.base.plates.BaseItemPlate; +import gtPlusPlus.core.item.base.plates.BaseItemPlateDense; import gtPlusPlus.core.item.base.plates.BaseItemPlateDouble; import gtPlusPlus.core.item.base.rings.BaseItemRing; import gtPlusPlus.core.item.base.rods.BaseItemRod; @@ -154,6 +155,7 @@ public class MaterialGenerator { temp = new BaseItemScrew(matInfo); temp = new BaseItemRotor(matInfo); temp = new BaseItemGear(matInfo); + temp = new BaseItemPlateDense(matInfo); } } else { tempBlock = new BlockBaseModular(matInfo, BlockTypes.STANDARD); diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java index af2f62e608..f06c4904f7 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -1,7 +1,7 @@ package gtPlusPlus.core.recipe; -import static gtPlusPlus.core.lib.CORE.GTNH; - +import com.github.technus.tectech.recipe.TT_recipeAdder; +import com.github.technus.tectech.thing.CustomItemList; import cpw.mods.fml.common.Loader; import gregtech.api.GregTech_API; import gregtech.api.enums.*; @@ -19,6 +19,7 @@ import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.ALLOY; import gtPlusPlus.core.material.ELEMENT; +import gtPlusPlus.core.material.MISC_MATERIALS; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.*; @@ -214,9 +215,6 @@ public class RECIPES_Machines { public static ItemStack INPUT_RCCokeOvenBlock; public static ItemStack INPUT_IECokeOvenBlock; - // Output Determiner - public static int Casing_Amount; - public static final void loadRecipes() { run(); Logger.INFO("Loading Recipes for the Various machine blocks."); @@ -224,13 +222,6 @@ public class RECIPES_Machines { private static void run() { - // Determines Casing Recipe Output - if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK && !GTNH) { - Casing_Amount = 2; - } else { - Casing_Amount = 1; - } - initModItems(); tieredMachineHulls(); controlCores(); @@ -600,26 +591,26 @@ public class RECIPES_Machines { new Object[] { ALLOY.HG1223.getFineWire(64), ALLOY.HG1223.getFineWire(64), - ItemList.Electric_Motor_IV.get(GTNH ? 32 : 16), - ItemList.Energy_LapotronicOrb.get(GTNH ? 32 : 16), - CI.getTieredComponent(OrePrefixes.cableGt12, 6, GTNH ? 32 : 16), - CI.getTieredComponent(OrePrefixes.wireGt16, 5, GTNH ? 64 : 32), + ItemList.Electric_Motor_IV.get(16), + ItemList.Energy_LapotronicOrb.get(16), + CI.getTieredComponent(OrePrefixes.cableGt12, 6, 16), + CI.getTieredComponent(OrePrefixes.wireGt16, 5, 32), ALLOY.ZERON_100.getFrameBox(4), ALLOY.ZIRCONIUM_CARBIDE.getPlateDouble(32), ALLOY.BABBIT_ALLOY.getPlate(64), - ALLOY.LEAGRISIUM.getGear(GTNH ? 16 : 8), + ALLOY.LEAGRISIUM.getGear(8), new Object[] {CI.getTieredCircuitOreDictName(4), 64}, new Object[] {CI.getTieredCircuitOreDictName(5), 32}, new Object[] {CI.getTieredCircuitOreDictName(6), 16}, GregtechItemList.Laser_Lens_WoodsGlass.get(1), }, new FluidStack[] { - ALLOY.NITINOL_60.getFluidStack(144 * 9 * (GTNH ? 4 : 2)), - ALLOY.INCOLOY_MA956.getFluidStack(144 * 9 * (GTNH ? 32 : 8)), - ALLOY.KANTHAL.getFluidStack(144 * 1 * (GTNH ? 16 : 4)), + ALLOY.NITINOL_60.getFluidStack(144 * 9 * (2)), + ALLOY.INCOLOY_MA956.getFluidStack(144 * 9 * (8)), + ALLOY.KANTHAL.getFluidStack(144 * 1 * (4)), }, GregtechItemList.Controller_MolecularTransformer.get(1), - 20 * 60 * 10 * (GTNH ? 2 : 1), + 20 * 60 * 10 * (1), (int) MaterialUtils.getVoltageForTier(6)); CORE.RA.addSixSlotAssemblingRecipe( @@ -899,14 +890,14 @@ public class RECIPES_Machines { 20 * 60 * 60 * 12, new Object[] { CI.getTieredMachineHull(7, 4), - CI.getFieldGenerator(5, GTNH ? 32 : 16), - CI.getElectricMotor(7, GTNH ? 32 : 16), - CI.getElectricPiston(7, GTNH ? 16 : 4), - CI.getEnergyCore(6, GTNH ? 8 : 2), - CI.getPlate(7, GTNH ? 32 : 16), - CI.getScrew(7, GTNH ? 64 : 32), - CI.getBolt(6, GTNH ? 64 : 32), - CI.getTieredComponent(OrePrefixes.rod, 6, GTNH ? 20 : 10), + CI.getFieldGenerator(5, 16), + CI.getElectricMotor(7, 16), + CI.getElectricPiston(7, 4), + CI.getEnergyCore(6, 2), + CI.getPlate(7, 16), + CI.getScrew(7, 32), + CI.getBolt(6, 32), + CI.getTieredComponent(OrePrefixes.rod, 6, 10), new Object[] {CI.getTieredCircuitOreDictName(7), 20}, ItemList.Tool_DataOrb.get(32), GregtechItemList.Laser_Lens_Special.get(1) @@ -918,7 +909,7 @@ public class RECIPES_Machines { ALLOY.BABBIT_ALLOY.getFluidStack(128 * 144), }, GregtechItemList.Controller_ElementalDuplicator.get(1), - 20 * 60 * 60 * (GTNH ? 2 : 1), + 20 * 60 * 60, (int) MaterialUtils.getVoltageForTier(7)); CORE.RA.addAssemblylineRecipe( @@ -926,12 +917,12 @@ public class RECIPES_Machines { 20 * 60 * 60 * 4, new Object[] { CI.getTieredGTPPMachineCasing(7, 2), - CI.getFieldGenerator(4, GTNH ? 8 : 4), - CI.getEnergyCore(4, GTNH ? 8 : 2), - CI.getPlate(7, GTNH ? 16 : 8), - CI.getScrew(6, GTNH ? 32 : 16), - CI.getBolt(6, GTNH ? 32 : 16), - CI.getTieredComponent(OrePrefixes.rod, 5, GTNH ? 32 : 16), + CI.getFieldGenerator(4, 4), + CI.getEnergyCore(4, 2), + CI.getPlate(7, 8), + CI.getScrew(6, 16), + CI.getBolt(6, 16), + CI.getTieredComponent(OrePrefixes.rod, 5, 16), new Object[] {CI.getTieredCircuitOreDictName(6), 32}, ItemList.Tool_DataOrb.get(32), }, @@ -942,7 +933,7 @@ public class RECIPES_Machines { ALLOY.BABBIT_ALLOY.getFluidStack(64 * 144), }, GregtechItemList.Hatch_Input_Elemental_Duplicator.get(1), - 20 * 60 * 60 * (GTNH ? 4 : 2), + 20 * 60 * 60 * (2), (int) MaterialUtils.getVoltageForTier(6)); CORE.RA.addAssemblylineRecipe( @@ -950,12 +941,12 @@ public class RECIPES_Machines { 20 * 60 * 60 * 2, new Object[] { CI.getTieredMachineHull(6, 5), - CI.getFieldGenerator(3, GTNH ? 32 : 16), - CI.getEnergyCore(2, GTNH ? 8 : 2), - CI.getPlate(7, GTNH ? 8 : 4), - CI.getScrew(7, GTNH ? 8 : 4), - CI.getBolt(6, GTNH ? 16 : 8), - CI.getTieredComponent(OrePrefixes.rod, 5, GTNH ? 8 : 4), + CI.getFieldGenerator(3, 16), + CI.getEnergyCore(2, 2), + CI.getPlate(7, 4), + CI.getScrew(7, 4), + CI.getBolt(6, 8), + CI.getTieredComponent(OrePrefixes.rod, 5, 4), new Object[] {CI.getTieredCircuitOreDictName(5), 4}, ItemList.Tool_DataStick.get(4), }, @@ -966,7 +957,7 @@ public class RECIPES_Machines { ALLOY.BABBIT_ALLOY.getFluidStack(16 * 144), }, GregtechItemList.Casing_ElementalDuplicator.get(1), - 20 * 60 * (GTNH ? 20 : 10), + 20 * 60 * (10), (int) MaterialUtils.getVoltageForTier(6)); } @@ -1256,11 +1247,10 @@ public class RECIPES_Machines { private static void runModRecipes() { if (LoadedMods.Gregtech) { - // Computer Cube CORE.RA.addSixSlotAssemblingRecipe( new ItemStack[] { - ItemUtils.getSimpleStack(CI.getDataOrb(), 4 * (GTNH ? 2 : 1)), + ItemUtils.getSimpleStack(CI.getDataOrb(), 4 * (1)), ItemList.Cover_Screen.get(4), CI.machineHull_IV, ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(7), 2) @@ -1273,7 +1263,7 @@ public class RECIPES_Machines { // Circuit programmer CORE.RA.addSixSlotAssemblingRecipe( new ItemStack[] { - ItemUtils.getSimpleStack(CI.robotArm_LV, 4 * (GTNH ? 2 : 1)), + ItemUtils.getSimpleStack(CI.robotArm_LV, 4 * (1)), ItemList.Cover_Controller.get(1, CI.electricMotor_MV), CI.machineHull_MV, ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(1), 2), @@ -1301,12 +1291,11 @@ public class RECIPES_Machines { CORE.RA.addSixSlotAssemblingRecipe( new ItemStack[] { ItemUtils.getItemStackWithMeta(true, "IC2:blockGenerator:6", "IC2-RTG", 6, 1), - ALLOY.NITINOL_60.getPlate(GTNH ? 32 : 8), - ALLOY.MARAGING350.getGear(GTNH ? 16 : 4), - ItemUtils.getSimpleStack(GTNH ? CI.fieldGenerator_IV : CI.fieldGenerator_EV, 8), - ItemUtils.getItemStackOfAmountFromOreDict("wireFinePlatinum", GTNH ? 64 : 32), - ItemUtils.getItemStackOfAmountFromOreDict( - CI.getTieredCircuitOreDictName(GTNH ? 7 : 6), GTNH ? 5 : 4) + ALLOY.NITINOL_60.getPlate(8), + ALLOY.MARAGING350.getGear(4), + ItemUtils.getSimpleStack(CI.fieldGenerator_EV, 8), + ItemUtils.getItemStackOfAmountFromOreDict("wireFinePlatinum", 32), + ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(6), 4) }, ALLOY.NIOBIUM_CARBIDE.getFluidStack(144 * 16), GregtechItemList.RTG.get(1), @@ -1327,20 +1316,20 @@ public class RECIPES_Machines { 30); ItemStack aFluidRegulator1 = - ItemUtils.getValueOfItemList("FluidRegulator_MV", GTNH ? 4 : 2, ItemList.Electric_Pump_HV); + ItemUtils.getValueOfItemList("FluidRegulator_MV", 2, ItemList.Electric_Pump_HV); ItemStack aFluidRegulator2 = ItemUtils.getValueOfItemList( "FluidRegulator_IV", - GTNH ? 4 : 2, - ItemUtils.getValueOfItemList("Electric_Pump_LuV", GTNH ? 8 : 4, ItemList.Electric_Pump_IV)); + 2, + ItemUtils.getValueOfItemList("Electric_Pump_LuV", 4, ItemList.Electric_Pump_IV)); // Poo Collector CORE.RA.addSixSlotAssemblingRecipe( new ItemStack[] { CI.machineHull_MV, aFluidRegulator1, - CI.getTieredComponent(OrePrefixes.pipeMedium, 2, GTNH ? 4 : 2), - ALLOY.EGLIN_STEEL.getPlate(GTNH ? 8 : 4), - ALLOY.POTIN.getScrew(GTNH ? 12 : 6) + CI.getTieredComponent(OrePrefixes.pipeMedium, 2, 2), + ALLOY.EGLIN_STEEL.getPlate(4), + ALLOY.POTIN.getScrew(6) }, ALLOY.TUMBAGA.getFluidStack(144 * 4), ItemUtils.getSimpleStack(ModBlocks.blockPooCollector), @@ -1353,8 +1342,8 @@ public class RECIPES_Machines { CI.getTieredMachineHull(-1), ItemUtils.getSimpleStack(ModBlocks.blockPooCollector), aFluidRegulator2, - CI.getTieredComponent(OrePrefixes.pipeHuge, 6, GTNH ? 8 : 4), - CI.getTieredComponent(OrePrefixes.screw, 6, GTNH ? 32 : 16) + CI.getTieredComponent(OrePrefixes.pipeHuge, 6, 4), + CI.getTieredComponent(OrePrefixes.screw, 6, 16) }, CI.getAlternativeTieredFluid(5, 144 * 9), ItemUtils.getSimpleStack(ModBlocks.blockPooCollector, 8, 1), @@ -1503,7 +1492,7 @@ public class RECIPES_Machines { CI.getTieredMachineHull(3), ItemUtils.getSimpleStack(Items.egg, 64), ItemUtils.getSimpleStack(ModItems.itemRope, 32), - CI.getPlate(4, GTNH ? 16 : 8) + CI.getPlate(4, 8) }, FluidUtils.getFluidStack("mobessence", 4096), ItemUtils.getSimpleStack(ModBlocks.blockEggBox, 1), @@ -1518,8 +1507,8 @@ public class RECIPES_Machines { CI.getTieredMachineHull(2), ItemUtils.getSimpleStack(ModBlocks.blockCircuitProgrammer), VolumetricFlaskHelper.getVolumetricFlask(8), - CI.getTieredComponent(OrePrefixes.pipeSmall, 2, GTNH ? 4 : 2), - CI.getPlate(2, GTNH ? 8 : 4) + CI.getTieredComponent(OrePrefixes.pipeSmall, 2, 2), + CI.getPlate(2, 4) }, CI.getAlternativeTieredFluid(1, 144 * 8), ItemUtils.getSimpleStack(ModBlocks.blockVolumetricFlaskSetter, 1), @@ -1530,7 +1519,7 @@ public class RECIPES_Machines { if (CORE.ConfigSwitches.enableMultiblock_IronBlastFurnace) { RECIPE_IronBlastFurnace = GregtechItemList.Machine_Iron_BlastFurnace.get(1); - RECIPE_IronPlatedBricks = GregtechItemList.Casing_IronPlatedBricks.get(Casing_Amount); + RECIPE_IronPlatedBricks = GregtechItemList.Casing_IronPlatedBricks.get(1); // Iron BF RecipeUtils.addShapedGregtechRecipe( @@ -1580,7 +1569,7 @@ public class RECIPES_Machines { if (CORE.ConfigSwitches.enableMultiblock_IndustrialCentrifuge) { // Industrial Centrifuge RECIPE_IndustrialCentrifugeController = GregtechItemList.Industrial_Centrifuge.get(1); - RECIPE_IndustrialCentrifugeCasing = GregtechItemList.Casing_Centrifuge1.get(Casing_Amount); + RECIPE_IndustrialCentrifugeCasing = GregtechItemList.Casing_Centrifuge1.get(1); // Industrial Centrifuge RecipeUtils.addShapedGregtechRecipe( @@ -1622,9 +1611,9 @@ public class RECIPES_Machines { if (CORE.ConfigSwitches.enableMultiblock_IndustrialCokeOven) { // Industrial Coke Oven RECIPE_IndustrialCokeOvenController = GregtechItemList.Industrial_CokeOven.get(1); - RECIPE_IndustrialCokeOvenFrame = GregtechItemList.Casing_CokeOven.get(Casing_Amount); - RECIPE_IndustrialCokeOvenCasingA = GregtechItemList.Casing_CokeOven_Coil1.get(Casing_Amount); - RECIPE_IndustrialCokeOvenCasingB = GregtechItemList.Casing_CokeOven_Coil2.get(Casing_Amount); + RECIPE_IndustrialCokeOvenFrame = GregtechItemList.Casing_CokeOven.get(1); + RECIPE_IndustrialCokeOvenCasingA = GregtechItemList.Casing_CokeOven_Coil1.get(1); + RECIPE_IndustrialCokeOvenCasingB = GregtechItemList.Casing_CokeOven_Coil2.get(1); if (LoadedMods.Railcraft) { // Industrial Coke Oven @@ -1706,7 +1695,7 @@ public class RECIPES_Machines { if (CORE.ConfigSwitches.enableMultiblock_IndustrialElectrolyzer) { // Industrial Electrolyzer RECIPE_IndustrialElectrolyzerController = GregtechItemList.Industrial_Electrolyzer.get(1); - RECIPE_IndustrialElectrolyzerFrame = GregtechItemList.Casing_Electrolyzer.get(Casing_Amount); + RECIPE_IndustrialElectrolyzerFrame = GregtechItemList.Casing_Electrolyzer.get(1); // Electrolyzer Frame Casing RecipeUtils.addShapedGregtechRecipe( @@ -1749,7 +1738,7 @@ public class RECIPES_Machines { if (CORE.ConfigSwitches.enableMultiblock_IndustrialPlatePress) { // Industrial Material Press RECIPE_IndustrialMaterialPressController = GregtechItemList.Industrial_PlatePress.get(1); - RECIPE_IndustrialMaterialPressFrame = GregtechItemList.Casing_MaterialPress.get(Casing_Amount); + RECIPE_IndustrialMaterialPressFrame = GregtechItemList.Casing_MaterialPress.get(1); // Material Press Frame Casing RecipeUtils.addShapedGregtechRecipe( @@ -1792,7 +1781,7 @@ public class RECIPES_Machines { if (CORE.ConfigSwitches.enableMultiblock_IndustrialMacerationStack) { // Industrial Maceration Stack RECIPE_IndustrialMacerationStackController = GregtechItemList.Industrial_MacerationStack.get(1); - RECIPE_IndustrialMacerationStackFrame = GregtechItemList.Casing_MacerationStack.get(Casing_Amount); + RECIPE_IndustrialMacerationStackFrame = GregtechItemList.Casing_MacerationStack.get(1); // Maceration Frame Casing RecipeUtils.addShapedGregtechRecipe( @@ -1835,7 +1824,7 @@ public class RECIPES_Machines { if (CORE.ConfigSwitches.enableMultiblock_IndustrialWireMill) { // Industrial Wire Factory RECIPE_IndustrialWireFactoryController = GregtechItemList.Industrial_WireFactory.get(1); - RECIPE_IndustrialWireFactoryFrame = GregtechItemList.Casing_WireFactory.get(Casing_Amount); + RECIPE_IndustrialWireFactoryFrame = GregtechItemList.Casing_WireFactory.get(1); // Wire Factory Frame Casing RecipeUtils.addShapedGregtechRecipe( @@ -1876,214 +1865,83 @@ public class RECIPES_Machines { // Tiered Tanks if (CORE.ConfigSwitches.enableMachine_FluidTanks) { - Logger.WARNING("Is New Horizons Loaded? " + GTNH); - if (!GTNH) { - - // Allows clearing stored fluids. - GregtechItemList[] aTanks = new GregtechItemList[] { - GregtechItemList.GT_FluidTank_ULV, GregtechItemList.GT_FluidTank_LV, - GregtechItemList.GT_FluidTank_MV, - GregtechItemList.GT_FluidTank_HV, GregtechItemList.GT_FluidTank_EV, - GregtechItemList.GT_FluidTank_IV, - GregtechItemList.GT_FluidTank_LuV, GregtechItemList.GT_FluidTank_ZPM, - GregtechItemList.GT_FluidTank_UV, - GregtechItemList.GT_FluidTank_MAX - }; - for (GregtechItemList aTank : aTanks) { - RecipeUtils.addShapedGregtechRecipe( - aTank.get(1), null, null, null, null, null, null, null, null, aTank.get(1)); - } - - RecipeUtils.addShapedGregtechRecipe( - CI.component_Plate[1], - CI.component_Plate[1], - CI.component_Plate[1], - CI.component_Plate[1], - pipeTier1, - CI.component_Plate[1], - CI.component_Plate[1], - GregtechItemList.Fluid_Cell_144L.get(1), - CI.component_Plate[1], - GregtechItemList.GT_FluidTank_ULV.get(1)); - RecipeUtils.addShapedGregtechRecipe( - CI.component_Plate[2], - CI.component_Plate[2], - CI.component_Plate[2], - CI.component_Plate[2], - pipeTier2, - CI.component_Plate[2], - CI.component_Plate[2], - CI.electricPump_LV, - CI.component_Plate[2], - GregtechItemList.GT_FluidTank_LV.get(1)); - RecipeUtils.addShapedGregtechRecipe( - CI.component_Plate[3], - CI.component_Plate[3], - CI.component_Plate[3], - CI.component_Plate[3], - pipeTier3, - CI.component_Plate[3], - CI.component_Plate[3], - CI.electricPump_MV, - CI.component_Plate[3], - GregtechItemList.GT_FluidTank_MV.get(1)); - RecipeUtils.addShapedGregtechRecipe( - CI.component_Plate[4], - CI.component_Plate[4], - CI.component_Plate[4], - CI.component_Plate[4], - pipeTier4, - CI.component_Plate[4], - CI.component_Plate[4], - CI.electricPump_HV, - CI.component_Plate[4], - GregtechItemList.GT_FluidTank_HV.get(1)); - RecipeUtils.addShapedGregtechRecipe( - CI.component_Plate[5], - CI.component_Plate[5], - CI.component_Plate[5], - CI.component_Plate[5], - pipeTier5, - CI.component_Plate[5], - CI.component_Plate[5], - CI.electricPump_EV, - CI.component_Plate[5], - GregtechItemList.GT_FluidTank_EV.get(1)); - RecipeUtils.addShapedGregtechRecipe( - CI.component_Plate[6], - CI.component_Plate[6], - CI.component_Plate[6], - CI.component_Plate[6], - pipeTier6, - CI.component_Plate[6], - CI.component_Plate[6], - CI.electricPump_IV, - CI.component_Plate[6], - GregtechItemList.GT_FluidTank_IV.get(1)); - RecipeUtils.addShapedGregtechRecipe( - CI.component_Plate[7], - CI.component_Plate[7], - CI.component_Plate[7], - CI.component_Plate[7], - pipeTier7, - CI.component_Plate[7], - CI.component_Plate[7], - CI.electricPump_LuV, - CI.component_Plate[7], - GregtechItemList.GT_FluidTank_LuV.get(1)); - RecipeUtils.addShapedGregtechRecipe( - CI.component_Plate[8], - CI.component_Plate[8], - CI.component_Plate[8], - CI.component_Plate[8], - pipeTier8, - CI.component_Plate[8], - CI.component_Plate[8], - CI.electricPump_ZPM, - CI.component_Plate[8], - GregtechItemList.GT_FluidTank_ZPM.get(1)); - RecipeUtils.addShapedGregtechRecipe( - CI.component_Plate[9], - CI.component_Plate[9], - CI.component_Plate[9], - CI.component_Plate[9], - pipeTier9, - CI.component_Plate[9], - CI.component_Plate[9], - CI.electricPump_UV, - CI.component_Plate[9], - GregtechItemList.GT_FluidTank_UV.get(1)); - RecipeUtils.addShapedGregtechRecipe( - CI.component_Plate[10], - CI.component_Plate[10], - CI.component_Plate[10], - CI.component_Plate[10], - pipeTier10, - CI.component_Plate[10], - CI.component_Plate[10], - CI.electricPump_MAX, - CI.component_Plate[10], - GregtechItemList.GT_FluidTank_MAX.get(1)); - } else { - - CI.component_Plate[1] = "plateTin"; - pipeTier1 = "pipeLargeClay"; - CI.circuitTier1 = ItemList.Circuit_Primitive.get(1); - CI.component_Plate[2] = "plateCopper"; - pipeTier2 = "pipeHugeClay"; - CI.component_Plate[3] = "plateBronze"; - pipeTier3 = "pipeMediumBronze"; - CI.component_Plate[4] = "plateIron"; - pipeTier4 = "pipeMediumSteel"; - CI.component_Plate[5] = "plateSteel"; - CI.component_Plate[6] = "plateRedstone"; - CI.component_Plate[7] = "plateAluminium"; - CI.component_Plate[8] = "plateDarkSteel"; - ItemStack waterBucket = ItemUtils.getSimpleStack(Items.water_bucket); - - // Allows clearing stored fluids. - GregtechItemList[] aTanks = new GregtechItemList[] { - GregtechItemList.GT_FluidTank_ULV, - GregtechItemList.GT_FluidTank_LV, - GregtechItemList.GT_FluidTank_MV, - GregtechItemList.GT_FluidTank_HV - }; - for (GregtechItemList aTank : aTanks) { - RecipeUtils.addShapedGregtechRecipe( - aTank.get(1), null, null, null, null, null, null, null, null, aTank.get(1)); - } - - RecipeUtils.addShapedGregtechRecipe( - CI.component_Plate[1], - CI.component_Plate[5], - CI.component_Plate[1], - CI.component_Plate[4], - pipeTier1, - CI.component_Plate[4], - CI.component_Plate[4], - waterBucket, - CI.component_Plate[4], - GregtechItemList.GT_FluidTank_ULV.get(1)); - RecipeUtils.addShapedGregtechRecipe( - CI.component_Plate[5], - CI.component_Plate[4], - CI.component_Plate[5], - CI.component_Plate[3], - pipeTier2, - CI.component_Plate[3], - CI.component_Plate[3], - CI.electricPump_LV, - CI.component_Plate[3], - GregtechItemList.GT_FluidTank_LV.get(1)); - RecipeUtils.addShapedGregtechRecipe( - CI.component_Plate[8], - CI.component_Plate[3], - CI.component_Plate[8], - CI.component_Plate[5], - pipeTier3, - CI.component_Plate[5], - CI.component_Plate[5], - CI.electricPump_LV, - CI.component_Plate[5], - GregtechItemList.GT_FluidTank_MV.get(1)); + CI.component_Plate[1] = "plateTin"; + pipeTier1 = "pipeLargeClay"; + CI.circuitTier1 = ItemList.Circuit_Primitive.get(1); + CI.component_Plate[2] = "plateCopper"; + pipeTier2 = "pipeHugeClay"; + CI.component_Plate[3] = "plateBronze"; + pipeTier3 = "pipeMediumBronze"; + CI.component_Plate[4] = "plateIron"; + pipeTier4 = "pipeMediumSteel"; + CI.component_Plate[5] = "plateSteel"; + CI.component_Plate[6] = "plateRedstone"; + CI.component_Plate[7] = "plateAluminium"; + CI.component_Plate[8] = "plateDarkSteel"; + ItemStack waterBucket = ItemUtils.getSimpleStack(Items.water_bucket); + + // Allows clearing stored fluids. + GregtechItemList[] aTanks = new GregtechItemList[] { + GregtechItemList.GT_FluidTank_ULV, + GregtechItemList.GT_FluidTank_LV, + GregtechItemList.GT_FluidTank_MV, + GregtechItemList.GT_FluidTank_HV + }; + for (GregtechItemList aTank : aTanks) { Re