aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authormiozune <miozune@gmail.com>2023-02-05 01:40:43 +0900
committerGitHub <noreply@github.com>2023-02-04 17:40:43 +0100
commitbb9da48b9975cb27e3b7c538bff2853a34b36fcd (patch)
tree9de91abf611bf119935df6322e27805cf835fafc /src/main/java
parent8792eb5d9b70cbb1dc0b444cfd8524dfb4a0aa0c (diff)
downloadGT5-Unofficial-bb9da48b9975cb27e3b7c538bff2853a34b36fcd.tar.gz
GT5-Unofficial-bb9da48b9975cb27e3b7c538bff2853a34b36fcd.tar.bz2
GT5-Unofficial-bb9da48b9975cb27e3b7c538bff2853a34b36fcd.zip
Remove redundant flags (#529)
* Remove CORE.GTNH * Remove LoadedMods.Gregtech * Remove LoadedMods.IndustrialCraft2 * Remove LoadedMods.MiscUtils * Remove CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK * clean * Remove mention to GT versions * Fix assembler mode
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/gregtech/api/enums/TAE.java30
-rw-r--r--src/main/java/gtPlusPlus/GTplusplus.java7
-rw-r--r--src/main/java/gtPlusPlus/api/helpers/MaterialHelper.java45
-rw-r--r--src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java49
-rw-r--r--src/main/java/gtPlusPlus/core/common/CommonProxy.java5
-rw-r--r--src/main/java/gtPlusPlus/core/common/compat/COMPAT_IC2.java29
-rw-r--r--src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java179
-rw-r--r--src/main/java/gtPlusPlus/core/handler/EnumHelperHandler.java11
-rw-r--r--src/main/java/gtPlusPlus/core/handler/OldCircuitHandler.java97
-rw-r--r--src/main/java/gtPlusPlus/core/handler/Recipes/RegistrationHandler.java1
-rw-r--r--src/main/java/gtPlusPlus/core/item/ModItems.java60
-rw-r--r--src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java22
-rw-r--r--src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java4
-rw-r--r--src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java19
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/ItemGiantEgg.java12
-rw-r--r--src/main/java/gtPlusPlus/core/item/init/ItemsMultiTools.java10
-rw-r--r--src/main/java/gtPlusPlus/core/lib/CORE.java24
-rw-r--r--src/main/java/gtPlusPlus/core/lib/LoadedMods.java41
-rw-r--r--src/main/java/gtPlusPlus/core/material/ELEMENT.java63
-rw-r--r--src/main/java/gtPlusPlus/core/material/Material.java7
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java48
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/RECIPES_Extruder.java51
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java387
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java73
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java293
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java560
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java3836
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java562
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/RECIPES_Shapeless.java32
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/RECIPE_Batteries.java8
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/common/CI.java74
-rw-r--r--src/main/java/gtPlusPlus/core/util/Utils.java62
-rw-r--r--src/main/java/gtPlusPlus/core/util/minecraft/HazmatUtils.java26
-rw-r--r--src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java18
-rw-r--r--src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java13
-rw-r--r--src/main/java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java25
-rw-r--r--src/main/java/gtPlusPlus/core/util/reflect/AddGregtechRecipe.java118
-rw-r--r--src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java61
-rw-r--r--src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java8
-rw-r--r--src/main/java/gtPlusPlus/plugin/sulfurchem/Core_SulfuricChemistry.java88
-rw-r--r--src/main/java/gtPlusPlus/xmod/bop/blocks/BOP_Block_Registrator.java26
-rw-r--r--src/main/java/gtPlusPlus/xmod/cofh/HANDLER_COFH.java2
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java16
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java23
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java15
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DynamoBuffer.java15
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler_Adv.java43
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java83
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaPipeEntityBase_Cable.java43
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java46
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_GT_Ore_Layer.java17
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java50
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/StaticFields59.java26
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java180
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow_Item.java10
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java624
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java9
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java9
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_RfConvertor.java2
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaGarbageCollector.java2
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IronBlastFurnace.java23
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java93
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatformBase.java4
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/GT_Material_Loader.java13
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_Ex.java13
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_GTNH.java9
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java258
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java46
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java172
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java428
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java23
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java7
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAlgaeContent.java7
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAmazonWarehouse.java6
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechComponentAssembler.java7
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java304
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java14
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCyclotron.java6
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java9
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java6
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java9
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechHiAmpTransformer.java232
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialAlloySmelter.java6
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialArcFurnace.java6
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCuttingFactory.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElectrolyzer.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialExtruder.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFishPond.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFluidHeater.java6
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialForgeHammer.java6
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFuelRefinery.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialGeneratorArray.java10
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java93
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMixer.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiMachine.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialPlatePress.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSifter.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialThermalCentrifuge.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialTreeFarm.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWashPlant.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIronBlastFurnace.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLargeTurbinesAndHeatExchanger.java6
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechMolecularTransformer.java6
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNitroDieselFix.java390
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerBreakers.java6
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerSubStation.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechQuantumForceTransformer.java16
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRTG.java6
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java112
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSafeBlock.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java11
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarGenerators.java3
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarTower.java6
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamCondenser.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperChests.java64
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperConductionPoint.java18
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechThaumcraftDevices.java2
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredChunkloaders.java7
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredFluidTanks.java33
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTreeFarmerTE.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java158
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/NewHorizonsAccelerator.java144
-rw-r--r--src/main/java/gtPlusPlus/xmod/growthcraft/fishtrap/FishTrapHandler.java53
-rw-r--r--src/main/java/gtPlusPlus/xmod/ic2/HANDLER_IC2.java14
-rw-r--r--src/main/java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java306
-rw-r--r--src/main/java/gtPlusPlus/xmod/ob/SprinklerHandler.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/reliquary/util/ReliquaryRecipeHandler.java7
-rw-r--r--src/main/java/gtPlusPlus/xmod/thermalfoundation/HANDLER_TF.java10
-rw-r--r--src/main/java/gtPlusPlus/xmod/thermalfoundation/item/TF_Items.java20
137 files changed, 3829 insertions, 7892 deletions
diff --git a/src/main/java/gregtech/api/enums/TAE.java b/src/main/java/gregtech/api/enums/TAE.java
index 4baafada2c..de4f9d6d77 100644
--- a/src/main/java/gregtech/api/enums/TAE.java
+++ b/src/main/java/gregtech/api/enums/TAE.java
@@ -9,7 +9,6 @@ import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.api.objects.data.AutoMap;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
import gtPlusPlus.xmod.gregtech.api.objects.GTPP_CopiedBlockTexture;
@@ -84,18 +83,15 @@ public class TAE {
// Handle page 2.
Logger.INFO("[TAE} Registering Texture, Last used casing ID is " + gtPPLastUsedIndex + ".");
if (gtPPLastUsedIndex >= 128) {
- if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK && Utils.getGregtechSubVersion() > 30) {
- Field x = ReflectionUtils.getField(Textures.BlockIcons.class, "casingTexturePages");
- if (x != null) {
- ITexture[][] h = (ITexture[][]) x.get(null);
- if (h != null) {
- h[64][secondaryIndex++] = GTPP_CopiedBlockTexture;
- x.set(null, h);
- Logger.INFO(
- "[TAE} Registered Texture with ID " + (secondaryIndex - 1)
- + " in secondary index.");
- return true;
- }
+ Field x = ReflectionUtils.getField(Textures.BlockIcons.class, "casingTexturePages");
+ if (x != null) {
+ ITexture[][] h = (ITexture[][]) x.get(null);
+ if (h != null) {
+ h[64][secondaryIndex++] = GTPP_CopiedBlockTexture;
+ x.set(null, h);
+ Logger.INFO(
+ "[TAE} Registered Texture with ID " + (secondaryIndex - 1) + " in secondary index.");
+ return true;
}
}
}
@@ -116,9 +112,7 @@ public class TAE {
public static ITexture getTexture(int index) {
if (gtPPLastUsedIndex >= 128) {
- if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK && Utils.getGregtechSubVersion() > 30) {
- return Textures.BlockIcons.getCasingTextureForId(((64 * 128) + index));
- }
+ return Textures.BlockIcons.getCasingTextureForId(((64 * 128) + index));
}
return Textures.BlockIcons.getCasingTextureForId((64 + index));
}
@@ -127,9 +121,7 @@ public class TAE {
if (ID >= 64) {
if (gtPPLastUsedIndex >= 128) {
- if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK && Utils.getGregtechSubVersion() > 30) {
- return (128 + ID);
- }
+ return (128 + ID);
}
}
return (64 + ID);
diff --git a/src/main/java/gtPlusPlus/GTplusplus.java b/src/main/java/gtPlusPlus/GTplusplus.java
index 429537cc4a..d7b717f78f 100644
--- a/src/main/java/gtPlusPlus/GTplusplus.java
+++ b/src/main/java/gtPlusPlus/GTplusplus.java
@@ -145,7 +145,6 @@ public class GTplusplus implements ActionListener {
@Mod.EventHandler
public void preInit(final FMLPreInitializationEvent event) {
INIT_PHASE.PRE_INIT.setPhaseActive(true);
- Logger.INFO("Loading " + CORE.name + " " + CORE.VERSION + " on Gregtech " + Utils.getGregtechVersionAsString());
// Load all class objects within the plugin package.
Core_Manager.veryEarlyInit();
PacketHandler.init();
@@ -384,12 +383,6 @@ public class GTplusplus implements ActionListener {
mGregMatLoader = new GT_Material_Loader();
- // Non GTNH Materials
- if (!CORE.GTNH) {
- // Mithril - Random Dungeon Loot
- mGregMatLoader.enableMaterial(Materials.Mithril);
- }
-
// Force - Alloying
mGregMatLoader.enableMaterial(Materials.Force);
}
diff --git a/src/main/java/gtPlusPlus/api/helpers/MaterialHelper.java b/src/main/java/gtPlusPlus/api/helpers/MaterialHelper.java
index dccb7371d5..61e582c7a3 100644
--- a/src/main/java/gtPlusPlus/api/helpers/MaterialHelper.java
+++ b/src/main/java/gtPlusPlus/api/helpers/MaterialHelper.java
@@ -10,7 +10,6 @@ import gregtech.api.enums.OrePrefixes;
import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Fluid;
import gregtech.api.util.GT_OreDictUnificator;
import gtPlusPlus.core.material.Material;
-import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
public class MaterialHelper {
@@ -38,30 +37,28 @@ public class MaterialHelper {
*/
public static boolean generateHexadecuplePipe(Materials aMaterial, String name, String displayName, int aID,
int baseCapacity, int heatCapacity, boolean gasProof) {
- if (Utils.getGregtechVersionAsInt() >= 50930) {
- try {
- Class<GT_MetaPipeEntity_Fluid> aPipeEntity = GT_MetaPipeEntity_Fluid.class;
- Constructor<GT_MetaPipeEntity_Fluid> constructor = aPipeEntity.getConstructor(
- new Class[] { int.class, String.class, String.class, float.class, Materials.class, int.class,
- int.class, boolean.class, int.class });
- if (constructor != null) {
- GT_MetaPipeEntity_Fluid aPipe;
- aPipe = constructor.newInstance(
- aID,
- "GT_Pipe_" + name + "_Hexadecuple",
- "Hexadecuple " + displayName + " Fluid Pipe",
- 1.0F,
- aMaterial,
- baseCapacity,
- heatCapacity,
- gasProof,
- 16);
- return GT_OreDictUnificator.registerOre("pipeHexadecuple" + aMaterial, aPipe.getStackForm(1L));
- }
+ try {
+ Class<GT_MetaPipeEntity_Fluid> aPipeEntity = GT_MetaPipeEntity_Fluid.class;
+ Constructor<GT_MetaPipeEntity_Fluid> constructor = aPipeEntity.getConstructor(
+ new Class[] { int.class, String.class, String.class, float.class, Materials.class, int.class,
+ int.class, boolean.class, int.class });
+ if (constructor != null) {
+ GT_MetaPipeEntity_Fluid aPipe;
+ aPipe = constructor.newInstance(
+ aID,
+ "GT_Pipe_" + name + "_Hexadecuple",
+ "Hexadecuple " + displayName + " Fluid Pipe",
+ 1.0F,
+ aMaterial,
+ baseCapacity,
+ heatCapacity,
+ gasProof,
+ 16);
+ return GT_OreDictUnificator.registerOre("pipeHexadecuple" + aMaterial, aPipe.getStackForm(1L));
+ }
- } catch (NoSuchMethodException | SecurityException | InstantiationException | IllegalAccessException
- | IllegalArgumentException | InvocationTargetException e) {}
- }
+ } catch (NoSuchMethodException | SecurityException | InstantiationException | IllegalAccessException
+ | IllegalArgumentException | InvocationTargetException e) {}
return false;
}
diff --git a/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java
index c8c0f4ca08..140773f4ea 100644
--- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java
+++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java
@@ -18,7 +18,6 @@ import gregtech.api.util.GT_OreDictUnificator;
import gtPlusPlus.api.interfaces.ITexturedBlock;
import gtPlusPlus.core.client.renderer.CustomOreBlockRenderer;
import gtPlusPlus.core.item.base.itemblock.ItemBlockOre;
-import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
@@ -106,26 +105,20 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock {
GTPP_RenderedTexture aIconSet = new GTPP_RenderedTexture(
blockMaterial.getTextureSet().mTextures[OrePrefixes.ore.mTextureIndex],
this.blockMaterial.getRGBA());
- if (aIconSet != null) {
- return new ITexture[] { new GTPP_CopiedBlockTexture(Blocks.stone, 0, 0), aIconSet };
- }
+ return new ITexture[] { new GTPP_CopiedBlockTexture(Blocks.stone, 0, 0), aIconSet };
}
if (hiddenTextureArray == null) {
- if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
- hiddenTextureArray = Textures.BlockIcons.GRANITES;
- } else {
- try {
- Field o = ReflectionUtils.getField(Textures.BlockIcons.class, "STONES");
- if (o != null) {
- hiddenTextureArray = (IIconContainer[]) o.get(Textures.BlockIcons.class);
- }
- if (hiddenTextureArray == null) {
- hiddenTextureArray = new IIconContainer[6];
- }
- } catch (IllegalArgumentException | IllegalAccessException e) {
+ try {
+ Field o = ReflectionUtils.getField(Textures.BlockIcons.class, "STONES");
+ if (o != null) {
+ hiddenTextureArray = (IIconContainer[]) o.get(Textures.BlockIcons.class);
+ }
+ if (hiddenTextureArray == null) {
hiddenTextureArray = new IIconContainer[6];
}
+ } catch (IllegalArgumentException | IllegalAccessException e) {
+ hiddenTextureArray = new IIconContainer[6];
}
}
return new ITexture[] { new GTPP_RenderedTexture(hiddenTextureArray[0], new short[] { 240, 240, 240, 0 }) };
@@ -200,26 +193,20 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock {
GTPP_RenderedTexture aIconSet = new GTPP_RenderedTexture(
blockMaterial.getTextureSet().mTextures[OrePrefixes.ore.mTextureIndex],
this.blockMaterial.getRGBA());
- if (aIconSet != null) {
- return new ITexture[] { new GTPP_CopiedBlockTexture(Blocks.stone, 0, 0), aIconSet };
- }
+ return new ITexture[] { new GTPP_CopiedBlockTexture(Blocks.stone, 0, 0), aIconSet };
}
if (hiddenTextureArray == null) {
- if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
- hiddenTextureArray = Textures.BlockIcons.GRANITES;
- } else {
- try {
- Field o = ReflectionUtils.getField(Textures.BlockIcons.class, "STONES");
- if (o != null) {
- hiddenTextureArray = (IIconContainer[]) o.get(Textures.BlockIcons.class);
- }
- if (hiddenTextureArray == null) {
- hiddenTextureArray = new IIconContainer[6];
- }
- } catch (IllegalArgumentException | IllegalAccessException e) {
+ try {
+ Field o = ReflectionUtils.getField(Textures.BlockIcons.class, "STONES");
+ if (o != null) {
+ hiddenTextureArray = (IIconContainer[]) o.get(Textures.BlockIcons.class);
+ }
+ if (hiddenTextureArray == null) {
hiddenTextureArray = new IIconContainer[6];
}
+ } catch (IllegalArgumentException | IllegalAccessException e) {
+ hiddenTextureArray = new IIconContainer[6];
}
}
return new ITexture[] { new GTPP_RenderedTexture(hiddenTextureArray[0], new short[] { 240, 240, 240, 0 }) };
diff --git a/src/main/java/gtPlusPlus/core/common/CommonProxy.java b/src/main/java/gtPlusPlus/core/common/CommonProxy.java
index 26bf349b93..19cf2d8356 100644
--- a/src/main/java/gtPlusPlus/core/common/CommonProxy.java
+++ b/src/main/java/gtPlusPlus/core/common/CommonProxy.java
@@ -50,11 +50,6 @@ public class CommonProxy {
public CommonProxy() {
// Should Register Gregtech Materials I've Made
Utils.registerEvent(this);
- if (!CORE.GTNH) {
- Logger.INFO("We're using Gregtech " + Utils.getGregtechVersionAsString());
- } else {
- Logger.INFO("We're using GTNH's Gregtech " + Utils.getGregtechVersionAsString());
- }
}
public void preInit(final FMLPreInitializationEvent e) {
diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_IC2.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_IC2.java
index 666c0177ee..357647c83e 100644
--- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_IC2.java
+++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_IC2.java
@@ -5,7 +5,6 @@ import static gtPlusPlus.core.handler.COMPAT_HANDLER.RemoveRecipeQueue;
import net.minecraft.item.ItemStack;
import gtPlusPlus.core.lib.CORE.ConfigSwitches;
-import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.core.recipe.ShapedRecipeObject;
import gtPlusPlus.core.util.minecraft.ItemUtils;
@@ -50,22 +49,20 @@ public class COMPAT_IC2 {
if (ConfigSwitches.disableIC2Recipes) {
- if (LoadedMods.Gregtech) {
- // Fuck these right off.
- RemoveRecipeQueue.add("IC2:itemCable");
- RemoveRecipeQueue.add("IC2:itemCable:1");
- RemoveRecipeQueue.add("IC2:itemCable:2");
- RemoveRecipeQueue.add("IC2:itemCable:3");
- RemoveRecipeQueue.add("IC2:itemCable:5");
- RemoveRecipeQueue.add("IC2:itemCable:6");
- RemoveRecipeQueue.add("IC2:itemCable:10");
- RemoveRecipeQueue.add("IC2:itemCable:13");
- // RemoveRecipeQueue.add(itemCropnalyzer);
- // RemoveRecipeQueue.add(itemSolarHelmet);
+ // Fuck these right off.
+ RemoveRecipeQueue.add("IC2:itemCable");
+ RemoveRecipeQueue.add("IC2:itemCable:1");
+ RemoveRecipeQueue.add("IC2:itemCable:2");
+ RemoveRecipeQueue.add("IC2:itemCable:3");
+ RemoveRecipeQueue.add("IC2:itemCable:5");
+ RemoveRecipeQueue.add("IC2:itemCable:6");
+ RemoveRecipeQueue.add("IC2:itemCable:10");
+ RemoveRecipeQueue.add("IC2:itemCable:13");
+ // RemoveRecipeQueue.add(itemCropnalyzer);
+ // RemoveRecipeQueue.add(itemSolarHelmet);
- // AddRecipeQueue.add(Cropnalyzer);
- // AddRecipeQueue.add(SolarHelmet);
- }
+ // AddRecipeQueue.add(Cropnalyzer);
+ // AddRecipeQueue.add(SolarHelmet);
}
}
}
diff --git a/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
index 27816d2a42..5e78c2ed2d 100644
--- a/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
+++ b/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
@@ -1,7 +1,5 @@
package gtPlusPlus.core.handler;
-import static gtPlusPlus.core.lib.LoadedMods.Gregtech;
-
import java.util.LinkedList;
import java.util.Queue;
import java.util.Set;
@@ -35,7 +33,6 @@ import gtPlusPlus.core.item.ModItems;
import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.material.MaterialGenerator;
-import gtPlusPlus.core.recipe.RECIPES_Extruder;
import gtPlusPlus.core.recipe.RECIPES_GREGTECH;
import gtPlusPlus.core.recipe.RECIPES_LaserEngraver;
import gtPlusPlus.core.recipe.ShapedRecipeObject;
@@ -73,98 +70,90 @@ public class COMPAT_HANDLER {
}
public static void registerGregtechMachines() {
- if (Gregtech) {
-
- // Debug
- GregtechItemList.Garbage_Collector_Debug_Machine.set(
- new GregtechMetaGarbageCollector(
- "garbagecollector.01.tier.single",
- "JVM Garbage Collector",
- "Useful for debugging or smoother performance on local servers").getStackForm(1L));
-
- // Free IDs
- /*
- * --- 859 to 868 --- 911 to 940
- */
+ // Debug
+ GregtechItemList.Garbage_Collector_Debug_Machine.set(
+ new GregtechMetaGarbageCollector(
+ "garbagecollector.01.tier.single",
+ "JVM Garbage Collector",
+ "Useful for debugging or smoother performance on local servers").getStackForm(1L));
- new RECIPES_LaserEngraver();
- new RECIPES_Extruder();
- GregtechGeneratorsULV.run();
- GregtechEnergyBuffer.run();
- GregtechLFTR.run();
- GregtechSteamCondenser.run();
- GregtechSafeBlock.run();
- // GregtechSuperConductionPoint.run();
- GregtechIronBlastFurnace.run();
- GregtechIndustrialCentrifuge.run();
- GregtechIndustrialCokeOven.run();
- GregtechIndustrialPlatePress.run();
- GregtechRocketFuelGenerator.run();
- GregtechIndustrialElectrolyzer.run();
- GregtechIndustrialMacerator.run();
- GregtechIndustrialWiremill.run();
- GregtechIndustrialMassFabricator.run();
- GregtechIndustrialBlastSmelter.run();
- GregtechQuantumForceTransformer.run();
- GregtechSolarGenerators.run();
- GregtechPowerSubStation.run();
- GregtechDehydrator.run();
- GregtechAdvancedBoilers.run();
- GregtechPollutionDevices.run();
- GregtechTieredFluidTanks.run();
- // GregtechIndustrialMultiTank.run();
- GregtechGeothermalThermalGenerator.run();
- Gregtech4Content.run();
- GregtechIndustrialFuelRefinery.run();
- GregtechTreeFarmerTE.run();
- GregtechIndustrialTreeFarm.run();
- GregtechIndustrialSifter.run();
- GregtechSimpleWasher.run();
- GregtechRTG.run();
- GregtechCyclotron.run();
- GregtechHiAmpTransformer.run();
- GregtechIndustrialThermalCentrifuge.run();
- GregtechIndustrialWashPlant.run();
- GregtechSemiFluidgenerators.run();
- GregtechWirelessChargers.run();
- GregtechIndustrialGeneratorArray.run();
- GregtechIndustrialCuttingFactory.run();
- // GregtechMiniRaFusion.run();
- GregtechComponentAssembler.run();
- GregtechTeslaTower.run();
- GregtechSuperChests.run();
- GregtechIndustrialFishPond.run();
- GregtechTieredChunkloaders.run();
- GregtechIndustrialExtruder.run();
- GregtechIndustrialMultiMachine.run();
- // GregtechBedrockPlatforms.run();
- GregtechBufferDynamos.run();
- GregtechAmazonWarehouse.run();
- GregtechFactoryGradeReplacementMultis.run();
- GregtechThaumcraftDevices.run();
- GregtechThreadedBuffers.run();
- GregtechIndustrialMixer.run();
- GregtechCustomHatches.run();
- // GregtechNaqReactor.run();
- GregtechIndustrialArcFurnace.run();
- GregtechSolarTower.run();
- GregtechLargeTurbinesAndHeatExchanger.run();
- GregtechPowerBreakers.run();
- GregtechFluidReactor.run();
- GregtechAlgaeContent.run();
- GregtechIndustrialAlloySmelter.run();
- GregtechIsaMill.run();
- GregtechSteamMultis.run();
- GregtechIndustrialForgeHammer.run();
- GregtechMolecularTransformer.run();
- GregtechIndustrialElementDuplicator.run();
- GregtechIndustrialRockBreaker.run();
- GregtechIndustrialChisel.run();
- GregtechIndustrialFluidHeater.run();
+ // Free IDs
+ /*
+ * --- 859 to 868 --- 911 to 940
+ */
- // New Horizons Content
- NewHorizonsAccelerator.run();
- }
+ new RECIPES_LaserEngraver();
+ GregtechGeneratorsULV.run();
+ GregtechEnergyBuffer.run();
+ GregtechLFTR.run();
+ GregtechSteamCondenser.run();
+ GregtechSafeBlock.run();
+ GregtechIronBlastFurnace.run();
+ GregtechIndustrialCentrifuge.run();
+ GregtechIndustrialCokeOven.run();
+ GregtechIndustrialPlatePress.run();
+ GregtechRocketFuelGenerator.run();
+ GregtechIndustrialElectrolyzer.run();
+ GregtechIndustrialMacerator.run();
+ GregtechIndustrialWiremill.run();
+ GregtechIndustrialMassFabricator.run();
+ GregtechIndustrialBlastSmelter.run();
+ GregtechQuantumForceTransformer.run();
+ GregtechSolarGenerators.run();
+ GregtechPowerSubStation.run();
+ GregtechDehydrator.run();
+ GregtechAdvancedBoilers.run();
+ GregtechPollutionDevices.run();
+ GregtechTieredFluidTanks.run();
+ // GregtechIndustrialMultiTank.run();
+ GregtechGeothermalThermalGenerator.run();
+ Gregtech4Content.run();
+ GregtechIndustrialFuelRefinery.run();
+ GregtechTreeFarmerTE.run();
+ GregtechIndustrialTreeFarm.run();
+ GregtechIndustrialSifter.run();
+ GregtechSimpleWasher.run();
+ GregtechRTG.run();
+ GregtechCyclotron.run();
+ GregtechHiAmpTransformer.run();
+ GregtechIndustrialThermalCentrifuge.run();
+ GregtechIndustrialWashPlant.run();
+ GregtechSemiFluidgenerators.run();
+ GregtechWirelessChargers.run();
+ GregtechIndustrialGeneratorArray.run();
+ GregtechIndustrialCuttingFactory.run();
+ // GregtechMiniRaFusion.run();
+ GregtechComponentAssembler.run();
+ GregtechTeslaTower.run();
+ GregtechSuperChests.run();
+ GregtechIndustrialFishPond.run();
+ GregtechTieredChunkloaders.run();
+ GregtechIndustrialExtruder.run();
+ GregtechIndustrialMultiMachine.run();
+ // GregtechBedrockPlatforms.run();
+ GregtechBufferDynamos.run();
+ GregtechAmazonWarehouse.run();
+ GregtechFactoryGradeReplacementMultis.run();
+ GregtechThaumcraftDevices.run();
+ GregtechThreadedBuffers.run();
+ GregtechIndustrialMixer.run();
+ GregtechCustomHatches.run();
+ // GregtechNaqReactor.run();
+ GregtechIndustrialArcFurnace.run();
+ GregtechSolarTower.run();
+ GregtechLargeTurbinesAndHeatExchanger.run();
+ GregtechPowerBreakers.run();
+ GregtechFluidReactor.run();
+ GregtechAlgaeContent.run();
+ GregtechIndustrialAlloySmelter.run();
+ GregtechIsaMill.run();
+ GregtechSteamMultis.run();
+ GregtechIndustrialForgeHammer.run();
+ GregtechMolecularTransformer.run();
+ GregtechIndustrialElementDuplicator.run();
+ GregtechIndustrialRockBreaker.run();
+ GregtechIndustrialChisel.run();
+ GregtechIndustrialFluidHeater.run();
}
// InterMod
@@ -203,9 +192,7 @@ public class COMPAT_HANDLER {
if (LoadedMods.CompactWindmills) {
COMPAT_CompactWindmills.OreDict();
}
- if (LoadedMods.IndustrialCraft2) {
- COMPAT_IC2.OreDict();
- }
+ COMPAT_IC2.OreDict();
if (LoadedMods.PamsHarvestcraft) {
COMPAT_HarvestCraft.OreDict();
}
diff --git a/src/main/java/gtPlusPlus/core/handler/EnumHelperHandler.java b/src/main/java/gtPlusPlus/core/handler/EnumHelperHandler.java
index c22cb3bc56..746b2bb814 100644
--- a/src/main/java/gtPlusPlus/core/handler/EnumHelperHandler.java
+++ b/src/main/java/gtPlusPlus/core/handler/EnumHelperHandler.java
@@ -1,19 +1,12 @@
package gtPlusPlus.core.handler;
-import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.xmod.gregtech.HANDLER_GT;
import gtPlusPlus.xmod.ic2.CustomInternalName;
public class EnumHelperHandler {
public static void init() {
-
- if (LoadedMods.IndustrialCraft2) {
- CustomInternalName.init();
- }
-
- if (LoadedMods.Gregtech) {
- HANDLER_GT.addNewOrePrefixes();
- }
+ CustomInternalName.init();
+ HANDLER_GT.addNewOrePrefixes();
}
}
diff --git a/src/main/java/gtPlusPlus/core/handler/OldCircuitHandler.java b/src/main/java/gtPlusPlus/core/handler/OldCircuitHandler.java
deleted file mode 100644
index 4881479be3..0000000000
--- a/src/main/java/gtPlusPlus/core/handler/OldCircuitHandler.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package gtPlusPlus.core.handler;
-
-import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableOldGTcircuits;
-
-import java.lang.reflect.Field;
-import java.util.HashSet;
-
-import org.apache.commons.lang3.reflect.FieldUtils;
-
-import gregtech.api.enums.GT_Values;
-import gregtech.api.util.EmptyRecipeMap;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.recipe.RECIPES_Old_Circuits;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechItems;
-
-public class OldCircuitHandler {
-
- public static void preInit() {
- if (enableOldGTcircuits && CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK && !CORE.GTNH) {
- removeCircuitRecipeMap(); // Bye shitty recipes.
- }
- }
-
- public static void init() {}
-
- public static void postInit() {
- if (enableOldGTcircuits && CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK && !CORE.GTNH) {
- RECIPES_Old_Circuits.handleCircuits();
- new RECIPES_Old_Circuits();
- }
- }
-
- public static boolean addCircuitItems() {
- if (enableOldGTcircuits && CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK && !CORE.GTNH) {
- return MetaGeneratedGregtechItems.INSTANCE.registerOldCircuits();
- }
- return false;
- }
-
- private static boolean removeCircuitRecipeMap() {
- if (enableOldGTcircuits && CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK && !CORE.GTNH) {
- try {
- Logger.INFO(
- "[Old Feature - Circuits] Trying to override the Circuit Assembler Recipe map, so that no recipes for new circuits get added.");
- ReflectionUtils.setFinalStatic(
- GT_Recipe_Map.class.getDeclaredField("sCircuitAssemblerRecipes"),
- new EmptyRecipeMap(
- new HashSet<GT_Recipe>(0),
- "gt.recipe.removed",
- "Removed",
- null,
- GT_Values.RES_PATH_GUI + "basicmachines/Default",
- 0,
- 0,
- 0,
- 0,
- 0,
- GT_Values.E,
- 0,
- GT_Values.E,
- true,
- false));
- Field jaffar = GT_Recipe_Map.class.getDeclaredField("sCircuitAssemblerRecipes");
- FieldUtils.removeFinalModifier(jaffar, true);
- jaffar.set(
- null,
- new EmptyRecipeMap(
- new HashSet<GT_Recipe>(0),
- "gt.recipe.removed",
- "Removed",
- null,
- GT_Values.RES_PATH_GUI + "basicmachines/Default",
- 0,
- 0,
- 0,
- 0,
- 0,
- GT_Values.E,
- 0,
- GT_Values.E,
- true,
- false));
- Logger.INFO(
- "[Old Feature - Circuits] Successfully replaced circuit assembler recipe map with one that cannot hold recipes.");
- } catch (Exception e) {
- Logger.INFO("[Old Feature - Circuits] Failed removing circuit assembler recipe map.");
- return false;
- }
- return true;
- }
- return false;
- }
-}
diff --git a/src/main/java/gtPlusPlus/core/handler/Recipes/RegistrationHandler.java b/src/main/java/gtPlusPlus/core/handler/Recipes/RegistrationHandler.java
index f240656dd7..cd4ff542dc 100644
--- a/src/main/java/gtPlusPlus/core/handler/Recipes/RegistrationHandler.java
+++ b/src/main/java/gtPlusPlus/core/handler/Recipes/RegistrationHandler.java
@@ -17,7 +17,6 @@ public class RegistrationHandler {
RECIPES_Tools.loadRecipes();
RECIPES_General.loadRecipes();
RECIPES_Machines.loadRecipes();
- RECIPES_Shapeless.loadRecipes();
RECIPES_MachineComponents.loadRecipes();
RECIPE_Batteries.loadRecipes();
Logger.INFO("Loaded: " + recipesSuccess + " Failed: " + recipesFailed);
diff --git a/src/main/java/gtPlusPlus/core/item/ModItems.java b/src/main/java/gtPlusPlus/core/item/ModItems.java
index e9bb6e1bf6..04f22931c6 100644
--- a/src/main/java/gtPlusPlus/core/item/ModItems.java
+++ b/src/main/java/gtPlusPlus/core/item/ModItems.java
@@ -94,8 +94,6 @@ public final class ModItems {
public static Item itemPlateBlutonium;
public static Item itemPlateCyanite;
public static Item itemPlateLudicrite;
- // Thaumcraft
- public static Item itemPlateVoidMetal;
// Pneumaticraft
public static Item itemPlateCompressedIron;
// SimplyJetpacks
@@ -534,8 +532,7 @@ public final class ModItems {
// in radioisotope thermoelectric generators (RTGs)
// and radioisotope heater units - one gram of plutonium-238 generates approximately 0.5 W of thermal power.
MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().PLUTONIUM238, false);
- if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustPlutonium239", 1) == null
- || Utils.getGregtechVersionAsInt() < 50931) {
+ if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustPlutonium239", 1) == null) {
MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().PLUTONIUM239, false);
}
@@ -544,10 +541,6 @@ public final class ModItems {
MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().POLONIUM210, false);
MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().AMERICIUM241, false);
- if (!CORE.GTNH) {
- MaterialGenerator.generateOreMaterialWithAllExcessComponents(ELEMENT.getInstance().TRINIUM);
- }
-
// Custom Materials that will have standalone refinery processes
MaterialGenerator.generate(ELEMENT.STANDALONE.ADVANCED_NITINOL, false);
MaterialGenerator.generate(ELEMENT.STANDALONE.ASTRAL_TITANIUM);
@@ -565,10 +558,6 @@ public final class ModItems {
MISC_MATERIALS.run();
- // Carbides - Tungsten Carbide exists in .09 so don't generate it. - Should still come before alloys though
- if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
- MaterialGenerator.generate(ALLOY.TUNGSTEN_CARBIDE);
- }
MaterialGenerator.generate(ALLOY.SILICON_CARBIDE);
MaterialGenerator.generate(ALLOY.ZIRCONIUM_CARBIDE);
MaterialGenerator.generate(ALLOY.TANTALUM_CARBIDE);
@@ -656,10 +645,6 @@ public final class ModItems {
MaterialGenerator.generate(ALLOY.HG1223, false, false);
// Generate Fictional Materials
- if (!CORE.GTNH) {
- MaterialGenerator.generate(ELEMENT.getInstance().TRINIUM, false);
- MaterialGenerator.generate(ELEMENT.getInstance().TRINIUM_REFINED, false);
- }
MaterialGenerator.generate(ALLOY.TRINIUM_TITANIUM);
MaterialGenerator.generate(ALLOY.TRINIUM_NAQUADAH, false);
MaterialGenerator.generate(ALLOY.TRINIUM_NAQUADAH_CARBON);
@@ -900,12 +885,9 @@ public final class ModItems {
dustFertUN32 = ItemUtils
.generateSpecialUseDusts("UN32Fertiliser", "UN-32 Fertiliser", Utils.rgbtoHexValue(55, 190, 55))[0];
- ItemStack temp1 = null;
+ ItemStack temp1 = ItemUtils.getCorrectStacktype("IC2:itemFertilizer", 1);
ItemStack temp2 = null;
- if (LoadedMods.IndustrialCraft2) {
- temp1 = ItemUtils.getCorrectStacktype("IC2:itemFertilizer", 1);
- }
if (LoadedMods.Forestry) {
temp2 = ItemUtils.getCorrectStacktype("Forestry:fertilizerCompound", 1);
}
@@ -1264,20 +1246,6 @@ public final class ModItems {
Logger.WARNING("BigReactors not Found - Skipping Resources.");
}
- // Thaumcraft
- if ((LoadedMods.Thaumcraft || LOAD_ALL_CONTENT) && !CORE.GTNH) {
- Logger.INFO("Thaumcraft Found - Loading Resources.");
- // Item Init
- try {
- ItemUtils.getItemForOreDict("Thaumcraft:ItemResource", "ingotVoidMetal", "Void Metal Ingot", 16);
- itemPlateVoidMetal = ItemUtils.generateSpecialUsePlate("Void", "Void", new short[] { 82, 17, 82 }, 0);
- GT_OreDictUnificator.registerOre("plateVoidMetal", new ItemStack(ModItems.itemPlateVoidMetal));
- } catch (final NullPointerException e) {}
-
- } else {
- Logger.WARNING("Thaumcraft not Found - Skipping Resources.");
- }
-
// Pneumaticraft
if (LoadedMods.PneumaticCraft || LOAD_ALL_CONTENT) {
Logger.INFO("PneumaticCraft Found - Loading Resources.");
@@ -1311,22 +1279,18 @@ public final class ModItems {
}
// IC2 Exp
- if (LoadedMods.IndustrialCraft2 || LOAD_ALL_CONTENT) {
- Logger.INFO("IndustrialCraft2 Found - Loading Resources.");
-
- // Baubles Mod Test
- try {
- final Class<?> baublesTest = ReflectionUtils.getClass("baubles.api.IBauble");
- if (baublesTest != null) {
- COMPAT_Baubles.run();
- } else {
- Logger.INFO("Baubles Not Found - Skipping Resources.");
- }
- } catch (final Throwable T) {
+ Logger.INFO("IndustrialCraft2 Found - Loading Resources.");
+
+ // Baubles Mod Test
+ try {
+ final Class<?> baublesTest = ReflectionUtils.getClass("baubles.api.IBauble");
+ if (baublesTest != null) {
+ COMPAT_Baubles.run();
+ } else {
Logger.INFO("Baubles Not Found - Skipping Resources.");
}
- } else {
- Logger.WARNING("IndustrialCraft2 not Found - Skipping Resources.");
+ } catch (final Throwable T) {
+ Logger.INFO("Baubles Not Found - Skipping Resources.");
}
// Special Item Handling Case
diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java
index f60b1af543..ca0adc9676 100644
--- a/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java
+++ b/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java
@@ -558,18 +558,16 @@ public class AgriculturalChem extends ItemPackage {
/**
* IC2 Support
*/
- if (LoadedMods.IndustrialCraft2) {
- aFertIC2 = ItemUtils.getItemStackFromFQRN("IC2:itemFertilizer", 1);
- CORE.RA.addDehydratorRecipe(
- new ItemStack[] { CI.getNumberedCircuit(12), ItemUtils.getSimpleStack(aDustOrganicFert, 4) },
- null,
- null,
- new ItemStack[] { ItemUtils.getItemStackFromFQRN("IC2:itemFertilizer", 3), aManureByprod,
- aManureByprod },
- new int[] { 10000, 2000, 2000 },
- 20 * 20,
- 240);
- }
+ aFertIC2 = ItemUtils.getItemStackFromFQRN("IC2:itemFertilizer", 1);
+ CORE.RA.addDehydratorRecipe(
+ new ItemStack[] { CI.getNumberedCircuit(12), ItemUtils.getSimpleStack(aDustOrganicFert, 4) },
+ null,
+ null,
+ new ItemStack[] { ItemUtils.getItemStackFromFQRN("IC2:itemFertilizer", 3), aManureByprod,
+ aManureByprod },
+ new int[] { 10000, 2000, 2000 },
+ 20 * 20,
+ 240);
// Dirt Production
CORE.RA.addCompressorRecipe(
diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java b/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java
index dd27ca4e00..d335281fd9 100644
--- a/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java
+++ b/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java
@@ -38,7 +38,7 @@ public class CoalTar extends ItemPackage {
FluidUtils.getFluidStack("nitrofuel", 7500),
ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 11),
100,
- CORE.GTNH ? 1000 : 500);
+ 1000);
CORE.RA.addChemicalRecipe(
ItemUtils.getItemStackOfAmountFromOreDict("cellBioDiesel", 9),
ItemUtils.getItemStackOfAmountFromOreDict("cellEthylbenzene", 2),
@@ -46,7 +46,7 @@ public class CoalTar extends ItemPackage {
FluidUtils.getFluidStack("nitrofuel", 3000),
ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 11),
300,
- CORE.GTNH ? 1000 : 500);
+ 1000);
}
public static void recipeCreateEthylene() {
diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java b/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java
index 5af0676af7..1bffc2f092 100644
--- a/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java
+++ b/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java
@@ -220,22 +220,6 @@ public class RocketFuels extends ItemPackage {
}
}
- private static void createLOX() {
- GT_Values.RA.addVacuumFreezerRecipe(
- ItemUtils.getItemStackOfAmountFromOreDict("cellOxygen", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("cellLiquidOxygen", 1),
- 20 * 16);
- CORE.RA.addAdvancedFreezerRecipe(
- new ItemStack[] {},
- new FluidStack[] { FluidUtils.getFluidStack("oxygen", 3000) },
- new FluidStack[] { FluidUtils.getFluidStack(Liquid_Oxygen, 3000) },
- new ItemStack[] {},
- new int[] {},
- 20 * 16,
- 240,
- 0);
- }
-
private static void createLOH() {
GT_Values.RA.addVacuumFreezerRecipe(
ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 1),
@@ -475,9 +459,6 @@ public class RocketFuels extends ItemPackage {
createHydrazine();
createMonomethylhydrazine();
- if (!CORE.GTNH) {
- createLOX();
- }
createLOH();
createHydratedAmmoniumNitrateSlurry();
diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemGiantEgg.java b/src/main/java/gtPlusPlus/core/item/general/ItemGiantEgg.java
index 6afb84765f..2cebe798c3 100644
--- a/src/main/java/gtPlusPlus/core/item/general/ItemGiantEgg.java
+++ b/src/main/java/gtPlusPlus/core/item/general/ItemGiantEgg.java
@@ -81,14 +81,10 @@ public class ItemGiantEgg extends BaseItemTickable {
private static ItemStack getStemCellStack() {
if (mCorrectStemCells == null) {
- if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK && Utils.getGregtechSubVersion() > 28) {
- ItemStack xl = ItemUtils
- .getValueOfItemList("Circuit_Chip_Stemcell", 1, ItemUtils.getSimpleStack(Items.egg, 2));
- if (xl != null) {
- mCorrectStemCells = xl.copy();
- }
- } else {
- mCorrectStemCells = ItemUtils.getSimpleStack(Items.egg, 2);
+ ItemStack xl = ItemUtils
+ .getValueOfItemList("Circuit_Chip_Stemcell", 1, ItemUtils.getSimpleStack(Items.egg, 2));
+ if (xl != null) {
+ mCorrectStemCells = xl.copy();
}
}
return mCorrectStemCells;
diff --git a/src/main/java/gtPlusPlus/core/item/init/ItemsMultiTools.java b/src/main/java/gtPlusPlus/core/item/init/ItemsMultiTools.java
index 2a5fa9107d..e8e4807747 100644
--- a/src/main/java/gtPlusPlus/core/item/init/ItemsMultiTools.java
+++ b/src/main/java/gtPlusPlus/core/item/init/ItemsMultiTools.java
@@ -4,7 +4,6 @@ import gregtech.api.enums.Materials;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.item.ModItems;
import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.core.material.ALLOY;
import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.util.minecraft.ItemUtils;
@@ -18,13 +17,12 @@ public class ItemsMultiTools {
private static void run() {
// Load Multitools
- final boolean gtStyleTools = LoadedMods.Gregtech;
if (CORE.ConfigSwitches.enableMultiSizeTools) {
// GT Materials
final Materials[] rm = Materials.values();
for (final Materials m : rm) {
- toolFactoryGT(m, gtStyleTools);
+ toolFactoryGT(m);
}
// GT++ Materials
@@ -53,9 +51,9 @@ public class ItemsMultiTools {
}
}
- private static boolean toolFactoryGT(final Materials m, final boolean b) {
- ModItems.MP_GTMATERIAL = ItemUtils.generateMultiPick(b, m);
- ModItems.MS_GTMATERIAL = ItemUtils.generateMultiShovel(b, m);
+ private static boolean toolFactoryGT(final Materials m) {
+ ModItems.MP_GTMATERIAL = ItemUtils.generateMultiPick(true, m);
+ ModItems.MS_GTMATERIAL = ItemUtils.generateMultiShovel(true, m);
return true;
}
diff --git a/src/main/java/gtPlusPlus/core/lib/CORE.java b/src/main/java/gtPlusPlus/core/lib/CORE.java
index 870ccf733f..dc6e8cc7a3 100644
--- a/src/main/java/gtPlusPlus/core/lib/CORE.java
+++ b/src/main/java/gtPlusPlus/core/lib/CORE.java
@@ -10,13 +10,11 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
import net.minecraft.world.WorldServer;
-import net.minecraftforge.common.config.Configuration;
import net.minecraftforge.common.util.FakePlayerFactory;
import com.mojang.authlib.GameProfile;
import cpw.mods.fml.common.FMLCommonHandler;
-import gregtech.api.GregTech_API;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.api.objects.data.Pair;
import gtPlusPlus.api.objects.random.XSTR;
@@ -24,26 +22,17 @@ import gtPlusPlus.core.util.reflect.ReflectionUtils;
import gtPlusPlus.preloader.CORE_Preloader;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
import gtPlusPlus.xmod.gregtech.api.interfaces.internal.IGregtech_RecipeAdder;
-import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy;
import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_TesseractGenerator;
import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_TesseractTerminal;
public class CORE {
- // import cpw.mods.fml.common.Optional;
-
- // Analytics handler
- // public static SegmentAnalytics mHelper;
-
public static Map PlayerCache;
// Math Related
public static final float PI = (float) Math.PI;
public static volatile Random RANDOM = new XSTR();
- // Env. Variables
- public static Configuration Config;
-
public static boolean DEVENV = false;
// Only can be set in Dev, no config or setting elsewhere.
public static final boolean LOAD_ALL_CONTENT = false;;
@@ -58,10 +47,6 @@ public class CORE {
public static int EVERGLADES_ID = 227;
public static int EVERGLADESBIOME_ID = 238;
- // GT Vars;
- public static final int GREG_FIRST_ID = 760;
- public static final boolean MAIN_GREGTECH_5U_EXPERIMENTAL_FORK = Meta_GT_Proxy.areWeUsingGregtech5uExperimental();
- public static final int GREGTECH_API_VERSION = GregTech_API.VERSION;
public static int turbineCutoffBase = 75000;
// GT++ Fake Player Profile
@@ -77,8 +62,6 @@ public class CORE {
.translateToLocal("GTPP.core.GT_Tooltip_Radioactive");
public static final String noItem = "";
- // Because I want to be lazy Gregtech New Horizons Var.
- public static boolean GTNH = false;
// Because I want to be lazy. Beyond Reality Classic Var.
public static boolean BRC = false;
@@ -101,9 +84,6 @@ public class CORE {
/**
* Some Gregtech Material and Recipe Variables
*/
- @Deprecated
- public static IGregtech_RecipeAdder sRecipeAdder;
-
public static IGregtech_RecipeAdder RA;
public static final GT_Materials[] sMU_GeneratedMaterials = new GT_Materials[1000];
@@ -324,8 +304,4 @@ public class CORE {
}
FMLCommonHandler.instance().exitJava(0, true);
}
-
- public static final void gc() {
- System.gc();
- }
}
diff --git a/src/main/java/gtPlusPlus/core/lib/LoadedMods.java b/src/main/java/gtPlusPlus/core/lib/LoadedMods.java
index da24c8bbc1..498b69860e 100644
--- a/src/main/java/gtPlusPlus/core/lib/LoadedMods.java
+++ b/src/main/java/gtPlusPlus/core/lib/LoadedMods.java
@@ -7,19 +7,16 @@ import java.util.HashMap;
import cpw.mods.fml.common.Loader;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.lib.CORE.ConfigSwitches;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechTextures;
import gtPlusPlus.xmod.gregtech.recipes.GregtechRecipeAdder;
public class LoadedMods {
// Initialize Variables
- public static boolean Gregtech = false;
public static boolean PlayerAPI = false;
public static boolean BuildCraft = false;
public static boolean EnderIO = false;
public static boolean Big_Reactors = false;
- public static boolean IndustrialCraft2 = false;
public static boolean IndustrialCraft2Classic = false;
public static boolean Simply_Jetpacks = false;
public static boolean RFTools = false;
@@ -39,7 +36,6 @@ public class LoadedMods {
public static boolean MagicBees = false;
public static boolean ExtraBees = false;
public static boolean Psychedelicraft = false;
- public static boolean MiscUtils = true; // Dummy For MetaData Lookups in MT Wrapper
public static boolean ThermalFoundation = false;
public static boolean IHL = false;
public static boolean AdvancedSolarPanel = false;
@@ -72,29 +68,21 @@ public class LoadedMods {
@SuppressWarnings("deprecation")
public static void checkLoaded() {
Logger.INFO("Looking for optional mod prereqs.");
- if (isModLoaded("gregtech")) {
- Gregtech = true;
- Logger.INFO("Components enabled for: Gregtech");
- if (Gregtech) {
- try {
- CORE.sRecipeAdder = CORE.RA = new GregtechRecipeAdder();
- Logger.INFO("Created Gregtech recipe handler.");
- GregtechTextures.BlockIcons.VOID.name();
- GregtechTextures.ItemIcons.VOID.name();
- Logger.INFO("Created Gregtech texture handler.");
- } catch (final NullPointerException e) {
- Logger.INFO("Could NOT create a Gregtech recipe handler.");
- }
- }
-
- totalMods++;
+ Logger.INFO("Components enabled for: Gregtech");
+ try {
+ CORE.RA = new GregtechRecipeAdder();
+ Logger.INFO("Created Gregtech recipe handler.");
+ GregtechTextures.BlockIcons.VOID.name();
+ GregtechTextures.ItemIcons.VOID.name();
+ Logger.INFO("Created Gregtech texture handler.");
+ } catch (final NullPointerException e) {
+ Logger.INFO("Could NOT create a Gregtech recipe handler.");
}
- if (isModLoaded("dreamcraft")
- || ReflectionUtils.doesClassExist("gregtech.api.util.GT_Multiblock_Tooltip_Builder")) {
+
+ totalMods++;
+ if (isModLoaded("dreamcraft")) {
DreamCraft = true;
- GTNH = true;
Logger.INFO("Components enabled for: DreamCraft");
- Logger.INFO("Components enabled for: GT: New Horizons");
totalMods++;
}
if (isModLoaded("beyondrealitycore")) {
@@ -153,11 +141,6 @@ public class LoadedMods {
Logger.INFO("Components enabled for: Big Reactors");
totalMods++;
}
- if (isModLoaded("IC2")) {
- IndustrialCraft2 = true;
- Logger.INFO("Components enabled for: IndustrialCraft2");
- totalMods++;
- }
if (isModLoaded("IC2-Classic-Spmod")) {
IndustrialCraft2Classic = true;
Logger.INFO("Components enabled for: IndustrialCraft2-Classic");
diff --git a/src/main/java/gtPlusPlus/core/material/ELEMENT.java b/src/main/java/gtPlusPlus/core/material/ELEMENT.java
index f73c1af0ab..666de12f53 100644
--- a/src/main/java/gtPlusPlus/core/material/ELEMENT.java
+++ b/src/main/java/gtPlusPlus/core/material/ELEMENT.java
@@ -4,7 +4,6 @@ import gregtech.api.enums.Materials;
import gregtech.api.enums.TextureSet;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.client.CustomTextureSet.TextureSets;
-import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.material.state.MaterialState;
import gtPlusPlus.core.util.data.StringUtils;
import gtPlusPlus.core.util.minecraft.MaterialUtils;
@@ -597,66 +596,8 @@ public final class ELEMENT {
public ELEMENT() {
// GTNH Trinium Handling
- if (CORE.GTNH) {
- // yay
- Materials a1 = MaterialUtils.getMaterial("Trinium");
- Materials a2 = Materials.valueOf("Trinium");
- Materials a3 = Materials.get("Trinium");
- Materials a4;
- if (a1 == null) {
- Logger.INFO("[Material] First attempt to find Trinium failed, using backup method.");
- if (a2 == null) {
- Logger.INFO("[Material] Fallback attempt to find Trinium failed, using second fallback.");
- if (a3 == null) {
- Logger.INFO("[Material] Fallback attempt to find Trinium failed, dumping materials.");
- for (Materials m : Materials.values()) {
- Logger.INFO("[Material] Found " + MaterialUtils.getMaterialName(m));
- }
- a4 = null;
- } else {
- Logger.INFO("[Material] a3 Found " + MaterialUtils.getMaterialName(a3));
- a4 = a3;
- }
- } else {
- Logger.INFO("[Material] a2 Found " + MaterialUtils.getMaterialName(a2));
- a4 = a2;
- }
- TRINIUM = MaterialUtils.generateMaterialFromGtENUM(a4);
- } else {
- Logger.INFO("[Material] a1 Found " + MaterialUtils.getMaterialName(a1));
- TRINIUM = MaterialUtils.generateMaterialFromGtENUM(a1);
- }
-
- TRINIUM_REFINED = TRINIUM;
-
- } else {
- TRINIUM = new Material(
- "Trinium",
- MaterialState.SOLID,
- TextureSet.SET_FINE,
- new short[] { 70, 110, 30 },
- 604,
- 4057,
- 181,
- 133,
- false,
- "Ke",
- 0,
- false); // Not a GT Inherited Material
- TRINIUM_REFINED = new Material(
- "Refined Trinium",
- MaterialState.SOLID,
- TextureSets.REFINED.get(),
- new short[] { 210, 255, 170 },
- 4304,
- 14057,
- 181,
- 133,
- false,
- "Ke",
- 0,
- new MaterialStack[] { new MaterialStack(TRINIUM, 1) }); // Not a GT Inherited Material
- }
+ TRINIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Trinium);
+ TRINIUM_REFINED = TRINIUM;
}
public static ELEMENT getInstance() {
diff --git a/src/main/java/gtPlusPlus/core/material/Material.java b/src/main/java/gtPlusPlus/core/material/Material.java
index 98ab4739d4..00f5139b60 100644
--- a/src/main/java/gtPlusPlus/core/material/Material.java
+++ b/src/main/java/gtPlusPlus/core/material/Material.java
@@ -33,7 +33,6 @@ import gtPlusPlus.core.util.minecraft.FluidUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.minecraft.MaterialUtils;
import gtPlusPlus.xmod.gregtech.api.enums.CustomOrePrefix;
-import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechConduits;
import gtPlusPlus.xmod.thaumcraft.objects.wrapper.aspect.TC_Aspect_Wrapper;
import gtPlusPlus.xmod.tinkers.material.BaseTinkersMaterial;
@@ -1138,11 +1137,7 @@ public class Material {
}
public final ItemStack getCable16(final int stacksize) {
- if (GregtechConduits.cableGt16 != null) {
- return getComponentByPrefix(GregtechConduits.cableGt16, stacksize);
- } else {
- return ItemUtils.getErrorStack(stacksize);
- }
+ return getComponentByPrefix(OrePrefixes.cableGt16, stacksize);
}
/**
diff --git a/src/main/java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java b/src/main/java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java
index ff104057b1..aace371163 100644
--- a/src/main/java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java
+++ b/src/main/java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java
@@ -1,7 +1,6 @@
package gtPlusPlus.core.recipe;
import gregtech.api.enums.ItemList;
-import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.recipe.common.CI;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
@@ -9,18 +8,9 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
public class LOADER_Machine_Components {
public static void initialise() {
-
registerDefaultComponents();
- if (!CORE.GTNH) {
- if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
- registerGTExperimentalComponents();
- } else {
- registerGTStandardComponents();
- }
- } else {
- registerGTNHComponents();
- }
+ registerGTNHComponents();
}
private static void registerDefaultComponents() {
@@ -65,13 +55,11 @@ public class LOADER_Machine_Components {
CI.sensor_HV = ItemList.Sensor_HV.get(1);
CI.sensor_EV = ItemList.Sensor_EV.get(1);
CI.sensor_IV = ItemList.Sensor_IV.get(1);
- if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
- CI.fluidRegulator_LV = ItemUtils.getValueOfItemList("FluidRegulator_LV", ItemList.Pump_LV).get(1);
- CI.fluidRegulator_MV = ItemUtils.getValueOfItemList("FluidRegulator_MV", ItemList.Pump_MV).get(1);
- CI.fluidRegulator_HV = ItemUtils.getValueOfItemList("FluidRegulator_HV", ItemList.Pump_HV).get(1);
- CI.fluidRegulator_EV = ItemUtils.getValueOfItemList("FluidRegulator_EV", ItemList.Pump_EV).get(1);
- CI.fluidRegulator_IV = ItemUtils.getValueOfItemList("FluidRegulator_IV", ItemList.Pump_IV).get(1);
- }
+ CI.fluidRegulator_LV = ItemUtils.getValueOfItemList("FluidRegulator_LV", ItemList.Pump_LV).get(1);
+ CI.fluidRegulator_MV = ItemUtils.getValueOfItemList("FluidRegulator_MV", ItemList.Pump_MV).get(1);
+ CI.fluidRegulator_HV = ItemUtils.getValueOfItemList("FluidRegulator_HV", ItemList.Pump_HV).get(1);
+ CI.fluidRegulator_EV = ItemUtils.getValueOfItemList("FluidRegulator_EV", ItemList.Pump_EV).get(1);
+ CI.fluidRegulator_IV = ItemUtils.getValueOfItemList("FluidRegulator_IV", ItemList.Pump_IV).get(1);
}
private static void registerGTExperimentalComponents() {
@@ -101,11 +89,9 @@ public class LOADER_Machine_Components {
CI.sensor_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32696, 1);
CI.sensor_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32697, 1);
- if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
- CI.fluidRegulator_LuV = ItemUtils.getValueOfItemList("FluidRegulator_LuV", ItemList.Pump_LuV).get(1);
- CI.fluidRegulator_ZPM = ItemUtils.getValueOfItemList("FluidRegulator_ZPM", ItemList.Pump_ZPM).get(1);
- CI.fluidRegulator_UV = ItemUtils.getValueOfItemList("FluidRegulator_UV", ItemList.Pump_UV).get(1);
- }
+ CI.fluidRegulator_LuV = ItemUtils.getValueOfItemList("FluidRegulator_LuV", ItemList.Pump_LuV).get(1);
+ CI.fluidRegulator_ZPM = ItemUtils.getValueOfItemList("FluidRegulator_ZPM", ItemList.Pump_ZPM).get(1);
+ CI.fluidRegulator_UV = ItemUtils.getValueOfItemList("FluidRegulator_UV", ItemList.Pump_UV).get(1);
registerComponentsULV();
registerComponentsMAX();
@@ -145,11 +131,9 @@ public class LOADER_Machine_Components {
CI.sensor_UV = GregtechItemList.Sensor_UV.get(1);
CI.sensor_MAX = GregtechItemList.Sensor_MAX.get(1);
- if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
- CI.fluidRegulator_LuV = ItemUtils.getValueOfItemList("FluidRegulator_LuV", ItemList.Pump_LuV).get(1);
- CI.fluidRegulator_ZPM = ItemUtils.getValueOfItemList("FluidRegulator_ZPM", ItemList.Pump_ZPM).get(1);
- CI.fluidRegulator_UV = ItemUtils.getValueOfItemList("FluidRegulator_UV", ItemList.Pump_UV).get(1);
- }
+ CI.fluidRegulator_LuV = ItemUtils.getValueOfItemList("FluidRegulator_LuV", ItemList.Pump_LuV).get(1);
+ CI.fluidRegulator_ZPM = ItemUtils.getValueOfItemList("FluidRegulator_ZPM", ItemList.Pump_ZPM).get(1);
+ CI.fluidRegulator_UV = ItemUtils.getValueOfItemList("FluidRegulator_UV", ItemList.Pump_UV).get(1);
registerComponentsULV();
}
@@ -188,11 +172,9 @@ public class LOADER_Machine_Components {
CI.sensor_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32696, 1);
CI.sensor_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32697, 1);
- if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
- CI.fluidRegulator_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32665, 1);
- CI.fluidRegulator_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32666, 1);
- CI.fluidRegulator_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32667, 1);
- }
+ CI.fluidRegulator_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32665, 1);
+ CI.fluidRegulator_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32666, 1);
+ CI.fluidRegulator_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32667, 1);
// Thanks 0lafe
CI.electricMotor_MAX = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32596, 1);
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Extruder.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Extruder.java
deleted file mode 100644
index 524aa08f60..0000000000
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Extruder.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package gtPlusPlus.core.recipe;
-
-import net.minecraft.item.ItemStack;
-
-import gregtech.api.enums.*;
-import gregtech.api.interfaces.IOreRecipeRegistrator;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-
-public class RECIPES_Extruder implements IOreRecipeRegistrator {
-
- public RECIPES_Extruder() {
- OrePrefixes.ingot.add((IOreRecipeRegistrator) this);
- OrePrefixes.dust.add((IOreRecipeRegistrator) this);
- }
-
- public void registerOre(final OrePrefixes aPrefix, final Materials aMaterial, final String aOreDictName,
- final String aModName, final ItemStack aStack) {
- if (!CORE.GTNH && ((aMaterial == Materials.Glass || aMaterial == Materials.WroughtIron
- || GT_OreDictUnificator.get(OrePrefixes.ingot, (Object) aMaterial, 1L) != null)
- && !aMaterial.contains(SubTag.NO_SMELTING))) {
- final long aMaterialMass = aMaterial.getMass();
- final int tAmount = (int) (aPrefix.mMaterialAmount / 3628800L);
- if (tAmount > 0 && tAmount <= 64 && aPrefix.mMaterialAmount % 3628800L == 0L) {
- int tVoltageMultiplier = (aMaterial.mBlastFurnaceTemp >= 2800) ? 64 : 16;
- if (aMaterial.contains(SubTag.NO_SMASHING)) {
- tVoltageMultiplier /= 4;
- } else if (aPrefix.name().startsWith(OrePrefixes.dust.name())) {
- return;
- }
-
- GT_Values.RA.addExtruderRecipe(
- GT_Utility.copyAmount(1L, new Object[] { aStack }),
- GregtechItemList.Shape_Extruder_SmallGear.get(0L, new Object[0]),
- GT_OreDictUnificator
- .get(OrePrefixes.gearGtSmall, (Object) aMaterial.mSmeltInto, (long) tAmount),
- ((int) Math.max(aMaterialMass * 5L * tAmount, tAmount) / 4),
- 8 * tVoltageMultiplier);
- GT_Values.RA.addAlloySmelterRecipe(
- GT_Utility.copyAmount(2L, new Object[] { aStack }),
- ItemList.Shape_Mold_Gear_Small.get(0L, new Object[0]),
- GT_OreDictUnificator
- .get(OrePrefixes.gearGtSmall, (Object) aMaterial.mSmeltInto, (long) tAmount),
- ((int) Math.max(aMaterialMass * 10L * tAmount, tAmount) / 4),
- 2 * tVoltageMultiplier);
- }
- }
- }
-}
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index 0dcdb008bb..3bf145f0b3 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -1,7 +1,5 @@
package gtPlusPlus.core.recipe;
-import static gtPlusPlus.core.lib.CORE.GTNH;
-
import java.util.ArrayList;
import net.minecraft.init.Blocks;
@@ -30,7 +28,6 @@ import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.core.material.*;
import gtPlusPlus.core.material.nuclear.FLUORIDES;
import gtPlusPlus.core.recipe.common.CI;
-import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.minecraft.EnchantingUtils;
import gtPlusPlus.core.util.minecraft.FluidUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
@@ -59,10 +56,8 @@ public class RECIPES_GREGTECH {
dehydratorRecipes();
blastFurnaceRecipes();
- if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
- largeChemReactorRecipes();
- fusionRecipes();
- }
+ largeChemReactorRecipes();
+ fusionRecipes();
fissionFuelRecipes();
autoclaveRecipes();
@@ -359,80 +354,45 @@ public class RECIPES_GREGTECH {
private static void assemblyLineRecipes() {
- ItemStack[] aCoilWire = new ItemStack[] {
- ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 0, GTNH ? 64 : 32),
- ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 1, GTNH ? 64 : 32),
- ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 2, GTNH ? 64 : 32),
- ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 3, GTNH ? 64 : 32), };
+ ItemStack[] aCoilWire = new ItemStack[] { ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 0, 64),
+ ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 1, 64),
+ ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 2, 64),
+ ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 3, 64), };
// Containment Casings
CORE.RA.addAssemblylineRecipe(
ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_1_CONTAINMENT, 1),
20 * 60 * 30,
- new Object[] { ItemList.Field_Generator_IV.get(GTNH ? 32 : 16),
- ItemList.Electric_Motor_EV.get(GTNH ? 64 : 32),
- ItemList.Energy_LapotronicOrb.get(GTNH ? 32 : 16),
- CI.getTieredComponent(OrePrefixes.cableGt12, 7, GTNH ? 32 : 16),
- CI.getTieredComponent(OrePrefixes.wireGt16, 6, GTNH ? 64 : 32),
- ItemUtils.getOrePrefixStack(OrePrefixes.plate, Materials.Naquadria, GTNH ? 64 : 16),
- ELEMENT.getInstance().GADOLINIUM.getDust(GTNH ? 32 : 8),
- ELEMENT.getInstance().SAMARIUM.getDust(GTNH ? 16 : 4), ALLOY.ARCANITE.getGear(GTNH ? 8 : 2),
- new Object[] { CI.getTieredCircuitOreDictName(5), 64 },
+ new Object[] { ItemList.Field_Generator_IV.get(32), ItemList.Electric_Motor_EV.get(64),
+ ItemList.Energy_LapotronicOrb.get(32), CI.getTieredComponent(OrePrefixes.cableGt12, 7, 32),
+ CI.getTieredComponent(OrePrefixes.wireGt16, 6, 64),
+ ItemUtils.getOrePrefixStack(OrePrefixes.plate, Materials.Naquadria, 64),
+ ELEMENT.getInstance().GADOLINIUM.getDust(32), ELEMENT.getInstance().SAMARIUM.getDust(16),
+ ALLOY.ARCANITE.getGear(8), new Object[] { CI.getTieredCircuitOreDictName(5), 64 },
new Object[] { CI.getTieredCircuitOreDictName(6), 32 },
new Object[] { CI.getTieredCircuitOreDictName(7), 16 },
GregtechItemList.Laser_Lens_Special.get(1), aCoilWire[3] },
- new FluidStack[] { ALLOY.NITINOL_60.getFluidStack(144 * 9 * (GTNH ? 4 : 2)),
- ALLOY.ENERGYCRYSTAL.getFluidStack(144 * 9 * (GTNH ? 8 : 4)),
- ALLOY.TUMBAGA.getFluidStack(144 * 9 * (GTNH ? 32 : 8)),
- ALLOY.NICHROME.getFluidStack(144 * 1 * (GTNH ? 16 : 4)), },
+ new FluidStack[] { ALLOY.NITINOL_60.getFluidStack(144 * 9 * 4),
+ ALLOY.ENERGYCRYSTAL.getFluidStack(144 * 9 * 8), ALLOY.TUMBAGA.getFluidStack(144 * 9 * 32),
+ ALLOY.NICHROME.getFluidStack(144 * 1 * 16), },
ItemUtils.getSimpleStack(ModBlocks.blockCasings3Misc, 15, 32),
- 20 * 60 * 10 * (GTNH ? 2 : 1),
+ 20 * 60 * 10 * 2,
(int) MaterialUtils.getVoltageForTier(6));
- // Slow Fusion Controller
- /*
- * CORE.RA.addAssemblylineRecipe( GregtechItemList.COMET_Cyclotron.get(1), 20 * 60 * 30, new ItemStack[] {
- * CI.getFieldGenerator(6, GTNH ? 32 : 8), ItemList.Electric_Motor_EV.get(GTNH ? 32 : 8),
- * ItemList.Tool_Scanner.get(GTNH ? 4 : 2), CI.getTieredComponent(OrePrefixes.cableGt12, 6, GTNH ? 32 : 16),
- * CI.getTieredComponent(OrePrefixes.wireGt16, 5, GTNH ? 64 : 32), CI.getTieredComponent(OrePrefixes.plate, 6,
- * GTNH ? 64 : 32), ELEMENT.getInstance().GADOLINIUM.getDust(GTNH ? 32 : 8),
- * ELEMENT.getInstance().SAMARIUM.getDust(GTNH ? 16 : 4), ALLOY.INCOLOY_MA956.getGear(GTNH ? 8 : 2),
- * CI.getTieredComponent(OrePrefixes.circuit, 5, GTNH ? 64 : 32), CI.getTieredComponent(OrePrefixes.circuit, 6,
- * GTNH ? 32 : 16), CI.getTieredComponent(OrePrefixes.circuit, 7, GTNH ? 16 : 8) }, new FluidStack[] {
- * CI.getTieredFluid(6, 144 * 9 * (GTNH ? 8 : 4)), CI.getTertiaryTieredFluid(6, 144 * 9 * (GTNH ? 8 : 4)),
- * CI.getAlternativeTieredFluid(6, 144 * 9 * (GTNH ? 8 : 4)), CI.getTieredFluid(5, 144 * 9 * (GTNH ? 16 : 8)),
- * }, GregtechItemList.Miniature_Fusion.get(1), 20 * 60 * 5 * (GTNH ? 2 : 1), (int)
- * MaterialUtils.getVoltageForTier(7));
- */
-
- // Plasma Tank
- /*
- * CORE.RA.addAssemblylineRecipe( ItemUtils.getOrePrefixStack(OrePrefixes.pipeMedium, Materials.Superconductor,
- * 1), 20 * 60 * 5, new ItemStack[] { CI.getTieredComponent(OrePrefixes.plate, 5, GTNH ? 32 : 16),
- * CI.getTieredComponent(OrePrefixes.circuit, 5, GTNH ? 16 : 4), CI.getTieredComponent(OrePrefixes.pipeHuge, 5,
- * GTNH ? 16 : 4), CI.getTieredComponent(OrePrefixes.cableGt08, 7, GTNH ? 32 : 16),
- * CI.getTieredComponent(OrePrefixes.gearGt, 6, GTNH ? 8 : 4), aCoilWire[2] }, new FluidStack[] {
- * CI.getTieredFluid(4, 144 * 9 * (GTNH ? 16 : 8)), CI.getTertiaryTieredFluid(4, 144 * 9 * (GTNH ? 16 : 8)),
- * CI.getAlternativeTieredFluid(4, 144 * 9 * (GTNH ? 16 : 8)), }, GregtechItemList.Plasma_Tank.get(1), 20 * 60 *
- * 1 * (GTNH ? 2 : 1), (int) MaterialUtils.getVoltageForTier(5));
- */
-
// Turbine Automation Port
CORE.RA.addAssemblylineRecipe(
ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_8_TURBINE_AUTOMATION, 1),
20 * 60 * 60 * 24,
- new Object[] { CI.getTieredMachineHull(8, 4), CI.getConveyor(8, GTNH ? 24 : 12),
- CI.getElectricMotor(7, GTNH ? 32 : 16), CI.getElectricPiston(7, GTNH ? 16 : 4),
- CI.getEnergyCore(6, GTNH ? 8 : 2), CI.getPlate(8, GTNH ? 24 : 12),
- CI.getTieredComponent(OrePrefixes.screw, 8, GTNH ? 48 : 24),
- CI.getTieredComponent(OrePrefixes.bolt, 7, GTNH ? 32 : 16),
- CI.getTieredComponent(OrePrefixes.rod, 6, GTNH ? 12 : 6),
+ new Object[] { CI.getTieredMachineHull(8, 4), CI.getConveyor(8, 24), CI.getElectricMotor(7, 32),
+ CI.getElectricPiston(7, 16), CI.getEnergyCore(6, 8), CI.getPlate(8, 24),
+ CI.getTieredComponent(OrePrefixes.screw, 8, 48), CI.getTieredComponent(OrePrefixes.bolt, 7, 32),
+ CI.getTieredComponent(OrePrefixes.rod, 6, 12),
new Object[] { CI.getTieredCircuitOreDictName(7), 20 },
- CI.getTieredComponent(OrePrefixes.rotor, 6, GTNH ? 16 : 8), },
+ CI.getTieredComponent(OrePrefixes.rotor, 6, 16), },
new FluidStack[] { CI.getTieredFluid(8, 144 * 32), CI.getAlternativeTieredFluid(7, 144 * 16),
CI.getTertiaryTieredFluid(7, 144 * 16), ALLOY.BABBIT_ALLOY.getFluidStack(128 * 144) },
GregtechItemList.Hatch_Input_TurbineHousing.get(4),
- 20 * 60 * 60 * (GTNH ? 2 : 1),
+ 20 * 60 * 60 * 2,
(int) MaterialUtils.getVoltageForTier(8));
/*
@@ -452,13 +412,12 @@ public class RECIPES_GREGTECH {
aResearch[aCasingSlot],
20 * 60 * 60,
new ItemStack[] { CI.getTieredComponent(OrePrefixes.plate, j - 1, 16),
- CI.getTieredComponent(OrePrefixes.cableGt08, j + 1, (GTNH ? 32 : 16)),
+ CI.getTieredComponent(OrePrefixes.cableGt08, j + 1, 32),
CI.getTieredComponent(OrePrefixes.gearGt, j - 1, 4), aCoilWire[aCasingSlot] },
- new FluidStack[] { CI.getTieredFluid(j, 144 * (GTNH ? 8 : 4)),
- CI.getTertiaryTieredFluid(j - 2, 144 * (GTNH ? 16 : 8)),
- CI.getAlternativeTieredFluid(j, 144 * (GTNH ? 16 : 12)), },
+ new FluidStack[] { CI.getTieredFluid(j, 144 * 8), CI.getTertiaryTieredFluid(j - 2, 144 * 16),
+ CI.getAlternativeTieredFluid(j, 144 * 16), },
aGemCasings[aCasingSlot++],
- 20 * 60 * 1 * (GTNH ? 2 : 1),
+ 20 * 60 * 1 * 2,
(int) MaterialUtils.getVoltageForTier(j));
}
@@ -481,15 +440,14 @@ public class RECIPES_GREGTECH {
new Object[] { aGemCasings[aCasingSlot], ItemUtils.getSimpleStack(aExoticInputs[aCasingSlot], 16),
CI.getTieredComponent(OrePrefixes.plate, j, 16),
new Object[] { CI.getTieredCircuitOreDictName(j), 8 },
- CI.getTieredComponent(OrePrefixes.wireGt16, j + 1, GTNH ? 32 : 16),
- CI.getTieredComponent(OrePrefixes.bolt, j, GTNH ? 8 : 4),
- CI.getTieredComponent(OrePrefixes.screw, j - 1, GTNH ? 8 : 4), },
- new FluidStack[] { CI.getTieredFluid(j, 144 * 1 * (GTNH ? 16 : 8)),
- CI.getTertiaryTieredFluid(j - 2, 144 * 2 * (GTNH ? 16 : 8)),
- CI.getAlternativeTieredFluid(j, 144 * (GTNH ? 16 : 8)),
- CI.getTertiaryTieredFluid(j - 1, 144 * (GTNH ? 16 : 8)), },
+ CI.getTieredComponent(OrePrefixes.wireGt16, j + 1, 32),
+ CI.getTieredComponent(OrePrefixes.bolt, j, 8),
+ CI.getTieredComponent(OrePrefixes.screw, j - 1, 8), },
+ new FluidStack[] { CI.getTieredFluid(j, 144 * 1 * 16),
+ CI.getTertiaryTieredFluid(j - 2, 144 * 2 * 16), CI.getAlternativeTieredFluid(j, 144 * 16),
+ CI.getTertiaryTieredFluid(j - 1, 144 * 16), },
aGemBatteries[aCasingSlot++],
- 20 * 60 * 1 * (GTNH ? 2 : 1),
+ 20 * 60 * 1 * 2,
(int) MaterialUtils.getVoltageForTier(j));
}
@@ -498,20 +456,19 @@ public class RECIPES_GREGTECH {
CORE.RA.addAssemblylineRecipe(
ItemUtils.simpleMetaStack(Items.golden_apple, 1, 1),
20 * 60 * 10,
- new Object[] { ItemUtils.getSimpleStack(aGemCasings[2], GTNH ? 4 : 2),
- CI.getTieredComponent(OrePrefixes.plate, 8, GTNH ? 32 : 16),
+ new Object[] { ItemUtils.getSimpleStack(aGemCasings[2], 4),
+ CI.getTieredComponent(OrePrefixes.plate, 8, 32),
new Object[] { CI.getTieredCircuitOreDictName(7), 16 },
- CI.getTieredComponent(OrePrefixes.cableGt02, 7, GTNH ? 16 : 8),
- CI.getTieredComponent(OrePrefixes.gearGt, 6, GTNH ? 6 : 3),
- CI.getTieredComponent(OrePrefixes.screw, 7, GTNH ? 16 : 8),
- CI.getTieredComponent(OrePrefixes.bolt, 5, GTNH ? 24 : 12),
- CI.getTieredComponent(OrePrefixes.frameGt, 4, GTNH ? 12 : 6), aCoilWire[3] },
- new FluidStack[] { CI.getTieredFluid(7, 144 * 18 * (GTNH ? 16 : 8)),
- CI.getTertiaryTieredFluid(7, 144 * 18 * (GTNH ? 16 : 8)),
- CI.getAlternativeTieredFluid(6, 144 * 18 * (GTNH ? 16 : 8)),
- CI.getAlternativeTieredFluid(7, 144 * 18 * (GTNH ? 16 : 8)), },
+ CI.getTieredComponent(OrePrefixes.cableGt02, 7, 16),
+ CI.getTieredComponent(OrePrefixes.gearGt, 6, 6),
+ CI.getTieredComponent(OrePrefixes.screw, 7, 16),
+ CI.getTieredComponent(OrePrefixes.bolt, 5, 24),
+ CI.getTieredComponent(OrePrefixes.frameGt, 4, 12), aCoilWire[3] },
+ new FluidStack[] { CI.getTieredFluid(7, 144 * 18 * 16), CI.getTertiaryTieredFluid(7, 144 * 18 * 16),
+ CI.getAlternativeTieredFluid(6, 144 * 18 * 16),
+ CI.getAlternativeTieredFluid(7, 144 * 18 * 16), },
ItemUtils.getItemStackFromFQRN("miscutils:personalHealingDevice", 1),
- 20 * 60 * 30 * (GTNH ? 2 : 1),
+ 20 * 60 * 30 * 2,
(int) MaterialUtils.getVoltageForTier(7));
// Charge Pack LuV-UV
@@ -537,15 +494,14 @@ public class RECIPES_GREGTECH {
new Object[] { CI.getTieredCircuitOreDictName(h), 4 },
new Object[] { CI.getTieredCircuitOreDictName(h - 1), 8 },
CI.getTieredComponent(OrePrefixes.cableGt12, h - 1, 16),
- CI.getTieredComponent(OrePrefixes.screw, h, GTNH ? 16 : 8),
- CI.getTieredComponent(OrePrefixes.bolt, h - 2, GTNH ? 32 : 16),
- CI.getFieldGenerator(h, 1), },
- new FluidStack[] { CI.getTieredFluid(h, 144 * 4 * (GTNH ? 8 : 4)),
- CI.getTertiaryTieredFluid(h - 1, 144 * 4 * (GTNH ? 8 : 4)),
- CI.getAlternativeTieredFluid(h - 1, 144 * 4 * (GTNH ? 8 : 4)),
- CI.getAlternativeTieredFluid(h - 2, 144 * 4 * (GTNH ? 8 : 4)), },
+ CI.getTieredComponent(OrePrefixes.screw, h, 16),
+ CI.getTieredComponent(OrePrefixes.bolt, h - 2, 32), CI.getFieldGenerator(h, 1), },
+ new FluidStack[] { CI.getTieredFluid(h, 144 * 4 * 8),
+ CI.getTertiaryTieredFluid(h - 1, 144 * 4 * 8),
+ CI.getAlternativeTieredFluid(h - 1, 144 * 4 * 8),
+ CI.getAlternativeTieredFluid(h - 2, 144 * 4 * 8), },
aChargeOutputs[aCurrSlot],
- 20 * 60 * 30 * (GTNH ? 2 : 1) * (aCurrSlot + 1),
+ 20 * 60 * 30 * 2 * (aCurrSlot + 1),
(int) MaterialUtils.getVoltageForTier(h));
aCurrSlot++;
}
@@ -554,20 +510,19 @@ public class RECIPES_GREGTECH {
CORE.RA.addAssemblylineRecipe(
ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_9_CLOAKING, 1),
20 * 60 * 10,
- new Object[] { ItemUtils.getSimpleStack(aGemCasings[3], GTNH ? 4 : 2),
- CI.getTieredComponent(OrePrefixes.plate, 8, GTNH ? 32 : 16),
+ new Object[] { ItemUtils.getSimpleStack(aGemCasings[3], 4),
+ CI.getTieredComponent(OrePrefixes.plate, 8, 32),
new Object[] { CI.getTieredCircuitOreDictName(7), 16 },
- CI.getTieredComponent(OrePrefixes.cableGt04, 8, GTNH ? 16 : 8),
- CI.getTieredComponent(OrePrefixes.gearGt, 7, GTNH ? 6 : 3),
- CI.getTieredComponent(OrePrefixes.screw, 8, GTNH ? 16 : 8),
- CI.getTieredComponent(OrePrefixes.bolt, 7, GTNH ? 24 : 12),
- CI.getTieredComponent(OrePrefixes.frameGt, 5, GTNH ? 12 : 6), aCoilWire[3] },
- new FluidStack[] { CI.getTieredFluid(8, 144 * 18 * (GTNH ? 16 : 8)),
- CI.getTertiaryTieredFluid(8, 144 * 18 * (GTNH ? 16 : 8)),
- CI.getAlternativeTieredFluid(7, 144 * 18 * (GTNH ? 16 : 8)),
- CI.getAlternativeTieredFluid(8, 144 * 18 * (GTNH ? 16 : 8)), },
+ CI.getTieredComponent(OrePrefixes.cableGt04, 8, 16),
+ CI.getTieredComponent(OrePrefixes.gearGt, 7, 6),
+ CI.getTieredComponent(OrePrefixes.screw, 8, 16),
+ CI.getTieredComponent(OrePrefixes.bolt, 7, 24),
+ CI.getTieredComponent(OrePrefixes.frameGt, 5, 12), aCoilWire[3] },
+ new FluidStack[] { CI.getTieredFluid(8, 144 * 18 * 16), CI.getTertiaryTieredFluid(8, 144 * 18 * 16),
+ CI.getAlternativeTieredFluid(7, 144 * 18 * 16),
+ CI.getAlternativeTieredFluid(8, 144 * 18 * 16), },
ItemUtils.getItemStackFromFQRN("miscutils:personalCloakingDevice", 1),
- 20 * 60 * 30 * (GTNH ? 2 : 1),
+ 20 * 60 * 30 * 2,
(int) MaterialUtils.getVoltageForTier(8));
}
GT_Values.RA.addAssemblylineRecipe(
@@ -723,7 +678,7 @@ public class RECIPES_GREGTECH {
ItemUtils.getSimpleStack(ModItems.dustDecayedRadium226, 1),
null,
null,
- FluidUtils.getFluidStack("radon", !GTNH ? 500 : 144),
+ FluidUtils.getFluidStack("radon", 144),
null,
null,
null,
@@ -751,20 +706,6 @@ public class RECIPES_GREGTECH {
private static void blastSmelterRecipes() {
- if (!GTNH) {
- // Trinium
- CORE.RA.addBlastSmelterRecipe(
- new ItemStack[] { ItemUtils.getGregtechCircuit(8), ELEMENT.getInstance().BISMUTH.getDust(8),
- ELEMENT.getInstance().IRON.getDust(64), ELEMENT.getInstance().CARBON.getDust(16),
- ELEMENT.getInstance().GOLD.getDust(16), ELEMENT.getInstance().SILVER.getDust(16),
- ELEMENT.getInstance().OSMIUM.getDust(4), ELEMENT.getInstance().IRIDIUM.getDust(4),
- ELEMENT.getInstance().CERIUM.getDust(8) },
- FluidUtils.getFluidStack("molten.trinium", 136 * 144),
- 0,
- 20 * 3000,
- 2040 * 4);
- }
-
// Eglin Steel
CORE.RA.addBlastSmelterRecipe(
new ItemStack[] { ItemUtils.getGregtechCircuit(6), ELEMENT.getInstance().IRON.getDust(4),
@@ -941,19 +882,17 @@ public class RECIPES_GREGTECH {
// Hydrofluoric Acid
boolean addedGtExtraction = false;
// Try use Internal GT Fluid first
- if (Utils.getGregtechVersionAsInt() >= 50929) {
- // Hydrofluoric Acid
- CORE.RA.addFluidCannerRecipe(
- ItemUtils.getSimpleStack(Items.glass_bottle),
- ItemUtils.getSimpleStack(ModItems.itemHydrofluoricPotion),
- FluidUtils.getFluidStack("hydrofluoricacid_gt5u", 250),
- null);
- addedGtExtraction = CORE.RA.addFluidCannerRecipe(
- ItemUtils.getSimpleStack(ModItems.itemHydrofluoricPotion),
- ItemUtils.getSimpleStack(Items.glass_bottle),
- null,
- FluidUtils.getFluidStack("hydrofluoricacid_gt5u", 250));
- }
+ // Hydrofluoric Acid
+ CORE.RA.addFluidCannerRecipe(
+ ItemUtils.getSimpleStack(Items.glass_bottle),
+ ItemUtils.getSimpleStack(ModItems.itemHydrofluoricPotion),
+ FluidUtils.getFluidStack("hydrofluoricacid_gt5u", 250),
+ null);
+ addedGtExtraction = CORE.RA.addFluidCannerRecipe(
+ ItemUtils.getSimpleStack(ModItems.itemHydrofluoricPotion),
+ ItemUtils.getSimpleStack(Items.glass_bottle),
+ null,
+ FluidUtils.getFluidStack("hydrofluoricacid_gt5u", 250));
// Add a Fill recipe for GT++ Acid
CORE.RA.addFluidCannerRecipe(
ItemUtils.getSimpleStack(Items.glass_bottle),
@@ -1317,8 +1256,7 @@ public class RECIPES_GREGTECH {
ItemStack aFluidReg4 = ItemUtils.getValueOfItemList("FluidRegulator_EV", ItemList.Pump_EV).get(1);
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] { aFluidReg1, CI.electricMotor_LV,
- CI.getTieredComponent(OrePrefixes.bolt, 1, GTNH ? 8 : 4),
+ new ItemStack[] { aFluidReg1, CI.electricMotor_LV, CI.getTieredComponent(OrePrefixes.bolt, 1, 8),
ItemUtils.getItemStackOfAmountFromOreDict("ringBrass", 1),
ItemUtils.getItemStackOfAmountFromOreDict("stickBrass", 1),
ItemUtils.getItemStackOfAmountFromOreDict("plateSteel", 2) },
@@ -1327,8 +1265,7 @@ public class RECIPES_GREGTECH {
10 * 20,
30);
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] { aFluidReg2, CI.electricMotor_MV,
- CI.getTieredComponent(OrePrefixes.bolt, 2, GTNH ? 8 : 4),
+ new ItemStack[] { aFluidReg2, CI.electricMotor_MV, CI.getTieredComponent(OrePrefixes.bolt, 2, 8),
ItemUtils.getItemStackOfAmountFromOreDict("ringInvar", 1),
ItemUtils.getItemStackOfAmountFromOreDict("stickInvar", 1),
ItemUtils.getItemStackOfAmountFromOreDict("plateAluminium", 2) },
@@ -1337,8 +1274,7 @@ public class RECIPES_GREGTECH {
10 * 20 * 2,
120);
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] { aFluidReg3, CI.electricMotor_HV,
- CI.getTieredComponent(OrePrefixes.bolt, 3, GTNH ? 8 : 4),
+ new ItemStack[] { aFluidReg3, CI.electricMotor_HV, CI.getTieredComponent(OrePrefixes.bolt, 3, 8),
ItemUtils.getItemStackOfAmountFromOreDict("ringChrome", 1),
ItemUtils.getItemStackOfAmountFromOreDict("stickChrome", 1),
ItemUtils.getItemStackOfAmountFromOreDict("plateStainlessSteel", 2) },
@@ -1348,8 +1284,7 @@ public class RECIPES_GREGTECH {
480);
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] { aFluidReg4, CI.electricMotor_EV,
- CI.getTieredComponent(OrePrefixes.bolt, 4, GTNH ? 8 : 4),
+ new ItemStack[] { aFluidReg4, CI.electricMotor_EV, CI.getTieredComponent(OrePrefixes.bolt, 4, 8),
ItemUtils.getItemStackOfAmountFromOreDict("ringTitanium", 1),
ItemUtils.getItemStackOfAmountFromOreDict("stickTitanium", 1),
ItemUtils.getItemStackOfAmountFromOreDict("plateTungstenSteel", 2) },
@@ -1411,79 +1346,21 @@ public class RECIPES_GREGTECH {
CORE.RA.addSixSlotAssemblingRecipe(
new ItemStack[] { aPackPlates[aAS], aPackRing[aAS], aPackWire[aAS], aPackCircuit[aAS],
- aPackBatteries[aAS], CI.getSensor(i, GTNH ? 4 : 2), },
- CI.getTieredFluid(i, (144 * (GTNH ? 4 : 2))),
+ aPackBatteries[aAS], CI.getSensor(i, 4), },
+ CI.getTieredFluid(i, (144 * 4)),
aPackOutput[aAS],
30 * 20 * i,
(int) GT_Values.V[i]);
}
- if (!GTNH) {
- if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
- GT_Values.RA.addAssemblerRecipe(
- GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.WroughtIron, 1L),
- GT_OreDictUnificator.get(OrePrefixes.ring, Materials.WroughtIron, 2L),
- GregtechItemList.Fluid_Cell_1L.get(1L, new Object[0]),
- 50,
- 32);
- GT_Values.RA.addAssemblerRecipe(
- GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Bronze, 1L),
- GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Bronze, 2L),
- GregtechItemList.Fluid_Cell_16L.get(1L, new Object[0]),
- 50,
- 32);
- GT_Values.RA.addAssemblerRecipe(
- GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Brass, 1L),
- GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Brass, 2L),
- GregtechItemList.Fluid_Cell_36L.get(1L, new Object[0]),
- 75,
- 32);
- GT_Values.RA.addAssemblerRecipe(
- GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Invar, 1L),
- GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Invar, 2L),
- GregtechItemList.Fluid_Cell_144L.get(1L, new Object[0]),
- 75,
- 32);
-
- } else {
- GT_Values.RA.addAssemblerRecipe(
- GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 8L),
- GT_OreDictUnificator.get(OrePrefixes.ring, Materials.WroughtIron, 4L),
- GregtechItemList.Fluid_Cell_1L.get(1L, new Object[0]),
- 50,
- 32);
- GT_Values.RA.addAssemblerRecipe(
- GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Bronze, 8L),
- GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Bronze, 4L),
- GregtechItemList.Fluid_Cell_16L.get(1L, new Object[0]),
- 50,
- 32);
- GT_Values.RA.addAssemblerRecipe(
- GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Brass, 8L),
- GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Brass, 4L),
- GregtechItemList.Fluid_Cell_36L.get(1L, new Object[0]),
- 75,
- 32);
- GT_Values.RA.addAssemblerRecipe(
- GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Invar, 8L),
- GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Invar, 4L),
- GregtechItemList.Fluid_Cell_144L.get(1L, new Object[0]),
- 75,
- 32);
- }
- }
-
if (LoadedMods.Baubles) {
// Turbine Housing Research Page
CORE.RA.addSixSlotAssemblingRecipe(
new ItemStack[] { ItemUtils.getGregtechCircuit(17),
- ItemUtils.getItemStackOfAmountFromOreDict("plateTrinium", GTNH ? 64 : 32),
- CI.getSensor(6, GTNH ? 6 : 3), CI.getBolt(7, GTNH ? 64 : 32),
- ItemUtils.getItemStackOfAmountFromOreDict("wireFinePlatinum", GTNH ? 64 : 32),
- ItemUtils.getItemStackOfAmountFromOreDict(
- CI.getTieredCircuitOreDictName(7),
- GTNH ? 12 : 6) },
+ ItemUtils.getItemStackOfAmountFromOreDict("plateTrinium", 64), CI.getSensor(6, 6),
+ CI.getBolt(7, 64), ItemUtils.getItemStackOfAmountFromOreDict("wireFinePlatinum", 64),
+ ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(7), 12) },
CI.getAlternativeTieredFluid(7, 144 * 32),
ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_8_TURBINE_AUTOMATION, 1),
20 * 60 * 5,
@@ -1492,12 +1369,9 @@ public class RECIPES_GREGTECH {
// Cloaking Device Research Page
CORE.RA.addSixSlotAssemblingRecipe(
new ItemStack[] { ItemUtils.getGregtechCircuit(17),
- ItemUtils.getSimpleStack(ModItems.itemCircuitLFTR, 4),
- CI.getFieldGenerator(6, GTNH ? 16 : 8),
- ItemUtils.getItemStackOfAmountFromOreDict("wireFinePalladium", GTNH ? 32 : 16),
- ItemUtils.getItemStackOfAmountFromOreDict(
- CI.getTieredCircuitOreDictName(6),
- GTNH ? 12 : 6) },
+ ItemUtils.getSimpleStack(ModItems.itemCircuitLFTR, 4), CI.getFieldGenerator(6, 16),
+ ItemUtils.getItemStackOfAmountFromOreDict("wireFinePalladium", 32),
+ ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(6), 12) },
CI.getAlternativeTieredFluid(7, 144 * 32),
ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_9_CLOAKING, 1),
20 * 60 * 10,
@@ -1505,12 +1379,10 @@ public class RECIPES_GREGTECH {
// Supreme Pizza Gloves
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] { ItemUtils.getGregtechCircuit(19),
- ItemUtils.getSimpleStack(ModItems.itemRope, GTNH ? 32 : 16),
- ItemUtils.getItemStackOfAmountFromOreDict("gearGtSmallWroughtIron", GTNH ? 8 : 4),
- ItemUtils.getItemStackOfAmountFromOreDict("wireFineCopper", GTNH ? 32 : 16),
- ItemUtils
- .getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(1), GTNH ? 2 : 1) },
+ new ItemStack[] { ItemUtils.getGregtechCircuit(19), ItemUtils.getSimpleStack(ModItems.itemRope, 32),
+ ItemUtils.getItemStackOfAmountFromOreDict("gearGtSmallWroughtIron", 8),
+ ItemUtils.getItemStackOfAmountFromOreDict("wireFineCopper", 32),
+ ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(1), 2) },
FluidUtils.getFluidStack("molten.rubber", 2000),
ItemUtils.getSimpleStack(ModItems.itemPersonalFireProofDevice),
20 * 60 * 5,
@@ -1562,27 +1434,11 @@ public class RECIPES_GREGTECH {
null,
10 * 20,
60);
-
- if (!GTNH) {
- final FluidStack[] sulfurdioxideOutput = { FluidUtils.getFluidStack("oxygen", 2000) };
- GT_Values.RA.addDistillationTowerRecipe(
- FluidUtils.getFluidStack("sulfurdioxide", 144 * 3),
- sulfurdioxideOutput,
- ItemUtils.getItemStackOfAmountFromOreDict("dustSulfur", 1),
- 5 * 20,
- 30);
- }
}
private static void addFuels() {
Logger.INFO("Registering New Fuels.");
- if (!GTNH) {
- GT_Values.RA.addFuel(ItemUtils.simpleMetaStack("EnderIO:bucketFire_water", 0, 1), null, 120, 0);
- GT_Values.RA.addFuel(ItemUtils.simpleMetaStack("EnderIO:bucketRocket_fuel", 0, 1), null, 112, 0);
- GT_Values.RA.addFuel(ItemUtils.simpleMetaStack("EnderIO:bucketHootch", 0, 1), null, 36, 0);
- }
-
HotFuel.addNewHotFuel(
FluidUtils.getLava(83),
FluidUtils.getPahoehoeLava(83),
@@ -1754,7 +1610,7 @@ public class RECIPES_GREGTECH {
ItemUtils.getItemStackOfAmountFromOreDict("dustGraphite", 8),
ItemUtils.getItemStackOfAmountFromOreDict("dustSmallSilicon", 8),
60 * 20,
- MaterialUtils.getVoltageForTier(GTNH ? 5 : 4),
+ MaterialUtils.getVoltageForTier(5),
4500);
// Bomb Casings
@@ -1766,7 +1622,7 @@ public class RECIPES_GREGTECH {
GregtechItemList.Bomb_Cast_Molten.get(4),
null,
4 * 60 * 20,
- MaterialUtils.getVoltageForTier(GTNH ? 3 : 2),
+ MaterialUtils.getVoltageForTier(3),
2800);
// Krypton Processing
@@ -1971,20 +1827,20 @@ public class RECIPES_GREGTECH {
// Graviton Smash
CORE.RA.addCyclotronRecipe(
CI.getNumberedCircuit(15),
- FluidUtils.getFluidStack("plasma.hydrogen", GTNH ? 50 : 10),
+ FluidUtils.getFluidStack("plasma.hydrogen", 50),
new ItemStack[] { Particle.getBaseParticle(Particle.GRAVITON),
Particle.getBaseParticle(Particle.UNKNOWN) },
null,
new int[] { 15, 100 },
- 20 * (GTNH ? 90 : 30),
+ 20 * (90),
(int) MaterialUtils.getVoltageForTier(6),
1000 * 20);
- FluidStack aPlasma = Materials.Duranium.getMolten(GTNH ? 40 : 10);
+ FluidStack aPlasma = Materials.Duranium.getMolten(40);
FluidStack aPlasma_NULL = Materials._NULL.getPlasma(1);
if (aPlasma == null || aPlasma.isFluidEqual(aPlasma_NULL)) {
- aPlasma = Materials.Americium.getMolten(GTNH ? 20 : 5);
+ aPlasma = Materials.Americium.getMolten(20);
}
// Quantum Anomaly
@@ -1994,7 +1850,7 @@ public class RECIPES_GREGTECH {
new ItemStack[] { GregtechItemList.Laser_Lens_Special.get(1) },
null,
new int[] { 100 },
- 20 * (GTNH ? 25 : 60),
+ 20 * (25),
(int) MaterialUtils.getVoltageForTier(8),
500 * 20);
@@ -2003,7 +1859,7 @@ public class RECIPES_GREGTECH {
*/
int IonCount = 2;
- int tenCountA = (GTNH ? 2 : 1);
+ int tenCountA = 2;
int tenCountB = 0;
for (String y : IonParticles.MetaToNameMap.values()) {
if (y.toLowerCase().contains("hydrogen")) {
@@ -2127,50 +1983,7 @@ public class RECIPES_GREGTECH {
private static void sifterRecipes() {}
- private static void electroMagneticSeperatorRecipes() {
-
- if (!GTNH) {
- // Trinium
- GT_Values.RA.addElectromagneticSeparatorRecipe(
- ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedNaquadah", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustNaquadah", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustSmallNaquadahEnriched", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustSmallTrinium", 1),
- new int[] { 10000, 2500, 5000 },
- 20 * 20,
- 24);
-
- // Trinium
- GT_Values.RA.addElectromagneticSeparatorRecipe(
- ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedIridium", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustIridium", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustSmallOsmium", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustSmallTrinium", 1),
- new int[] { 10000, 2500, 5000 },
- 20 * 20,
- 24);
-
- // Trinium
- GT_Values.RA.addElectromagneticSeparatorRecipe(
- ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedWulfenite", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustWulfenite", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustSmallTrinium", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustSmallTrinium", 1),
- new int[] { 10000, 3000, 3000 },
- 20 * 20,
- 24);
- }
- }
-
- private static void advancedMixerRecipes() {
- // HgBa2Ca2Cu3O8
- /*
- * CORE.RA.addMixerRecipe( ItemUtils.getItemStackOfAmountFromOreDict("cellMercury", 1),
- * ItemUtils.getItemStackOfAmountFromOreDict("dustBarium", 2),
- * ItemUtils.getItemStackOfAmountFromOreDict("dustCalcium", 2),
- * ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 3), FluidUtils.getFluidStack("oxygen", 8000), null,
- * CI.emptyCells(1), ALLOY.HG1223.getDust(16), null, null, 30 * 20, 500);
- */
+ private static void electroMagneticSeperatorRecipes() {}
- }
+ private static void advancedMixerRecipes() {}
}
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java
index ee9d2c4d29..eb3f9ad2c3 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java
@@ -1,6 +1,5 @@
package gtPlusPlus.core.recipe;
-import static gtPlusPlus.core.lib.CORE.GTNH;
import static gtPlusPlus.core.recipe.common.CI.bitsd;
import static gtPlusPlus.core.util.minecraft.ItemUtils.getSimpleStack;
import static gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechConduits.generatePipeRecipes;
@@ -12,7 +11,6 @@ import net.minecraft.item.ItemStack;
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
import gregtech.api.util.GT_ModHandler;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.block.ModBlocks;
@@ -48,21 +46,19 @@ public class RECIPES_General {
static ItemStack RECIPE_HydrogenDust;
public static void loadRecipes() {
- if (LoadedMods.Gregtech) {
- RECIPE_Paper = ItemUtils.getSimpleStack(Items.paper);
- RECIPE_Dirt = ItemUtils.getSimpleStack(Blocks.dirt);
- RECIPE_Snow = ItemUtils.getSimpleStack(Blocks.snow);
- RECIPE_Obsidian = ItemUtils.getSimpleStack(Blocks.obsidian);
- RECIPE_CraftingTable = ItemUtils.getSimpleStack(Blocks.crafting_table);
- RECIPE_HydrogenDust = ItemUtils.getSimpleStack(ModItems.itemHydrogenBlob);
- RECIPE_BasicCasingIC2 = ItemUtils.getItemStackFromFQRN("IC2:blockMachine", 1);
- OUTPUT_Workbench_Bronze = GregtechItemList.GT4_Workbench_Bronze.get(1);
- OUTPUT_Workbench_Advanced = GregtechItemList.GT4_Workbench_Advanced.get(1);
- OUTPUT_Blueprint = ItemUtils.getSimpleStack(ModItems.itemBlueprintBase, 2);
- run();
- addCompressedObsidian();
- migratedRecipes();
- }
+ RECIPE_Paper = ItemUtils.getSimpleStack(Items.paper);
+ RECIPE_Dirt = ItemUtils.getSimpleStack(Blocks.dirt);
+ RECIPE_Snow = ItemUtils.getSimpleStack(Blocks.snow);
+ RECIPE_Obsidian = ItemUtils.getSimpleStack(Blocks.obsidian);
+ RECIPE_CraftingTable = ItemUtils.getSimpleStack(Blocks.crafting_table);
+ RECIPE_HydrogenDust = ItemUtils.getSimpleStack(ModItems.itemHydrogenBlob);
+ RECIPE_BasicCasingIC2 = ItemUtils.getItemStackFromFQRN("IC2:blockMachine", 1);
+ OUTPUT_Workbench_Bronze = GregtechItemList.GT4_Workbench_Bronze.get(1);
+ OUTPUT_Workbench_Advanced = GregtechItemList.GT4_Workbench_Advanced.get(1);
+ OUTPUT_Blueprint = ItemUtils.getSimpleStack(ModItems.itemBlueprintBase, 2);
+ run();
+ addCompressedObsidian();
+ migratedRecipes();
}
private static void run() {
@@ -185,12 +181,7 @@ public class RECIPES_General {
}
// Iron bars
- final ItemStack ironBars;
- if (CORE.GTNH) {
- ironBars = ItemUtils.getItemStackFromFQRN("dreamcraft:item.SteelBars", 1);
- } else {
- ironBars = ItemUtils.getItemStackFromFQRN("minecraft:iron_bars", 1);
- }
+ final ItemStack ironBars = ItemUtils.getItemStackFromFQRN("dreamcraft:item.SteelBars", 1);
// Fish Trap
if (RecipeUtils.addShapedRecipe(
@@ -207,38 +198,6 @@ public class RECIPES_General {
Logger.INFO("Added a recipe for the Fish Trap.");
}
- // Small Gear Extruder Shape
- if (!CORE.GTNH) {
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Shape_Extruder_SmallGear.get(1L),
- GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE
- | GT_ModHandler.RecipeBits.REVERSIBLE,
- new Object[] { "hXS", "XPX", "fXd", Character.valueOf('P'), ItemList.Shape_Extruder_Gear,
- Character.valueOf('X'), OrePrefixes.plate.get(Materials.Steel), Character.valueOf('S'),
- OrePrefixes.screw.get(Materials.Steel) });
-
- String[] ironTypes = { "", "Wrought", "Pig", "Any" };
- for (int y = 0; y < ironTypes.length; y++) {
- // Iron bars
- String ironRecipe = "stick" + ironTypes[y] + "Iron";
- if (RecipeUtils.addShapedRecipe(
- null,
- CI.craftingToolWrench,
- null,
- ironRecipe,
- ironRecipe,
- ironRecipe,
- ironRecipe,
- ironRecipe,
- ironRecipe,
- ItemUtils.getItemStackFromFQRN("minecraft:iron_bars", 8))) {
- Logger.INFO("Re-added old GT recipe for Iron Bars.");
- }
- }
- }
-
- // Shaped Crafting for ULV Material Dusts
-
// Potin
if (RecipeUtils.addShapelessGregtechRecipe(
new Object[] { "dustLead", "dustBronze", "dustTin", "dustLead", "dustBronze" },
@@ -449,8 +408,8 @@ public class RECIPES_General {
// Pest Killer
CORE.RA.addSixSlotAssemblingRecipe(
new ItemStack[] { CI.getNumberedCircuit(16), CI.getTieredMachineCasing(1), CI.getElectricPump(2, 1),
- CI.getPlate(2, GTNH ? 4 : 2),
- ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(0), GTNH ? 2 : 1), },
+ CI.getPlate(2, 4),
+ ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(0), 2), },
FluidUtils.getHotWater(500), // Fluid
ItemUtils.getSimpleStack(ModBlocks.blockPestKiller), // Output
20 * 60, // Dur
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java
index bd5ac25bf3..65c7a1ca56 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java
@@ -8,10 +8,8 @@ import gregtech.api.util.GT_OreDictUnificator;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.item.ModItems;
-import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.everglades.dimension.Dimension_Everglades;
-import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
public class RECIPES_LaserEngraver implements IOreRecipeRegistrator {
@@ -22,197 +20,118 @@ public class RECIPES_LaserEngraver implements IOreRecipeRegistrator {
@Override
public void registerOre(final OrePrefixes aPrefix, final Materials aMaterial, final String aOreDictName,
final String aModName, final ItemStack aStack) {
- if (aOreDictName.equals(OreDictNames.craftingLensBlue.toString())) {
-
- if (CORE.ConfigSwitches.enableCustomCircuits && !CORE.GTNH) {
- if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("foilYttriumBariumCuprate", 1) != null) {
- GT_Values.RA.addLaserEngraverRecipe(
- GT_OreDictUnificator.get(OrePrefixes.foil, Materials.YttriumBariumCuprate, 2L),
- GT_Utility.copyAmount(0L, new Object[] { aStack }),
- GregtechItemList.Circuit_Parts_Wiring_IV.get(1L, new Object[0]),
- 64,
- 480);
- } else {
- Logger.INFO(
- "foilYttriumBariumCuprate does not exist within Gregtech, please report this issue to Blood-asp on github.");
- Logger.INFO(
- "This material item can be re-enabled within the gregtech configuration files, If you wish to fix this yourself.");
- }
- if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("foilVanadiumGallium", 1) != null) {
- GT_Values.RA.addLaserEngraverRecipe(
- GT_OreDictUnificator.get(OrePrefixes.foil, Materials.VanadiumGallium, 2L),
- GT_Utility.copyAmount(0L, new Object[] { aStack }),
- GregtechItemList.Circuit_Parts_Wiring_IV.get(1L, new Object[0]),
- 64,
- 480);
- } else {
- Logger.INFO(
- "foilVanadiumGallium does not exist within Gregtech, please report this issue to Blood-asp on github.");
- Logger.INFO(
- "This material item can be re-enabled within the gregtech configuration files, If you wish to fix this yourself.");
- }
- if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("foilNiobiumTitanium", 1) != null) {
- GT_Values.RA.addLaserEngraverRecipe(
- GT_OreDictUnificator.get(OrePrefixes.foil, Materials.NiobiumTitanium, 2L),
- GT_Utility.copyAmount(0L, new Object[] { aStack }),
- GregtechItemList.Circuit_Parts_Wiring_IV.get(1L, new Object[0]),
- 64,
- 480);
- } else {
- Logger.INFO(
- "foilNiobiumTitanium does not exist within Gregtech, please report this issue to Blood-asp on github.");
- Logger.INFO(
- "This material item can be re-enabled within the gregtech configuration files, If you wish to fix this yourself.");
- }
+ if (aOreDictName.equals(OreDictNames.craftingLensWhite.toString())) {
+ if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateLithium", 1) != null) {
+ GT_Values.RA.addLaserEngraverRecipe(
+ GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Lithium, 2L),
+ GT_Utility.copyAmount(0L, new Object[] { aStack }),
+ ItemUtils.getItemStackOfAmountFromOreDict("plateDoubleLithium7", 1),
+ 4 * 60 * 20,
+ 2000);
+ } else {
+ Logger.INFO(
+ "plateLithium does not exist within Gregtech, please report this issue to Blood-asp on github.");
+ Logger.INFO(
+ "This material item can be re-enabled within the gregtech configuration files, If you wish to fix this yourself.");
}
-
- } else if (aOreDictName.equals(OreDictNames.craftingLensYellow.toString())) {
- if (CORE.ConfigSwitches.enableCustomCircuits && !CORE.GTNH) {
- if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("foilOsmium", 1) != null) {
- GT_Values.RA.addLaserEngraverRecipe(
- GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmium, 2L),
- GT_Utility.copyAmount(0L, new Object[] { aStack }),
- GregtechItemList.Circuit_Parts_Wiring_LuV.get(1L, new Object[0]),
- 64,
- 1024);
- } else {
- Logger.INFO(
- "foilOsmium does not exist within Gregtech, please report this issue to Blood-asp on github.");
- Logger.INFO(
- "This material item can be re-enabled within the gregtech configuration files, If you wish to fix this yourself.");
- }
+ if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustLithium", 1) != null) {
+ GT_Values.RA.addLaserEngraverRecipe(
+ GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lithium, 3L),
+ GT_Utility.copyAmount(0L, new Object[] { aStack }),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustLithium7", 1),
+ 2 * 60 * 20,
+ 2000);
+ } else {
+ Logger.INFO(
+ "dustLithium does not exist within Gregtech, please report this issue to Blood-asp on github.");
+ Logger.INFO(
+ "This material item can be re-enabled within the gregtech configuration files, If you wish to fix this yourself.");
}
- } else if (aOreDictName.equals(OreDictNames.craftingLensCyan.toString())) {} else
- if (aOreDictName.equals(OreDictNames.craftingLensRed.toString())) {} else
- if (aOreDictName.equals(OreDictNames.craftingLensGreen.toString())) {
- if (CORE.ConfigSwitches.enableCustomCircuits && !CORE.GTNH) {
- if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("foilNaquadah", 1) != null) {
- GT_Values.RA.addLaserEngraverRecipe(
- GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadah, 2L),
- GT_Utility.copyAmount(0L, new Object[] { aStack }),
- GregtechItemList.Circuit_Parts_Wiring_ZPM.get(1L, new Object[0]),
- 64,
- 2000);
- } else {
- Logger.INFO(
- "foilNaquadah does not exist within Gregtech, please report this issue to Blood-asp on github.");
- Logger.INFO(
- "This material item can be re-enabled within the gregtech configuration files, If you wish to fix this yourself.");
- }
- }
- } else if (aOreDictName.equals(OreDictNames.craftingLensWhite.toString())) {
- if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateLithium", 1) != null) {
- GT_Values.RA.addLaserEngraverRecipe(
- GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Lithium, 2L),
- GT_Utility.copyAmount(0L, new Object[] { aStack }),
- ItemUtils.getItemStackOfAmountFromOreDict("plateDoubleLithium7", 1),
- 4 * 60 * 20,
- 2000);
- } else {
- Logger.INFO(
- "plateLithium does not exist within Gregtech, please report this issue to Blood-asp on github.");
- Logger.INFO(
- "This material item can be re-enabled within the gregtech configuration files, If you wish to fix this yourself.");
- }
- if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustLithium", 1) != null) {
- GT_Values.RA.addLaserEngraverRecipe(
- GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lithium, 3L),
- GT_Utility.copyAmount(0L, new Object[] { aStack }),
- ItemUtils.getItemStackOfAmountFromOreDict("dustLithium7", 1),
- 2 * 60 * 20,
- 2000);
- } else {
- Logger.INFO(
- "dustLithium does not exist within Gregtech, please report this issue to Blood-asp on github.");
- Logger.INFO(
- "This material item can be re-enabled within the gregtech configuration files, If you wish to fix this yourself.");
- }
-
- } else if (aOreDictName.equals(OreDictNames.craftingLensLime.toString())) {
- // Coil Wires
- ItemStack coilWire1 = ItemUtils
- .getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire", "coilWire1", 0, 1);
- ItemStack coilWire2 = ItemUtils
- .getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire:1", "coilWire2", 1, 1);
- ItemStack coilWire3 = ItemUtils
- .getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire:2", "coilWire3", 2, 1);
- ItemStack coilWire4 = ItemUtils
- .getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire:3", "coilWire4", 3, 1);
+ } else if (aOreDictName.equals(OreDictNames.craftingLensLime.toString())) {
+ // Coil Wires
+ ItemStack coilWire1 = ItemUtils
+ .getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire", "coilWire1", 0, 1);
+ ItemStack coilWire2 = ItemUtils
+ .getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire:1", "coilWire2", 1, 1);
+ ItemStack coilWire3 = ItemUtils
+ .getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire:2", "coilWire3", 2, 1);
+ ItemStack coilWire4 = ItemUtils
+ .getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire:3", "coilWire4", 3, 1);
- // Simple Life
- String wire = "wireGt02";
+ // Simple Life
+ String wire = "wireGt02";
- // Wires to Laser
- ItemStack wireT1a = ItemUtils.getItemStackOfAmountFromOreDict(wire + "Aluminium", 1);
- ItemStack wireT1b = ItemUtils.getItemStackOfAmountFromOreDict(wire + "Nichrome", 1);
- ItemStack wireT2a = ItemUtils.getItemStackOfAmountFromOreDict(wire + "Osmium", 1);
- ItemStack wireT2b = ItemUtils.getItemStackOfAmountFromOreDict(wire + "Platinum", 1);
- ItemStack wireT3a = ItemUtils.getItemStackOfAmountFromOreDict(wire + "VanadiumGallium", 1);
- ItemStack wireT3b = ItemUtils.getItemStackOfAmountFromOreDict(wire + "YttriumBariumCuprate", 1);
- ItemStack wireT3c = ItemUtils.getItemStackOfAmountFromOreDict(wire + "NiobiumTitanium", 1);
- ItemStack wireT4a = ItemUtils.getItemStackOfAmountFromOreDict(wire + "Naquadah", 1);
+ // Wires to Laser
+ ItemStack wireT1a = ItemUtils.getItemStackOfAmountFromOreDict(wire + "Aluminium", 1);
+ ItemStack wireT1b = ItemUtils.getItemStackOfAmountFromOreDict(wire + "Nichrome", 1);
+ ItemStack wireT2a = ItemUtils.getItemStackOfAmountFromOreDict(wire + "Osmium", 1);
+ ItemStack wireT2b = ItemUtils.getItemStackOfAmountFromOreDict(wire + "Platinum", 1);
+ ItemStack wireT3a = ItemUtils.getItemStackOfAmountFromOreDict(wire + "VanadiumGallium", 1);
+ ItemStack wireT3b = ItemUtils.getItemStackOfAmountFromOreDict(wire + "YttriumBariumCuprate", 1);
+ ItemStack wireT3c = ItemUtils.getItemStackOfAmountFromOreDict(wire + "NiobiumTitanium", 1);
+ ItemStack wireT4a = ItemUtils.getItemStackOfAmountFromOreDict(wire + "Naquadah", 1);
- // T1
- GT_Values.RA.addLaserEngraverRecipe(
- wireT1a,
- GT_Utility.copyAmount(0L, new Object[] { aStack }),
- coilWire1,
- 10 * 20,
- 500);
- GT_Values.RA.addLaserEngraverRecipe(
- wireT1b,
- GT_Utility.copyAmount(0L, new Object[] { aStack }),
- coilWire1,
- 10 * 20,
- 500);
- // T2
- GT_Values.RA.addLaserEngraverRecipe(
- wireT2a,
- GT_Utility.copyAmount(0L, new Object[] { aStack }),
- coilWire2,
- 20 * 20,
- 2000);
- GT_Values.RA.addLaserEngraverRecipe(
- wireT2b,
- GT_Utility.copyAmount(0L, new Object[] { aStack }),
- coilWire2,
- 20 * 20,
- 2000);
- // T3
- GT_Values.RA.addLaserEngraverRecipe(
- wireT3a,
- GT_Utility.copyAmount(0L, new Object[] { aStack }),
- coilWire3,
- 30 * 20,
- 8000);
- GT_Values.RA.addLaserEngraverRecipe(
- wireT3b,
- GT_Utility.copyAmount(0L, new Object[] { aStack }),
- coilWire3,
- 30 * 20,
- 8000);
- GT_Values.RA.addLaserEngraverRecipe(
- wireT3c,
- GT_Utility.copyAmount(0L, new Object[] { aStack }),
- coilWire3,
- 30 * 20,
- 8000);
- // T4
- GT_Values.RA.addLaserEngraverRecipe(
- wireT4a,
- GT_Utility.copyAmount(0L, new Object[] { aStack }),
- coilWire4,
- 40 * 20,
- 32000);
+ // T1
+ GT_Values.RA.addLaserEngraverRecipe(
+ wireT1a,
+ GT_Utility.copyAmount(0L, new Object[] { aStack }),
+ coilWire1,
+ 10 * 20,
+ 500);
+ GT_Values.RA.addLaserEngraverRecipe(
+ wireT1b,
+ GT_Utility.copyAmount(0L, new Object[] { aStack }),
+ coilWire1,
+ 10 * 20,
+ 500);
+ // T2
+ GT_Values.RA.addLaserEngraverRecipe(
+ wireT2a,
+ GT_Utility.copyAmount(0L, new Object[] { aStack }),
+ coilWire2,
+ 20 * 20,
+ 2000);
+ GT_Values.RA.addLaserEngraverRecipe(
+ wireT2b,
+ GT_Utility.copyAmount(0L, new Object[] { aStack }),
+ coilWire2,
+ 20 * 20,
+ 2000);
+ // T3
+ GT_Values.RA.addLaserEngraverRecipe(
+ wireT3a,
+ GT_Utility.copyAmount(0L, new Object[] { aStack }),
+ coilWire3,
+ 30 * 20,
+ 8000);
+ GT_Values.RA.addLaserEngraverRecipe(
+ wireT3b,
+ GT_Utility.copyAmount(0L, new Object[] { aStack }),
+ coilWire3,
+ 30 * 20,
+ 8000);
+ GT_Values.RA.addLaserEngraverRecipe(
+ wireT3c,
+ GT_Utility.copyAmount(0L, new Object[] { aStack }),
+ coilWire3,
+ 30 * 20,
+ 8000);
+ // T4
+ GT_Values.RA.addLaserEngraverRecipe(
+ wireT4a,
+ GT_Utility.copyAmount(0L, new Object[] { aStack }),
+ coilWire4,
+ 40 * 20,
+ 32000);
- } else if (aOreDictName.equals(OreDictNames.craftingLensOrange.toString())) {
- GT_Values.RA.addLaserEngraverRecipe(
- ItemUtils.getSimpleStack(ModItems.itemAlkalusDisk),
- GT_Utility.copyAmount(0L, new Object[] { aStack }),
- ItemUtils.getSimpleStack(Dimension_Everglades.portalItem),
- 360 * 60 * 20,
- 4096);
- }
+ } else if (aOreDictName.equals(OreDictNames.craftingLensOrange.toString())) {
+ GT_Values.RA.addLaserEngraverRecipe(
+ ItemUtils.getSimpleStack(ModItems.itemAlkalusDisk),
+ GT_Utility.copyAmount(0L, new Object[] { aStack }),
+ ItemUtils.getSimpleStack(Dimension_Everglades.portalItem),
+ 360 * 60 * 20,
+ 4096);
+ }
}
}
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java
index 54f0fe7849..2b35ba70ab 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java
@@ -1,12 +1,9 @@
package gtPlusPlus.core.recipe;
import gregtech.api.enums.*;
-import gregtech.api.util.GT_OreDictUnificator;
import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.recipe.common.CI;
import gtPlusPlus.core.util.minecraft.RecipeUtils;
-import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
public class RECIPES_MachineComponents {
@@ -95,389 +92,7 @@ public class RECIPES_MachineComponents {
public static final void loadRecipes() {
Logger.INFO("Loading Recipes for the Various Circuits and Machine components.");
- if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
- run();
- } else {
- onlyULVComponents();
- if (!CORE.GTNH) {
- onlyMaxComponents();
- }
- }
- gregtechMachinePhase();
- }
-
- private static void run() {
- // Electric Motors
- RecipeUtils.addShapedGregtechRecipe(
- cableTier7,
- wireTier7,
- rodTier7a,
- wireTier7,
- rodTier7b,
- wireTier7,
- rodTier7a,
- wireTier7,
- cableTier7,
- CI.electricMotor_LuV);
- RecipeUtils.addShapedGregtechRecipe(
- cableTier8,
- wireTier8,
- rodTier8a,
- wireTier8,
- rodTier8b,
- wireTier8,
- rodTier8a,
- wireTier8,
- cableTier8,
- CI.electricMotor_ZPM);
- RecipeUtils.addShapedGregtechRecipe(
- cableTier9,
- wireTier9,
- rodTier9a,
- wireTier9,
- rodTier9b,
- wireTier9,
- rodTier9a,
- wireTier9,
- cableTier9,
- CI.electricMotor_UV);
- RecipeUtils.addShapedGregtechRecipe(
- cableTier10,
- wireTier10,
- rodTier10a,
- wireTier10,
- rodTier10b,
- wireTier10,
- rodTier10a,
- wireTier10,
- cableTier10,
- CI.electricMotor_MAX);
-
- // Electric Pump
- RecipeUtils.addShapedGregtechRecipe(
- cableTier7,
- rotorTier7,
- itemRubberRing,
- CI.craftingToolScrewdriver,
- pipeTier7,
- CI.craftingToolWrench,
- itemRubberRing,
- CI.electricMotor_LuV,
- cableTier7,
- CI.electricPump_LuV);
- RecipeUtils.addShapedGregtechRecipe(
- cableTier8,
- rotorTier8,
- itemRubberRing,
- CI.craftingToolScrewdriver,
- pipeTier8,
- CI.craftingToolWrench,
- itemRubberRing,
- CI.electricMotor_ZPM,
- cableTier8,
- CI.electricPump_ZPM);
- RecipeUtils.addShapedGregtechRecipe(
- cableTier9,
- rotorTier9,
- itemRubberRing,
- CI.craftingToolScrewdriver,
- pipeTier9,
- CI.craftingToolWrench,
- itemRubberRing,
- CI.electricMotor_UV,
- cableTier9,
- CI.electricPump_UV);
- RecipeUtils.addShapedGregtechRecipe(
- cableTier10,
- rotorTier10,
- itemRubberRing,
- CI.craftingToolScrewdriver,
- pipeTier10,
- CI.craftingToolWrench,
- itemRubberRing,
- CI.electricMotor_MAX,
- cableTier10,
- CI.electricPump_MAX);
-
- // Electric Pump
- RecipeUtils.addShapedGregtechRecipe(
- plateTier7,
- plateTier7,
- plateTier7,
- cableTier7,
- rodTier7a,
- rodTier7a,
- cableTier7,
- CI.electricMotor_LuV,
- smallGearTier7,
- CI.electricPiston_LuV);
- RecipeUtils.addShapedGregtechRecipe(
- plateTier8,
- plateTier8,
- plateTier8,
- cableTier8,
- rodTier8a,
- rodTier8a,
- cableTier8,
- CI.electricMotor_ZPM,
- smallGearTier8,
- CI.electricPiston_ZPM);
- RecipeUtils.addShapedGregtechRecipe(
- plateTier9,
- plateTier9,
- plateTier9,
- cableTier9,
- rodTier9a,
- rodTier9a,
- cableTier9,
- CI.electricMotor_UV,
- smallGearTier9,
- CI.electricPiston_UV);
- RecipeUtils.addShapedGregtechRecipe(
- plateTier10,
- plateTier10,
- plateTier10,
- cableTier10,
- rodTier10a,
- rodTier10a,
- cableTier10,
- CI.electricMotor_MAX,
- smallGearTier10,
- CI.electricPiston_MAX);
-
- // Robot Arms
- RecipeUtils.addShapedGregtechRecipe(
- cableTier7,
- cableTier7,
- cableTier7,
- CI.electricMotor_LuV,
- rodTier7a,
- CI.electricMotor_LuV,
- CI.electricPiston_LuV,
- circuitTier7,
- rodTier7a,
- CI.robotArm_LuV);
- RecipeUtils.addShapedGregtechRecipe(
- cableTier8,
- cableTier8,
- cableTier8,
- CI.electricMotor_ZPM,
- rodTier8a,
- CI.electricMotor_ZPM,
- CI.electricPiston_ZPM,
- circuitTier8,
- rodTier8a,
- CI.robotArm_ZPM);
- RecipeUtils.addShapedGregtechRecipe(
- cableTier9,
- cableTier9,
- cableTier9,
- CI.electricMotor_UV,
- rodTier9a,
- CI.electricMotor_UV,
- CI.electricPiston_UV,
- circuitTier9,
- rodTier9a,
- CI.robotArm_UV);
- RecipeUtils.addShapedGregtechRecipe(
- cableTier10,
- cableTier10,
- cableTier10,
- CI.electricMotor_MAX,
- rodTier10a,
- CI.electricMotor_MAX,
- CI.electricPiston_MAX,
- circuitTier10,
- rodTier10a,
- CI.robotArm_MAX);
-
- // Conveyor Modules
- RecipeUtils.addShapedGregtechRecipe(
- plateRubber,
- plateRubber,
- plateRubber,
- CI.electricMotor_LuV,
- cableTier7,
- CI.electricMotor_LuV,
- plateRubber,
- plateRubber,
- plateRubber,
- CI.conveyorModule_LuV);
- RecipeUtils.addShapedGregtechRecipe(
- plateRubber,
- plateRubber,
- plateRubber,
- CI.electricMotor_ZPM,
- cableTier8,
- CI.electricMotor_ZPM,
- plateRubber,
- plateRubber,
- plateRubber,
- CI.conveyorModule_ZPM);
- RecipeUtils.addShapedGregtechRecipe(
- plateRubber,
- plateRubber,
- plateRubber,
- CI.electricMotor_UV,
- cableTier9,
- CI.electricMotor_UV,
- plateRubber,
- plateRubber,
- plateRubber,
- CI.conveyorModule_UV);
- RecipeUtils.addShapedGregtechRecipe(
- plateRubber,
- plateRubber,
- plateRubber,
- CI.electricMotor_MAX,
- cableTier10,
- CI.electricMotor_MAX,
- plateRubber,
- plateRubber,
- plateRubber,
- CI.conveyorModule_MAX);
-
- // Emitter Modules
- RecipeUtils.addShapedGregtechRecipe(
- rodTier7c,
- rodTier7c,
- circuitTier7,
- cableTier7,
- circuitTier6,
- rodTier7c,
- circuitTier7,
- cableTier7,
- rodTier7c,
- CI.emitter_LuV);
- RecipeUtils.addShapedGregtechRecipe(
- rodTier8c,
- rodTier8c,
- circuitTier8,
- cableTier8,
- circuitTier7,
- rodTier8c,
- circuitTier8,
- cableTier8,
- rodTier8c,
- CI.emitter_ZPM);
- RecipeUtils.addShapedGregtechRecipe(
- rodTier9c,
- rodTier9c,
- circuitTier9,
- cableTier9,
- circuitTier8,
- rodTier9c,
- circuitTier9,
- cableTier9,
- rodTier9c,
- CI.emitter_UV);
- RecipeUtils.addShapedGregtechRecipe(
- rodTier10c,
- rodTier10c,
- circuitTier10,
- cableTier10,
- circuitTier9,
- rodTier10c,
- circuitTier10,
- cableTier10,
- rodTier10c,
- CI.emitter_MAX);
-
- // Field Generator Modules
- RecipeUtils.addShapedGregtechRecipe(
- wireTier7,
- circuitTier7,
- wireTier7,
- circuitTier7,
- circuitTier6,
- circuitTier7,
- wireTier7,
- circuitTier7,
- wireTier7,
- CI.fieldGenerator_LuV);
- RecipeUtils.addShapedGregtechRecipe(
- wireTier8,
- circuitTier8,
- wireTier8,
- circuitTier8,
- circuitTier7,
- circuitTier8,
- wireTier8,
- circuitTier8,
- wireTier8,
- CI.fieldGenerator_ZPM);
- RecipeUtils.addShapedGregtechRecipe(
- wireTier9,
- circuitTier9,
- wireTier9,
- circuitTier9,
- circuitTier8,
- circuitTier9,
- wireTier9,
- circuitTier9,
- wireTier9,
- CI.fieldGenerator_UV);
- RecipeUtils.addShapedGregtechRecipe(
- wireTier10,
- circuitTier10,
- wireTier10,
- circuitTier10,
- circuitTier9,
- circuitTier10,
- wireTier10,
- circuitTier10,
- wireTier10,
- CI.fieldGenerator_MAX);
-
- // Sensor Modules
- RecipeUtils.addShapedRecipe(
- plateTier7,
- null,
- circuitTier6,
- plateTier7,
- rodTier7c,
- null,
- circuitTier7,
- plateTier7,
- plateTier7,
- CI.sensor_LuV);
- RecipeUtils.addShapedRecipe(
- plateTier8,
- null,
- circuitTier7,
- plateTier8,
- rodTier8c,
- null,
- circuitTier8,
- plateTier8,
- plateTier8,
- CI.sensor_ZPM);
- RecipeUtils.addShapedRecipe(
- plateTier9,
- null,
- circuitTier8,
- plateTier9,
- rodTier9c,
- null,
- circuitTier9,
- plateTier9,
- plateTier9,
- CI.sensor_UV);
- RecipeUtils.addShapedRecipe(
- plateTier10,
- null,
- circuitTier9,
- plateTier10,
- rodTier10c,
- null,
- circuitTier10,
- plateTier10,
- plateTier10,
- CI.sensor_MAX);
-
onlyULVComponents();
-
- Logger.INFO("Done loading recipes for the Various machine components.");
}
private static void onlyULVComponents() {
@@ -577,179 +192,4 @@ public class RECIPES_MachineComponents {
plateTier0,
CI.sensor_ULV);
}
-
- private static void onlyMaxComponents() {
- RecipeUtils.addShapedGregtechRecipe(
- cableTier10,
- wireTier10,
- rodTier10a,
- wireTier10,
- rodTier10b,
- wireTier10,
- rodTier10a,
- wireTier10,
- cableTier10,
- CI.electricMotor_MAX);
- RecipeUtils.addShapedGregtechRecipe(
- cableTier10,
- rotorTier10,
- itemRubberRing,
- CI.craftingToolScrewdriver,
- pipeTier10,
- CI.craftingToolWrench,
- itemRubberRing,
- CI.electricMotor_MAX,
- cableTier10,
- CI.electricPump_MAX);
- RecipeUtils.addShapedGregtechRecipe(
- plateTier10,
- plateTier10,
- plateTier10,
- cableTier10,
- rodTier10a,
- rodTier10a,
- cableTier10,
- CI.electricMotor_MAX,
- smallGearTier10,
- CI.electricPiston_MAX);
- RecipeUtils.addShapedGregtechRecipe(
- cableTier10,
- cableTier10,
- cableTier10,
- CI.electricMotor_MAX,
- rodTier10a,
- CI.electricMotor_MAX,
- CI.electricPiston_MAX,
- circuitTier10,
- rodTier10a,
- CI.robotArm_MAX);
- RecipeUtils.addShapedGregtechRecipe(
- plateRubber,
- plateRubber,
- plateRubber,
- CI.electricMotor_MAX,
- cableTier10,
- CI.electricMotor_MAX,
- plateRubber,
- plateRubber,
- plateRubber,
- CI.conveyorModule_MAX);
- RecipeUtils.addShapedGregtechRecipe(
- rodTier10c,
- rodTier10c,
- circuitTier10,
- cableTier10,
- circuitTier9,
- rodTier10c,
- circuitTier10,
- cableTier10,
- rodTier10c,
- CI.emitter_MAX);
- RecipeUtils.addShapedGregtechRecipe(
- wireTier10,
- circuitTier10,
- wireTier10,
- circuitTier10,
- circuitTier9,
- circuitTier10,
- wireTier10,
- circuitTier10,
- wireTier10,
- CI.fieldGenerator_MAX);
- RecipeUtils.addShapedRecipe(
- plateTier10,
- null,
- circuitTier9,
- plateTier10,
- rodTier10c,
- null,
- circuitTier10,
- plateTier10,
- plateTier10,
- CI.sensor_MAX);
- }
-
- private static void gregtechMachinePhase() {
- if (CORE.ConfigSwitches.enableCustomCircuits && !CORE.GTNH) {
- Logger.INFO("Adding Gregtech machine recipes for the circuits.");
- GT_Values.RA.addFormingPressRecipe(
- GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Silicon, 1L),
- GregtechItemList.Circuit_Parts_Wiring_IV.get(4L, new Object[0]),
- GregtechItemList.Circuit_Board_IV.get(1L, new Object[0]),
- 30,
- 240);
- GT_Values.RA.addFormingPressRecipe(
- GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Silicon, 1L),
- GregtechItemList.Circuit_Parts_Wiring_LuV.get(4L, new Object[0]),
- GregtechItemList.Circuit_Board_LuV.get(1L, new Object[0]),
- 60,
- 480);
- GT_Values.RA.addFormingPressRecipe(
- GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Silicon, 2L),
- GregtechItemList.Circuit_Parts_Wiring_ZPM.get(4L, new Object[0]),
- GregtechItemList.Circuit_Board_ZPM.get(1L, new Object[0]),
- 90,
- 1000);
- GT_Values.RA.addFormingPressRecipe(
- GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Lazurite, 1L),
- GregtechItemList.Circuit_Parts_Crystal_Chip_IV.get(3L, new Object[0]),
- GregtechItemList.Circuit_Parts_IV.get(1L, new Object[0]),
- 30,
- 480);
- GT_Values.RA.addFormingPressRecipe(
- GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Lazurite, 1L),
- GregtechItemList.Circuit_Parts_Crystal_Chip_LuV.get(3L, new Object[0]),
- GregtechItemList.Circuit_Parts_LuV.get(1L, new Object[0]),
- 60,
- 1000);
- GT_Values.RA.addFormingPressRecipe(
- GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Lazurite, 1L),
- GregtechItemList.Circuit_Parts_Crystal_Chip_ZPM.get(3L, new Object[0]),
- GregtechItemList.Circuit_Parts_ZPM.get(1L, new Object[0]),
- 90,
- 2000);
- GT_Values.RA.addForgeHammerRecipe(
- ItemList.Circuit_Master.get(1L, new Object[0]),
- GregtechItemList.Circuit_Parts_Crystal_Chip_IV.get(5L, new Object[0]),
- 30,
- 256);
- GT_Values.RA.addForgeHammerRecipe(
- GregtechItemList.Circuit_IV.get(1L, new Object[0]),
- GregtechItemList.Circuit_Parts_Crystal_Chip_LuV.get(5L, new Object[0]),
- 60,
- 512);
- GT_Values.RA.addForgeHammerRecipe(
- GregtechItemList.Circuit_LuV.get(1L, new Object[0]),
- GregtechItemList.Circuit_Parts_Crystal_Chip_ZPM.get(5L, new Object[0]),
- 120,
- 1024);
- for (final Materials tMat : Materials.values()) {
- if ((tMat.mStandardMoltenFluid != null) && (tMat.contains(SubTag.SOLDERING_MATERIAL))) {
- final int tMultiplier = tMat.contains(SubTag.SOLDERING_MATERIAL_GOOD) ? 1
- : tMat.contains(SubTag.SOLDERING_MATERIAL_BAD) ? 4 : 2;
- GT_Values.RA.addAssemblerRecipe(
- GregtechItemList.Circuit_Board_IV.get(1L, new Object[0]),
- GregtechItemList.Circuit_Parts_IV.get(1L, new Object[0]),
- tMat.getMolten((144L * tMultiplier) / 4L),
- GregtechItemList.Circuit_IV.get(1L, new Object[0]),
- 30,
- 480);
- GT_Values.RA.addAssemblerRecipe(
- GregtechItemList.Circuit_Board_LuV.get(1L, new Object[0]),
- GregtechItemList.Circuit_Parts_LuV.get(1L, new Object[0]),
- tMat.getMolten((144L * tMultiplier) / 4L),
- GregtechItemList.Circuit_LuV.get(1L, new Object[0]),
- 60,
- 1000);
- GT_Values.RA.addAssemblerRecipe(
- GregtechItemList.Circuit_Board_ZPM.get(1L, new Object[0]),
- GregtechItemList.Circuit_Parts_ZPM.get(1L, new Object[0]),
- tMat.getMolten((144L * tMultiplier) / 4L),
- GregtechItemList.Circuit_ZPM.get(1L, new Object[0]),
- 90,
- 2000);
- }
- }
- }
- }
}
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index 473a4899c1..40352de898 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -965,31 +965,26 @@ public class RECIPES_Machines {
}
private static void initModItems() {
- if (LoadedMods.IndustrialCraft2) {
- IC2MFE = ItemUtils.getItemStackWithMeta(LoadedMods.IndustrialCraft2, "IC2:blockElectric", "IC2_MFE", 1, 1);
- IC2MFSU = ItemUtils
- .getItemStackWithMeta(LoadedMods.IndustrialCraft2, "IC2:blockElectric", "IC2_MFSU", 2, 1);
- }
- if (LoadedMods.Gregtech) {
-
- // Lava Boiler
- boiler_Coal = ItemList.Machine_Bronze_Boiler.get(1);
-
- // IV/EV/HV MACHINES
- IV_MACHINE_Electrolyzer = ItemList.Machine_IV_Electrolyzer.get(1);
- IV_MACHINE_Centrifuge = ItemList.Machine_IV_Centrifuge.get(1);
- IV_MACHINE_BendingMachine = ItemList.Machine_IV_Bender.get(1);
- IV_MACHINE_Wiremill = ItemList.Machine_IV_Wiremill.get(1);
- IV_MACHINE_Macerator = ItemList.Machine_IV_Macerator.get(1);
- IV_MACHINE_Cutter = ItemList.Machine_IV_Cutter.get(1);
- IV_MACHINE_Extruder = ItemList.Machine_IV_Extruder.get(1);
- HV_MACHINE_Sifter = ItemList.Machine_HV_Sifter.get(1);
- IV_MACHINE_ThermalCentrifuge = ItemList.Machine_IV_ThermalCentrifuge.get(1);
- IV_MACHINE_OreWasher = ItemList.Machine_IV_OreWasher.get(1);
- IV_MACHINE_AlloySmelter = ItemList.Machine_IV_AlloySmelter.get(1);
- IV_MACHINE_Mixer = ItemList.Machine_IV_Mixer.get(1);
- IV_MACHINE_ChemicalBath = ItemList.Machine_IV_ChemicalBath.get(1);
- }
+ IC2MFE = ItemUtils.getItemStackWithMeta(true, "IC2:blockElectric", "IC2_MFE", 1, 1);
+ IC2MFSU = ItemUtils.getItemStackWithMeta(true, "IC2:blockElectric", "IC2_MFSU", 2, 1);
+
+ // Lava Boiler
+ boiler_Coal = ItemList.Machine_Bronze_Boiler.get(1);
+
+ // IV/EV/HV MACHINES
+ IV_MACHINE_Electrolyzer = ItemList.Machine_IV_Electrolyzer.get(1);
+ IV_MACHINE_Centrifuge = ItemList.Machine_IV_Centrifuge.get(1);
+ IV_MACHINE_BendingMachine = ItemList.Machine_IV_Bender.get(1);
+ IV_MACHINE_Wiremill = ItemList.Machine_IV_Wiremill.get(1);
+ IV_MACHINE_Macerator = ItemList.Machine_IV_Macerator.get(1);
+ IV_MACHINE_Cutter = ItemList.Machine_IV_Cutter.get(1);
+ IV_MACHINE_Extruder = ItemList.Machine_IV_Extruder.get(1);
+ HV_MACHINE_Sifter = ItemList.Machine_HV_Sifter.get(1);
+ IV_MACHINE_ThermalCentrifuge = ItemList.Machine_IV_ThermalCentrifuge.get(1);
+ IV_MACHINE_OreWasher = ItemList.Machine_IV_OreWasher.get(1);
+ IV_MACHINE_AlloySmelter = ItemList.Machine_IV_AlloySmelter.get(1);
+ IV_MACHINE_Mixer = ItemList.Machine_IV_Mixer.get(1);
+ IV_MACHINE_ChemicalBath = ItemList.Machine_IV_ChemicalBath.get(1);
if (CORE.ConfigSwitches.enableMultiblock_IndustrialCokeOven) {
if (LoadedMods.Railcraft) {
// Misc
@@ -1010,1024 +1005,1006 @@ public class RECIPES_Machines {
}
private static void runModRecipes() {
- if (LoadedMods.Gregtech) {
- // Computer Cube
- CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] { ItemUtils.getSimpleStack(CI.getDataOrb(), 4 * (1)), ItemList.Cover_Screen.get(4),
- CI.machineHull_IV,
- ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(7), 2) },
- ELEMENT.getInstance().TANTALUM.getFluidStack(144 * 16),
- GregtechItemList.Gregtech_Computer_Cube.get(1),
- 60 * 20 * 3,
- 8000);
+ // Computer Cube
+ CORE.RA.addSixSlotAssemblingRecipe(
+ new ItemStack[] { ItemUtils.getSimpleStack(CI.getDataOrb(), 4 * (1)), ItemList.Cover_Screen.get(4),
+ CI.machineHull_IV,
+ ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(7), 2) },
+ ELEMENT.getInstance().TANTALUM.getFluidStack(144 * 16),
+ GregtechItemList.Gregtech_Computer_Cube.get(1),
+ 60 * 20 * 3,
+ 8000);
- // Circuit programmer
- CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] { ItemUtils.getSimpleStack(CI.robotArm_LV, 4 * (1)),
- ItemList.Cover_Controller.get(1, CI.electricMotor_MV), CI.machineHull_MV,
- ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(1), 2),
- ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(2), 2) },
- ELEMENT.getInstance().IRON.getFluidStack(144 * 4),
- ItemUtils.getSimpleStack(ModBlocks.blockCircuitProgrammer),
- 60 * 10 * 1,
- 30);
-
- // Lead Lined Chest
- for (ItemStack plateRubber : OreDictionary.getOres("plateAnyRubber")) CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] { CI.machineHull_LV, GT_Utility.copyAmount(32, plateRubber),
- ItemUtils.getItemStackOfAmountFromOreDict("plateDenseLead", 9),
- ItemUtils.getSimpleStack(Blocks.chest) },
- ELEMENT.getInstance().LEAD.getFluidStack(144 * 16),
- ItemUtils.getSimpleStack(ModBlocks.blockDecayablesChest),
- 60 * 10 * 3,
- 60);
-
- // RTG
- CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] { ItemUtils.getItemStackWithMeta(true, "IC2:blockGenerator:6", "IC2-RTG", 6, 1),
- 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),
- 60 * 20 * 10,
- 8000);
-
- // Super Jukebox
- CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] { CI.machineHull_LV, ItemUtils.getItemStackOfAmountFromOreDict("circuitBasic", 4),
- ItemUtils.getItemStackOfAmountFromOreDict("plateTumbaga", 8),
- ItemUtils.getSimpleStack(Blocks.jukebox) },
- ELEMENT.getInstance().COPPER.getFluidStack(144 * 2),
- ItemUtils.getSimpleStack(ModBlocks.blockCustomJukebox),
- 20 * 30,
- 30);
+ // Circuit programmer
+ CORE.RA.addSixSlotAssemblingRecipe(
+ new ItemStack[] { ItemUtils.getSimpleStack(CI.robotArm_LV, 4 * (1)),
+ ItemList.Cover_Controller.get(1, CI.electricMotor_MV), CI.machineHull_MV,
+ ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(1), 2),
+ ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(2), 2) },
+ ELEMENT.getInstance().IRON.getFluidStack(144 * 4),
+ ItemUtils.getSimpleStack(ModBlocks.blockCircuitProgrammer),
+ 60 * 10 * 1,
+ 30);
+
+ // Lead Lined Chest
+ for (ItemStack plateRubber : OreDictionary.getOres("plateAnyRubber")) CORE.RA.addSixSlotAssemblingRecipe(
+ new ItemStack[] { CI.machineHull_LV, GT_Utility.copyAmount(32, plateRubber),
+ ItemUtils.getItemStackOfAmountFromOreDict("plateDenseLead", 9),
+ ItemUtils.getSimpleStack(Blocks.chest) },
+ ELEMENT.getInstance().LEAD.getFluidStack(144 * 16),
+ ItemUtils.getSimpleStack(ModBlocks.blockDecayablesChest),
+ 60 * 10 * 3,
+ 60);
+
+ // RTG
+ CORE.RA.addSixSlotAssemblingRecipe(
+ new ItemStack[] { ItemUtils.getItemStackWithMeta(true, "IC2:blockGenerator:6", "IC2-RTG", 6, 1),
+ 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),
+ 60 * 20 * 10,
+ 8000);
+
+ // Super Jukebox
+ CORE.RA.addSixSlotAssemblingRecipe(
+ new ItemStack[] { CI.machineHull_LV, ItemUtils.getItemStackOfAmountFromOreDict("circuitBasic", 4),
+ ItemUtils.getItemStackOfAmountFromOreDict("plateTumbaga", 8),
+ ItemUtils.getSimpleStack(Blocks.jukebox) },
+ ELEMENT.getInstance().COPPER.getFluidStack(144 * 2),
+ ItemUtils.getSimpleStack(ModBlocks.blockCustomJukebox),
+ 20 * 30,
+ 30);
- ItemStack aFluidRegulator1 = ItemUtils
- .getValueOfItemList("FluidRegulator_MV", 2, ItemList.Electric_Pump_HV);
- ItemStack aFluidRegulator2 = ItemUtils.getValueOfItemList(
- "FluidRegulator_IV",
- 2,
- ItemUtils.getValueOfItemList("Electric_Pump_LuV", 4, ItemList.Electric_Pump_IV));
+ ItemStack aFluidRegulator1 = ItemUtils.getValueOfItemList("FluidRegulator_MV", 2, ItemList.Electric_Pump_HV);
+ ItemStack aFluidRegulator2 = ItemUtils.getValueOfItemList(
+ "FluidRegulator_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, 2), ALLOY.EGLIN_STEEL.getPlate(4),
- ALLOY.POTIN.getScrew(6) },
- ALLOY.TUMBAGA.getFluidStack(144 * 4),
- ItemUtils.getSimpleStack(ModBlocks.blockPooCollector),
- 20 * 60,
- 30);
+ // Poo Collector
+ CORE.RA.addSixSlotAssemblingRecipe(
+ new ItemStack[] { CI.machineHull_MV, aFluidRegulator1,
+ CI.getTieredComponent(OrePrefixes.pipeMedium, 2, 2), ALLOY.EGLIN_STEEL.getPlate(4),
+ ALLOY.POTIN.getScrew(6) },
+ ALLOY.TUMBAGA.getFluidStack(144 * 4),
+ ItemUtils.getSimpleStack(ModBlocks.blockPooCollector),
+ 20 * 60,
+ 30);
- // Adv. Poo Collector
- CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] { CI.getTieredMachineHull(-1),
- ItemUtils.getSimpleStack(ModBlocks.blockPooCollector), aFluidRegulator2,
- CI.getTieredComponent(OrePrefixes.pipeHuge, 6, 4),
- CI.getTieredComponent(OrePrefixes.screw, 6, 16) },
- CI.getAlternativeTieredFluid(5, 144 * 9),
- ItemUtils.getSimpleStack(ModBlocks.blockPooCollector, 8, 1),
- 20 * 60 * 5,
- 500);
+ // Adv. Poo Collector
+ CORE.RA.addSixSlotAssemblingRecipe(
+ new ItemStack[] { CI.getTieredMachineHull(-1), ItemUtils.getSimpleStack(ModBlocks.blockPooCollector),
+ aFluidRegulator2, CI.getTieredComponent(OrePrefixes.pipeHuge, 6, 4),
+ CI.getTieredComponent(OrePrefixes.screw, 6, 16) },
+ CI.getAlternativeTieredFluid(5, 144 * 9),
+ ItemUtils.getSimpleStack(ModBlocks.blockPooCollector, 8, 1),
+ 20 * 60 * 5,
+ 500);
+
+ // Basic Steam Turbine
+ RecipeUtils.addShapedGregtechRecipe(
+ CI.getTieredComponent(OrePrefixes.pipeSmall, 0, 1),
+ "circuitPrimitive",
+ CI.getTieredComponent(OrePrefixes.pipeSmall, 0, 1),
+ ALLOY.TUMBAGA.getRotor(1),
+ CI.machineCasing_ULV,
+ ALLOY.TUMBAGA.getRotor(1),
+ CI.getElectricMotor(0, 1),
+ "cableGt01RedAlloy",
+ CI.getElectricMotor(0, 1),
+ GregtechItemList.Generator_Steam_Turbine_ULV.get(1));
- // Basic Steam Turbine
- RecipeUtils.addShapedGregtechRecipe(
- CI.getTieredComponent(OrePrefixes.pipeSmall, 0, 1),
- "circuitPrimitive",
- CI.getTieredComponent(OrePrefixes.pipeSmall, 0, 1),
- ALLOY.TUMBAGA.getRotor(1),
- CI.machineCasing_ULV,
- ALLOY.TUMBAGA.getRotor(1),
- CI.getElectricMotor(0, 1),
- "cableGt01RedAlloy",
- CI.getElectricMotor(0, 1),
- GregtechItemList.Generator_Steam_Turbine_ULV.get(1));
+ // Basic Gas Turbine
+ RecipeUtils.addShapedGregtechRecipe(
+ "circuitPrimitive",
+ ALLOY.TUMBAGA.getRotor(1),
+ "circuitPrimitive",
+ ALLOY.TUMBAGA.getRotor(1),
+ CI.machineCasing_ULV,
+ ALLOY.TUMBAGA.getRotor(1),
+ CI.getElectricMotor(0, 1),
+ "cableGt01RedAlloy",
+ CI.getElectricMotor(0, 1),
+ GregtechItemList.Generator_Gas_Turbine_ULV.get(1));
- // Basic Gas Turbine
+ // Basic Combustion Turbine
+ RecipeUtils.addShapedGregtechRecipe(
+ CI.getElectricPiston(0, 1),
+ "circuitPrimitive",
+ CI.getElectricPiston(0, 1),
+ CI.getElectricMotor(0, 1),
+ CI.machineCasing_ULV,
+ CI.getElectricMotor(0, 1),
+ ALLOY.TUMBAGA.getGear(1),
+ "cableGt01RedAlloy",
+ ALLOY.TUMBAGA.getGear(1),
+ GregtechItemList.Generator_Diesel_ULV.get(1));
+
+ // Steam Condenser
+ if (CORE.ConfigSwitches.enableMachine_SteamConverter) {
+ RECIPE_SteamCondenser = GregtechItemList.Condensor_MAX.get(1);
RecipeUtils.addShapedGregtechRecipe(
- "circuitPrimitive",
- ALLOY.TUMBAGA.getRotor(1),
- "circuitPrimitive",
- ALLOY.TUMBAGA.getRotor(1),
- CI.machineCasing_ULV,
- ALLOY.TUMBAGA.getRotor(1),
- CI.getElectricMotor(0, 1),
- "cableGt01RedAlloy",
- CI.getElectricMotor(0, 1),
- GregtechItemList.Generator_Gas_Turbine_ULV.get(1));
+ pipeLargeCopper,
+ pipeHugeSteel,
+ pipeLargeCopper,
+ plateEnergeticAlloy,
+ CI.electricPump_HV,
+ plateEnergeticAlloy,
+ plateEnergeticAlloy,
+ pipeLargeCopper,
+ plateEnergeticAlloy,
+ RECIPE_SteamCondenser);
+ }
- // Basic Combustion Turbine
- RecipeUtils.addShapedGregtechRecipe(
- CI.getElectricPiston(0, 1),
- "circuitPrimitive",
- CI.getElectricPiston(0, 1),
- CI.getElectricMotor(0, 1),
- CI.machineCasing_ULV,
- CI.getElectricMotor(0, 1),
- ALLOY.TUMBAGA.getGear(1),
- "cableGt01RedAlloy",
- ALLOY.TUMBAGA.getGear(1),
- GregtechItemList.Generator_Diesel_ULV.get(1));
-
- // Steam Condenser
- if (CORE.ConfigSwitches.enableMachine_SteamConverter) {
- RECIPE_SteamCondenser = GregtechItemList.Condensor_MAX.get(1);
- RecipeUtils.addShapedGregtechRecipe(
- pipeLargeCopper,
- pipeHugeSteel,
- pipeLargeCopper,
- plateEnergeticAlloy,
- CI.electricPump_HV,
- plateEnergeticAlloy,
- plateEnergeticAlloy,
- pipeLargeCopper,
- plateEnergeticAlloy,
- RECIPE_SteamCondenser);
- }
+ ItemStack aBronzeBricks = ItemUtils.simpleMetaStack(GregTech_API.sBlockCasings1, 10, 1);
+ // Steam Macerator Multi
+ RecipeUtils.addShapedGregtechRecipe(
+ aBronzeBricks,
+ "gemDiamond",
+ aBronzeBricks,
+ "craftingPiston",
+ ALLOY.TUMBAGA.getFrameBox(1),
+ "craftingPiston",
+ aBronzeBricks,
+ "gemDiamond",
+ aBronzeBricks,
+ GregtechItemList.Controller_SteamMaceratorMulti.get(1));
+ // Steam Compressor Multi
+ RecipeUtils.addShapedGregtechRecipe(
+ aBronzeBricks,
+ "craftingPiston",
+ aBronzeBricks,
+ ALLOY.TUMBAGA.getGear(1),
+ ALLOY.TUMBAGA.getFrameBox(1),
+ ALLOY.TUMBAGA.getGear(1),
+ aBronzeBricks,
+ "craftingPiston",
+ aBronzeBricks,
+ GregtechItemList.Controller_SteamCompressorMulti.get(1));
+
+ // Steam Hatch
+ RecipeUtils.addShapedGregtechRecipe(
+ "plateBronze",
+ "pipeMediumBronze",
+ "plateBronze",
+ "plateBronze",
+ GregtechItemList.GT_FluidTank_ULV.get(1),
+ "plateBronze",
+ "plateBronze",
+ "pipeMediumBronze",
+ "plateBronze",
+ GregtechItemList.Hatch_Input_Steam.get(1));
+
+ // Steam Input Bus
+ RecipeUtils.addShapedGregtechRecipe(
+ "plateBronze",
+ ALLOY.TUMBAGA.getPlate(1),
+ "plateBronze",
+ "plateTin",
+ ItemUtils.getSimpleStack(Blocks.hopper),
+ "plateTin",
+ "plateBronze",
+ ALLOY.TUMBAGA.getPlate(1),
+ "plateBronze",
+ GregtechItemList.Hatch_Input_Bus_Steam.get(1));
- ItemStack aBronzeBricks = ItemUtils.simpleMetaStack(GregTech_API.sBlockCasings1, 10, 1);
- // Steam Macerator Multi
- RecipeUtils.addShapedGregtechRecipe(
- aBronzeBricks,
- "gemDiamond",
- aBronzeBricks,
- "craftingPiston",
- ALLOY.TUMBAGA.getFrameBox(1),
- "craftingPiston",
- aBronzeBricks,
- "gemDiamond",
- aBronzeBricks,
- GregtechItemList.Controller_SteamMaceratorMulti.get(1));
- // Steam Compressor Multi
- RecipeUtils.addShapedGregtechRecipe(
- aBronzeBricks,
- "craftingPiston",
- aBronzeBricks,
- ALLOY.TUMBAGA.getGear(1),
- ALLOY.TUMBAGA.getFrameBox(1),
- ALLOY.TUMBAGA.getGear(1),
- aBronzeBricks,
- "craftingPiston",
- aBronzeBricks,
- GregtechItemList.Controller_SteamCompressorMulti.get(1));
-
- // Steam Hatch
- RecipeUtils.addShapedGregtechRecipe(
- "plateBronze",
- "pipeMediumBronze",
- "plateBronze",
- "plateBronze",
- GregtechItemList.GT_FluidTank_ULV.get(1),
- "plateBronze",
- "plateBronze",
- "pipeMediumBronze",
- "plateBronze",
- GregtechItemList.Hatch_Input_Steam.get(1));
-
- // Steam Input Bus
- RecipeUtils.addShapedGregtechRecipe(
- "plateBronze",
- ALLOY.TUMBAGA.getPlate(1),
- "plateBronze",
- "plateTin",
- ItemUtils.getSimpleStack(Blocks.hopper),
- "plateTin",
- "plateBronze",
- ALLOY.TUMBAGA.getPlate(1),
- "plateBronze",
- GregtechItemList.Hatch_Input_Bus_Steam.get(1));
-
- // Steam Output Bus
+ // Steam Output Bus
+ RecipeUtils.addShapedGregtechRecipe(
+ "plateBronze",
+ "plateTin",
+ "plateBronze",
+ ALLOY.TUMBAGA.getPlate(1),
+ ItemUtils.getSimpleStack(Blocks.hopper),
+ ALLOY.TUMBAGA.getPlate(1),
+ "plateBronze",
+ "plateTin",
+ "plateBronze",
+ GregtechItemList.Hatch_Output_Bus_Steam.get(1));
+
+ // RF Convertor
+ if (LoadedMods.CoFHCore && CORE.ConfigSwitches.enableMachine_RF_Convetor) {
RecipeUtils.addShapedGregtechRecipe(
- "plateBronze",
- "plateTin",
- "plateBronze",
- ALLOY.TUMBAGA.getPlate(1),
- ItemUtils.getSimpleStack(Blocks.hopper),
- ALLOY.TUMBAGA.getPlate(1),
- "plateBronze",
- "plateTin",
- "plateBronze",
- GregtechItemList.Hatch_Output_Bus_Steam.get(1));
-
- // RF Convertor
- if (LoadedMods.CoFHCore && CORE.ConfigSwitches.enableMachine_RF_Convetor) {
- RecipeUtils.addShapedGregtechRecipe(
- CI.getPlate(4, 1),
- CI.getTieredCircuitOreDictName(5),
- CI.getPlate(4, 1),
- CI.getTransmissionComponent(3, 1),
- CI.getTieredGTPPMachineCasing(4, 1),
- CI.getTransmissionComponent(3, 1),
- CI.getPlate(4, 1),
- plateEnergeticAlloy,
- CI.getPlate(4, 1),
- GregtechItemList.Energy_Buffer_RF_Convertor.get(1));
- }
+ CI.getPlate(4, 1),
+ CI.getTieredCircuitOreDictName(5),
+ CI.getPlate(4, 1),
+ CI.getTransmissionComponent(3, 1),
+ CI.getTieredGTPPMachineCasing(4, 1),
+ CI.getTransmissionComponent(3, 1),
+ CI.getPlate(4, 1),
+ plateEnergeticAlloy,
+ CI.getPlate(4, 1),
+ GregtechItemList.Energy_Buffer_RF_Convertor.get(1));
+ }
- // Egg Box
+ // Egg Box
+ CORE.RA.addSixSlotAssemblingRecipe(
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(8), CI.getTieredMachineHull(3),
+ ItemUtils.getSimpleStack(Items.egg, 64), ItemUtils.getSimpleStack(ModItems.itemRope, 32),
+ CI.getPlate(4, 8) },
+ FluidUtils.getFluidStack("mobessence", 4096),
+ ItemUtils.getSimpleStack(ModBlocks.blockEggBox, 1),
+ 20 * 60,
+ 480);
+
+ // Flask Configurator
+ if (Meta_GT_Proxy.sDoesVolumetricFlaskExist) {
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] { CI.getNumberedAdvancedCircuit(8), CI.getTieredMachineHull(3),
- ItemUtils.getSimpleStack(Items.egg, 64), ItemUtils.getSimpleStack(ModItems.itemRope, 32),
- CI.getPlate(4, 8) },
- FluidUtils.getFluidStack("mobessence", 4096),
- ItemUtils.getSimpleStack(ModBlocks.blockEggBox, 1),
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(8), CI.getTieredMachineHull(2),
+ ItemUtils.getSimpleStack(ModBlocks.blockCircuitProgrammer),
+ VolumetricFlaskHelper.getVolumetricFlask(8),
+ CI.getTieredComponent(OrePrefixes.pipeSmall, 2, 2), CI.getPlate(2, 4) },
+ CI.getAlternativeTieredFluid(1, 144 * 8),
+ ItemUtils.getSimpleStack(ModBlocks.blockVolumetricFlaskSetter, 1),
20 * 60,
- 480);
+ 120);
+ }
- // Flask Configurator
- if (Meta_GT_Proxy.sDoesVolumetricFlaskExist) {
- CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] { CI.getNumberedAdvancedCircuit(8), CI.getTieredMachineHull(2),
- ItemUtils.getSimpleStack(ModBlocks.blockCircuitProgrammer),
- VolumetricFlaskHelper.getVolumetricFlask(8),
- CI.getTieredComponent(OrePrefixes.pipeSmall, 2, 2), CI.getPlate(2, 4) },
- CI.getAlternativeTieredFluid(1, 144 * 8),
- ItemUtils.getSimpleStack(ModBlocks.blockVolumetricFlaskSetter, 1),
- 20 * 60,
- 120);
- }
+ if (CORE.ConfigSwitches.enableMultiblock_IronBlastFurnace) {
- if (CORE.ConfigSwitches.enableMultiblock_IronBlastFurnace) {
+ RECIPE_IronBlastFurnace = GregtechItemList.Machine_Iron_BlastFurnace.get(1);
+ RECIPE_IronPlatedBricks = GregtechItemList.Casing_IronPlatedBricks.get(1);
- RECIPE_IronBlastFurnace = GregtechItemList.Machine_Iron_BlastFurnace.get(1);
- RECIPE_IronPlatedBricks = GregtechItemList.Casing_IronPlatedBricks.get(1);
+ // Iron BF
+ RecipeUtils.addShapedGregtechRecipe(
+ "plateDoubleAnyIron",
+ "craftingFurnace",
+ "plateDoubleAnyIron",
+ boiler_Coal,
+ CI.machineCasing_ULV,
+ boiler_Coal,
+ "plateDoubleAnyIron",
+ "bucketLava",
+ "plateDoubleAnyIron",
+ RECIPE_IronBlastFurnace);
+ // Iron plated Bricks
+ RecipeUtils.addShapedGregtechRecipe(
+ "plateAnyIron",
+ RECIPES_Tools.craftingToolHardHammer,
+ "plateAnyIron",
+ "plateAnyIron",
+ blockBricks,
+ "plateAnyIron",
+ "plateAnyIron",
+ RECIPES_Tools.craftingToolWrench,
+ "plateAnyIron",
+ RECIPE_IronPlatedBricks);
+
+ // Add recycle recipes for the Iron Plated Bricks
+ // GT_ModHandler.addPulverisationRecipe(RECIPE_IronPlatedBricks,
+ // ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustIron", 6),
+ // ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustClay", 2), true);
+ CORE.RA.addPulverisationRecipe(
+ RECIPE_IronPlatedBricks,
+ ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustIron", 6),
+ ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustClay", 2),
+ null);
+ GT_Values.RA.addArcFurnaceRecipe(
+ RECIPE_IronPlatedBricks,
+ new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDictNoBroken("ingotWroughtIron", 6),
+ ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustAsh", 2) },
+ new int[] { 0 },
+ 32 * 20,
+ 32);
+ }
- // Iron BF
- RecipeUtils.addShapedGregtechRecipe(
- "plateDoubleAnyIron",
- "craftingFurnace",
- "plateDoubleAnyIron",
- boiler_Coal,
- CI.machineCasing_ULV,
- boiler_Coal,
- "plateDoubleAnyIron",
- "bucketLava",
- "plateDoubleAnyIron",
- RECIPE_IronBlastFurnace);
- // Iron plated Bricks
- RecipeUtils.addShapedGregtechRecipe(
- "plateAnyIron",
- RECIPES_Tools.craftingToolHardHammer,
- "plateAnyIron",
- "plateAnyIron",
- blockBricks,
- "plateAnyIron",
- "plateAnyIron",
- RECIPES_Tools.craftingToolWrench,
- "plateAnyIron",
- RECIPE_IronPlatedBricks);
-
- // Add recycle recipes for the Iron Plated Bricks
- // GT_ModHandler.addPulverisationRecipe(RECIPE_IronPlatedBricks,
- // ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustIron", 6),
- // ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustClay", 2), true);
- CORE.RA.addPulverisationRecipe(
- RECIPE_IronPlatedBricks,
- ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustIron", 6),
- ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustClay", 2),
- null);
- GT_Values.RA.addArcFurnaceRecipe(
- RECIPE_IronPlatedBricks,
- new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDictNoBroken("ingotWroughtIron", 6),
- ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustAsh", 2) },
- new int[] { 0 },
- 32 * 20,
- 32);
- }
+ if (CORE.ConfigSwitches.enableMultiblock_IndustrialCentrifuge) {
+ // Industrial Centrifuge
+ RECIPE_IndustrialCentrifugeController = GregtechItemList.Industrial_Centrifuge.get(1);
+ RECIPE_IndustrialCentrifugeCasing = GregtechItemList.Casing_Centrifuge1.get(1);
- if (CORE.ConfigSwitches.enableMultiblock_IndustrialCentrifuge) {
- // Industrial Centrifuge
- RECIPE_IndustrialCentrifugeController = GregtechItemList.Industrial_Centrifuge.get(1);
- RECIPE_IndustrialCentrifugeCasing = GregtechItemList.Casing_Centrifuge1.get(1);
+ // Industrial Centrifuge
+ RecipeUtils.addShapedGregtechRecipe(
+ CI.circuitTier5,
+ pipeHugeStainlessSteel,
+ CI.circuitTier5,
+ CI.component_Plate[6],
+ IV_MACHINE_Centrifuge,
+ CI.component_Plate[6],
+ CI.component_Plate[8],
+ CI.machineCasing_IV,
+ CI.component_Plate[8],
+ RECIPE_IndustrialCentrifugeController);
+ // Centrifuge Casing
+ RecipeUtils.addShapedGregtechRecipe(
+ CI.component_Plate[6],
+ "stickTumbaga",
+ CI.component_Plate[6],
+ CI.component_Plate[8],
+ "stickTumbaga",
+ CI.component_Plate[8],
+ CI.component_Plate[6],
+ "stickTumbaga",
+ CI.component_Plate[6],
+ RECIPE_IndustrialCentrifugeCasing);
+ GT_Values.RA.addAssemblerRecipe(
+ new ItemStack[] { ALLOY.MARAGING250.getPlate(4), ALLOY.INCONEL_792.getPlate(2),
+ ALLOY.TUMBAGA.getRod(3), GT_Utility.getIntegratedCircuit(1), },
+ GT_Values.NF,
+ RECIPE_IndustrialCentrifugeCasing,
+ 50,
+ 16);
+ }
- // Industrial Centrifuge
- RecipeUtils.addShapedGregtechRecipe(
- CI.circuitTier5,
- pipeHugeStainlessSteel,
- CI.circuitTier5,
- CI.component_Plate[6],
- IV_MACHINE_Centrifuge,
- CI.component_Plate[6],
- CI.component_Plate[8],
- CI.machineCasing_IV,
- CI.component_Plate[8],
- RECIPE_IndustrialCentrifugeController);
- // Centrifuge Casing
- RecipeUtils.addShapedGregtechRecipe(
- CI.component_Plate[6],
- "stickTumbaga",
- CI.component_Plate[6],
- CI.component_Plate[8],
- "stickTumbaga",
- CI.component_Plate[8],
- CI.component_Plate[6],
- "stickTumbaga",
- CI.component_Plate[6],
- RECIPE_IndustrialCentrifugeCasing);
- GT_Values.RA.addAssemblerRecipe(
- new ItemStack[] { ALLOY.MARAGING250.getPlate(4), ALLOY.INCONEL_792.getPlate(2),
- ALLOY.TUMBAGA.getRod(3), GT_Utility.getIntegratedCircuit(1), },
- GT_Values.NF,
- RECIPE_IndustrialCentrifugeCasing,
- 50,
- 16);
- }
+ if (CORE.ConfigSwitches.enableMultiblock_IndustrialCokeOven) {
+ // Industrial Coke Oven
+ RECIPE_IndustrialCokeOvenController = GregtechItemList.Industrial_CokeOven.get(1);
+ RECIPE_IndustrialCokeOvenFrame = GregtechItemList.Casing_CokeOven.get(1);
+ RECIPE_IndustrialCokeOvenCasingA = GregtechItemList.Casing_CokeOven_Coil1.get(1);
+ RECIPE_IndustrialCokeOvenCasingB = GregtechItemList.Casing_CokeOven_Coil2.get(1);
- if (CORE.ConfigSwitches.enableMultiblock_IndustrialCokeOven) {
+ if (LoadedMods.Railcraft) {
// Industrial Coke Oven
- RECIPE_IndustrialCokeOvenController = GregtechItemList.Industrial_CokeOven.get(1);
- 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
- RecipeUtils.addShapedGregtechRecipe(
- CI.component_Plate[7],
- CI.circuitTier4,
- CI.component_Plate[7],
- CI.machineCasing_EV,
- INPUT_RCCokeOvenBlock,
- CI.machineCasing_EV,
- CI.component_Plate[7],
- CI.circuitTier4,
- CI.component_Plate[7],
- RECIPE_IndustrialCokeOvenController);
- }
- if (LoadedMods.ImmersiveEngineering) {
- // Industrial Coke Oven
- RecipeUtils.addShapedGregtechRecipe(
- CI.component_Plate[8],
- CI.circuitTier4,
- CI.component_Plate[8],
- CI.machineCasing_EV,
- INPUT_IECokeOvenBlock,
- CI.machineCasing_EV,
- CI.component_Plate[8],
- CI.circuitTier4,
- CI.component_Plate[8],
- RECIPE_IndustrialCokeOvenController);
- }
- // Coke Oven Frame Casing
RecipeUtils.addShapedGregtechRecipe(
CI.component_Plate[7],
- CI.component_Rod[7],
+ CI.circuitTier4,
CI.component_Plate[7],
- CI.component_Rod[7],
- "frameGtTantalloy61",
- CI.component_Rod[7],
+ CI.machineCasing_EV,
+ INPUT_RCCokeOvenBlock,
+ CI.machineCasing_EV,
CI.component_Plate[7],
- CI.component_Rod[7],
+ CI.circuitTier4,
CI.component_Plate[7],
- RECIPE_IndustrialCokeOvenFrame);
- GT_Values.RA.addAssemblerRecipe(
- new ItemStack[] { ALLOY.TANTALLOY_61.getPlate(4), ALLOY.TANTALLOY_61.getRod(4),
- ALLOY.TANTALLOY_61.getFrameBox(1), GT_Utility.getIntegratedCircuit(1), },
- GT_Values.NF,
- RECIPE_IndustrialCokeOvenFrame,
- 50,
- 16);
- // Coke Oven Coil 1
- RecipeUtils.addShapedGregtechRecipe(
- plateBronze,
- plateBronze,
- plateBronze,
- "frameGtBronze",
- CI.gearboxCasing_Tier_1,
- "frameGtBronze",
- plateBronze,
- plateBronze,
- plateBronze,
- RECIPE_IndustrialCokeOvenCasingA);
- // Coke Oven Coil 2
- RecipeUtils.addShapedGregtechRecipe(
- plateSteel,
- plateSteel,
- plateSteel,
- "frameGtSteel",
- CI.gearboxCasing_Tier_2,
- "frameGtSteel",
- plateSteel,
- plateSteel,
- plateSteel,
- RECIPE_IndustrialCokeOvenCasingB);
+ RECIPE_IndustrialCokeOvenController);
}
-
- if (CORE.ConfigSwitches.enableMultiblock_IndustrialElectrolyzer) {
- // Industrial Electrolyzer
- RECIPE_IndustrialElectrolyzerController = GregtechItemList.Industrial_Electrolyzer.get(1);
- RECIPE_IndustrialElectrolyzerFrame = GregtechItemList.Casing_Electrolyzer.get(1);
-
- // Electrolyzer Frame Casing
- RecipeUtils.addShapedGregtechRecipe(
- "platePotin",
- "stickLongChrome",
- "platePotin",
- "stickLongPotin",
- "frameGtPotin",
- "stickLongPotin",
- "platePotin",
- "stickLongPotin",
- "platePotin",
- RECIPE_IndustrialElectrolyzerFrame);
- GT_Values.RA.addAssemblerRecipe(
- new ItemStack[] { ALLOY.POTIN.getPlate(4), ALLOY.POTIN.getLongRod(3),
- GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Chrome, 1),
- ALLOY.POTIN.getFrameBox(1), GT_Utility.getIntegratedCircuit(1), },
- GT_Values.NF,
- RECIPE_IndustrialElectrolyzerFrame,
- 50,
- 16);
- // Industrial Electrolyzer
+ if (LoadedMods.ImmersiveEngineering) {
+ // Industrial Coke Oven
RecipeUtils.addShapedGregtechRecipe(
- "plateStellite",
- CI.circuitTier5,
- "plateStellite",
- CI.machineCasing_IV,
- IV_MACHINE_Electrolyzer,
- CI.machineCasing_IV,
- "plateStellite",
- "rotorStellite",
- "plateStellite",
- RECIPE_IndustrialElectrolyzerController);
+ CI.component_Plate[8],
+ CI.circuitTier4,
+ CI.component_Plate[8],
+ CI.machineCasing_EV,
+ INPUT_IECokeOvenBlock,
+ CI.machineCasing_EV,
+ CI.component_Plate[8],
+ CI.circuitTier4,
+ CI.component_Plate[8],
+ RECIPE_IndustrialCokeOvenController);
}
+ // Coke Oven Frame Casing
+ RecipeUtils.addShapedGregtechRecipe(
+ CI.component_Plate[7],
+ CI.component_Rod[7],
+ CI.component_Plate[7],
+ CI.component_Rod[7],
+ "frameGtTantalloy61",
+ CI.component_Rod[7],
+ CI.component_Plate[7],
+ CI.component_Rod[7],
+ CI.component_Plate[7],
+ RECIPE_IndustrialCokeOvenFrame);
+ GT_Values.RA.addAssemblerRecipe(
+ new ItemStack[] { ALLOY.TANTALLOY_61.getPlate(4), ALLOY.TANTALLOY_61.getRod(4),
+ ALLOY.TANTALLOY_61.getFrameBox(1), GT_Utility.getIntegratedCircuit(1), },
+ GT_Values.NF,
+ RECIPE_IndustrialCokeOvenFrame,
+ 50,
+ 16);
+ // Coke Oven Coil 1
+ RecipeUtils.addShapedGregtechRecipe(
+ plateBronze,
+ plateBronze,
+ plateBronze,
+ "frameGtBronze",
+ CI.gearboxCasing_Tier_1,
+ "frameGtBronze",
+ plateBronze,
+ plateBronze,
+ plateBronze,
+ RECIPE_IndustrialCokeOvenCasingA);
+ // Coke Oven Coil 2
+ RecipeUtils.addShapedGregtechRecipe(
+ plateSteel,
+ plateSteel,
+ plateSteel,
+ "frameGtSteel",
+ CI.gearboxCasing_Tier_2,
+ "frameGtSteel",
+ plateSteel,
+ plateSteel,
+ plateSteel,
+ RECIPE_IndustrialCokeOvenCasingB);
+ }
- if (CORE.ConfigSwitches.enableMultiblock_IndustrialPlatePress) {
- // Industrial Material Press
- RECIPE_IndustrialMaterialPressController = GregtechItemList.Industrial_PlatePress.get(1);
- RECIPE_IndustrialMaterialPressFrame = GregtechItemList.Casing_MaterialPress.get(1);
+ if (CORE.ConfigSwitches.enableMultiblock_IndustrialElectrolyzer) {
+ // Industrial Electrolyzer
+ RECIPE_IndustrialElectrolyzerController = GregtechItemList.Industrial_Electrolyzer.get(1);
+ RECIPE_IndustrialElectrolyzerFrame = GregtechItemList.Casing_Electrolyzer.get(1);
- // Material Press Frame Casing
- RecipeUtils.addShapedGregtechRecipe(
- "plateTitanium",
- "stickLongTumbaga",
- "plateTitanium",
- "stickTantalloy60",
- "frameGtTumbaga",
- "stickTantalloy60",
- "plateTitanium",
- "stickLongTumbaga",
- "plateTitanium",
- RECIPE_IndustrialMaterialPressFrame);
- GT_Values.RA.addAssemblerRecipe(
- new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 4),
- ALLOY.TANTALLOY_60.getRod(2), ALLOY.TUMBAGA.getLongRod(2), ALLOY.TUMBAGA.getFrameBox(1),
- GT_Utility.getIntegratedCircuit(1), },
- GT_Values.NF,
- RECIPE_IndustrialMaterialPressFrame,
- 50,
- 16);
- // Industrial Material Press
- RecipeUtils.addShapedGregtechRecipe(
- "plateTitanium",
- CI.circuitTier5,
- "plateTitanium",
- CI.machineCasing_IV,
- IV_MACHINE_BendingMachine,
- CI.machineCasing_IV,
- "plateTitanium",
- CI.circuitTier5,
- "plateTitanium",
- RECIPE_IndustrialMaterialPressController);
- }
+ // Electrolyzer Frame Casing
+ RecipeUtils.addShapedGregtechRecipe(
+ "platePotin",
+ "stickLongChrome",
+ "platePotin",
+ "stickLongPotin",
+ "frameGtPotin",
+ "stickLongPotin",
+ "platePotin",
+ "stickLongPotin",
+ "platePotin",
+ RECIPE_IndustrialElectrolyzerFrame);
+ GT_Values.RA.addAssemblerRecipe(
+ new ItemStack[] { ALLOY.POTIN.getPlate(4), ALLOY.POTIN.getLongRod(3),
+ GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Chrome, 1),
+ ALLOY.POTIN.getFrameBox(1), GT_Utility.getIntegratedCircuit(1), },
+ GT_Values.NF,
+ RECIPE_IndustrialElectrolyzerFrame,
+ 50,
+ 16);
+ // Industrial Electrolyzer
+ RecipeUtils.addShapedGregtechRecipe(
+ "plateStellite",
+ CI.circuitTier5,
+ "plateStellite",
+ CI.machineCasing_IV,
+ IV_MACHINE_Electrolyzer,
+ CI.machineCasing_IV,
+ "plateStellite",
+ "rotorStellite",
+ "plateStellite",
+ RECIPE_IndustrialElectrolyzerController);
+ }
- if (CORE.ConfigSwitches.enableMultiblock_IndustrialMacerationStack) {
- // Industrial Maceration Stack
- RECIPE_IndustrialMacerationStackController = GregtechItemList.Industrial_MacerationStack.get(1);
- RECIPE_IndustrialMacerationStackFrame = GregtechItemList.Casing_MacerationStack.get(1);
+ if (CORE.ConfigSwitches.enableMultiblock_IndustrialPlatePress) {
+ // Industrial Material Press
+ RECIPE_IndustrialMaterialPressController = GregtechItemList.Industrial_PlatePress.get(1);
+ RECIPE_IndustrialMaterialPressFrame = GregtechItemList.Casing_MaterialPress.get(1);
- // Maceration Frame Casing
- RecipeUtils.addShapedGregtechRecipe(
- "platePalladium",
- "platePalladium",
- "platePalladium",
- "stickPlatinum",
- "frameGtInconel625",
- "stickPlatinum",
- "platePalladium",
- "stickLongPalladium",
- "platePalladium",
- RECIPE_IndustrialMacerationStackFrame);
- GT_Values.RA.addAssemblerRecipe(
- new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Palladium, 5),
- GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Platinum, 2),
- GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Palladium, 1),
- ALLOY.INCONEL_625.getFrameBox(1), GT_Utility.getIntegratedCircuit(1), },
- GT_Values.NF,
- RECIPE_IndustrialMacerationStackFrame,
- 50,
- 16);
- // Industrial Maceration stack
- RecipeUtils.addShapedGregtechRecipe(
- "plateTungstenCarbide",
- IV_MACHINE_Macerator,
- "plateTungstenCarbide",
- IV_MACHINE_Macerator,
- CI.circuitTier7,
- IV_MACHINE_Macerator,
- "plateTungstenCarbide",
- IV_MACHINE_Macerator,
- "plateTungstenCarbide",
- RECIPE_IndustrialMacerationStackController);
- }
+ // Material Press Frame Casing
+ RecipeUtils.addShapedGregtechRecipe(
+ "plateTitanium",
+ "stickLongTumbaga",
+ "plateTitanium",
+ "stickTantalloy60",
+ "frameGtTumbaga",
+ "stickTantalloy60",
+ "plateTitanium",
+ "stickLongTumbaga",
+ "plateTitanium",
+ RECIPE_IndustrialMaterialPressFrame);
+ GT_Values.RA.addAssemblerRecipe(
+ new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 4),
+ ALLOY.TANTALLOY_60.getRod(2), ALLOY.TUMBAGA.getLongRod(2), ALLOY.TUMBAGA.getFrameBox(1),
+ GT_Utility.getIntegratedCircuit(1), },
+ GT_Values.NF,
+ RECIPE_IndustrialMaterialPressFrame,
+ 50,
+ 16);
+ // Industrial Material Press
+ RecipeUtils.addShapedGregtechRecipe(
+ "plateTitanium",
+ CI.circuitTier5,
+ "plateTitanium",
+ CI.machineCasing_IV,
+ IV_MACHINE_BendingMachine,
+ CI.machineCasing_IV,
+ "plateTitanium",
+ CI.circuitTier5,
+ "plateTitanium",
+ RECIPE_IndustrialMaterialPressController);
+ }
- if (CORE.ConfigSwitches.enableMultiblock_IndustrialWireMill) {
- // Industrial Wire Factory
- RECIPE_IndustrialWireFactoryController = GregtechItemList.Industrial_WireFactory.get(1);
- RECIPE_IndustrialWireFactoryFrame = GregtechItemList.Casing_WireFactory.get(1);
+ if (CORE.ConfigSwitches.enableMultiblock_IndustrialMacerationStack) {
+ // Industrial Maceration Stack
+ RECIPE_IndustrialMacerationStackController = GregtechItemList.Industrial_MacerationStack.get(1);
+ RECIPE_IndustrialMacerationStackFrame = GregtechItemList.Casing_MacerationStack.get(1);
- // Wire Factory Frame Casing
- RecipeUtils.addShapedGregtechRecipe(
- "plateBlueSteel",
- "stickBlueSteel",
- "plateBlueSteel",
- "stickBlueSteel",
- "frameGtBlueSteel",
- "stickBlueSteel",
- "plateBlueSteel",
- "stickBlueSteel",
- "plateBlueSteel",
- RECIPE_IndustrialWireFactoryFrame);
- GT_Values.RA.addAssemblerRecipe(
- new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BlueSteel, 4),
- GT_OreDictUnificator.get(OrePrefixes.stick, Materials.BlueSteel, 4),
- GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.BlueSteel, 1),
- GT_Utility.getIntegratedCircuit(1), },
- GT_Values.NF,
- RECIPE_IndustrialWireFactoryFrame,
- 50,
- 16);
- // Industrial Wire Factory
- RecipeUtils.addShapedGregtechRecipe(
- "plateZeron100",
- CI.machineCasing_IV,
- "plateZeron100",
- CI.circuitTier5,
- IV_MACHINE_Wiremill,
- CI.circuitTier5,
- "plateZeron100",
- CI.machineCasing_IV,
- "plateZeron100",
- RECIPE_IndustrialWireFactoryController);
- }
+ // Maceration Frame Casing
+ RecipeUtils.addShapedGregtechRecipe(
+ "platePalladium",
+ "platePalladium",
+ "platePalladium",
+ "stickPlatinum",
+ "frameGtInconel625",
+ "stickPlatinum",
+ "platePalladium",
+ "stickLongPalladium",
+ "platePalladium",
+ RECIPE_IndustrialMacerationStackFrame);
+ GT_Values.RA.addAssemblerRecipe(
+ new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Palladium, 5),
+ GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Platinum, 2),
+ GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Palladium, 1),
+ ALLOY.INCONEL_625.getFrameBox(1), GT_Utility.getIntegratedCircuit(1), },
+ GT_Values.NF,
+ RECIPE_IndustrialMacerationStackFrame,
+ 50,
+ 16);
+ // Industrial Maceration stack
+ RecipeUtils.addShapedGregtechRecipe(
+ "plateTungstenCarbide",
+ IV_MACHINE_Macerator,
+ "plateTungstenCarbide",
+ IV_MACHINE_Macerator,
+ CI.circuitTier7,
+ IV_MACHINE_Macerator,
+ "plateTungstenCarbide",
+ IV_MACHINE_Macerator,
+ "plateTungstenCarbide",
+ RECIPE_IndustrialMacerationStackController);
+ }
- // Tiered Tanks
- if (CORE.ConfigSwitches.enableMachine_FluidTanks) {
- 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));
- }
+ if (CORE.ConfigSwitches.enableMultiblock_IndustrialWireMill) {
+ // Industrial Wire Factory
+ RECIPE_IndustrialWireFactoryController = GregtechItemList.Industrial_WireFactory.get(1);
+ RECIPE_IndustrialWireFactoryFrame = GregtechItemList.Casing_WireFactory.get(1);
+ // Wire Factory Frame Casing
+ RecipeUtils.addShapedGregtechRecipe(
+ "plateBlueSteel",
+ "stickBlueSteel",
+ "plateBlueSteel",
+ "stickBlueSteel",
+ "frameGtBlueSteel",
+ "stickBlueSteel",
+ "plateBlueSteel",
+ "stickBlueSteel",
+ "plateBlueSteel",
+ RECIPE_IndustrialWireFactoryFrame);
+ GT_Values.RA.addAssemblerRecipe(
+ new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BlueSteel, 4),
+ GT_OreDictUnificator.get(OrePrefixes.stick, Materials.BlueSteel, 4),
+ GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.BlueSteel, 1),
+ GT_Utility.getIntegratedCircuit(1), },
+ GT_Values.NF,
+ RECIPE_IndustrialWireFactoryFrame,
+ 50,
+ 16);
+ // Industrial Wire Factory
+ RecipeUtils.addShapedGregtechRecipe(
+ "plateZeron100",
+ CI.machineCasing_IV,
+ "plateZeron100",
+ CI.circuitTier5,
+ IV_MACHINE_Wiremill,
+ CI.circuitTier5,
+ "plateZeron100",
+ CI.machineCasing_IV,
+ "plateZeron100",
+ RECIPE_IndustrialWireFactoryController);
+ }
+
+ // Tiered Tanks
+ if (CORE.ConfigSwitches.enableMachine_FluidTanks) {
+ 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(
- 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));
- RecipeUtils.addShapedGregtechRecipe(
- CI.circuitTier1,
- CI.component_Plate[7],
- CI.circuitTier1,
- CI.component_Plate[8],
- pipeTier4,
- CI.component_Plate[8],
- CI.circuitTier1,
- CI.electricPump_MV,
- CI.circuitTier1,
- GregtechItemList.GT_FluidTank_HV.get(1));
+ aTank.get(1),
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ aTank.get(1));
}
- if (CORE.ConfigSwitches.enableMultiblock_MultiTank) {
- // Industrial Multi Tank
- // RECIPE_IndustrialMultiTankController = GregtechItemList.Industrial_MultiTank.get(1);
- RECIPE_IndustrialMultiTankFrame = GregtechItemList.Casing_MultitankExterior.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));
+ RecipeUtils.addShapedGregtechRecipe(
+ CI.circuitTier1,
+ CI.component_Plate[7],
+ CI.circuitTier1,
+ CI.component_Plate[8],
+ pipeTier4,
+ CI.component_Plate[8],
+ CI.circuitTier1,
+ CI.electricPump_MV,
+ CI.circuitTier1,
+ GregtechItemList.GT_FluidTank_HV.get(1));
+ }
- // Industrial Multi Tank Casing
- RecipeUtils.addShapedGregtechRecipe(
- "stickGrisium",
- "plateGrisium",
- "stickGrisium",
- "plateGrisium",
- "frameGtGrisium",
- "plateGrisium",
- "plateGrisium",
- "plateGrisium",
- "plateGrisium",
- RECIPE_IndustrialMultiTankFrame);
- // Industrial Multi Tank
- RecipeUtils.addShapedGregtechRecipe(
- "pipeHugeTantalloy60",
- "gearGrisium",
- "pipeHugeTantalloy60",
- CI.circuitTier4,
- RECIPE_IndustrialMultiTankFrame,
- CI.circuitTier4,
- "plateDoubleGrisium",
- "rotorGrisium",
- "plateDoubleGrisium",
- RECIPE_IndustrialMultiTankController);
- }
- // TODO
-
- // Semi-Fluid Generators
- ItemStack[][] aSemiFluidInputs = new ItemStack[5][10];
- aSemiFluidInputs[0] = new ItemStack[] { CI.getNumberedBioCircuit(14), CI.getTieredMachineHull(1, 1),
- CI.getElectricMotor(1, 2), CI.getElectricPiston(1, 2),
- CI.getTieredComponent(OrePrefixes.cableGt01, 1, 1),
- CI.getTieredComponent(OrePrefixes.circuit, 1, 1), CI.getGear(1, 2) };
- aSemiFluidInputs[1] = new ItemStack[] { CI.getNumberedBioCircuit(14), CI.getTieredMachineHull(2, 1),
- CI.getElectricMotor(2, 2), CI.getElectricPiston(2, 2),
- CI.getTieredComponent(OrePrefixes.cableGt01, 2, 1),
- CI.getTieredComponent(OrePrefixes.circuit, 2, 1), CI.getGear(2, 2) };
- aSemiFluidInputs[2] = new ItemStack[] { CI.getNumberedBioCircuit(14), CI.getTieredMachineHull(3, 1),
- CI.getElectricMotor(3, 2), CI.getElectricPiston(3, 2),
- CI.getTieredComponent(OrePrefixes.cableGt01, 3, 1),
- CI.getTieredComponent(OrePrefixes.circuit, 3, 1), CI.getGear(3, 2) };
- aSemiFluidInputs[3] = new ItemStack[] { CI.getNumberedBioCircuit(14), CI.getTieredMachineHull(4, 1),
- CI.getElectricMotor(4, 2), CI.getElectricPiston(4, 2),
- CI.getTieredComponent(OrePrefixes.cableGt01, 4, 1),
- CI.getTieredComponent(OrePrefixes.circuit, 4, 1), CI.getGear(4, 2) };
- aSemiFluidInputs[4] = new ItemStack[] { CI.getNumberedBioCircuit(14), CI.getTieredMachineHull(5, 1),
- CI.getElectricMotor(5, 2), CI.getElectricPiston(5, 2),
- CI.getTieredComponent(OrePrefixes.cableGt01, 5, 1),
- CI.getTieredComponent(OrePrefixes.circuit, 5, 1), CI.getGear(5, 2) };
- FluidStack[] aSemiFluidFluidInputs = new FluidStack[] { ALLOY.POLYETHYLENE.getFluidStack(144),
- ALLOY.POLYETHYLENE.getFluidStack(144), ALLOY.POLYETHYLENE.getFluidStack(144),
- ALLOY.POLYETHYLENE.getFluidStack(144), ALLOY.POLYTETRAFLUOROETHYLENE.getFluidStack(144) };
-
- // ItemUtils.simpleMetaStack("IC2:blockGenerator:7", 7, 1);
- ItemStack[] aSemifluids = new ItemStack[] { GregtechItemList.Generator_SemiFluid_LV.get(1),
- GregtechItemList.Generator_SemiFluid_MV.get(1), GregtechItemList.Generator_SemiFluid_HV.get(1),
- GregtechItemList.Generator_SemiFluid_EV.get(1), GregtechItemList.Generator_SemiFluid_IV.get(1) };
- for (int o = 0; o < 5; o++) {
- CORE.RA.addSixSlotAssemblingRecipe(
- aSemiFluidInputs[o],
- aSemiFluidFluidInputs[o],
- aSemifluids[o],
- 20 * 30,
- MaterialUtils.getVoltageForTier(o + 1));
- }
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Generator_SemiFluid_LV.get(1L),
- new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_LV, 'P', ItemList.Electric_Piston_LV, 'E',
- ItemList.Electric_Motor_LV, 'C', OrePrefixes.circuit.get(Materials.Basic), 'W',
- OrePrefixes.cableGt01.get(Materials.Tin), 'G', ALLOY.TUMBAGA.getGear(2) });
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Generator_SemiFluid_MV.get(1L),
- new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_MV, 'P', ItemList.Electric_Piston_MV, 'E',
- ItemList.Electric_Motor_MV, 'C', OrePrefixes.circuit.get(Materials.Good), 'W',
- OrePrefixes.cableGt01.get(Materials.AnyCopper), 'G', ALLOY.EGLIN_STEEL.getGear(2) });
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Generator_SemiFluid_HV.get(1L),
- new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_HV, 'P', ItemList.Electric_Piston_HV, 'E',
- ItemList.Electric_Motor_HV, 'C', OrePrefixes.circuit.get(Materials.Advanced), 'W',
- OrePrefixes.cableGt01.get(Materials.Gold), 'G', ALLOY.INCONEL_625.getGear(2) });
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Generator_SemiFluid_EV.get(1L),
- new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_EV, 'P', ItemList.Electric_Piston_EV, 'E',
- ItemList.Electric_Motor_EV, 'C', OrePrefixes.circuit.get(Materials.Data), 'W',
- OrePrefixes.cableGt01.get(Materials.Aluminium), 'G', ALLOY.INCOLOY_DS.getGear(1) });
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Generator_SemiFluid_IV.get(1L),
- new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_IV, 'P', ItemList.Electric_Piston_IV, 'E',
- ItemList.Electric_Motor_IV, 'C', OrePrefixes.circuit.get(Materials.Elite), 'W',
- OrePrefixes.cableGt01.get(Materials.Tungsten), 'G', ALLOY.NITINOL_60.getGear(1) });
-
- if (CORE.ConfigSwitches.enableMultiblock_AlloyBlastSmelter) {
- // Industrial Blast Smelter
- RECIPE_IndustrialBlastSmelterController = GregtechItemList.Industrial_AlloyBlastSmelter.get(1);
- RECIPE_IndustrialBlastSmelterFrame = GregtechItemList.Casing_BlastSmelter.get(1);
- RECIPE_IndustrialBlastSmelterCoil = GregtechItemList.Casing_Coil_BlastSmelter.get(1);
-
- // Blast Smelter
- RecipeUtils.addShapedGregtechRecipe(
- "plateZirconiumCarbide",
- CI.circuitTier5,
- "plateZirconiumCarbide",
- cableTier6,
- IV_MACHINE_AlloySmelter,
- cableTier6,
- "plateZirconiumCarbide",
- CI.circuitTier5,
- "plateZirconiumCarbide",
- RECIPE_IndustrialBlastSmelterController);
- // Blast Smelter Frame Casing
- RecipeUtils.addShapedGregtechRecipe(
- "plateZirconiumCarbide",
- CI.craftingToolHammer_Hard,
- "plateZirconiumCarbide",
- "plateZirconiumCarbide",
- "frameGtZirconiumCarbide",
- "plateZirconiumCarbide",
- "plateZirconiumCarbide",
- CI.craftingToolWrench,
- "plateZirconiumCarbide",
- RECIPE_IndustrialBlastSmelterFrame);
- GT_Values.RA.addAssemblerRecipe(
- new ItemStack[] { ALLOY.ZIRCONIUM_CARBIDE.getPlate(6), ALLOY.ZIRCONIUM_CARBIDE.getFrameBox(1),
- GT_Utility.getIntegratedCircuit(1), },
- GT_Values.NF,
- RECIPE_IndustrialBlastSmelterFrame,
- 50,
- 16);
- // Blast Smelter Coil
- RecipeUtils.addShapedGregtechRecipe(
- "plateStaballoy",
- "plateStaballoy",
- "plateStaballoy",
- "frameGtStaballoy",
- CI.gearboxCasing_Tier_3,
- "frameGtStaballoy",
- "plateStaballoy",
- "plateStaballoy",
- "plateStaballoy",
- RECIPE_IndustrialBlastSmelterCoil);
- GT_Values.RA.addAssemblerRecipe(
- new ItemStack[] { ALLOY.STABALLOY.getPlate(6), ALLOY.STABALLOY.getFrameBox(2),
- CI.gearboxCasing_Tier_3, GT_Utility.getIntegratedCircuit(1), },
- GT_Values.NF,
- RECIPE_IndustrialBlastSmelterCoil,
- 50,
- 16);
- }
+ if (CORE.ConfigSwitches.enableMultiblock_MultiTank) {
+ // Industrial Multi Tank
+ // RECIPE_IndustrialMultiTankController = GregtechItemList.Industrial_MultiTank.get(1);
+ RECIPE_IndustrialMultiTankFrame = GregtechItemList.Casing_MultitankExterior.get(1);
+ // Industrial Multi Tank Casing
+ RecipeUtils.addShapedGregtechRecipe(
+ "stickGrisium",
+ "plateGrisium",
+ "stickGrisium",
+ "plateGrisium",
+ "frameGtGrisium",
+ "plateGrisium",
+ "plateGrisium",
+ "plateGrisium",
+ "plateGrisium",
+ RECIPE_IndustrialMultiTankFrame);
+ // Industrial Multi Tank
+ RecipeUtils.addShapedGregtechRecipe(
+ "pipeHugeTantalloy60",
+ "gearGrisium",
+ "pipeHugeTantalloy60",
+ CI.circuitTier4,
+ RECIPE_IndustrialMultiTankFrame,
+ CI.circuitTier4,
+ "plateDoubleGrisium",
+ "rotorGrisium",
+ "plateDoubleGrisium",
+ RECIPE_IndustrialMultiTankController);
+ }
+ // TODO
+
+ // Semi-Fluid Generators
+ ItemStack[][] aSemiFluidInputs = new ItemStack[5][10];
+ aSemiFluidInputs[0] = new ItemStack[] { CI.getNumberedBioCircuit(14), CI.getTieredMachineHull(1, 1),
+ CI.getElectricMotor(1, 2), CI.getElectricPiston(1, 2),
+ CI.getTieredComponent(OrePrefixes.cableGt01, 1, 1), CI.getTieredComponent(OrePrefixes.circuit, 1, 1),
+ CI.getGear(1, 2) };
+ aSemiFluidInputs[1] = new ItemStack[] { CI.getNumberedBioCircuit(14), CI.getTieredMachineHull(2, 1),
+ CI.getElectricMotor(2, 2), CI.getElectricPiston(2, 2),
+ CI.getTieredComponent(OrePrefixes.cableGt01, 2, 1), CI.getTieredComponent(OrePrefixes.circuit, 2, 1),
+ CI.getGear(2, 2) };
+ aSemiFluidInputs[2] = new ItemStack[] { CI.getNumberedBioCircuit(14), CI.getTieredMachineHull(3, 1),
+ CI.getElectricMotor(3, 2), CI.getElectricPiston(3, 2),
+ CI.getTieredComponent(OrePrefixes.cableGt01, 3, 1), CI.getTieredComponent(OrePrefixes.circuit, 3, 1),
+ CI.getGear(3, 2) };
+ aSemiFluidInputs[3] = new ItemStack[] { CI.getNumberedBioCircuit(14), CI.getTieredMachineHull(4, 1),
+ CI.getElectricMotor(4, 2), CI.getElectricPiston(4, 2),
+ CI.getTieredComponent(OrePrefixes.cableGt01, 4, 1), CI.getTieredComponent(OrePrefixes.circuit, 4, 1),
+ CI.getGear(4, 2) };
+ aSemiFluidInputs[4] = new ItemStack[] { CI.getNumberedBioCircuit(14), CI.getTieredMachineHull(5, 1),
+ CI.getElectricMotor(5, 2), CI.getElectricPiston(5, 2),
+ CI.getTieredComponent(OrePrefixes.cableGt01, 5, 1), CI.getTieredComponent(OrePrefixes.circuit, 5, 1),
+ CI.getGear(5, 2) };
+ FluidStack[] aSemiFluidFluidInputs = new FluidStack[] { ALLOY.POLYETHYLENE.getFluidStack(144),
+ ALLOY.POLYETHYLENE.getFluidStack(144), ALLOY.POLYETHYLENE.getFluidStack(144),
+ ALLOY.POLYETHYLENE.getFluidStack(144), ALLOY.POLYTETRAFLUOROETHYLENE.getFluidStack(144) };
+
+ // ItemUtils.simpleMetaStack("IC2:blockGenerator:7", 7, 1);
+ ItemStack[] aSemifluids = new ItemStack[] { GregtechItemList.Generator_SemiFluid_LV.get(1),
+ GregtechItemList.Generator_SemiFluid_MV.get(1), GregtechItemList.Generator_SemiFluid_HV.get(1),
+ GregtechItemList.Generator_SemiFluid_EV.get(1), GregtechItemList.Generator_SemiFluid_IV.get(1) };
+ for (int o = 0; o < 5; o++) {
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] { ItemList.Casing_Coil_Infinity.get(1), ItemList.Reactor_Coolant_Sp_6.get(4),
- ALLOY.LAURENIUM.getPlateDouble(2), CustomItemList.eM_Coil.get(1) },
- ALLOY.QUANTUM.getFluidStack(144 * 4),
- GregtechItemList.Casing_Coil_QuantumForceTransformer.get(1),
- 60 * 30,
- MaterialUtils.getVoltageForTier(6));
+ aSemiFluidInputs[o],
+ aSemiFluidFluidInputs[o],
+ aSemifluids[o],
+ 20 * 30,
+ MaterialUtils.getVoltageForTier(o + 1));
+ }
+ GT_ModHandler.addCraftingRecipe(
+ GregtechItemList.Generator_SemiFluid_LV.get(1L),
+ new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_LV, 'P', ItemList.Electric_Piston_LV, 'E',
+ ItemList.Electric_Motor_LV, 'C', OrePrefixes.circuit.get(Materials.Basic), 'W',
+ OrePrefixes.cableGt01.get(Materials.Tin), 'G', ALLOY.TUMBAGA.getGear(2) });
+ GT_ModHandler.addCraftingRecipe(
+ GregtechItemList.Generator_SemiFluid_MV.get(1L),
+ new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_MV, 'P', ItemList.Electric_Piston_MV, 'E',
+ ItemList.Electric_Motor_MV, 'C', OrePrefixes.circuit.get(Materials.Good), 'W',
+ OrePrefixes.cableGt01.get(Materials.AnyCopper), 'G', ALLOY.EGLIN_STEEL.getGear(2) });
+ GT_ModHandler.addCraftingRecipe(
+ GregtechItemList.Generator_SemiFluid_HV.get(1L),
+ new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_HV, 'P', ItemList.Electric_Piston_HV, 'E',
+ ItemList.Electric_Motor_HV, 'C', OrePrefixes.circuit.get(Materials.Advanced), 'W',
+ OrePrefixes.cableGt01.get(Materials.Gold), 'G', ALLOY.INCONEL_625.getGear(2) });
+ GT_ModHandler.addCraftingRecipe(
+ GregtechItemList.Generator_SemiFluid_EV.get(1L),
+ new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_EV, 'P', ItemList.Electric_Piston_EV, 'E',
+ ItemList.Electric_Motor_EV, 'C', OrePrefixes.circuit.get(Materials.Data), 'W',
+ OrePrefixes.cableGt01.get(Materials.Aluminium), 'G', ALLOY.INCOLOY_DS.getGear(1) });
+ GT_ModHandler.addCraftingRecipe(
+ GregtechItemList.Generator_SemiFluid_IV.get(1L),
+ new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_IV, 'P', ItemList.Electric_Piston_IV, 'E',
+ ItemList.Electric_Motor_IV, 'C', OrePrefixes.circuit.get(Materials.Elite), 'W',
+ OrePrefixes.cableGt01.get(Materials.Tungsten), 'G', ALLOY.NITINOL_60.getGear(1) });
+
+ if (CORE.ConfigSwitches.enableMultiblock_AlloyBlastSmelter) {
+ // Industrial Blast Smelter
+ RECIPE_IndustrialBlastSmelterController = GregtechItemList.Industrial_AlloyBlastSmelter.get(1);
+ RECIPE_IndustrialBlastSmelterFrame = GregtechItemList.Casing_BlastSmelter.get(1);
+ RECIPE_IndustrialBlastSmelterCoil = GregtechItemList.Casing_Coil_BlastSmelter.get(1);
+
+ // Blast Smelter
+ RecipeUtils.addShapedGregtechRecipe(
+ "plateZirconiumCarbide",
+ CI.circuitTier5,
+ "plateZirconiumCarbide",
+ cableTier6,
+ IV_MACHINE_AlloySmelter,
+ cableTier6,
+ "plateZirconiumCarbide",
+ CI.circuitTier5,
+ "plateZirconiumCarbide",
+ RECIPE_IndustrialBlastSmelterController);
+ // Blast Smelter Frame Casing
+ RecipeUtils.addShapedGregtechRecipe(
+ "plateZirconiumCarbide",
+ CI.craftingToolHammer_Hard,
+ "plateZirconiumCarbide",
+ "plateZirconiumCarbide",
+ "frameGtZirconiumCarbide",
+ "plateZirconiumCarbide",
+ "plateZirconiumCarbide",
+ CI.craftingToolWrench,
+ "plateZirconiumCarbide",
+ RECIPE_IndustrialBlastSmelterFrame);
+ GT_Values.RA.addAssemblerRecipe(
+ new ItemStack[] { ALLOY.ZIRCONIUM_CARBIDE.getPlate(6), ALLOY.ZIRCONIUM_CARBIDE.getFrameBox(1),
+ GT_Utility.getIntegratedCircuit(1), },
+ GT_Values.NF,
+ RECIPE_IndustrialBlastSmelterFrame,
+ 50,
+ 16);
+ // Blast Smelter Coil
+ RecipeUtils.addShapedGregtechRecipe(
+ "plateStaballoy",
+ "plateStaballoy",
+ "plateStaballoy",
+ "frameGtStaballoy",
+ CI.gearboxCasing_Tier_3,
+ "frameGtStaballoy",
+ "plateStaballoy",
+ "plateStaballoy",
+ "plateStaballoy",
+ RECIPE_IndustrialBlastSmelterCoil);
+ GT_Values.RA.addAssemblerRecipe(
+ new ItemStack[] { ALLOY.STABALLOY.getPlate(6), ALLOY.STABALLOY.getFrameBox(2),
+ CI.gearboxCasing_Tier_3, GT_Utility.getIntegratedCircuit(1), },
+ GT_Values.NF,
+ RECIPE_IndustrialBlastSmelterCoil,
+ 50,
+ 16);
+ }
- TT_recipeAdder.addResearchableAssemblylineRecipe(
- GregtechItemList.Casing_Coil_QuantumForceTransformer.get(1),
- 2048 * 120 * 20,
- 2048,
- (int) GT_Values.VP[11],
- 16,
- new Object[] { GregtechItemList.Controller_MolecularTransformer.get(1),
- GT_ModHandler.getModItem("eternalsingularity", "eternal_singularity", 1),
- new Object[] { OrePrefixes.circuit.get(Materials.Bio), 8 },
- ItemList.Electric_Pump_UEV.get(4), ItemList.Field_Generator_UEV.get(4),
- GregtechItemList.Laser_Lens_Special.get(1) },
- new FluidStack[] { MISC_MATERIALS.MUTATED_LIVING_SOLDER.getFluidStack(144 * 10),
- ALLOY.PIKYONIUM.getFluidStack(144 * 32) },
- GregtechItemList.QuantumForceTransformer.get(1),
- 1200 * 20,
- (int) GT_Values.VP[11]);
-
- if (CORE.ConfigSwitches.enableMultiblock_MatterFabricator) {
- // Industrial Matter Fabricator
- RECIPE_IndustrialMatterFabController = GregtechItemList.Industrial_MassFab.get(1);
- RECIPE_IndustrialMatterFabFrame = GregtechItemList.Casing_MatterFab.get(1);
- RECIPE_IndustrialMatterFabCoil = GregtechItemList.Casing_MatterGen.get(1);
-
- // Matter Fabricator CPU
- RecipeUtils.addShapedGregtechRecipe(
- CI.getPlate(8, 1),
- CI.circuitTier8,
- CI.getPlate(8, 1),
- GT_OreDictUnificator.get(OrePrefixes.cableGt04.get(Materials.NaquadahAlloy), 1L),
- CI.machineCasing_UV,
- GT_OreDictUnificator.get(OrePrefixes.cableGt04.get(Materials.NaquadahAlloy), 1L),
- CI.getPlate(8, 1),
- CI.circuitTier8,
- CI.getPlate(8, 1),
- RECIPE_IndustrialMatterFabController);
- // Matter Fabricator Frame Casing
- RecipeUtils.addShapedGregtechRecipe(
- "plateNiobiumCarbide",
- CI.component_Rod[8],
- "plateNiobiumCarbide",
- CI.component_Rod[8],
- "frameGtInconel690",
- CI.component_Rod[8],
- "plateNiobiumCarbide",
- CI.component_Rod[8],
- "plateNiobiumCarbide",
- RECIPE_IndustrialMatterFabFrame);
- GT_Values.RA.addAssemblerRecipe(
- new ItemStack[] { ALLOY.NIOBIUM_CARBIDE.getPlate(4), ALLOY.INCONEL_792.getRod(4),
- ALLOY.INCONEL_690.getFrameBox(1), GT_Utility.getIntegratedCircuit(1), },
- GT_Values.NF,
- RECIPE_IndustrialMatterFabFrame,
- 50,
- 16);
- // Matter Fabricator Coil
- RecipeUtils.addShapedGregtechRecipe(
- CI.getPlate(6, 1),
- CI.getPlate(7, 1),
- CI.getPlate(6, 1),
- "frameGtStellite",
- CI.machineCasing_UV,
- "frameGtStellite",
- CI.getPlate(6, 1),
- CI.getPlate(7, 1),
- CI.getPlate(6, 1),
- RECIPE_IndustrialMatterFabCoil);
- GT_Values.RA.addAssemblerRecipe(
- new ItemStack[] { CI.machineCasing_UV, ALLOY.ZERON_100.getPlate(4), ALLOY.PIKYONIUM.getPlate(2),
- ALLOY.STELLITE.getFrameBox(2), GT_Utility.getIntegratedCircuit(1), },
- GT_Values.NF,
- RECIPE_IndustrialMatterFabCoil,
- 50,
- 16);
- }
+ CORE.RA.addSixSlotAssemblingRecipe(
+ new ItemStack[] { ItemList.Casing_Coil_Infinity.get(1), ItemList.Reactor_Coolant_Sp_6.get(4),
+ ALLOY.LAURENIUM.getPlateDouble(2), CustomItemList.eM_Coil.get(1) },
+ ALLOY.QUANTUM.getFluidStack(144 * 4),
+ GregtechItemList.Casing_Coil_QuantumForceTransformer.get(1),
+ 60 * 30,
+ MaterialUtils.getVoltageForTier(6));
- if (CORE.ConfigSwitches.enableMultiblock_IndustrialSifter) {
- // Industrial Sieve
- RECIPE_IndustrialSieveController = GregtechItemList.Industrial_Sifter.get(1);
- RECIPE_IndustrialSieveFrame = GregtechItemList.Casing_Sifter.get(1);
- RECIPE_IndustrialSieveGrate = GregtechItemList.Casing_SifterGrate.get(1);
+ TT_recipeAdder.addResearchableAssemblylineRecipe(
+ GregtechItemList.Casing_Coil_QuantumForceTransformer.get(1),
+ 2048 * 120 * 20,
+ 2048,
+ (int) GT_Values.VP[11],
+ 16,
+ new Object[] { GregtechItemList.Controller_MolecularTransformer.get(1),
+ GT_ModHandler.getModItem("eternalsingularity", "eternal_singularity", 1),
+ new Object[] { OrePrefixes.circuit.get(Materials.Bio), 8 }, ItemList.Electric_Pump_UEV.get(4),
+ ItemList.Field_Generator_UEV.get(4), GregtechItemList.Laser_Lens_Special.get(1) },
+ new FluidStack[] { MISC_MATERIALS.MUTATED_LIVING_SOLDER.getFluidStack(144 * 10),
+ ALLOY.PIKYONIUM.getFluidStack(144 * 32) },
+ GregtechItemList.QuantumForceTransformer.get(1),
+ 1200 * 20,
+ (int) GT_Values.VP[11]);
+
+ if (CORE.ConfigSwitches.enableMultiblock_MatterFabricator) {
+ // Industrial Matter Fabricator
+ RECIPE_IndustrialMatterFabController = GregtechItemList.Industrial_MassFab.get(1);
+ RECIPE_IndustrialMatterFabFrame = GregtechItemList.Casing_MatterFab.get(1);
+ RECIPE_IndustrialMatterFabCoil = GregtechItemList.Casing_MatterGen.get(1);
+
+ // Matter Fabricator CPU
+ RecipeUtils.addShapedGregtechRecipe(
+ CI.getPlate(8, 1),
+ CI.circuitTier8,
+ CI.getPlate(8, 1),
+ GT_OreDictUnificator.get(OrePrefixes.cableGt04.get(Materials.NaquadahAlloy), 1L),
+ CI.machineCasing_UV,
+ GT_OreDictUnificator.get(OrePrefixes.cableGt04.get(Materials.NaquadahAlloy), 1L),
+ CI.getPlate(8, 1),
+ CI.circuitTier8,
+ CI.getPlate(8, 1),
+ RECIPE_IndustrialMatterFabController);
+ // Matter Fabricator Frame Casing
+ RecipeUtils.addShapedGregtechRecipe(
+ "plateNiobiumCarbide",
+ CI.component_Rod[8],
+ "plateNiobiumCarbide",
+ CI.component_Rod[8],
+ "frameGtInconel690",
+ CI.component_Rod[8],
+ "plateNiobiumCarbide",
+ CI.component_Rod[8],
+ "plateNiobiumCarbide",
+ RECIPE_IndustrialMatterFabFrame);
+ GT_Values.RA.addAssemblerRecipe(
+ new ItemStack[] { ALLOY.NIOBIUM_CARBIDE.getPlate(4), ALLOY.INCONEL_792.getRod(4),
+ ALLOY.INCONEL_690.getFrameBox(1), GT_Utility.getIntegratedCircuit(1), },
+ GT_Values.NF,
+ RECIPE_IndustrialMatterFabFrame,
+ 50,
+ 16);
+ // Matter Fabricator Coil
+ RecipeUtils.addShapedGregtechRecipe(
+ CI.getPlate(6, 1),
+ CI.getPlate(7, 1),
+ CI.getPlate(6, 1),
+ "frameGtStellite",
+ CI.machineCasing_UV,
+ "frameGtStellite",
+ CI.getPlate(6, 1),
+ CI.getPlate(7, 1),
+ CI.getPlate(6, 1),
+ RECIPE_IndustrialMatterFabCoil);
+ GT_Values.RA.addAssemblerRecipe(
+ new ItemStack[] { CI.machineCasing_UV, ALLOY.ZERON_100.getPlate(4), ALLOY.PIKYONIUM.getPlate(2),
+ ALLOY.STELLITE.getFrameBox(2), GT_Utility.getIntegratedCircuit(1), },
+ GT_Values.NF,
+ RECIPE_IndustrialMatterFabCoil,
+ 50,
+ 16);
+ }
- // Industrial Sieve
- RecipeUtils.addShapedGregtechRecipe(
- "plateEglinSteel",
- CI.circuitTier3,
- "plateEglinSteel",
- cableTier4,
- HV_MACHINE_Sifter,
- cableTier4,
- "plateEglinSteel",
- CI.circuitTier3,
- "plateEglinSteel",
- RECIPE_IndustrialSieveController);
- // Industrial Sieve Casing
- RecipeUtils.addShapedGregtechRecipe(
- "plateEglinSteel",
- "plateEglinSteel",
- "plateEglinSteel",
- "plateEglinSteel",
- "frameGtTumbaga",
- "plateEglinSteel",
- "plateEglinSteel",
- "plateEglinSteel",
- "plateEglinSteel",
- RECIPE_IndustrialSieveFrame);
- GT_Values.RA.addAssemblerRecipe(
- new ItemStack[] { ALLOY.EGLIN_STEEL.getPlate(8), ALLOY.TUMBAGA.getFrameBox(1),
- GT_Utility.getIntegratedCircuit(1), },
- GT_Values.NF,
- RECIPE_IndustrialSieveFrame,
- 50,
- 16);
- // Industrial Sieve Grate
- RecipeUtils.addShapedGregtechRecipe(
- "frameGtEglinSteel",
- "wireFineSteel",
- "frameGtEglinSteel",
- "wireFineSteel",
- "wireFineSteel",
- "wireFineSteel",
- "frameGtEglinSteel",
- "wireFineSteel",
- "frameGtEglinSteel",
- RECIPE_IndustrialSieveGrate);
- GT_Values.RA.addAssemblerRecipe(
- new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Steel, 5),
- ALLOY.EGLIN_STEEL.getFrameBox(4), GT_Utility.getIntegratedCircuit(1), },
- GT_Values.NF,
- RECIPE_IndustrialSieveGrate,
- 50,
- 16);
- }
+ if (CORE.ConfigSwitches.enableMultiblock_IndustrialSifter) {
+ // Industrial Sieve
+ RECIPE_IndustrialSieveController = GregtechItemList.Industrial_Sifter.get(1);
+ RECIPE_IndustrialSieveFrame = GregtechItemList.Casing_Sifter.get(1);
+ RECIPE_IndustrialSieveGrate = GregtechItemList.Casing_SifterGrate.get(1);
- if (CORE.ConfigSwitches.enableMultiblock_TreeFarmer) {
- // Industrial Tree Farmer
- RECIPE_TreeFarmController = GregtechItemList.Industrial_TreeFarm.get(1);
- RECIPE_TreeFarmFrame = GregtechItemList.Casing_PLACEHOLDER_TreeFarmer.get(1);
- // Industrial Tree Farm Controller
- RecipeUtils.addShapedGregtechRecipe(
- ItemList.Field_Generator_IV.get(1),
- ALLOY.INCOLOY_MA956.getRotor(1),
- ItemList.Field_Generator_IV.get(1),
- ALLOY.NITINOL_60.getPlate(1),
- GregtechItemList.GTPP_Casing_IV.get(1),
- ALLOY.NITINOL_60.getPlate(1),
- ItemList.Field_Generator_IV.get(1),
- ALLOY.INCONEL_792.getComponentByPrefix(OrePrefixes.pipeMedium, 1),
- ItemList.Field_Generator_IV.get(1),
- RECIPE_TreeFarmController);
- // Industrial Tree Farm Frame
- GT_Values.RA.addAssemblerRecipe(
- new ItemStack[] { GT_Utility.getIntegratedCircuit(2), ALLOY.TUMBAGA.getFrameBox(1),
- ItemUtils.getItemStackOfAmountFromOreDict("pipeTinySteel", 1), ItemList.MV_Coil.get(1),
- ItemList.IC2_Plantball.get(4),
- GT_OreDictUnificator.get(OrePrefixes.plank, Materials.Wood, 8), },
- GT_ModHandler.getDistilledWater(2000),
- RECIPE_TreeFarmFrame,
- 200,
- 64);
- }
+ // Industrial Sieve
+ RecipeUtils.addShapedGregtechRecipe(
+ "plateEglinSteel",
+ CI.circuitTier3,
+ "plateEglinSteel",
+ cableTier4,
+ HV_MACHINE_Sifter,
+ cableTier4,
+ "plateEglinSteel",
+ CI.circuitTier3,
+ "plateEglinSteel",
+ RECIPE_IndustrialSieveController);
+ // Industrial Sieve Casing
+ RecipeUtils.addShapedGregtechRecipe(
+ "plateEglinSteel",
+ "plateEglinSteel",
+ "plateEglinSteel",
+ "plateEglinSteel",
+ "frameGtTumbaga",
+ "plateEglinSteel",
+ "plateEglinSteel",
+ "plateEglinSteel",
+ "plateEglinSteel",
+ RECIPE_IndustrialSieveFrame);
+ GT_Values.RA.addAssemblerRecipe(
+ new ItemStack[] { ALLOY.EGLIN_STEEL.getPlate(8), ALLOY.TUMBAGA.getFrameBox(1),
+ GT_Utility.getIntegratedCircuit(1), },
+ GT_Values.NF,
+ RECIPE_IndustrialSieveFrame,
+ 50,
+ 16);
+ // Industrial Sieve Grate
+ RecipeUtils.addShapedGregtechRecipe(
+ "frameGtEglinSteel",
+ "wireFineSteel",
+ "frameGtEglinSteel",
+ "wireFineSteel",
+ "wireFineSteel",
+ "wireFineSteel",
+ "frameGtEglinSteel",
+ "wireFineSteel",
+ "frameGtEglinSteel",
+ RECIPE_IndustrialSieveGrate);
+ GT_Values.RA.addAssemblerRecipe(
+ new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Steel, 5),
+ ALLOY.EGLIN_STEEL.getFrameBox(4), GT_Utility.getIntegratedCircuit(1), },
+ GT_Values.NF,
+ RECIPE_IndustrialSieveGrate,
+ 50,
+ 16);
+ }
- if (CORE.ConfigSwitches.enableMachine_Tesseracts) {
- // Tesseracts
- RECIPE_TesseractGenerator = GregtechItemList.GT4_Tesseract_Generator.get(1);
- RECIPE_TesseractTerminal = GregtechItemList.GT4_Tesseract_Terminal.get(1);
- // Tesseract Generator
- RecipeUtils.addShapedGregtechRecipe(
- "plateTitanium",
- "circuitMaster",
- "plateTitanium",
- "circuitMaster",
- ItemUtils.getSimpleStack(Blocks.ender_chest),
- "circuitMaster",
- "plateTitanium",
- GregtechItemList.Gregtech_Computer_Cube.get(1),
- "plateTitanium",
- RECIPE_TesseractGenerator);
- // Tesseract Terminal
- RecipeUtils.addShapedGregtechRecipe(
- "plateTitanium",
- "circuitElite",
- "plateTitanium",
- "circuitElite",
- ItemUtils.getSimpleStack(Blocks.ender_chest),
- "circuitElite",
- "plateTitanium",
- CI.machineHull_EV,
- "plateTitanium",
- RECIPE_TesseractTerminal);
- }
+ if (CORE.ConfigSwitches.enableMultiblock_TreeFarmer) {
+ // Industrial Tree Farmer
+ RECIPE_TreeFarmController = GregtechItemList.Industrial_TreeFarm.get(1);
+ RECIPE_TreeFarmFrame = GregtechItemList.Casing_PLACEHOLDER_TreeFarmer.get(1);
+ // Industrial Tree Farm Controller
+ RecipeUtils.addShapedGregtechRecipe(
+ ItemList.Field_Generator_IV.get(1),
+ ALLOY.INCOLOY_MA956.getRotor(1),
+ ItemList.Field_Generator_IV.get(1),
+ ALLOY.NITINOL_60.getPlate(1),
+ GregtechItemList.GTPP_Casing_IV.get(1),
+ ALLOY.NITINOL_60.getPlate(1),
+ ItemList.Field_Generator_IV.get(1),
+ ALLOY.INCONEL_792.getComponentByPrefix(OrePrefixes.pipeMedium, 1),
+ ItemList.Field_Generator_IV.get(1),
+ RECIPE_TreeFarmController);
+ // Industrial Tree Farm Frame
+ GT_Values.RA.addAssemblerRecipe(
+ new ItemStack[] { GT_Utility.getIntegratedCircuit(2), ALLOY.TUMBAGA.getFrameBox(1),
+ ItemUtils.getItemStackOfAmountFromOreDict("pipeTinySteel", 1), ItemList.MV_Coil.get(1),
+ ItemList.IC2_Plantball.get(4),
+ GT_OreDictUnificator.get(OrePrefixes.plank, Materials.Wood, 8), },
+ GT_ModHandler.getDistilledWater(2000),
+ RECIPE_TreeFarmFrame,
+ 200,
+ 64);
+ }
- if (CORE.ConfigSwitches.enableMachine_SimpleWasher) {
- ItemStack plateWrought = ItemUtils.getItemStackOfAmountFromOreDict("plateWroughtIron", 1);
- ItemStack washerPipe;
-
- if (CORE.ConfigSwitches.enableCustom_Pipes) {
- washerPipe = ItemUtils.getItemStackOfAmountFromOreDict("pipeLargeClay", 1);
- RecipeUtils.addShapedGregtechRecipe(
- plateWrought,
- CI.electricPump_LV,
- plateWrought,
- plateWrought,
- washerPipe,
- plateWrought,
- plateWrought,
- CI.machineCasing_ULV,
- plateWrought,
- GregtechItemList.SimpleDustWasher_ULV.get(1));
- }
- // Add Recipe
- washerPipe = ItemUtils.getItemStackOfAmountFromOreDict("pipeLargeCopper", 1);
+ if (CORE.ConfigSwitches.enableMachine_Tesseracts) {
+ // Tesseracts
+ RECIPE_TesseractGenerator = GregtechItemList.GT4_Tesseract_Generator.get(1);
+ RECIPE_TesseractTerminal = GregtechItemList.GT4_Tesseract_Terminal.get(1);
+ // Tesseract Generator
+ RecipeUtils.addShapedGregtechRecipe(
+ "plateTitanium",
+ "circuitMaster",
+ "plateTitanium",
+ "circuitMaster",
+ ItemUtils.getSimpleStack(Blocks.ender_chest),
+ "circuitMaster",
+ "plateTitanium",
+ GregtechItemList.Gregtech_Computer_Cube.get(1),
+ "plateTitanium",
+ RECIPE_TesseractGenerator);
+ // Tesseract Terminal
+ RecipeUtils.addShapedGregtechRecipe(
+ "plateTitanium",
+ "circuitElite",
+ "plateTitanium",
+ "circuitElite",
+ ItemUtils.getSimpleStack(Blocks.ender_chest),
+ "circuitElite",
+ "plateTitanium",
+ CI.machineHull_EV,
+ "plateTitanium",
+ RECIPE_TesseractTerminal);
+ }
+
+ if (CORE.ConfigSwitches.enableMachine_SimpleWasher) {
+ ItemStack plateWrought = ItemUtils.getItemStackOfAmountFromOreDict("plateWroughtIron", 1);
+ ItemStack washerPipe;
+
+ if (CORE.ConfigSwitches.enableCustom_Pipes) {
+ washerPipe = ItemUtils.getItemStackOfAmountFromOreDict("pipeLargeClay", 1);
RecipeUtils.addShapedGregtechRecipe(
plateWrought,
CI.electricPump_LV,
@@ -2039,995 +2016,986 @@ public class RECIPES_Machines {
CI.machineCasing_ULV,
plateWrought,
GregtechItemList.SimpleDustWasher_ULV.get(1));
-
- int aSimpleWasherTier = 2;
- int aSlot = 0;
- ItemStack[][] aInputsForSimpleWashers = new ItemStack[4][6];
-
- aInputsForSimpleWashers[0] = new ItemStack[] { CI.getTieredMachineHull(2),
- CI.getTieredComponent(OrePrefixes.screw, 2, 8), CI.getTieredComponent(OrePrefixes.plate, 1, 4),
- CI.getTieredComponent(OrePrefixes.rod, 2, 2),
- CI.getTieredComponent(OrePrefixes.circuit, 2, 1), };
- aInputsForSimpleWashers[1] = new ItemStack[] { CI.getTieredMachineHull(4),
- CI.getTieredComponent(OrePrefixes.screw, 4, 12), CI.getTieredComponent(OrePrefixes.plate, 3, 6),
- CI.getTieredComponent(OrePrefixes.rod, 4, 3),
- CI.getTieredComponent(OrePrefixes.circuit, 4, 2), };
- aInputsForSimpleWashers[2] = new ItemStack[] { CI.getTieredMachineHull(6),
- CI.getTieredComponent(OrePrefixes.screw, 6, 24), CI.getTieredComponent(OrePrefixes.plate, 5, 8),
- CI.getTieredComponent(OrePrefixes.rod, 6, 4),
- CI.getTieredComponent(OrePrefixes.circuit, 6, 3), };
- aInputsForSimpleWashers[3] = new ItemStack[] { CI.getTieredMachineHull(8),
- CI.getTieredComponent(OrePrefixes.screw, 8, 32),
- CI.getTieredComponent(OrePrefixes.plate, 7, 16), CI.getTieredComponent(OrePrefixes.rod, 8, 5),
- CI.getTieredComponent(OrePrefixes.circuit, 8, 4), };
-
- ItemStack[] aSimpleWashers = new ItemStack[] { GregtechItemList.SimpleDustWasher_MV.get(1),
- GregtechItemList.SimpleDustWasher_EV.get(1), GregtechItemList.SimpleDustWasher_LuV.get(1),
- GregtechItemList.SimpleDustWasher_UV.get(1) };
- for (int i = 0; i < 4; i++) {
-
- CORE.RA.addSixSlotAssemblingRecipe(
- aInputsForSimpleWashers[aSlot],
- CI.getTieredFluid(aSimpleWasherTier, 144 * aSimpleWasherTier),
- aSimpleWashers[aSlot],
- 20 * 15 * aSimpleWasherTier,
- (int) GT_Values.V[aSimpleWasherTier]);
-
- aSimpleWasherTier += 2;
- aSlot++;
- }
}
+ // Add Recipe
+ washerPipe = ItemUtils.getItemStackOfAmountFromOreDict("pipeLargeCopper", 1);
+ RecipeUtils.addShapedGregtechRecipe(
+ plateWrought,
+ CI.electricPump_LV,
+ plateWrought,
+ plateWrought,
+ washerPipe,
+ plateWrought,
+ plateWrought,
+ CI.machineCasing_ULV,
+ plateWrought,
+ GregtechItemList.SimpleDustWasher_ULV.get(1));
+
+ int aSimpleWasherTier = 2;
+ int aSlot = 0;
+ ItemStack[][] aInputsForSimpleWashers = new ItemStack[4][6];
+
+ aInputsForSimpleWashers[0] = new ItemStack[] { CI.getTieredMachineHull(2),
+ CI.getTieredComponent(OrePrefixes.screw, 2, 8), CI.getTieredComponent(OrePrefixes.plate, 1, 4),
+ CI.getTieredComponent(OrePrefixes.rod, 2, 2), CI.getTieredComponent(OrePrefixes.circuit, 2, 1), };
+ aInputsForSimpleWashers[1] = new ItemStack[] { CI.getTieredMachineHull(4),
+ CI.getTieredComponent(OrePrefixes.screw, 4, 12), CI.getTieredComponent(OrePrefixes.plate, 3, 6),
+ CI.getTieredComponent(OrePrefixes.rod, 4, 3), CI.getTieredComponent(OrePrefixes.circuit, 4, 2), };
+ aInputsForSimpleWashers[2] = new ItemStack[] { CI.getTieredMachineHull(6),
+ CI.getTieredComponent(OrePrefixes.screw, 6, 24), CI.getTieredComponent(OrePrefixes.plate, 5, 8),
+ CI.getTieredComponent(OrePrefixes.rod, 6, 4), CI.getTieredComponent(OrePrefixes.circuit, 6, 3), };
+ aInputsForSimpleWashers[3] = new ItemStack[] { CI.getTieredMachineHull(8),
+ CI.getTieredComponent(OrePrefixes.screw, 8, 32), CI.getTieredComponent(OrePrefixes.plate, 7, 16),
+ CI.getTieredComponent(OrePrefixes.rod, 8, 5), CI.getTieredComponent(OrePrefixes.circuit, 8, 4), };
+
+ ItemStack[] aSimpleWashers = new ItemStack[] { GregtechItemList.SimpleDustWasher_MV.get(1),
+ GregtechItemList.SimpleDustWasher_EV.get(1), GregtechItemList.SimpleDustWasher_LuV.get(1),
+ GregtechItemList.SimpleDustWasher_UV.get(1) };
+ for (int i = 0; i < 4; i++) {
- if (CORE.ConfigSwitches.enableMachine_Pollution && PollutionUtils.isPollutionEnabled()) {
-
- RecipeUtils.addShapedGregtechRecipe(
- "plateCarbon",
- "plateCarbon",
- "plateCarbon",
- "dustCarbon",
- "dustCarbon",
- "dustCarbon",
- "plateCarbon",
- "plateCarbon",
- "plateCarbon",
- ItemUtils.simpleMetaStack(ModItems.itemAirFilter, 0, 1));
-
- RecipeUtils.addShapedGregtechRecipe(
- "plateCarbon",
- "plateCarbon",
- "plateCarbon",
- "cellLithiumPeroxide",
- "dustCarbon",
- "cellLithiumPeroxide",
- "plateCarbon",
- "plateCarbon",
- "plateCarbon",
- ItemUtils.simpleMetaStack(ModItems.itemAirFilter, 1, 1));
-
- // Pollution Detector
- RecipeUtils.addShapedGregtechRecipe(
- "plateSteel",
- CI.sensor_LV,
- "plateSteel",
- "plateSteel",
- CI.electricMotor_LV,
- "plateSteel",
- CI.getTieredCircuit(1),
- CI.machineHull_LV,
- CI.getTieredCircuit(1),
- GregtechItemList.Pollution_Detector.get(1));
-
- // ULV
- RecipeUtils.addShapedGregtechRecipe(
- CI.component_Plate[0],
- ItemUtils.simpleMetaStack(ModItems.itemAirFilter, 0, 1),
- CI.component_Plate[0],
- CI.component_Plate[0],
- CI.electricMotor_ULV,
- CI.component_Plate[0],
- CI.getTieredCircuit(0),
- CI.machineHull_ULV,
- CI.getTieredCircuit(0),
- GregtechItemList.Pollution_Cleaner_ULV.get(1));
- // LV
- RecipeUtils.addShapedGregtechRecipe(
- CI.component_Plate[1],
- ItemUtils.simpleMetaStack(ModItems.itemAirFilter, 0, 1),
- CI.component_Plate[1],
- CI.component_Plate[1],
- CI.electricMotor_LV,
- CI.component_Plate[1],
- CI.getTieredCircuit(1),
- CI.machineHull_LV,
- CI.getTieredCircuit(1),
- GregtechItemList.Pollution_Cleaner_LV.get(1));
- // MV
- RecipeUtils.addShapedGregtechRecipe(
- CI.component_Plate[2],
- ItemUtils.simpleMetaStack(ModItems.itemAirFilter, 0, 1),
- CI.component_Plate[2],
- CI.component_Plate[2],
- CI.electricMotor_MV,
- CI.component_Plate[2],
- CI.getTieredCircuit(2),
- CI.machineHull_MV,
- CI.getTieredCircuit(2),
- GregtechItemList.Pollution_Cleaner_MV.get(1));
- // HV
- RecipeUtils.addShapedGregtechRecipe(
- CI.component_Plate[3],
- ItemUtils.simpleMetaStack(ModItems.itemAirFilter, 0, 1),
- CI.component_Plate[3],
- CI.component_Plate[3],
- CI.electricMotor_HV,
- CI.component_Plate[3],
- CI.getTieredCircuit(3),
- CI.machineHull_HV,
- CI.getTieredCircuit(3),
- GregtechItemList.Pollution_Cleaner_HV.get(1));
- // EV
- RecipeUtils.addShapedGregtechRecipe(
- CI.component_Plate[4],
- ItemUtils.simpleMetaStack(ModItems.itemAirFilter, 0, 1),
- CI.component_Plate[4],
- CI.component_Plate[4],
- CI.electricMotor_EV,
- CI.component_Plate[4],
- CI.getTieredCircuit(4),
- CI.machineHull_EV,
- CI.getTieredCircuit(4),
- GregtechItemList.Pollution_Cleaner_EV.get(1));
- // IV
- RecipeUtils.addShapedGregtechRecipe(
- CI.component_Plate[5],
- ItemUtils.simpleMetaStack(ModItems.itemAirFilter, 1, 1),
- CI.component_Plate[5],
- CI.component_Plate[5],
- CI.electricMotor_IV,
- CI.component_Plate[5],
- CI.getTieredCircuit(5),
- CI.machineHull_IV,
- CI.getTieredCircuit(5),
- GregtechItemList.Pollution_Cleaner_IV.get(1));
- // LuV
- RecipeUtils.addShapedGregtechRecipe(
- CI.component_Plate[6],
- ItemUtils.simpleMetaStack(ModItems.itemAirFilter, 1, 1),
- CI.component_Plate[6],
- CI.component_Plate[6],
- CI.electricMotor_LuV,
- CI.component_Plate[6],
- CI.getTieredCircuit(6),
- CI.machineHull_LuV,
- CI.getTieredCircuit(6),
- GregtechItemList.Pollution_Cleaner_LuV.get(1));
- // ZPM
- RecipeUtils.addShapedGregtechRecipe(
- CI.component_Plate[7],
- ItemUtils.simpleMetaStack(ModItems.itemAirFilter, 1, 1),
- CI.component_Plate[7],
- CI.component_Plate[7],
- CI.electricMotor_ZPM,
- CI.component_Plate[7],
- CI.getTieredCircuit(7),
- CI.machineHull_ZPM,
- CI.getTieredCircuit(7),
- GregtechItemList.Pollution_Cleaner_ZPM.get(1));
- // UV
- RecipeUtils.addShapedGregtechRecipe(
- CI.component_Plate[8],
- ItemUtils.simpleMetaStack(ModItems.itemAirFilter, 1, 1),
- CI.component_Plate[8],
- CI.component_Plate[8],
- CI.electricMotor_UV,
- CI.component_Plate[8],
- CI.getTieredCircuit(8),
- CI.machineHull_UV,
- CI.getTieredCircuit(8),
- GregtechItemList.Pollution_Cleaner_UV.get(1));
- // MAX
- RecipeUtils.addShapedGregtechRecipe(
- CI.component_Plate[9],
- ItemUtils.simpleMetaStack(ModItems.itemAirFilter, 1, 1),
- CI.component_Plate[9],
- CI.component_Plate[9],
- CI.electricMotor_MAX,
- CI.component_Plate[9],
- CI.getTieredCircuit(9),
- CI.machineHull_MAX,
- CI.getTieredCircuit(9),
- GregtechItemList.Pollution_Cleaner_MAX.get(1));
+ CORE.RA.addSixSlotAssemblingRecipe(
+ aInputsForSimpleWashers[aSlot],
+ CI.getTieredFluid(aSimpleWasherTier, 144 * aSimpleWasherTier),
+ aSimpleWashers[aSlot],
+ 20 * 15 * aSimpleWasherTier,
+ (int) GT_Values.V[aSimpleWasherTier]);
+
+ aSimpleWasherTier += 2;
+ aSlot++;
}
+ }
- if (CORE.ConfigSwitches.enableMultiblock_ThermalBoiler) {
- RECIPE_ThermalBoilerController = GregtechItemList.GT4_Thermal_Boiler.get(1);
- RECIPE_ThermalBoilerCasing = GregtechItemList.Casing_ThermalContainment.get(2);
- ItemStack centrifugeEV = ItemList.Machine_EV_Centrifuge.get(1);
-
- RecipeUtils.addShapedGregtechRecipe(
- "craftingGeothermalGenerator",
- centrifugeEV,
- "craftingGeothermalGenerator",
- "gearGtTitanium",
- CI.getTieredCircuitOreDictName(6),
- "gearGtTitanium",
- "craftingGeothermalGenerator",
- centrifugeEV,
- "craftingGeothermalGenerator",
- RECIPE_ThermalBoilerController);
-
- RecipeUtils.addShapedGregtechRecipe(
- "craftingGeothermalGenerator",
- centrifugeEV,
- "craftingGeothermalGenerator",
- "gearGtTungstenSteel",
- CI.getTieredCircuitOreDictName(5),
- "gearGtTungstenSteel",
- "craftingGeothermalGenerator",
- centrifugeEV,
- "craftingGeothermalGenerator",
- RECIPE_ThermalBoilerController);
+ if (CORE.ConfigSwitches.enableMachine_Pollution && PollutionUtils.isPollutionEnabled()) {
- RecipeUtils.addShapedGregtechRecipe(
- ALLOY.MARAGING350.getPlate(1),
- "plateStainlessSteel",
- ALLOY.MARAGING350.getPlate(1),
- "circuitAdvanced",
- CI.machineCasing_HV,
- "circuitAdvanced",
- ALLOY.MARAGING350.getPlate(1),
- ALLOY.MARAGING350.getPlate(1),
- ALLOY.MARAGING350.getPlate(1),
- RECIPE_ThermalBoilerCasing);
-
- // Lava Filter Recipe
- CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] { CI.getNumberedCircuit(18),
- ItemUtils.getItemStackOfAmountFromOreDict("dustCarbon", 32),
- ItemUtils.getItemStackOfAmountFromOreDict("wireFineSteel", 32),
- ItemUtils.getItemStackOfAmountFromOreDict("ringTumbaga", 16),
- ItemUtils.getItemStackOfAmountFromOreDict("foilCopper", 4),
- ItemUtils.getItemStackWithMeta(
- LoadedMods.IndustrialCraft2,
- "IC2:itemPartCarbonMesh",
- "RawCarbonMesh",
- 0,
- 64), },
- CI.getTieredFluid(3, 144),
- ItemUtils.getSimpleStack(ModItems.itemLavaFilter, 16),
- 1600,
- 240);
- }
+ RecipeUtils.addShapedGregtechRecipe(
+ "plateCarbon",
+ "plateCarbon",
+ "plateCarbon",
+ "dustCarbon",
+ "dustCarbon",
+ "dustCarbon",
+ "plateCarbon",
+ "plateCarbon",
+ "plateCarbon",
+ ItemUtils.simpleMetaStack(ModItems.itemAirFilter, 0, 1));
- // Air Intake Hatch
- ItemList FluidRegulator_IV = ItemUtils.getValueOfItemList("FluidRegulator_IV", ItemList.Pump_IV);
- ItemStack aTieredFluidRegulator = CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK ? FluidRegulator_IV.get(1)
- : ItemList.Pump_IV.get(1);
+ RecipeUtils.addShapedGregtechRecipe(
+ "plateCarbon",
+ "plateCarbon",
+ "plateCarbon",
+ "cellLithiumPeroxide",
+ "dustCarbon",
+ "cellLithiumPeroxide",
+ "plateCarbon",
+ "plateCarbon",
+ "plateCarbon",
+ ItemUtils.simpleMetaStack(ModItems.itemAirFilter, 1, 1));
+
+ // Pollution Detector
+ RecipeUtils.addShapedGregtechRecipe(
+ "plateSteel",
+ CI.sensor_LV,
+ "plateSteel",
+ "plateSteel",
+ CI.electricMotor_LV,
+ "plateSteel",
+ CI.getTieredCircuit(1),
+ CI.machineHull_LV,
+ CI.getTieredCircuit(1),
+ GregtechItemList.Pollution_Detector.get(1));
+
+ // ULV
+ RecipeUtils.addShapedGregtechRecipe(
+ CI.component_Plate[0],
+ ItemUtils.simpleMetaStack(ModItems.itemAirFilter, 0, 1),
+ CI.component_Plate[0],
+ CI.component_Plate[0],
+ CI.electricMotor_ULV,
+ CI.component_Plate[0],
+ CI.getTieredCircuit(0),
+ CI.machineHull_ULV,
+ CI.getTieredCircuit(0),
+ GregtechItemList.Pollution_Cleaner_ULV.get(1));
+ // LV
+ RecipeUtils.addShapedGregtechRecipe(
+ CI.component_Plate[1],
+ ItemUtils.simpleMetaStack(ModItems.itemAirFilter, 0, 1),
+ CI.component_Plate[1],
+ CI.component_Plate[1],
+ CI.electricMotor_LV,
+ CI.component_Plate[1],
+ CI.getTieredCircuit(1),
+ CI.machineHull_LV,
+ CI.getTieredCircuit(1),
+ GregtechItemList.Pollution_Cleaner_LV.get(1));
+ // MV
+ RecipeUtils.addShapedGregtechRecipe(
+ CI.component_Plate[2],
+ ItemUtils.simpleMetaStack(ModItems.itemAirFilter, 0, 1),
+ CI.component_Plate[2],
+ CI.component_Plate[2],
+ CI.electricMotor_MV,
+ CI.component_Plate[2],
+ CI.getTieredCircuit(2),
+ CI.machineHull_MV,
+ CI.getTieredCircuit(2),
+ GregtechItemList.Pollution_Cleaner_MV.get(1));
+ // HV
+ RecipeUtils.addShapedGregtechRecipe(
+ CI.component_Plate[3],
+ ItemUtils.simpleMetaStack(ModItems.itemAirFilter, 0, 1),
+ CI.component_Plate[3],
+ CI.component_Plate[3],
+ CI.electricMotor_HV,
+ CI.component_Plate[3],
+ CI.getTieredCircuit(3),
+ CI.machineHull_HV,
+ CI.getTieredCircuit(3),
+ GregtechItemList.Pollution_Cleaner_HV.get(1));
+ // EV
+ RecipeUtils.addShapedGregtechRecipe(
+ CI.component_Plate[4],
+ ItemUtils.simpleMetaStack(ModItems.itemAirFilter, 0, 1),
+ CI.component_Plate[4],
+ CI.component_Plate[4],
+ CI.electricMotor_EV,
+ CI.component_Plate[4],
+ CI.getTieredCircuit(4),
+ CI.machineHull_EV,
+ CI.getTieredCircuit(4),
+ GregtechItemList.Pollution_Cleaner_EV.get(1));
+ // IV
+ RecipeUtils.addShapedGregtechRecipe(
+ CI.component_Plate[5],
+ ItemUtils.simpleMetaStack(ModItems.itemAirFilter, 1, 1),
+ CI.component_Plate[5],
+ CI.component_Plate[5],
+ CI.electricMotor_IV,
+ CI.component_Plate[5],
+ CI.getTieredCircuit(5),
+ CI.machineHull_IV,
+ CI.getTieredCircuit(5),
+ GregtechItemList.Pollution_Cleaner_IV.get(1));
+ // LuV
RecipeUtils.addShapedGregtechRecipe(
CI.component_Plate[6],
- ItemList.Casing_Grate.get(1),
+ ItemUtils.simpleMetaStack(ModItems.itemAirFilter, 1, 1),
CI.component_Plate[6],
CI.component_Plate[6],
- CI.getFluidRegulator(5, 1),
+ CI.electricMotor_LuV,
CI.component_Plate[6],
- CI.getTieredCircuit(5),
- ItemList.Hatch_Input_IV.get(1),
- CI.getTieredCircuit(5),
- GregtechItemList.Hatch_Air_Intake.get(1));
+ CI.getTieredCircuit(6),
+ CI.machineHull_LuV,
+ CI.getTieredCircuit(6),
+ GregtechItemList.Pollution_Cleaner_LuV.get(1));
+ // ZPM
+ RecipeUtils.addShapedGregtechRecipe(
+ CI.component_Plate[7],
+ ItemUtils.simpleMetaStack(ModItems.itemAirFilter, 1, 1),
+ CI.component_Plate[7],
+ CI.component_Plate[7],
+ CI.electricMotor_ZPM,
+ CI.component_Plate[7],
+ CI.getTieredCircuit(7),
+ CI.machineHull_ZPM,
+ CI.getTieredCircuit(7),
+ GregtechItemList.Pollution_Cleaner_ZPM.get(1));
+ // UV
+ RecipeUtils.addShapedGregtechRecipe(
+ CI.component_Plate[8],
+ ItemUtils.simpleMetaStack(ModItems.itemAirFilter, 1, 1),
+ CI.component_Plate[8],
+ CI.component_Plate[8],
+ CI.electricMotor_UV,
+ CI.component_Plate[8],
+ CI.getTieredCircuit(8),
+ CI.machineHull_UV,
+ CI.getTieredCircuit(8),
+ GregtechItemList.Pollution_Cleaner_UV.get(1));
+ // MAX
+ RecipeUtils.addShapedGregtechRecipe(
+ CI.component_Plate[9],
+ ItemUtils.simpleMetaStack(ModItems.itemAirFilter, 1, 1),
+ CI.component_Plate[9],
+ CI.component_Plate[9],
+ CI.electricMotor_MAX,
+ CI.component_Plate[9],
+ CI.getTieredCircuit(9),
+ CI.machineHull_MAX,
+ CI.getTieredCircuit(9),
+ GregtechItemList.Pollution_Cleaner_MAX.get(1));
+ }
+
+ if (CORE.ConfigSwitches.enableMultiblock_ThermalBoiler) {
+ RECIPE_ThermalBoilerController = GregtechItemList.GT4_Thermal_Boiler.get(1);
+ RECIPE_ThermalBoilerCasing = GregtechItemList.Casing_ThermalContainment.get(2);
+ ItemStack centrifugeEV = ItemList.Machine_EV_Centrifuge.get(1);
+
+ RecipeUtils.addShapedGregtechRecipe(
+ "craftingGeothermalGenerator",
+ centrifugeEV,
+ "craftingGeothermalGenerator",
+ "gearGtTitanium",
+ CI.getTieredCircuitOreDictName(6),
+ "gearGtTitanium",
+ "craftingGeothermalGenerator",
+ centrifugeEV,
+ "craftingGeothermalGenerator",
+ RECIPE_ThermalBoilerController);
+
+ RecipeUtils.addShapedGregtechRecipe(
+ "craftingGeothermalGenerator",
+ centrifugeEV,
+ "craftingGeothermalGenerator",
+ "gearGtTungstenSteel",
+ CI.getTieredCircuitOreDictName(5),
+ "gearGtTungstenSteel",
+ "craftingGeothermalGenerator",
+ centrifugeEV,
+ "craftingGeothermalGenerator",
+ RECIPE_ThermalBoilerController);
+
+ RecipeUtils.addShapedGregtechRecipe(
+ ALLOY.MARAGING350.getPlate(1),
+ "plateStainlessSteel",
+ ALLOY.MARAGING350.getPlate(1),
+ "circuitAdvanced",
+ CI.machineCasing_HV,
+ "circuitAdvanced",
+ ALLOY.MARAGING350.getPlate(1),
+ ALLOY.MARAGING350.getPlate(1),
+ ALLOY.MARAGING350.getPlate(1),
+ RECIPE_ThermalBoilerCasing);
+
+ // Lava Filter Recipe
+ CORE.RA.addSixSlotAssemblingRecipe(
+ new ItemStack[] { CI.getNumberedCircuit(18),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustCarbon", 32),
+ ItemUtils.getItemStackOfAmountFromOreDict("wireFineSteel", 32),
+ ItemUtils.getItemStackOfAmountFromOreDict("ringTumbaga", 16),
+ ItemUtils.getItemStackOfAmountFromOreDict("foilCopper", 4),
+ ItemUtils.getItemStackWithMeta(true, "IC2:itemPartCarbonMesh", "RawCarbonMesh", 0, 64), },
+ CI.getTieredFluid(3, 144),
+ ItemUtils.getSimpleStack(ModItems.itemLavaFilter, 16),
+ 1600,
+ 240);
+ }
+
+ // Air Intake Hatch
+ ItemList FluidRegulator_IV = ItemUtils.getValueOfItemList("FluidRegulator_IV", ItemList.Pump_IV);
+ ItemStack aTieredFluidRegulator = FluidRegulator_IV.get(1);
+ RecipeUtils.addShapedGregtechRecipe(
+ CI.component_Plate[6],
+ ItemList.Casing_Grate.get(1),
+ CI.component_Plate[6],
+ CI.component_Plate[6],
+ CI.getFluidRegulator(5, 1),
+ CI.component_Plate[6],
+ CI.getTieredCircuit(5),
+ ItemList.Hatch_Input_IV.get(1),
+ CI.getTieredCircuit(5),
+ GregtechItemList.Hatch_Air_Intake.get(1));
+
+ RecipeUtils.addShapedGregtechRecipe(
+ CI.getPlate(7, 1),
+ GregtechItemList.Hatch_Air_Intake.get(1),
+ CI.getPlate(7, 1),
+ CI.getPlate(7, 1),
+ CI.getFluidRegulator(7, 1),
+ CI.getPlate(7, 1),
+ CI.getTieredCircuit(7),
+ ItemList.Hatch_Input_ZPM.get(1),
+ CI.getTieredCircuit(7),
+ GregtechItemList.Hatch_Air_Intake_Extreme.get(1));
+
+ if (CORE.ConfigSwitches.enableMultiblock_LiquidFluorideThoriumReactor) {
+
+ // Thorium Reactor
+ RECIPE_LFTRController = GregtechItemList.ThoriumReactor.get(1);
+ RECIPE_LFTRInnerCasing = GregtechItemList.Casing_Reactor_II.get(1); // Zeron
+ RECIPE_LFTROuterCasing = GregtechItemList.Casing_Reactor_I.get(1); // Hastelloy
+
+ ItemStack controlCircuit = ItemUtils.getSimpleStack(ModItems.itemCircuitLFTR);
+ RecipeUtils.addShapedGregtechRecipe(
+ controlCircuit,
+ "cableGt12Naquadah",
+ controlCircuit,
+ "plateDoubleHastelloyN",
+ GregtechItemList.Gregtech_Computer_Cube.get(1),
+ "plateDoubleHastelloyN",
+ "plateThorium232",
+ CI.machineHull_IV,
+ "plateThorium232",
+ RECIPE_LFTRController);
+ RecipeUtils.addShapedGregtechRecipe(
+ "plateDoubleHastelloyC276",
+ CI.craftingToolScrewdriver,
+ "plateDoubleHastelloyC276",
+ "gearGtTalonite",
+ CI.fieldGenerator_MV,
+ "gearGtTalonite",
+ "plateDoubleHastelloyC276",
+ CI.craftingToolHammer_Hard,
+ "plateDoubleHastelloyC276",
+ RECIPE_LFTRInnerCasing);
+
+ ItemStack IC2HeatPlate = ItemUtils.getItemStackFromFQRN("IC2:reactorPlatingHeat", 1);
+ RecipeUtils.addShapedGregtechRecipe(
+ "plateDoubleHastelloyN",
+ IC2HeatPlate,
+ "plateDoubleHastelloyN",
+ IC2HeatPlate,
+ "frameGtHastelloyC276",
+ IC2HeatPlate,
+ "plateDoubleHastelloyN",
+ IC2HeatPlate,
+ "plateDoubleHastelloyN",
+ RECIPE_LFTROuterCasing);
+
+ // LFTR Control Circuit
+ CORE.RA.addSixSlotAssemblingRecipe(
+ new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(6), 1),
+ CI.fieldGenerator_HV },
+ null,
+ controlCircuit,
+ 240 * 20,
+ 500);
+
+ // Fission Fuel Plant
+ RecipeUtils.addShapedGregtechRecipe(
+ CI.getTieredCircuitOreDictName(5),
+ CI.craftingToolSolderingIron,
+ CI.getTieredCircuitOreDictName(5),
+ "plateDenseTungstenSteel",
+ GregtechItemList.Gregtech_Computer_Cube.get(1),
+ "plateDenseTungstenSteel",
+ "gearGtStellite",
+ CI.machineHull_IV,
+ "gearGtStellite",
+ GregtechItemList.Industrial_FuelRefinery.get(1));
+
+ ItemStack mInnerTank = ItemList.Quantum_Tank_LV.get(1);
+
+ // Incoloy Casing
+ RecipeUtils.addShapedGregtechRecipe(
+ "plateIncoloyDS",
+ "pipeHugeStaballoy",
+ "plateIncoloyDS",
+ "gearGtIncoloyDS",
+ mInnerTank,
+ "gearGtIncoloyDS",
+ "plateIncoloyDS",
+ "pipeHugeStaballoy",
+ "plateIncoloyDS",
+ GregtechItemList.Casing_Refinery_Internal.get(1));
+
+ // Hastelloy-N Sealant Casing
+ RecipeUtils.addShapedGregtechRecipe(
+ "plateIncoloyMA956",
+ "plateHastelloyN",
+ "plateIncoloyMA956",
+ "plateHastelloyN",
+ "frameGtHastelloyC276",
+ "plateHastelloyN",
+ "plateIncoloyMA956",
+ "plateHastelloyN",
+ "plateIncoloyMA956",
+ GregtechItemList.Casing_Refinery_External.get(1));
+
+ // Hastelloy-X Structural Casing
+ RecipeUtils.addShapedGregtechRecipe(
+ "ringInconel792",
+ "gearGtHastelloyX",
+ CI.component_Plate[5],
+ CI.craftingToolHammer_Hard,
+ "frameGtHastelloyC276",
+ CI.craftingToolWrench,
+ CI.component_Plate[5],
+ CI.getTieredMachineCasing(4),
+ "ringInconel792",
+ GregtechItemList.Casing_Refinery_Structural.get(1));
RecipeUtils.addShapedGregtechRecipe(
+ CI.getPlate(5, 1),
+ ALLOY.HASTELLOY_X.getPlateDouble(1),
+ CI.getPlate(5, 1),
+ CI.getPlate(5, 1),
+ CI.getTieredMachineCasing(5),
+ CI.getPlate(5, 1),
+ CI.getRobotArm(5, 1),
+ ItemList.Casing_FrostProof.get(1),
+ CI.getRobotArm(5, 1),
+ GregtechItemList.ColdTrap_IV.get(1));
+ RecipeUtils.addShapedGregtechRecipe(
CI.getPlate(7, 1),
- GregtechItemList.Hatch_Air_Intake.get(1),
+ ALLOY.HS188A.getPlateDouble(1),
CI.getPlate(7, 1),
CI.getPlate(7, 1),
- CI.getFluidRegulator(7, 1),
+ GregtechItemList.ColdTrap_IV.get(1),
CI.getPlate(7, 1),
- CI.getTieredCircuit(7),
- ItemList.Hatch_Input_ZPM.get(1),
- CI.getTieredCircuit(7),
- GregtechItemList.Hatch_Air_Intake_Extreme.get(1));
-
- if (CORE.ConfigSwitches.enableMultiblock_LiquidFluorideThoriumReactor) {
+ CI.getRobotArm(7, 1),
+ ItemList.Casing_FrostProof.get(1),
+ CI.getRobotArm(7, 1),
+ GregtechItemList.ColdTrap_ZPM.get(1));
- // Thorium Reactor
- RECIPE_LFTRController = GregtechItemList.ThoriumReactor.get(1);
- RECIPE_LFTRInnerCasing = GregtechItemList.Casing_Reactor_II.get(1); // Zeron
- RECIPE_LFTROuterCasing = GregtechItemList.Casing_Reactor_I.get(1); // Hastelloy
+ RecipeUtils.addShapedGregtechRecipe(
+ CI.getFieldGenerator(3, 1),
+ CI.getRobotArm(5, 1),
+ CI.getPlate(5, 1),
+ ALLOY.HASTELLOY_N.getPlateDouble(1),
+ ItemList.Machine_IV_ChemicalReactor.get(1),
+ ALLOY.HASTELLOY_N.getPlateDouble(1),
+ CI.getPlate(5, 1),
+ ALLOY.HASTELLOY_N.getPlateDouble(1),
+ CI.getFieldGenerator(3, 1),
+ GregtechItemList.ReactorProcessingUnit_IV.get(1));
+ RecipeUtils.addShapedGregtechRecipe(
+ CI.getFieldGenerator(5, 1),
+ CI.getRobotArm(7, 1),
+ CI.getPlate(7, 1),
+ ALLOY.HS188A.getPlateDouble(1),
+ GregtechItemList.ReactorProcessingUnit_IV.get(1),
+ ALLOY.HS188A.getPlateDouble(1),
+ CI.getPlate(7, 1),
+ ALLOY.HS188A.getPlateDouble(1),
+ CI.getFieldGenerator(5, 1),
+ GregtechItemList.ReactorProcessingUnit_ZPM.get(1));
+ }
- ItemStack controlCircuit = ItemUtils.getSimpleStack(ModItems.itemCircuitLFTR);
- RecipeUtils.addShapedGregtechRecipe(
- controlCircuit,
- "cableGt12Naquadah",
- controlCircuit,
- "plateDoubleHastelloyN",
- GregtechItemList.Gregtech_Computer_Cube.get(1),
- "plateDoubleHastelloyN",
- "plateThorium232",
- CI.machineHull_IV,
- "plateThorium232",
- RECIPE_LFTRController);
- RecipeUtils.addShapedGregtechRecipe(
- "plateDoubleHastelloyC276",
- CI.craftingToolScrewdriver,
- "plateDoubleHastelloyC276",
- "gearGtTalonite",
- CI.fieldGenerator_MV,
- "gearGtTalonite",
- "plateDoubleHastelloyC276",
- CI.craftingToolHammer_Hard,
- "plateDoubleHastelloyC276",
- RECIPE_LFTRInnerCasing);
-
- ItemStack IC2HeatPlate = ItemUtils.getItemStackFromFQRN("IC2:reactorPlatingHeat", 1);
- RecipeUtils.addShapedGregtechRecipe(
- "plateDoubleHastelloyN",
- IC2HeatPlate,
- "plateDoubleHastelloyN",
- IC2HeatPlate,
- "frameGtHastelloyC276",
- IC2HeatPlate,
- "plateDoubleHastelloyN",
- IC2HeatPlate,
- "plateDoubleHastelloyN",
- RECIPE_LFTROuterCasing);
-
- // LFTR Control Circuit
- CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(6), 1),
- CI.fieldGenerator_HV },
- null,
- controlCircuit,
- 240 * 20,
- 500);
+ // Shelves
+ RecipeUtils.addShapedGregtechRecipe(
+ "screwWood",
+ "plateWood",
+ "screwWood",
+ CI.craftingToolHammer_Hard,
+ "frameGtWood",
+ CI.craftingToolHammer_Soft,
+ "plateWood",
+ "plateWood",
+ "plateWood",
+ GregtechItemList.GT4_Shelf.get(2));
+
+ RecipeUtils.addShapelessGregtechRecipe(
+ new ItemStack[] { GregtechItemList.GT4_Shelf.get(1) },
+ GregtechItemList.GT4_Shelf_Compartment.get(1));
+ RecipeUtils.addShapelessGregtechRecipe(
+ new ItemStack[] { GregtechItemList.GT4_Shelf_Compartment.get(1) },
+ GregtechItemList.GT4_Shelf_Desk.get(1));
+ RecipeUtils.addShapelessGregtechRecipe(
+ new ItemStack[] { GregtechItemList.GT4_Shelf_Desk.get(1) },
+ GregtechItemList.GT4_Shelf_Iron.get(1));
+ RecipeUtils.addShapelessGregtechRecipe(
+ new ItemStack[] { GregtechItemList.GT4_Shelf_Iron.get(1) },
+ GregtechItemList.GT4_Shelf_FileCabinet.get(1));
+ RecipeUtils.addShapelessGregtechRecipe(
+ new ItemStack[] { GregtechItemList.GT4_Shelf_FileCabinet.get(1) },
+ GregtechItemList.GT4_Shelf.get(1));
+
+ // Cyclotron
+ if (CORE.ConfigSwitches.enableMultiblock_Cyclotron) {
+ RECIPE_CyclotronController = GregtechItemList.COMET_Cyclotron.get(1);
+ RECIPE_CyclotronOuterCasing = GregtechItemList.Casing_Cyclotron_External.get(1);
+ RECIPE_CyclotronInnerCoil = GregtechItemList.Casing_Cyclotron_Coil.get(1);
+
+ // Outer Casing
+ CORE.RA.addSixSlotAssemblingRecipe(
+ new ItemStack[] { ItemList.Casing_FrostProof.get(1),
+ ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 0, 4),
+ ALLOY.INCOLOY_DS.getPlate(8), ALLOY.INCONEL_690.getScrew(16),
+ ALLOY.EGLIN_STEEL.getLongRod(4), CI.getElectricPiston(3, 2) },
+ ALLOY.ZIRCONIUM_CARBIDE.getFluidStack(144 * 8), // Input Fluid
+ RECIPE_CyclotronOuterCasing,
+ 30 * 20 * 2,
+ MaterialUtils.getVoltageForTier(4));
+
+ // Inner Coil
+ CORE.RA.addSixSlotAssemblingRecipe(
+ new ItemStack[] { ItemList.Casing_Coil_Nichrome.get(1),
+ ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 1, 8),
+ ALLOY.INCOLOY_MA956.getPlate(8), ALLOY.TANTALLOY_61.getBolt(16),
+ ALLOY.INCOLOY_020.getScrew(32), CI.getFieldGenerator(4, 1) },
+ ALLOY.HG1223.getFluidStack(144 * 5), // Input Fluid
+ RECIPE_CyclotronInnerCoil,
+ 60 * 20 * 2,
+ MaterialUtils.getVoltageForTier(5));
+
+ // Controller
+ CORE.RA.addSixSlotAssemblingRecipe(
+ new ItemStack[] { CI.machineHull_IV, ItemUtils.getSimpleStack(RECIPE_CyclotronInnerCoil, 2),
+ ALLOY.INCOLOY_020.getPlate(8), ALLOY.TANTALLOY_61.getGear(2),
+ ALLOY.INCOLOY_MA956.getScrew(16),
+ ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(5), 16) },
+ ALLOY.INCOLOY_020.getFluidStack(144 * 9), // Input Fluid
+ RECIPE_CyclotronController,
+ 60 * 20 * 5,
+ MaterialUtils.getVoltageForTier(5));
+ }
- // Fission Fuel Plant
- RecipeUtils.addShapedGregtechRecipe(
- CI.getTieredCircuitOreDictName(5),
- CI.craftingToolSolderingIron,
- CI.getTieredCircuitOreDictName(5),
- "plateDenseTungstenSteel",
- GregtechItemList.Gregtech_Computer_Cube.get(1),
- "plateDenseTungstenSteel",
- "gearGtStellite",
- CI.machineHull_IV,
- "gearGtStellite",
- GregtechItemList.Industrial_FuelRefinery.get(1));
+ // Mazut
+ GT_ModHandler.addCraftingRecipe(
+ GregtechItemList.Controller_LargeSemifluidGenerator.get(1L),
+ CI.bitsd,
+ new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_EV, 'P', ItemList.Electric_Piston_EV, 'E',
+ ItemList.Electric_Pump_EV, 'C', OrePrefixes.circuit.get(Materials.Data), 'W',
+ OrePrefixes.cableGt08.get(Materials.Electrum), 'G', ALLOY.INCONEL_792.getGear(1) });
- ItemStack mInnerTank = ItemList.Quantum_Tank_LV.get(1);
+ if (CORE.ConfigSwitches.enableMultiblock_PowerSubstation) {
+ RecipeUtils.addShapedRecipe(
+ "screwTitanium",
+ "plateIncoloy020",
+ "screwTitanium",
+ "plateIncoloy020",
+ "frameGtIncoloyMA956",
+ "plateIncoloy020",
+ "screwTitanium",
+ "plateIncoloy020",
+ "screwTitanium",
+ GregtechItemList.Casing_Power_SubStation.get(1));
+
+ ItemStack mBattery = ItemUtils.getSimpleStack(ModItems.itemCircuitLFTR);
- // Incoloy Casing
- RecipeUtils.addShapedGregtechRecipe(
- "plateIncoloyDS",
- "pipeHugeStaballoy",
- "plateIncoloyDS",
- "gearGtIncoloyDS",
- mInnerTank,
- "gearGtIncoloyDS",
- "plateIncoloyDS",
- "pipeHugeStaballoy",
- "plateIncoloyDS",
- GregtechItemList.Casing_Refinery_Internal.get(1));
-
- // Hastelloy-N Sealant Casing
- RecipeUtils.addShapedGregtechRecipe(
- "plateIncoloyMA956",
- "plateHastelloyN",
- "plateIncoloyMA956",
- "plateHastelloyN",
- "frameGtHastelloyC276",
- "plateHastelloyN",
- "plateIncoloyMA956",
- "plateHastelloyN",
- "plateIncoloyMA956",
- GregtechItemList.Casing_Refinery_External.get(1));
-
- // Hastelloy-X Structural Casing
- RecipeUtils.addShapedGregtechRecipe(
- "ringInconel792",
- "gearGtHastelloyX",
- CI.component_Plate[5],
- CI.craftingToolHammer_Hard,
- "frameGtHastelloyC276",
- CI.craftingToolWrench,
- CI.component_Plate[5],
- CI.getTieredMachineCasing(4),
- "ringInconel792",
- GregtechItemList.Casing_Refinery_Structural.get(1));
+ RecipeUtils.addShapedRecipe(
+ "plateIncoloyMA956",
+ mBattery,
+ "plateIncoloyMA956",
+ GregtechItemList.Casing_Power_SubStation.get(1),
+ GregtechItemList.Casing_Vanadium_Redox.get(1),
+ GregtechItemList.Casing_Power_SubStation.get(1),
+ "plateIncoloy020",
+ "plateIncoloyMA956",
+ "plateIncoloy020",
+ GregtechItemList.PowerSubStation.get(1));
+ }
- RecipeUtils.addShapedGregtechRecipe(
- CI.getPlate(5, 1),
- ALLOY.HASTELLOY_X.getPlateDouble(1),
- CI.getPlate(5, 1),
- CI.getPlate(5, 1),
- CI.getTieredMachineCasing(5),
- CI.getPlate(5, 1),
- CI.getRobotArm(5, 1),
- ItemList.Casing_FrostProof.get(1),
- CI.getRobotArm(5, 1),
- GregtechItemList.ColdTrap_IV.get(1));
- RecipeUtils.addShapedGregtechRecipe(
- CI.getPlate(7, 1),
- ALLOY.HS188A.getPlateDouble(1),
- CI.getPlate(7, 1),
- CI.getPlate(7, 1),
- GregtechItemList.ColdTrap_IV.get(1),
- CI.getPlate(7, 1),
- CI.getRobotArm(7, 1),
- ItemList.Casing_FrostProof.get(1),
- CI.getRobotArm(7, 1),
- GregtechItemList.ColdTrap_ZPM.get(1));
+ if (CORE.ConfigSwitches.enableMultiblock_IndustrialThermalCentrifuge) {
+ RecipeUtils.addShapedRecipe(
+ "plateRedSteel",
+ CI.craftingToolHammer_Hard,
+ "plateRedSteel",
+ "plateRedSteel",
+ "frameGtBlackSteel",
+ "plateRedSteel",
+ "plateRedSteel",
+ CI.craftingToolWrench,
+ "plateRedSteel",
+ GregtechItemList.Casing_ThermalCentrifuge.get(1));
+ GT_Values.RA.addAssemblerRecipe(
+ new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedSteel, 6),
+ GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.BlackSteel, 1),
+ GT_Utility.getIntegratedCircuit(1), },
+ GT_Values.NF,
+ GregtechItemList.Casing_ThermalCentrifuge.get(1L),
+ 50,
+ 16);
- RecipeUtils.addShapedGregtechRecipe(
- CI.getFieldGenerator(3, 1),
- CI.getRobotArm(5, 1),
- CI.getPlate(5, 1),
- ALLOY.HASTELLOY_N.getPlateDouble(1),
- ItemList.Machine_IV_ChemicalReactor.get(1),
- ALLOY.HASTELLOY_N.getPlateDouble(1),
- CI.getPlate(5, 1),
- ALLOY.HASTELLOY_N.getPlateDouble(1),
- CI.getFieldGenerator(3, 1),
- GregtechItemList.ReactorProcessingUnit_IV.get(1));
- RecipeUtils.addShapedGregtechRecipe(
- CI.getFieldGenerator(5, 1),
- CI.getRobotArm(7, 1),
- CI.getPlate(7, 1),
- ALLOY.HS188A.getPlateDouble(1),
- GregtechItemList.ReactorProcessingUnit_IV.get(1),
- ALLOY.HS188A.getPlateDouble(1),
- CI.getPlate(7, 1),
- ALLOY.HS188A.getPlateDouble(1),
- CI.getFieldGenerator(5, 1),
- GregtechItemList.ReactorProcessingUnit_ZPM.get(1));
- }
+ RecipeUtils.addShapedRecipe(
+ "plateRedSteel",
+ "circuitElite",
+ "plateRedSteel",
+ "stickTalonite",
+ IV_MACHINE_ThermalCentrifuge,
+ "stickTalonite",
+ "plateRedSteel",
+ "gearGtTalonite",
+ "plateRedSteel",
+ GregtechItemList.Industrial_ThermalCentrifuge.get(1));
+ }
- // Shelves
- RecipeUtils.addShapedGregtechRecipe(
- "screwWood",
- "plateWood",
- "screwWood",
+ if (CORE.ConfigSwitches.enableMultiblock_IndustrialWashPlant) {
+ RecipeUtils.addShapedRecipe(
+ "plateGrisium",
CI.craftingToolHammer_Hard,
- "frameGtWood",
- CI.craftingToolHammer_Soft,
- "plateWood",
- "plateWood",
- "plateWood",
- GregtechItemList.GT4_Shelf.get(2));
+ "plateGrisium",
+ "plateTalonite",
+ "frameGtGrisium",
+ "plateTalonite",
+ "plateGrisium",
+ CI.craftingToolWrench,
+ "plateGrisium",
+ GregtechItemList.Casing_WashPlant.get(1));
+ GT_Values.RA.addAssemblerRecipe(
+ new ItemStack[] { ALLOY.LEAGRISIUM.getPlate(4), ALLOY.TALONITE.getPlate(2),
+ ALLOY.LEAGRISIUM.getFrameBox(1), GT_Utility.getIntegratedCircuit(1), },
+ GT_Values.NF,
+ GregtechItemList.Casing_WashPlant.get(1L),
+ 50,
+ 16);
- RecipeUtils.addShapelessGregtechRecipe(
- new ItemStack[] { GregtechItemList.GT4_Shelf.get(1) },
- GregtechItemList.GT4_Shelf_Compartment.get(1));
- RecipeUtils.addShapelessGregtechRecipe(
- new ItemStack[] { GregtechItemList.GT4_Shelf_Compartment.get(1) },
- GregtechItemList.GT4_Shelf_Desk.get(1));
- RecipeUtils.addShapelessGregtechRecipe(
- new ItemStack[] { GregtechItemList.GT4_Shelf_Desk.get(1) },
- GregtechItemList.GT4_Shelf_Iron.get(1));
- RecipeUtils.addShapelessGregtechRecipe(
- new ItemStack[] { GregtechItemList.GT4_Shelf_Iron.get(1) },
- GregtechItemList.GT4_Shelf_FileCabinet.get(1));
- RecipeUtils.addShapelessGregtechRecipe(
- new ItemStack[] { GregtechItemList.GT4_Shelf_FileCabinet.get(1) },
- GregtechItemList.GT4_Shelf.get(1));
+ RecipeUtils.addShapedRecipe(
+ "plateGrisium",
+ IV_MACHINE_OreWasher,
+ "plateGrisium",
+ "plateTalonite",
+ "circuitElite",
+ "plateTalonite",
+ "plateGrisium",
+ IV_MACHINE_ChemicalBath,
+ "plateGrisium",
+ GregtechItemList.Industrial_WashPlant.get(1));
+ }
- // Cyclotron
- if (CORE.ConfigSwitches.enableMultiblock_Cyclotron) {
- RECIPE_CyclotronController = GregtechItemList.COMET_Cyclotron.get(1);
- RECIPE_CyclotronOuterCasing = GregtechItemList.Casing_Cyclotron_External.get(1);
- RECIPE_CyclotronInnerCoil = GregtechItemList.Casing_Cyclotron_Coil.get(1);
+ if (CORE.ConfigSwitches.enableMultiblock_LargeAutoCrafter) {
- // Outer Casing
- CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] { ItemList.Casing_FrostProof.get(1),
- ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 0, 4),
- ALLOY.INCOLOY_DS.getPlate(8), ALLOY.INCONEL_690.getScrew(16),
- ALLOY.EGLIN_STEEL.getLongRod(4), CI.getElectricPiston(3, 2) },
- ALLOY.ZIRCONIUM_CARBIDE.getFluidStack(144 * 8), // Input Fluid
- RECIPE_CyclotronOuterCasing,
- 30 * 20 * 2,
- MaterialUtils.getVoltageForTier(4));
-
- // Inner Coil
- CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] { ItemList.Casing_Coil_Nichrome.get(1),
- ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 1, 8),
- ALLOY.INCOLOY_MA956.getPlate(8), ALLOY.TANTALLOY_61.getBolt(16),
- ALLOY.INCOLOY_020.getScrew(32), CI.getFieldGenerator(4, 1) },
- ALLOY.HG1223.getFluidStack(144 * 5), // Input Fluid
- RECIPE_CyclotronInnerCoil,
- 60 * 20 * 2,
- MaterialUtils.getVoltageForTier(5));
-
- // Controller
- CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] { CI.machineHull_IV, ItemUtils.getSimpleStack(RECIPE_CyclotronInnerCoil, 2),
- ALLOY.INCOLOY_020.getPlate(8), ALLOY.TANTALLOY_61.getGear(2),
- ALLOY.INCOLOY_MA956.getScrew(16),
- ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(5), 16) },
- ALLOY.INCOLOY_020.getFluidStack(144 * 9), // Input Fluid
- RECIPE_CyclotronController,
- 60 * 20 * 5,
- MaterialUtils.getVoltageForTier(5));
- }
+ ItemStack aCoreBlock = ItemUtils.getValueOfItemList(
+ "Block_IridiumTungstensteel",
+ 1,
+ ItemUtils.getItemStackOfAmountFromOreDict("blockOsmiridium", 1));
- // Mazut
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Controller_LargeSemifluidGenerator.get(1L),
- CI.bitsd,
- new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_EV, 'P', ItemList.Electric_Piston_EV, 'E',
- ItemList.Electric_Pump_EV, 'C', OrePrefixes.circuit.get(Materials.Data), 'W',
- OrePrefixes.cableGt08.get(Materials.Electrum), 'G', ALLOY.INCONEL_792.getGear(1) });
-
- if (CORE.ConfigSwitches.enableMultiblock_PowerSubstation) {
- RecipeUtils.addShapedRecipe(
- "screwTitanium",
- "plateIncoloy020",
- "screwTitanium",
- "plateIncoloy020",
- "frameGtIncoloyMA956",
- "plateIncoloy020",
- "screwTitanium",
- "plateIncoloy020",
- "screwTitanium",
- GregtechItemList.Casing_Power_SubStation.get(1));
-
- ItemStack mBattery = ItemUtils.getSimpleStack(ModItems.itemCircuitLFTR);
-
- RecipeUtils.addShapedRecipe(
- "plateIncoloyMA956",
- mBattery,
- "plateIncoloyMA956",
- GregtechItemList.Casing_Power_SubStation.get(1),
- GregtechItemList.Casing_Vanadium_Redox.get(1),
- GregtechItemList.Casing_Power_SubStation.get(1),
- "plateIncoloy020",
- "plateIncoloyMA956",
- "plateIncoloy020",
- GregtechItemList.PowerSubStation.get(1));
- }
+ aCoreBlock.stackSize = 1;
- if (CORE.ConfigSwitches.enableMultiblock_IndustrialThermalCentrifuge) {
- RecipeUtils.addShapedRecipe(
- "plateRedSteel",
- CI.craftingToolHammer_Hard,
- "plateRedSteel",
- "plateRedSteel",
- "frameGtBlackSteel",
- "plateRedSteel",
- "plateRedSteel",
- CI.craftingToolWrench,
- "plateRedSteel",
- GregtechItemList.Casing_ThermalCentrifuge.get(1));
- GT_Values.RA.addAssemblerRecipe(
- new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedSteel, 6),
- GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.BlackSteel, 1),
- GT_Utility.getIntegratedCircuit(1), },
- GT_Values.NF,
- GregtechItemList.Casing_ThermalCentrifuge.get(1L),
- 50,
- 16);
-
- RecipeUtils.addShapedRecipe(
- "plateRedSteel",
- "circuitElite",
- "plateRedSteel",
- "stickTalonite",
- IV_MACHINE_ThermalCentrifuge,
- "stickTalonite",
- "plateRedSteel",
- "gearGtTalonite",
- "plateRedSteel",
- GregtechItemList.Industrial_ThermalCentrifuge.get(1));
- }
+ CORE.RA.addSixSlotAssemblingRecipe(
+ new ItemStack[] { ItemUtils.getSimpleStack(GregtechItemList.Casing_Multi_Use.get(1), 1), aCoreBlock,
+ CI.getTieredComponent(OrePrefixes.circuit, 2, 16),
+ CI.getTieredComponent(OrePrefixes.screw, 5, 32),
+ CI.getTieredComponent(OrePrefixes.bolt, 5, 12),
+ CI.getTieredComponent(OrePrefixes.plate, 6, 8), },
+ CI.getTertiaryTieredFluid(6, 144 * (4)),
+ GregtechItemList.Casing_Autocrafter.get(1),
+ 20 * 60 * 2,
+ MaterialUtils.getVoltageForTier(5));
- if (CORE.ConfigSwitches.enableMultiblock_IndustrialWashPlant) {
- RecipeUtils.addShapedRecipe(
- "plateGrisium",
- CI.craftingToolHammer_Hard,
- "plateGrisium",
- "plateTalonite",
- "frameGtGrisium",
- "plateTalonite",
- "plateGrisium",
- CI.craftingToolWrench,
- "plateGrisium",
- GregtechItemList.Casing_WashPlant.get(1));
- GT_Values.RA.addAssemblerRecipe(
- new ItemStack[] { ALLOY.LEAGRISIUM.getPlate(4), ALLOY.TALONITE.getPlate(2),
- ALLOY.LEAGRISIUM.getFrameBox(1), GT_Utility.getIntegratedCircuit(1), },
- GT_Values.NF,
- GregtechItemList.Casing_WashPlant.get(1L),
- 50,
- 16);
-
- RecipeUtils.addShapedRecipe(
- "plateGrisium",
- IV_MACHINE_OreWasher,
- "plateGrisium",
- "plateTalonite",
- "circuitElite",
- "plateTalonite",
- "plateGrisium",
- IV_MACHINE_ChemicalBath,
- "plateGrisium",
- GregtechItemList.Industrial_WashPlant.get(1));
- }
+ CORE.RA.addSixSlotAssemblingRecipe(
+ new ItemStack[] { GregtechItemList.Casing_Refinery_Structural.get(4),
+ ItemUtils.getSimpleStack(ModItems.itemCircuitLFTR, 1),
+ CI.getTieredComponent(OrePrefixes.cableGt08, 6, 16), CI.getTransmissionComponent(5, 2),
+ GregtechItemList.Gregtech_Computer_Cube.get(1), },
+ CI.getTieredFluid(7, 144 * 8),
+ GregtechItemList.GT4_Multi_Crafter.get(1),
+ 20 * 60 * 5,
+ MaterialUtils.getVoltageForTier(5));
- if (CORE.ConfigSwitches.enableMultiblock_LargeAutoCrafter) {
+ CORE.RA.addSixSlotAssemblingRecipe(
+ new ItemStack[] { ItemUtils.getSimpleStack(GregtechItemList.Casing_Multi_Use.get(1), 1),
+ CI.getEmitter(4, 2), CI.getRobotArm(4, 2), CI.getTieredComponent(OrePrefixes.circuit, 2, 8),
+ CI.getTieredComponent(OrePrefixes.screw, 3, 8),
+ CI.getTieredComponent(OrePrefixes.plate, 5, 4), },
+ CI.getAlternativeTieredFluid(5, 144 * 4),
+ ItemUtils.getSimpleStack(ModBlocks.blockProjectTable),
+ 20 * 30 * 3,
+ MaterialUtils.getVoltageForTier(4));
+ }
- ItemStack aCoreBlock = CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK
- ? ItemUtils.getValueOfItemList(
- "Block_IridiumTungstensteel",
- 1,
- ItemUtils.getItemStackOfAmountFromOreDict("blockOsmiridium", 1))
- : ItemUtils.getItemStackOfAmountFromOreDict("blockOsmiridium", 1);
+ if (CORE.ConfigSwitches.enableMultiblock_IndustrialCuttingMachine) {
+ ItemStack plate = ALLOY.MARAGING300.getPlate(1);
+ RecipeUtils.addShapedRecipe(
+ plate,
+ CI.craftingToolHammer_Hard,
+ plate,
+ "plateStellite",
+ "frameGtTalonite",
+ "plateStellite",
+ plate,
+ CI.craftingToolWrench,
+ plate,
+ GregtechItemList.Casing_CuttingFactoryFrame.get(1));
+ GT_Values.RA.addAssemblerRecipe(
+ new ItemStack[] { ALLOY.MARAGING300.getPlate(4), ALLOY.STELLITE.getPlate(2),
+ ALLOY.TALONITE.getFrameBox(1), GT_Utility.getIntegratedCircuit(1), },
+ GT_Values.NF,
+ GregtechItemList.Casing_CuttingFactoryFrame.get(1L),
+ 50,
+ 16);
- aCoreBlock.stackSize = 1;
+ RecipeUtils.addShapedRecipe(
+ plate,
+ CI.getTieredCircuit(4),
+ plate,
+ "wireFinePlatinum",
+ IV_MACHINE_Cutter,
+ "wireFinePlatinum",
+ plate,
+ CI.getTieredCircuit(4),
+ plate,
+ GregtechItemList.Industrial_CuttingFactoryController.get(1));
+ }
- CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] { ItemUtils.getSimpleStack(GregtechItemList.Casing_Multi_Use.get(1), 1),
- aCoreBlock, CI.getTieredComponent(OrePrefixes.circuit, 2, 16),
- CI.getTieredComponent(OrePrefixes.screw, 5, 32),
- CI.getTieredComponent(OrePrefixes.bolt, 5, 12),
- CI.getTieredComponent(OrePrefixes.plate, 6, 8), },
- CI.getTertiaryTieredFluid(6, 144 * (4)),
- GregtechItemList.Casing_Autocrafter.get(1),
- 20 * 60 * 2,
- MaterialUtils.getVoltageForTier(5));
+ // IV_MACHINE_Extruder
+ if (CORE.ConfigSwitches.enableMultiblock_IndustrialExtrudingMachine) {
+ ItemStack plate = ALLOY.INCONEL_690.getPlate(1);
+ RecipeUtils.addShapedRecipe(
+ plate,
+ CI.craftingToolHammer_Hard,
+ plate,
+ "plateTalonite",
+ "frameGtStaballoy",
+ "plateTalonite",
+ plate,
+ CI.craftingToolWrench,
+ plate,
+ GregtechItemList.Casing_Extruder.get(1));
+ GT_Values.RA.addAssemblerRecipe(
+ new ItemStack[] { ALLOY.INCONEL_690.getPlate(4), ALLOY.TALONITE.getPlate(2),
+ ALLOY.STABALLOY.getFrameBox(1), GT_Utility.getIntegratedCircuit(1), },
+ GT_Values.NF,
+ GregtechItemList.Casing_Extruder.get(1L),
+ 50,
+ 16);
- CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] { GregtechItemList.Casing_Refinery_Structural.get(4),
- ItemUtils.getSimpleStack(ModItems.itemCircuitLFTR, 1),
- CI.getTieredComponent(OrePrefixes.cableGt08, 6, 16), CI.getTransmissionComponent(5, 2),
- GregtechItemList.Gregtech_Computer_Cube.get(1), },
- CI.getTieredFluid(7, 144 * 8),
- GregtechItemList.GT4_Multi_Crafter.get(1),
- 20 * 60 * 5,
- MaterialUtils.getVoltageForTier(5));
+ RecipeUtils.addShapedRecipe(
+ plate,
+ CI.getTieredCircuit(5),
+ plate,
+ CI.electricPiston_IV,
+ IV_MACHINE_Extruder,
+ CI.electricPiston_IV,
+ plate,
+ CI.getTieredCircuit(5),
+ plate,
+ GregtechItemList.Industrial_Extruder.get(1));
+ }
- CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] { ItemUtils.getSimpleStack(GregtechItemList.Casing_Multi_Use.get(1), 1),
- CI.getEmitter(4, 2), CI.getRobotArm(4, 2),
- CI.getTieredComponent(OrePrefixes.circuit, 2, 8),
- CI.getTieredComponent(OrePrefixes.screw, 3, 8),
- CI.getTieredComponent(OrePrefixes.plate, 5, 4), },
- CI.getAlternativeTieredFluid(5, 144 * 4),
- ItemUtils.getSimpleStack(ModBlocks.blockProjectTable),
- 20 * 30 * 3,
- MaterialUtils.getVoltageForTier(4));
- }
+ if (CORE.ConfigSwitches.enableMultiblock_IndustrialFishingPort) {
+ ItemStack plate = ALLOY.AQUATIC_STEEL.getPlate(1);
+ RecipeUtils.addShapedRecipe(
+ plate,
+ CI.craftingToolHammer_Hard,
+ plate,
+ "plateEglinSteel",
+ "frameGtEglinSteel",
+ "plateEglinSteel",
+ plate,
+ CI.craftingToolWrench,
+ plate,
+ GregtechItemList.Casing_FishPond.get(1));
+ GT_Values.RA.addAssemblerRecipe(
+ new ItemStack[] { ALLOY.AQUATIC_STEEL.getPlate(4), ALLOY.EGLIN_STEEL.getPlate(2),
+ ALLOY.EGLIN_STEEL.getFrameBox(1), GT_Utility.getIntegratedCircuit(1), },
+ GT_Values.NF,
+ GregtechItemList.Casing_FishPond.get(1L),
+ 50,
+ 16);
+ RecipeUtils.addShapedRecipe(
+ plate,
+ CI.getTieredCircuit(5),
+ plate,
+ "wireFineElectrum",
+ ItemUtils.getSimpleStack(ModBlocks.blockFishTrap),
+ "wireFineElectrum",
+ plate,
+ CI.getTieredCircuit(5),
+ plate,
+ GregtechItemList.Industrial_FishingPond.get(1));
+ }
- if (CORE.ConfigSwitches.enableMultiblock_IndustrialCuttingMachine) {
- ItemStack plate = ALLOY.MARAGING300.getPlate(1);
- RecipeUtils.addShapedRecipe(
- plate,
- CI.craftingToolHammer_Hard,
- plate,
- "plateStellite",
- "frameGtTalonite",
- "plateStellite",
- plate,
- CI.craftingToolWrench,
- plate,
- GregtechItemList.Casing_CuttingFactoryFrame.get(1));
- GT_Values.RA.addAssemblerRecipe(
- new ItemStack[] { ALLOY.MARAGING300.getPlate(4), ALLOY.STELLITE.getPlate(2),
- ALLOY.TALONITE.getFrameBox(1), GT_Utility.getIntegratedCircuit(1), },
- GT_Values.NF,
- GregtechItemList.Casing_CuttingFactoryFrame.get(1L),
- 50,
- 16);
-
- RecipeUtils.addShapedRecipe(
- plate,
- CI.getTieredCircuit(4),
- plate,
- "wireFinePlatinum",
- IV_MACHINE_Cutter,
- "wireFinePlatinum",
- plate,
- CI.getTieredCircuit(4),
- plate,
- GregtechItemList.Industrial_CuttingFactoryController.get(1));
- }
+ if (true) {
+ // Advanced Vacuum Freezer
+ ItemStack plate = ALLOY.HG1223.getPlateDouble(1);
+ ItemStack gear = ALLOY.INCOLOY_MA956.getGear(1);
+ ItemStack frame = ALLOY.LAFIUM.getFrameBox(1);
+ ItemStack cell1 = ItemList.Reactor_Coolant_He_6.get(1);
+ ItemStack cell2 = ItemList.Reactor_Coolant_NaK_6.get(1);
- // IV_MACHINE_Extruder
- if (CORE.ConfigSwitches.enableMultiblock_IndustrialExtrudingMachine) {
- ItemStack plate = ALLOY.INCONEL_690.getPlate(1);
- RecipeUtils.addShapedRecipe(
- plate,
- CI.craftingToolHammer_Hard,
- plate,
- "plateTalonite",
- "frameGtStaballoy",
- "plateTalonite",
- plate,
- CI.craftingToolWrench,
- plate,
- GregtechItemList.Casing_Extruder.get(1));
- GT_Values.RA.addAssemblerRecipe(
- new ItemStack[] { ALLOY.INCONEL_690.getPlate(4), ALLOY.TALONITE.getPlate(2),
- ALLOY.STABALLOY.getFrameBox(1), GT_Utility.getIntegratedCircuit(1), },
- GT_Values.NF,
- GregtechItemList.Casing_Extruder.get(1L),
- 50,
- 16);
-
- RecipeUtils.addShapedRecipe(
- plate,
- CI.getTieredCircuit(5),
- plate,
- CI.electricPiston_IV,
- IV_MACHINE_Extruder,
- CI.electricPiston_IV,
- plate,
- CI.getTieredCircuit(5),
- plate,
- GregtechItemList.Industrial_Extruder.get(1));
- }
+ RecipeUtils.addShapedRecipe(
+ plate,
+ gear,
+ plate,
+ cell1,
+ frame,
+ cell2,
+ plate,
+ gear,
+ plate,
+ GregtechItemList.Casing_AdvancedVacuum.get(1));
+ RecipeUtils.addShapedRecipe(
+ gear,
+ CI.getTieredCircuit(6),
+ gear,
+ CI.electricPiston_IV,
+ GregtechItemList.Casing_AdvancedVacuum.get(1),
+ CI.electricPiston_IV,
+ plate,
+ GregtechItemList.Gregtech_Computer_Cube.get(1),
+ plate,
+ GregtechItemList.Industrial_Cryogenic_Freezer.get(1));
- if (CORE.ConfigSwitches.enableMultiblock_IndustrialFishingPort) {
- ItemStack plate = ALLOY.AQUATIC_STEEL.getPlate(1);
- RecipeUtils.addShapedRecipe(
- plate,
- CI.craftingToolHammer_Hard,
- plate,
- "plateEglinSteel",
- "frameGtEglinSteel",
- "plateEglinSteel",
- plate,
- CI.craftingToolWrench,
- plate,
- GregtechItemList.Casing_FishPond.get(1));
- GT_Values.RA.addAssemblerRecipe(
- new ItemStack[] { ALLOY.AQUATIC_STEEL.getPlate(4), ALLOY.EGLIN_STEEL.getPlate(2),
- ALLOY.EGLIN_STEEL.getFrameBox(1), GT_Utility.getIntegratedCircuit(1), },
- GT_Values.NF,
- GregtechItemList.Casing_FishPond.get(1L),
- 50,
- 16);
- RecipeUtils.addShapedRecipe(
- plate,
- CI.getTieredCircuit(5),
- plate,
- "wireFineElectrum",
- ItemUtils.getSimpleStack(ModBlocks.blockFishTrap),
- "wireFineElectrum",
- plate,
- CI.getTieredCircuit(5),
- plate,
- GregtechItemList.Industrial_FishingPond.get(1));
- }
+ // Advanced Blast Furnace
+ plate = ALLOY.HASTELLOY_N.getPlateDouble(1);
+ gear = ALLOY.HASTELLOY_W.getGear(1);
+ frame = ALLOY.HASTELLOY_X.getFrameBox(1);
+ cell1 = ItemUtils.simpleMetaStack("IC2:reactorHeatSwitchDiamond:1", 1, 1);
+ cell2 = ItemUtils.simpleMetaStack("IC2:reactorVentGold:1", 1, 1);
+ ItemStack cell3 = ItemUtils.simpleMetaStack("IC2:reactorVentDiamond:1:1", 1, 1);
- if (true) {
- // Advanced Vacuum Freezer
- ItemStack plate = ALLOY.HG1223.getPlateDouble(1);
- ItemStack gear = ALLOY.INCOLOY_MA956.getGear(1);
- ItemStack frame = ALLOY.LAFIUM.getFrameBox(1);
- ItemStack cell1 = ItemList.Reactor_Coolant_He_6.get(1);
- ItemStack cell2 = ItemList.Reactor_Coolant_NaK_6.get(1);
-
- RecipeUtils.addShapedRecipe(
- plate,
- gear,
- plate,
- cell1,
- frame,
- cell2,
- plate,
- gear,
- plate,
- GregtechItemList.Casing_AdvancedVacuum.get(1));
- RecipeUtils.addShapedRecipe(
- gear,
- CI.getTieredCircuit(6),
- gear,
- CI.electricPiston_IV,
- GregtechItemList.Casing_AdvancedVacuum.get(1),
- CI.electricPiston_IV,
- plate,
- GregtechItemList.Gregtech_Computer_Cube.get(1),
- plate,
- GregtechItemList.Industrial_Cryogenic_Freezer.get(1));
-
- // Advanced Blast Furnace
- plate = ALLOY.HASTELLOY_N.getPlateDouble(1);
- gear = ALLOY.HASTELLOY_W.getGear(1);
- frame = ALLOY.HASTELLOY_X.getFrameBox(1);
- cell1 = ItemUtils.simpleMetaStack("IC2:reactorHeatSwitchDiamond:1", 1, 1);
- cell2 = ItemUtils.simpleMetaStack("IC2:reactorVentGold:1", 1, 1);
- ItemStack cell3 = ItemUtils.simpleMetaStack("IC2:reactorVentDiamond:1:1", 1, 1);
-
- RecipeUtils.addShapedRecipe(
- plate,
- cell1,
- plate,
- cell3,
- frame,
- cell2,
- plate,
- gear,
- plate,
- GregtechItemList.Casing_Adv_BlastFurnace.get(1));
- RecipeUtils.addShapedRecipe(
- gear,
- CI.getTieredCircuit(6),
- gear,
- CI.robotArm_IV,
- GregtechItemList.Casing_Adv_BlastFurnace.get(1),
- CI.robotArm_IV,
- plate,
- GregtechItemList.Gregtech_Computer_Cube.get(1),
- plate,
- GregtechItemList.Machine_Adv_BlastFurnace.get(1));
- // Hatch_Input_Pyrotheum
- GT_Values.RA.addAssemblerRecipe(
- new ItemStack[] { ItemList.Hatch_Input_IV.get(1),
- GregtechItemList.Casing_Adv_BlastFurnace.get(1), ALLOY.MARAGING250.getPlate(4),
- ALLOY.MARAGING300.getGear(1),
- GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 2),
- GT_Utility.getIntegratedCircuit(1), },
- GT_Values.NF,
- GregtechItemList.Hatch_Input_Pyrotheum.get(1L),
- 50,
- 16);
- // Casing_Adv_BlastFurnace
- GT_Values.RA.addAssemblerRecipe(
- new ItemStack[] { ALLOY.HASTELLOY_X.getFrameBox(1), ALLOY.HASTELLOY_N.getPlateDouble(4),
- ALLOY.HASTELLOY_W.getGear(1),
- ItemUtils.simpleMetaStack("IC2:reactorHeatSwitchDiamond:1", 1, 1),
- ItemUtils.simpleMetaStack("IC2:reactorVentGold:1", 1, 1),
- ItemUtils.simpleMetaStack("IC2:reactorVentDiamond:1:1", 1, 1),
- GT_Utility.getIntegratedCircuit(1), },
- GT_Values.NF,
- GregtechItemList.Casing_Adv_BlastFurnace.get(1L),
- 50,
- 16);
-
- // Advanced Implosion Compressor
- plate = ItemUtils.getItemStackOfAmountFromOreDict("plateAlloyIridium", 1);
- gear = ALLOY.LEAGRISIUM.getGear(1);
- frame = ALLOY.CINOBITE.getFrameBox(1);
- cell1 = ItemUtils.simpleMetaStack("IC2:reactorHeatSwitchDiamond:1", 1, 1);
- cell2 = ItemUtils.simpleMetaStack("IC2:reactorVentGold:1", 1, 1);
-
- RecipeUtils.addShapedRecipe(
- gear,
- CI.getTieredCircuit(6),
- gear,
- CI.fieldGenerator_IV,
- CI.machineHull_ZPM,
- CI.robotArm_IV,
- plate,
- GregtechItemList.Gregtech_Computer_Cube.get(1),
- plate,
- GregtechItemList.Machine_Adv_ImplosionCompressor.get(1));
-
- // Supply Depot
- plate = ALLOY.TUNGSTEN_CARBIDE.getPlateDouble(1);
- gear = ALLOY.TRINIUM_TITANIUM.getRing(1);
- frame = ALLOY.TUNGSTEN_CARBIDE.getFrameBox(1);
- cell1 = CI.conveyorModule_LuV;
- cell2 = CI.electricMotor_LuV;
- ItemStack casingAmazon = GregtechItemList.Casing_AmazonWarehouse.get(1);
- ItemStack aTieredUnboxinator = CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK ? ItemUtils
- .getValueOfItemList("Machine_LuV_Unboxinator", 1, ItemList.Machine_IV_Unboxinator.get(1))
- : ItemList.Machine_IV_Unboxinator.get(1);
-
- RecipeUtils.addShapedRecipe(
- plate,
- ItemUtils.getItemStackOfAmountFromOreDict("cableGt12VanadiumGallium", 1),
- plate,
- cell1,
- frame,
- cell2,
- plate,
- gear,
- plate,
- GregtechItemList.Casing_AmazonWarehouse.get(1));
- GT_Values.RA.addAssemblerRecipe(
- new ItemStack[] { ALLOY.TUNGSTEN_CARBIDE.getFrameBox(1),
- ALLOY.TUNGSTEN_CARBIDE.getPlateDouble(4), ALLOY.TRINIUM_TITANIUM.getRing(1),
- ItemList.Electric_Motor_LuV.get(1), ItemList.Conveyor_Module_LuV.get(1),
- ItemUtils.getItemStackOfAmountFromOreDict("cableGt12VanadiumGallium", 1),
- GT_Utility.getIntegratedCircuit(1), },
- GT_Values.NF,
- GregtechItemList.Casing_AmazonWarehouse.get(1L),
- 50,
- 16);
- RecipeUtils.addShapedRecipe(
- casingAmazon,
- CI.getTieredCircuit(7),
- casingAmazon,
- CI.robotArm_LuV,
- aTieredUnboxinator,
- CI.robotArm_LuV,
- CI.conveyorModule_LuV,
- GregtechItemList.Gregtech_Computer_Cube.get(1),
- CI.conveyorModule_LuV,
- GregtechItemList.Amazon_Warehouse_Controller.get(1));
-
- // Industrial Mixing Machine
- RecipeUtils.addShapedRecipe(
- "plateStaballoy",
- CI.getTieredCircuit(5),
- "plateStaballoy",
- "plateZirconiumCarbide",
- IV_MACHINE_Mixer,
- "plateZirconiumCarbide",
- "plateStaballoy",
- CI.getTieredCircuit(5),
- "plateStaballoy",
- GregtechItemList.Industrial_Mixer.get(1));
- }
+ RecipeUtils.addShapedRecipe(
+ plate,
+ cell1,
+ plate,
+ cell3,
+ frame,
+ cell2,
+ plate,
+ gear,
+ plate,
+ GregtechItemList.Casing_Adv_BlastFurnace.get(1));
+ RecipeUtils.addShapedRecipe(
+ gear,
+ CI.getTieredCircuit(6),
+ gear,
+ CI.robotArm_IV,
+ GregtechItemList.Casing_Adv_BlastFurnace.get(1),
+ CI.robotArm_IV,
+ plate,
+ GregtechItemList.Gregtech_Computer_Cube.get(1),
+ plate,
+ GregtechItemList.Machine_Adv_BlastFurnace.get(1));
+ // Hatch_Input_Pyrotheum
+ GT_Values.RA.addAssemblerRecipe(
+ new ItemStack[] { ItemList.Hatch_Input_IV.get(1), GregtechItemList.Casing_Adv_BlastFurnace.get(1),
+ ALLOY.MARAGING250.getPlate(4), ALLOY.MARAGING300.getGear(1),
+ GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 2),
+ GT_Utility.getIntegratedCircuit(1), },
+ GT_Values.NF,
+ GregtechItemList.Hatch_Input_Pyrotheum.get(1L),
+ 50,
+ 16);
+ // Casing_Adv_BlastFurnace
+ GT_Values.RA.addAssemblerRecipe(
+ new ItemStack[] { ALLOY.HASTELLOY_X.getFrameBox(1), ALLOY.HASTELLOY_N.getPlateDouble(4),
+ ALLOY.HASTELLOY_W.getGear(1),
+ ItemUtils.simpleMetaStack("IC2:reactorHeatSwitchDiamond:1", 1, 1),
+ ItemUtils.simpleMetaStack("IC2:reactorVentGold:1", 1, 1),
+ ItemUtils.simpleMetaStack("IC2:reactorVentDiamond:1:1", 1, 1),
+ GT_Utility.getIntegratedCircuit(1), },
+ GT_Values.NF,
+ GregtechItemList.Casing_Adv_BlastFurnace.get(1L),
+ 50,
+ 16);
+
+ // Advanced Implosion Compressor
+ plate = ItemUtils.getItemStackOfAmountFromOreDict("plateAlloyIridium", 1);
+ gear = ALLOY.LEAGRISIUM.getGear(1);
+ frame = ALLOY.CINOBITE.getFrameBox(1);
+ cell1 = ItemUtils.simpleMetaStack("IC2:reactorHeatSwitchDiamond:1", 1, 1);
+ cell2 = ItemUtils.simpleMetaStack("IC2:reactorVentGold:1", 1, 1);
- if (CORE.ConfigSwitches.enableMultiblock_IndustrialMultiMachine) {
- ItemStack plate = ALLOY.STABALLOY.getPlate(1);
-
- ItemStack o_Compressor = ItemList.Machine_IV_Compressor.get(1);
- ItemStack o_Lathe = ItemList.Machine_IV_Lathe.get(1);
- ItemStack o_Electromagnet = ItemList.Machine_IV_Polarizer.get(1);
- ItemStack o_Fermenter = ItemList.Machine_IV_Fermenter.get(1);
- ItemStack o_Distillery = ItemList.Machine_IV_FluidExtractor.get(1);
- ItemStack o_Extractor = ItemList.Machine_IV_Extractor.get(1);
-
- RecipeUtils.addShapedRecipe(
- plate,
- CI.craftingToolHammer_Hard,
- plate,
- "plateStainlessSteel",
- "frameGtZirconiumCarbide",
- "plateStainlessSteel",
- plate,
- CI.craftingToolWrench,
- plate,
- GregtechItemList.Casing_Multi_Use.get(1));
- GT_Values.RA.addAssemblerRecipe(
- new ItemStack[] { ALLOY.STABALLOY.getPlate(4),
- GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 2),
- ALLOY.ZIRCONIUM_CARBIDE.getFrameBox(1), GT_Utility.getIntegratedCircuit(1), },
- GT_Values.NF,
- GregtechItemList.Casing_Multi_Use.get(1L),
- 50,
- 16);
-
- RecipeUtils.addShapedRecipe(
- o_Compressor,
- o_Lathe,
- o_Electromagnet,
- plate,
- ItemUtils.getSimpleStack(ModBlocks.blockProjectTable),
- plate,
- o_Fermenter,
- o_Distillery,
- o_Extractor,
- GregtechItemList.Industrial_MultiMachine.get(1));
- }
+ RecipeUtils.addShapedRecipe(
+ gear,
+ CI.getTieredCircuit(6),
+ gear,
+ CI.fieldGenerator_IV,
+ CI.machineHull_ZPM,
+ CI.robotArm_IV,
+ plate,
+ GregtechItemList.Gregtech_Computer_Cube.get(1),
+ plate,
+ GregtechItemList.Machine_Adv_ImplosionCompressor.get(1));
+
+ // Supply Depot
+ plate = ALLOY.TUNGSTEN_CARBIDE.getPlateDouble(1);
+ gear = ALLOY.TRINIUM_TITANIUM.getRing(1);
+ frame = ALLOY.TUNGSTEN_CARBIDE.getFrameBox(1);
+ cell1 = CI.conveyorModule_LuV;
+ cell2 = CI.electricMotor_LuV;
+ ItemStack casingAmazon = GregtechItemList.Casing_AmazonWarehouse.get(1);
+ ItemStack aTieredUnboxinator = ItemUtils
+ .getValueOfItemList("Machine_LuV_Unboxinator", 1, ItemList.Machine_IV_Unboxinator.get(1));
- /*
- * 6/1/19 - Content additions
- */
+ RecipeUtils.addShapedRecipe(
+ plate,
+ ItemUtils.getItemStackOfAmountFromOreDict("cableGt12VanadiumGallium", 1),
+ plate,
+ cell1,
+ frame,
+ cell2,
+ plate,
+ gear,
+ plate,
+ GregtechItemList.Casing_AmazonWarehouse.get(1));
+ GT_Values.RA.addAssemblerRecipe(
+ new ItemStack[] { ALLOY.TUNGSTEN_CARBIDE.getFrameBox(1), ALLOY.TUNGSTEN_CARBIDE.getPlateDouble(4),
+ ALLOY.TRINIUM_TITANIUM.getRing(1), ItemList.Electric_Motor_LuV.get(1),
+ ItemList.Conveyor_Module_LuV.get(1),
+ ItemUtils.getItemStackOfAmountFromOreDict("cableGt12VanadiumGallium", 1),
+ GT_Utility.getIntegratedCircuit(1), },
+ GT_Values.NF,
+ GregtechItemList.Casing_AmazonWarehouse.get(1L),
+ 50,
+ 16);
+ RecipeUtils.addShapedRecipe(
+ casingAmazon,
+ CI.getTieredCircuit(7),
+ casingAmazon,
+ CI.robotArm_LuV,
+ aTieredUnboxinator,
+ CI.robotArm_LuV,
+ CI.conveyorModule_LuV,
+ GregtechItemList.Gregtech_Computer_Cube.get(1),
+ CI.conveyorModule_LuV,
+ GregtechItemList.Amazon_Warehouse_Controller.get(1));
- if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
+ // Industrial Mixing Machine
+ RecipeUtils.addShapedRecipe(
+ "plateStaballoy",
+ CI.getTieredCircuit(5),
+ "plateStaballoy",
+ "plateZirconiumCarbide",
+ IV_MACHINE_Mixer,
+ "plateZirconiumCarbide",
+ "plateStaballoy",
+ CI.getTieredCircuit(5),
+ "plateStaballoy",
+ GregtechItemList.Industrial_Mixer.get(1));
+ }
- ItemStack aDrillController = ItemUtils.getValueOfItemList("OreDrill4", ItemList.Hull_UV).get(1);
+ if (CORE.ConfigSwitches.enableMultiblock_IndustrialMultiMachine) {
+ ItemStack plate = ALLOY.STABALLOY.getPlate(1);
- // Drilling Platform Casings
- CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- ItemUtils.getItemStackOfAmountFromOreDict("frameGtTriniumNaquadahCarbonite", 4),
- ItemUtils.getItemStackOfAmountFromOreDict("plateDoubleTriniumTitaniumAlloy", 1 * (1)),
- ItemUtils.getItemStackOfAmountFromOreDict("gearGtPikyonium64B", 2 * (1)),
- ALLOY.TRINIUM_REINFORCED_STEEL.getPlateDouble(4 * (1)),
- ItemUtils.getSimpleStack((CI.machineHull_LuV), 1 * (1)), },
- ALLOY.MARAGING350.getFluidStack(144 * 16 * (1)),
- GregtechItemList.Casing_BedrockMiner.get(1),
- (int) GT_Values.V[4],
- (int) GT_Values.V[6]);
- }
+ ItemStack o_Compressor = ItemList.Machine_IV_Compressor.get(1);
+ ItemStack o_Lathe = ItemList.Machine_IV_Lathe.get(1);
+ ItemStack o_Electromagnet = ItemList.Machine_IV_Polarizer.get(1);
+ ItemStack o_Fermenter = ItemList.Machine_IV_Fermenter.get(1);
+ ItemStack o_Distillery = ItemList.Machine_IV_FluidExtractor.get(1);
+ ItemStack o_Extractor = ItemList.Machine_IV_Extractor.get(1);
+
+ RecipeUtils.addShapedRecipe(
+ plate,
+ CI.craftingToolHammer_Hard,
+ plate,
+ "plateStainlessSteel",
+ "frameGtZirconiumCarbide",
+ "plateStainlessSteel",
+ plate,
+ CI.craftingToolWrench,
+ plate,
+ GregtechItemList.Casing_Multi_Use.get(1));
+ GT_Values.RA.addAssemblerRecipe(
+ new ItemStack[] { ALLOY.STABALLOY.getPlate(4),
+ GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 2),
+ ALLOY.ZIRCONIUM_CARBIDE.getFrameBox(1), GT_Utility.getIntegratedCircuit(1), },
+ GT_Values.NF,
+ GregtechItemList.Casing_Multi_Use.get(1L),
+ 50,
+ 16);
+
+ RecipeUtils.addShapedRecipe(
+ o_Compressor,
+ o_Lathe,
+ o_Electromagnet,
+ plate,
+ ItemUtils.getSimpleStack(ModBlocks.blockProjectTable),
+ plate,
+ o_Fermenter,
+ o_Distillery,
+ o_Extractor,
+ GregtechItemList.Industrial_MultiMachine.get(1));
}
+ /*
+ * 6/1/19 - Content additions
+ */
+
+ // Drilling Platform Casings
+ CORE.RA.addSixSlotAssemblingRecipe(
+ new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("frameGtTriniumNaquadahCarbonite", 4),
+ ItemUtils.getItemStackOfAmountFromOreDict("plateDoubleTriniumTitaniumAlloy", 1 * (1)),
+ ItemUtils.getItemStackOfAmountFromOreDict("gearGtPikyonium64B", 2 * (1)),
+ ALLOY.TRINIUM_REINFORCED_STEEL.getPlateDouble(4 * 1),
+ ItemUtils.getSimpleStack((CI.machineHull_LuV), 1 * 1), },
+ ALLOY.MARAGING350.getFluidStack(144 * 16 * 1),
+ GregtechItemList.Casing_BedrockMiner.get(1),
+ (int) GT_Values.V[4],
+ (int) GT_Values.V[6]);
+
int aCostMultiplier = 1;
// Reservoir Hatch
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java
deleted file mode 100644
index af4f9b90b8..0000000000
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java
+++ /dev/null
@@ -1,562 +0,0 @@
-package gtPlusPlus.core.recipe;
-
-import net.minecraft.item.ItemStack;
-
-import cpw.mods.fml.common.Loader;
-import gregtech.api.enums.GT_Values;
-import gregtech.api.enums.ItemList;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OreDictNames;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.enums.SubTag;
-import gregtech.api.interfaces.IOreRecipeRegistrator;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.recipe.common.CI;
-import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.core.util.minecraft.RecipeUtils;
-import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-
-public class RECIPES_Old_Circuits implements IOreRecipeRegistrator {
-
- public RECIPES_Old_Circuits() {
- OrePrefixes.crafting.add(this);
- }
-
- @Override
- public void registerOre(final OrePrefixes aPrefix, final Materials aMaterial, final String aOreDictName,
- final String aModName, final ItemStack aStack) {
- if (aOreDictName.equals(OreDictNames.craftingLensRed.toString())) {
- Logger.INFO("[Old Feature - Circuits] Adding recipes for old circuits. (Part 2)");
- GT_Values.RA.addLaserEngraverRecipe(
- GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Copper, 1L),
- GT_Utility.copyAmount(0L, new Object[] { aStack }),
- GregtechItemList.Old_Circuit_Parts_Wiring_Basic.get(1L, new Object[0]),
- 64,
- 30);
- GT_Values.RA.addLaserEngraverRecipe(
- GT_OreDictUnificator.get(OrePrefixes.foil, Materials.AnnealedCopper, 1L),
- GT_Utility.copyAmount(0L, new Object[] { aStack }),
- GregtechItemList.Old_Circuit_Parts_Wiring_Basic.get(1L, new Object[0]),
- 64,
- 30);
- GT_Values.RA.addLaserEngraverRecipe(
- GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gold, 1L),
- GT_Utility.copyAmount(0L, new Object[] { aStack }),
- GregtechItemList.Old_Circuit_Parts_Wiring_Advanced.get(1L, new Object[0]),
- 64,
- 120);
- GT_Values.RA.addLaserEngraverRecipe(
- GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 1L),
- GT_Utility.copyAmount(0L, new Object[] { aStack }),
- GregtechItemList.Old_Circuit_Parts_Wiring_Advanced.get(1L, new Object[0]),
- 64,
- 120);
- GT_Values.RA.addLaserEngraverRecipe(
- GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Platinum, 1L),
- GT_Utility.copyAmount(0L, new Object[] { aStack }),
- GregtechItemList.Old_Circuit_Parts_Wiring_Elite.get(1L, new Object[0]),
- 64,
- 480);
- } else if (aOreDictName.equals(OreDictNames.craftingLensGreen.toString())) {
- Logger.INFO("[Old Feature - Circuits] Adding recipes for old circuits. (Part 3)");
- GT_Values.RA.addLaserEngraverRecipe(
- GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Olivine, 1L),
- GT_Utility.copyAmount(0L, new Object[] { aStack }),
- GregtechItemList.Old_Circuit_Parts_Crystal_Chip_Elite.get(1L, new Object[0]),
- 256,
- 480);
- GT_Values.RA.addLaserEngraverRecipe(
- GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Emerald, 1L),
- GT_Utility.copyAmount(0L, new Object[] { aStack }),
- GregtechItemList.Old_Circuit_Parts_Crystal_Chip_Elite.get(1L, new Object[0]),
- 256,
- 480);
- } else if (aOreDictName.equals(OreDictNames.craftingLensBlue.toString())
- || aOreDictName.equals(OreDictNames.craftingLensCyan.toString())
- || aOreDictName.equals(OreDictNames.craftingLensLightBlue.toString())) {
- Logger.INFO("[Old Feature - Circuits] Adding recipes for old circuits. (Part 4)");
- GT_Values.RA.addLaserEngraverRecipe(
- ItemList.IC2_LapotronCrystal.getWildcard(1L, new Object[0]),
- GT_Utility.copyAmount(0L, new Object[] { aStack }),
- GregtechItemList.Old_Circuit_Parts_Crystal_Chip_Master.get(3L, new Object[0]),
- 256,
- 480);
- }
- }
-
- private static boolean addCircuitRecipes() {
- Logger.INFO("[Old Feature - Circuits] Adding recipes for old circuits. (Part 1)");
- GT_ModHandler.addShapelessCraftingRecipe(
- GregtechItemList.Old_Circuit_Primitive.get(1L, new Object[0]),
- new Object[] { GT_ModHandler.getIC2Item("casingadviron", 1L),
- OrePrefixes.wireGt01.get(Materials.RedAlloy), OrePrefixes.wireGt01.get(Materials.RedAlloy),
- OrePrefixes.wireGt01.get(Materials.Tin) });
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Old_Circuit_Basic.get(1L, new Object[0]),
- new Object[] { "WWW", "CPC", "WWW", 'C', OrePrefixes.circuit.get(Materials.Primitive), 'W',
- OreDictNames.craftingWireCopper, 'P', OrePrefixes.plate.get(Materials.Steel) });
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Old_Circuit_Basic.get(1L, new Object[0]),
- new Object[] { "WCW", "WPW", "WCW", 'C', OrePrefixes.circuit.get(Materials.Primitive), 'W',
- OreDictNames.craftingWireCopper, 'P', OrePrefixes.plate.get(Materials.Steel) });
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Old_Circuit_Basic.get(1L, new Object[0]),
- new Object[] { "WWW", "CPC", "WWW", 'C', OrePrefixes.circuit.get(Materials.Primitive), 'W',
- OrePrefixes.cableGt01.get(Materials.RedAlloy), 'P', OrePrefixes.plate.get(Materials.Steel) });
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Old_Circuit_Basic.get(1L, new Object[0]),
- new Object[] { "WCW", "WPW", "WCW", 'C', OrePrefixes.circuit.get(Materials.Primitive), 'W',
- OrePrefixes.cableGt01.get(Materials.RedAlloy), 'P', OrePrefixes.plate.get(Materials.Steel) });
-
- GT_Values.RA.addFormingPressRecipe(
- GregtechItemList.Old_Empty_Board_Basic.get(1L, new Object[0]),
- GregtechItemList.Old_Circuit_Parts_Wiring_Basic.get(4L, new Object[0]),
- GregtechItemList.Old_Circuit_Board_Basic.get(1L, new Object[0]),
- 32,
- 16);
- GT_Values.RA.addFormingPressRecipe(
- GregtechItemList.Old_Empty_Board_Basic.get(1L, new Object[0]),
- GregtechItemList.Old_Circuit_Parts_Wiring_Advanced.get(4L, new Object[0]),
- GregtechItemList.Old_Circuit_Board_Advanced.get(1L, new Object[0]),
- 32,
- 64);
- GT_Values.RA.addFormingPressRecipe(
- GregtechItemList.Old_Empty_Board_Elite.get(1L, new Object[0]),
- GregtechItemList.Old_Circuit_Parts_Wiring_Elite.get(4L, new Object[0]),
- GregtechItemList.Old_Circuit_Board_Elite.get(1L, new Object[0]),
- 32,
- 256);
-
- GT_Values.RA.addFormingPressRecipe(
- GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Lapis, 1L),
- GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glowstone, 1L),
- GregtechItemList.Old_Circuit_Parts_Advanced.get(2L, new Object[0]),
- 32,
- 64);
- GT_Values.RA.addFormingPressRecipe(
- GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Lazurite, 1L),
- GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glowstone, 1L),
- GregtechItemList.Old_Circuit_Parts_Advanced.get(2L, new Object[0]),
- 32,
- 64);
-
- int tMultiplier;
- for (Materials tMat : Materials.values()) {
- if ((tMat.mStandardMoltenFluid != null) && (tMat.contains(SubTag.SOLDERING_MATERIAL))) {
- tMultiplier = tMat.contains(SubTag.SOLDERING_MATERIAL_BAD) ? 4
- : tMat.contains(SubTag.SOLDERING_MATERIAL_GOOD) ? 1 : 2;
-
- GT_Values.RA.addAssemblerRecipe(
- ItemList.IC2_Item_Casing_Steel.get(1L, new Object[0]),
- GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.RedAlloy, 2L),
- tMat.getMolten(144L * tMultiplier / 8L),
- GregtechItemList.Old_Circuit_Primitive.get(1L, new Object[0]),
- 16,
- 8);
- GT_Values.RA.addAssemblerRecipe(
- GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Plastic, 1L),
- GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.RedAlloy, 1L),
- tMat.getMolten(144L * tMultiplier / 8L),
- GregtechItemList.Old_Circuit_Primitive.get(1L, new Object[0]),
- 16,
- 8);
- GT_Values.RA.addAssemblerRecipe(
- GregtechItemList.Old_Circuit_Board_Basic.get(1L, new Object[0]),
- GregtechItemList.Old_Circuit_Primitive.get(2L, new Object[0]),
- tMat.getMolten(144L * tMultiplier / 4L),
- GregtechItemList.Old_Circuit_Basic.get(1L, new Object[0]),
- 32,
- 16);
- GT_Values.RA.addAssemblerRecipe(
- GregtechItemList.Old_Circuit_Basic.get(1L, new Object[0]),
- GregtechItemList.Old_Circuit_Primitive.get(2L, new Object[0]),
- tMat.getMolten(144L * tMultiplier / 4L),
- GregtechItemList.Old_Circuit_Good.get(1L, new Object[0]),
- 32,
- 16);
- GT_Values.RA.addAssemblerRecipe(
- GregtechItemList.Old_Circuit_Board_Advanced.get(1L, new Object[0]),
- GregtechItemList.Old_Circuit_Parts_Advanced.get(2L, new Object[0]),
- tMat.getMolten(144L * tMultiplier / 2L),
- GregtechItemList.Old_Circuit_Advanced.get(1L, new Object[0]),
- 32,
- 64);
- GT_Values.RA.addAssemblerRecipe(
- GregtechItemList.Old_Circuit_Board_Advanced.get(1L, new Object[0]),
- GregtechItemList.Old_Circuit_Parts_Crystal_Chip_Elite.get(1L, new Object[0]),
- tMat.getMolten(144L * tMultiplier / 2L),
- GregtechItemList.Old_Circuit_Data.get(1L, new Object[0]),
- 32,
- 64);
- GT_Values.RA.addAssemblerRecipe(
- GregtechItemList.Old_Circuit_Board_Elite.get(1L, new Object[0]),
- GregtechItemList.Old_Circuit_Data.get(3L, new Object[0]),
- tMat.getMolten(144L * tMultiplier / 1L),
- GregtechItemList.Old_Circuit_Elite.get(1L, new Object[0]),
- 32,
- 256);
- GT_Values.RA.addAssemblerRecipe(
- GregtechItemList.Old_Circuit_Board_Elite.get(1L, new Object[0]),
- ItemList.Circuit_Parts_Crystal_Chip_Master.get(3L, new Object[0]),
- tMat.getMolten(144L * tMultiplier / 1L),
- GregtechItemList.Old_Circuit_Master.get(1L, new Object[0]),
- 32,
- 256);
- GT_Values.RA.addAssemblerRecipe(
- GregtechItemList.Old_Circuit_Board_Elite.get(1L, new Object[0]),
- GregtechItemList.Old_Circuit_Parts_Crystal_Chip_Master.get(3L, new Object[0]),
- tMat.getMolten(144L * tMultiplier / 1L),
- GregtechItemList.Old_Circuit_Master.get(1L, new Object[0]),
- 32,
- 256);
- GT_Values.RA.addAssemblerRecipe(
- GregtechItemList.Old_Circuit_Data.get(1L, new Object[0]),
- GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Plastic, 2L),
- tMat.getMolten(144L * tMultiplier / 2L),
- GregtechItemList.Old_Tool_DataStick.get(1L, new Object[0]),
- 128,
- 64);
- }
- }
-
- GT_Values.RA.addAssemblerRecipe(
- GregtechItemList.Old_Circuit_Elite.get(2L, new Object[0]),
- GregtechItemList.Old_Circuit_Parts_Crystal_Chip_Elite.get(18L, new Object[0]),
- GT_Values.NF,
- GregtechItemList.Old_Tool_DataOrb.get(1L, new Object[0]),
- 512,
- 256);
- GT_Values.RA.addAssemblerRecipe(
- GregtechItemList.Old_Circuit_Master.get(2L, new Object[0]),
- ItemList.Circuit_Parts_Crystal_Chip_Master.get(18L, new Object[0]),
- GT_Values.NF,
- ItemList.Energy_LapotronicOrb.get(1L, new Object[0]),
- 512,
- 1024);
- GT_Values.RA.addAssemblerRecipe(
- GregtechItemList.Old_Circuit_Master.get(2L, new Object[0]),
- GregtechItemList.Old_Circuit_Parts_Crystal_Chip_Master.get(18L, new Object[0]),
- GT_Values.NF,
- ItemList.Energy_LapotronicOrb.get(1L, new Object[0]),
- 512,
- 1024);
- GT_Values.RA.addAssemblerRecipe(
- GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Silicon, 1L),
- GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Plastic, 1L),
- GregtechItemList.Old_Empty_Board_Basic.get(1L, new Object[0]),
- 32,
- 16);
-
- Materials plasticType = Materials.get("Polytetrafluoroethylene") != null
- ? Materials.get("Polytetrafluoroethylene")
- : Materials.Plastic;
- GT_Values.RA.addAssemblerRecipe(
- GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Silicon, 2L),
- GT_OreDictUnificator.get(OrePrefixes.plate, plasticType, 1L),
- GregtechItemList.Old_Empty_Board_Elite.get(1L, new Object[0]),
- 32,
- 256);
-
- return true;
- }
-
- public static boolean handleCircuits() {
- hideCircuitsNEI();
- addCircuitRecipes();
- removeNewCircuits();
- generateTradeRecipes();
- return true;
- }
-
- private static boolean setItemList(ItemList Set, GregtechItemList Get) {
- try {
- Set.set(Get.get(1));
- return true;
- } catch (Throwable t) {}
- return false;
- }
-
- private static boolean removeNewCircuits() {
- Logger.INFO(
- "[Old Feature - Circuits] Overriding .28+ circuit values in the GT5u Itemlist with values from GT++.");
-
- boolean newVersion = CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK && Utils.getGregtechSubVersion() >= 30;
-
- setItemList(ItemList.Circuit_Primitive, GregtechItemList.Old_Circuit_Primitive);
- setItemList(ItemList.Circuit_Basic, GregtechItemList.Old_Circuit_Basic);
- setItemList(ItemList.Circuit_Good, GregtechItemList.Old_Circuit_Good);
- setItemList(ItemList.Circuit_Advanced, GregtechItemList.Old_Circuit_Advanced);
- // ItemList.Circuit_Data, GregtechItemList.Old_Circuit_Data);
- setItemList(ItemList.Circuit_Elite, GregtechItemList.Old_Circuit_Elite);
- setItemList(ItemList.Circuit_Master, GregtechItemList.Old_Circuit_Master);
- setItemList(ItemList.Circuit_Ultimate, GregtechItemList.Old_Circuit_Ultimate);
-
- /**
- * Try Set New circuits to have old replacements
- */
-
- // Basic
- if (newVersion) {
- setItemList(ItemList.valueOf("Circuit_Microprocessor"), GregtechItemList.Old_Circuit_Basic); // NEW
- }
- // Good
- if (newVersion) {
- setItemList(ItemList.valueOf("Circuit_Integrated_Good"), GregtechItemList.Old_Circuit_Good); // New
- }
- // Advanced
- if (newVersion) {
- setItemList(ItemList.valueOf("Circuit_Nanoprocessor"), GregtechItemList.Old_Circuit_Advanced);
- }
- // Data
- if (newVersion) {
- setItemList(ItemList.valueOf("Circuit_Quantumprocessor"), GregtechItemList.Old_Circuit_Data);
- }
- if (newVersion) {
- setItemList(ItemList.valueOf("Circuit_Nanocomputer"), GregtechItemList.Old_Circuit_Data);
- }
- // Elite
- if (newVersion) {
- setItemList(ItemList.valueOf("Circuit_Crystalprocessor"), GregtechItemList.Old_Circuit_Elite);
- }
- if (newVersion) {
- setItemList(ItemList.valueOf("Circuit_Quantumcomputer"), GregtechItemList.Old_Circuit_Elite);
- }
- if (newVersion) {
- setItemList(ItemList.valueOf("Circuit_Elitenanocomputer"), GregtechItemList.Old_Circuit_Elite);
- }
- // Master
- if (newVersion) {
- setItemList(ItemList.valueOf("Circuit_Neuroprocessor"), GregtechItemList.Old_Circuit_Master);
- }
- if (newVersion) {
- setItemList(ItemList.valueOf("Circuit_Masterquantumcomputer"), GregtechItemList.Old_Circuit_Master);
- }
- // Ultimate
- if (newVersion) {
- setItemList(ItemList.valueOf("Circuit_Wetwarecomputer"), GregtechItemList.Old_Circuit_Ultimate);
- }
- if (newVersion) {
- setItemList(ItemList.valueOf("Circuit_Ultimatecrystalcomputer"), GregtechItemList.Old_Circuit_Ultimate);
- }
- if (newVersion) {
- setItemList(ItemList.valueOf("Circuit_Quantummainframe"), GregtechItemList.Old_Circuit_Ultimate);
- }
- // Superconductor
- if (newVersion) {
- setItemList(ItemList.valueOf("Circuit_Wetwaresupercomputer"), GregtechItemList.Circuit_IV);
- }
- if (newVersion) {
- setItemList(ItemList.valueOf("Circuit_Crystalmainframe"), GregtechItemList.Circuit_IV);
- }
- // Infinite
- if (newVersion) {
- setItemList(ItemList.valueOf("Circuit_Wetwaremainframe"), GregtechItemList.Circuit_LuV);
- }
-
- // set data orbs and sticks to their new replacements
- setItemList(ItemList.Tool_DataStick, GregtechItemList.Old_Tool_DataStick);
- setItemList(ItemList.Tool_DataOrb, GregtechItemList.Old_Tool_DataOrb);
-
- setItemList(ItemList.Circuit_Board_Basic, GregtechItemList.Old_Circuit_Board_Basic);
- setItemList(ItemList.Circuit_Board_Advanced, GregtechItemList.Old_Circuit_Board_Advanced);
- setItemList(ItemList.Circuit_Board_Elite, GregtechItemList.Old_Circuit_Board_Elite);
- setItemList(ItemList.Circuit_Parts_Advanced, GregtechItemList.Old_Circuit_Parts_Advanced);
- setItemList(ItemList.Circuit_Parts_Wiring_Basic, GregtechItemList.Old_Circuit_Parts_Wiring_Basic);
- setItemList(ItemList.Circuit_Parts_Wiring_Advanced, GregtechItemList.Old_Circuit_Parts_Wiring_Advanced);
- setItemList(ItemList.Circuit_Parts_Wiring_Elite, GregtechItemList.Old_Circuit_Parts_Wiring_Elite);
- setItemList(ItemList.Circuit_Parts_Crystal_Chip_Elite, GregtechItemList.Old_Circuit_Parts_Crystal_Chip_Elite);
- setItemList(ItemList.Circuit_Parts_Crystal_Chip_Master, GregtechItemList.Old_Circuit_Parts_Crystal_Chip_Master);
-
- return true;
- }
-
- private static boolean generateTradeRecipes() {
-
- // Data stick and Data orbs.
- // GT Type to GT++ Type
- RecipeUtils.recipeBuilder(
- CI.craftingToolScrewdriver,
- null,
- null,
- ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32708", 32708, 1),
- null,
- null,
- null,
- null,
- null,
- GregtechItemList.Old_Tool_DataStick.get(1));
- RecipeUtils.recipeBuilder(
- CI.craftingToolScrewdriver,
- null,
- null,
- ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32707", 32707, 1),
- null,
- null,
- null,
- null,
- null,
- GregtechItemList.Old_Tool_DataOrb.get(1));
-
- // GT++ Type to GT Type
- RecipeUtils.recipeBuilder(
- CI.craftingToolScrewdriver,
- null,
- null,
- GregtechItemList.Old_Tool_DataStick.get(1),
- null,
- null,
- null,
- null,
- null,
- ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32708", 32708, 1));
- RecipeUtils.recipeBuilder(
- CI.craftingToolScrewdriver,
- null,
- null,
- GregtechItemList.Old_Tool_DataOrb.get(1),
- null,
- null,
- null,
- null,
- null,
- ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32707", 32707, 1));
-
- // Primitive
- RecipeUtils.addShapelessGregtechRecipe(
- new ItemStack[] { ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32700", 32700, 1) },
- ItemUtils.getItemStackOfAmountFromOreDict("circuitPrimitive", 1));
-
- // Basic
- RecipeUtils.addShapelessGregtechRecipe(
- new ItemStack[] { ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32701", 32701, 1) },
- ItemUtils.getItemStackOfAmountFromOreDict("circuitBasic", 1));
- RecipeUtils.addShapelessGregtechRecipe(
- new ItemStack[] { ItemUtils.simpleMetaStack("gregtech:gt.metaitem.03:32078", 32078, 1) },
- ItemUtils.getItemStackOfAmountFromOreDict("circuitBasic", 1));
-
- // Good
- RecipeUtils.addShapelessGregtechRecipe(
- new ItemStack[] { ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32702", 32702, 1) },
- ItemUtils.getItemStackOfAmountFromOreDict("circuitGood", 1));
- RecipeUtils.addShapelessGregtechRecipe(
- new ItemStack[] { ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32702", 32702, 1) },
- ItemUtils.getItemStackOfAmountFromOreDict("circuitGood", 1));
-
- // Advanced
- RecipeUtils.addShapelessGregtechRecipe(
- new ItemStack[] { ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32703", 32703, 1) },
- ItemUtils.getItemStackOfAmountFromOreDict("circuitAdvanced", 1));
- RecipeUtils.addShapelessGregtechRecipe(
- new ItemStack[] { ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32703", 32703, 1) },
- ItemUtils.getItemStackOfAmountFromOreDict("circuitAdvanced", 1));
-
- // Data
- RecipeUtils.addShapelessGregtechRecipe(
- new ItemStack[] { ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32704", 32704, 1) },
- ItemUtils.getItemStackOfAmountFromOreDict("circuitData", 1));
-
- // Elite
- RecipeUtils.addShapelessGregtechRecipe(
- new ItemStack[] { ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32705", 32705, 1) },
- ItemUtils.getItemStackOfAmountFromOreDict("circuitElite", 1));
-
- // Master
- RecipeUtils.addShapelessGregtechRecipe(
- new ItemStack[] { ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32706", 32706, 1) },
- ItemUtils.getItemStackOfAmountFromOreDict("circuitMaster", 1));
-
- // Components
- // Green Chip
- RecipeUtils.addShapelessGregtechRecipe(
- new ItemStack[] { ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32713", 32713, 1) },
- GregtechItemList.Old_Circuit_Parts_Crystal_Chip_Elite.get(1));
- // Blue Chip
- RecipeUtils.addShapelessGregtechRecipe(
- new ItemStack[] { ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32714", 32714, 1) },
- GregtechItemList.Old_Circuit_Parts_Crystal_Chip_Master.get(1));
-
- // Basic Board
- RecipeUtils.addShapelessGregtechRecipe(
- new ItemStack[] { ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32710", 32710, 1) },
- GregtechItemList.Old_Circuit_Board_Basic.get(1));
- // Advanced Board
- RecipeUtils.addShapelessGregtechRecipe(
- new ItemStack[] { ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32711", 32711, 1) },
- GregtechItemList.Old_Circuit_Board_Advanced.get(1));
- // Elite Board
- RecipeUtils.addShapelessGregtechRecipe(
- new ItemStack[] { ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32712", 32712, 1) },
- GregtechItemList.Old_Circuit_Board_Elite.get(1));
-
- // remove a few recipes
- /*
- * GT_ModHandler.removeRecipeByOutput(ItemUtils.simpleMetaStack("gregtech:gt.metaitem.03:32070", 32070, 1));
- * GT_ModHandler.removeRecipeByOutput(ItemUtils.simpleMetaStack("gregtech:gt.metaitem.03:32069", 32069, 1)); if
- * (LoadedMods.Extra_Utils){ ItemStack EQU = ItemUtils.simpleMetaStack("ExtraUtilities:enderQuarryUpgrade", 0,
- * 1); if (EQU != null){ GT_ModHandler.removeRecipeByOutput(EQU); GT_Values.RA.addAssemblerRecipe(
- * ItemUtils.simpleMetaStack("ExtraUtilities:decorativeBlock1:12", 12, 1),
- * GregtechItemList.Old_Circuit_Master.get(1), EQU, 80*20, 2); } } if (LoadedMods.GalacticraftCore){ ItemStack
- * ACW = ItemUtils.simpleMetaStack("GalacticraftCore:item.basicItem:14", 14, 1); if (ACW != null){
- * GT_ModHandler.removeRecipeByOutput(ACW); GT_Values.RA.addAssemblerRecipe(
- * ItemUtils.getItemStackOfAmountFromOreDict("gemDiamond", 1),
- * GregtechItemList.Old_Circuit_Board_Advanced.get(1), ACW, 160*20, 4); } ItemStack ACW2 =
- * ItemUtils.simpleMetaStack("GalacticraftCore:item.basicItem:13", 13, 1); if (ACW2 != null){
- * GT_ModHandler.removeRecipeByOutput(ACW2); GT_Values.RA.addAssemblerRecipe(
- * ItemUtils.getItemStackOfAmountFromOreDict("gemDiamond", 1), GregtechItemList.Old_Circuit_Board_Basic.get(1),
- * ACW2, 80*20, 2); } }
- */
-
- return true;
- }
-
- private static boolean hideCircuitsNEI() {
- Boolean isNEILoaded = Loader.isModLoaded("NotEnoughItems");
- if (isNEILoaded && !CORE.ConfigSwitches.showHiddenNEIItems) {
- Logger.INFO("[Old Feature - Circuits] Hiding .28+ circuits in NEI.");
- String[] CircuitToHide = { "Circuit_Board_Basic", "Circuit_Board_Advanced", "Circuit_Board_Elite",
- "Circuit_Parts_Advanced", "Circuit_Parts_Wiring_Basic", "Circuit_Parts_Wiring_Advanced",
- "Circuit_Parts_Wiring_Elite", "Circuit_Parts_Crystal_Chip_Elite",
- "Circuit_Parts_Crystal_Chip_Master", "Circuit_Primitive", "Circuit_Basic",
- "Circuit_Integrated_Good", "Circuit_Good", "Circuit_Advanced", "Circuit_Data", "Circuit_Elite",
- "Circuit_Master", "Circuit_Ultimate", "Circuit_Board_Coated", "Circuit_Board_Phenolic",
- "Circuit_Board_Epoxy", "Circuit_Board_Fiberglass", "Circuit_Board_Multifiberglass",
- "Circuit_Board_Wetware", "Circuit_Parts_Resistor", "Circuit_Parts_ResistorSMD",
- "Circuit_Parts_Glass_Tube", "Circuit_Parts_Vacuum_Tube", "Circuit_Parts_Coil",
- "Circuit_Parts_Diode", "Circuit_Parts_DiodeSMD", "Circuit_Parts_Transistor",
- "Circuit_Parts_TransistorSMD", "Circuit_Parts_Capacitor", "Circuit_Parts_CapacitorSMD",
- "Circuit_Silicon_Ingot", "Circuit_Silicon_Ingot2", "Circuit_Silicon_Ingot3",
- "Circuit_Silicon_Wafer", "Circuit_Silicon_Wafer2", "Circuit_Silicon_Wafer3", "Circuit_Wafer_ILC",
- "Circuit_Chip_ILC", "Circuit_Wafer_Ram", "Circuit_Chip_Ram", "Circuit_Wafer_NAND",
- "Circuit_Chip_NAND", "Circuit_Wafer_NOR", "Circuit_Chip_NOR", "Circuit_Wafer_CPU",
- "Circuit_Chip_CPU", "Circuit_Wafer_SoC", "Circuit_Chip_SoC", "Circuit_Wafer_SoC2",
- "Circuit_Chip_SoC2", "Circuit_Wafer_PIC", "Circuit_Chip_PIC", "Circuit_Wafer_HPIC",
- "Circuit_Chip_HPIC", "Circuit_Wafer_NanoCPU", "Circuit_Chip_NanoCPU", "Circuit_Wafer_QuantumCPU",
- "Circuit_Chip_QuantumCPU", "Circuit_Chip_CrystalCPU", "Circuit_Chip_CrystalSoC",
- "Circuit_Chip_NeuroCPU", "Circuit_Chip_Stemcell", "Circuit_Processor", "Circuit_Computer",
- "Circuit_Nanoprocessor", "Circuit_Nanocomputer", "Circuit_Elitenanocomputer",
- "Circuit_Quantumprocessor", "Circuit_Quantumcomputer", "Circuit_Masterquantumcomputer",
- "Circuit_Quantummainframe", "Circuit_Crystalprocessor", "Circuit_Crystalcomputer",
- "Circuit_Ultimatecrystalcomputer", "Circuit_Crystalmainframe", "Circuit_Neuroprocessor",
- "Circuit_Wetwarecomputer", "Circuit_Wetwaresupercomputer", "Circuit_Wetwaremainframe",
- "Circuit_Parts_RawCrystalChip",
- // Circuits Additions in .30/.31
- "Circuit_Board_Plastic", "Circuit_Parts_GlassFiber", "Circuit_Parts_PetriDish",
- "Circuit_Microprocessor" };
-
- for (String component : CircuitToHide) {
- try {
- ItemUtils.hideItemFromNEI(ItemUtils.getValueOfItemList(component, null).get(1L, new Object[0]));
- } catch (IllegalArgumentException I) {
- Logger.INFO("Could not find " + component + " in the Gregtech item list.");
- Logger.INFO("This is NOT an error, simply a notification.");
- }
- }
- }
- return true;
- }
-}
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Shapeless.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Shapeless.java
deleted file mode 100644
index 0bfd3605b9..0000000000
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Shapeless.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package gtPlusPlus.core.recipe;
-
-import net.minecraft.item.ItemStack;
-
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.LoadedMods;
-
-public class RECIPES_Shapeless {
-
- static ItemStack dustStaballoy;
-
- // Circuits
- static String circuitPrimitive = "circuitPrimitive";
- static String circuitBasic = "circuitBasic";
- static String circuitGood = "circuitGood";
- static String circuitAdvanced = "circuitAdvanced";
- static String circuitData = "circuitData";
- static String circuitElite = "circuitElite";
- static String circuitMaster = "circuitMaster";
- static String circuitUltimate = "circuitUltimate";
- static ItemStack gearboxCasing_Tier_1;
-
- public static final void loadRecipes() {
- // run();
- Logger.INFO("Loading Shapeless Recipes.");
- }
-
- private static void run() {
- // Gregtech items
- if (LoadedMods.Gregtech) {}
- }
-}
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPE_Batteries.java b/src/main/java/gtPlusPlus/core/recipe/RECIPE_Batteries.java
index 44ae76b363..26b695804c 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPE_Batteries.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPE_Batteries.java
@@ -3,7 +3,6 @@ package gtPlusPlus.core.recipe;
import net.minecraft.item.ItemStack;
import gregtech.api.enums.ItemList;
-import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.core.recipe.common.CI;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.minecraft.RecipeUtils;
@@ -20,11 +19,8 @@ public class RECIPE_Batteries {
static ItemStack machineTransformer_EV;
public static void loadRecipes() {
-
- if (LoadedMods.Gregtech) {
- machineTransformer_EV = ItemList.Transformer_EV_HV.get(1);
- run();
- }
+ machineTransformer_EV = ItemList.Transformer_EV_HV.get(1);
+ run();
}
private static void run() {
diff --git a/src/main/java/gtPlusPlus/core/recipe/common/CI.java b/src/main/java/gtPlusPlus/core/recipe/common/CI.java
index 486cbd97ca..03d4f66eb9 100644
--- a/src/main/java/gtPlusPlus/core/recipe/common/CI.java
+++ b/src/main/java/gtPlusPlus/core/recipe/common/CI.java
@@ -13,7 +13,6 @@ import gregtech.api.util.GT_Utility;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.item.chemistry.AgriculturalChem;
import gtPlusPlus.core.item.chemistry.GenericChem;
-import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.material.ALLOY;
import gtPlusPlus.core.material.ELEMENT;
import gtPlusPlus.core.material.Material;
@@ -235,34 +234,7 @@ public class CI {
}
public static Object getTieredCircuit(int tier) {
- if (CORE.ConfigSwitches.enableOldGTcircuits && CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK && !CORE.GTNH) {
- if (tier == 0) {
- return GregtechItemList.Old_Circuit_Primitive.get(1);
- } else if (tier == 1) {
- return GregtechItemList.Old_Circuit_Basic.get(1);
- } else if (tier == 2) {
- return GregtechItemList.Old_Circuit_Good.get(1);
- } else if (tier == 3) {
- return GregtechItemList.Old_Circuit_Advanced.get(1);
- } else if (tier == 4) {
- return GregtechItemList.Old_Circuit_Data.get(1);
- } else if (tier == 5) {
- return GregtechItemList.Old_Circuit_Elite.get(1);
- } else if (tier == 6) {
- return GregtechItemList.Old_Circuit_Master.get(1);
- } else if (tier == 7) {
- return GregtechItemList.Old_Circuit_Ultimate.get(1);
- } else if (tier == 8) {
- return GregtechItemList.Circuit_IV.get(1);
- } else if (tier == 9) {
- return GregtechItemList.Circuit_LuV.get(1);
- } else if (tier == 10) {
- return GregtechItemList.Circuit_ZPM.get(1);
- }
- } else {
- return getTieredCircuitOreDictName(tier);
- }
- return _NULL;
+ return getTieredCircuitOreDictName(tier);
}
public static ItemStack[] getAllCircuitsOfTier(int tier) {
@@ -352,19 +324,11 @@ public class CI {
}
public static ItemStack getDataOrb() {
- if (CORE.ConfigSwitches.enableOldGTcircuits && CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK && !CORE.GTNH) {
- return GregtechItemList.Old_Tool_DataOrb.get(1);
- } else {
- return ItemList.Tool_DataOrb.get(1);
- }
+ return ItemList.Tool_DataOrb.get(1);
}
public static ItemStack getDataStick() {
- if (CORE.ConfigSwitches.enableOldGTcircuits && CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK && !CORE.GTNH) {
- return GregtechItemList.Old_Tool_DataStick.get(1);
- } else {
- return ItemList.Tool_DataStick.get(1);
- }
+ return ItemList.Tool_DataStick.get(1);
}
public static final ItemStack getTieredMachineHull(int tier) {
@@ -481,10 +445,9 @@ public class CI {
ALLOY.TITANSTEEL, ELEMENT.STANDALONE.ASTRAL_TITANIUM, ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN,
ELEMENT.STANDALONE.HYPOGEN };
- private static final Materials[] aMaterial_Cables = new Materials[] { !CORE.GTNH ? Materials.Lead : Materials.Tin,
- Materials.Cobalt, Materials.AnnealedCopper, Materials.Gold, Materials.Titanium, Materials.Nichrome,
- Materials.Platinum, Materials.YttriumBariumCuprate, Materials.Naquadah, Materials.Duranium,
- Materials.Superconductor, };
+ private static final Materials[] aMaterial_Cables = new Materials[] { Materials.Tin, Materials.Cobalt,
+ Materials.AnnealedCopper, Materials.Gold, Materials.Titanium, Materials.Nichrome, Materials.Platinum,
+ Materials.YttriumBariumCuprate, Materials.Naquadah, Materials.Duranium, Materials.Superconductor, };
private static final Materials[] aMaterial_Circuits = new Materials[] { Materials.Primitive, Materials.Basic,
Materials.Good, Materials.Advanced, Materials.Data, Materials.Data, Materials.Elite, Materials.Master,
@@ -747,9 +710,6 @@ public class CI {
}
public static ItemStack getFluidRegulator(int aTier, int aSize) {
- if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
- return CI.getElectricPump(aTier, aSize);
- }
ItemStack aType;
int aLazyTier = 0;
if (aTier == aLazyTier++) {
@@ -1011,26 +971,10 @@ public class CI {
}
public static ItemStack getHeatCoil(int i) {
- if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
- if (i == 1) {
- return ItemList.Casing_Coil_Kanthal.get(1);
- } else if (i == 2) {
- return ItemList.Casing_Coil_Nichrome.get(1);
- } else {
- return ItemList.Casing_Coil_Cupronickel.get(1);
- }
- } else {
- if (!CORE.GTNH) {
- if (i > 6) {
- i = 6;
- }
- } else {
- if (i > 8) {
- i = 8;
- }
- }
- return ItemUtils.simpleMetaStack(StaticFields59.getBlockCasings5(), i, 1);
+ if (i > 8) {
+ i = 8;
}
+ return ItemUtils.simpleMetaStack(StaticFields59.getBlockCasings5(), i, 1);
}
public static ItemStack getNumberedBioCircuit(int i) {
diff --git a/src/main/java/gtPlusPlus/core/util/Utils.java b/src/main/java/gtPlusPlus/core/util/Utils.java
index b95574fc60..2155535acc 100644
--- a/src/main/java/gtPlusPlus/core/util/Utils.java
+++ b/src/main/java/gtPlusPlus/core/util/Utils.java
@@ -7,7 +7,6 @@ import java.io.File;
import java.io.IOException;
import java.io.ObjectOutput;
import java.io.ObjectOutputStream;
-import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
@@ -46,7 +45,6 @@ import org.apache.commons.lang3.EnumUtils;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.registry.EntityRegistry;
import cpw.mods.fml.common.registry.EntityRegistry.EntityRegistration;
-import gregtech.GT_Mod;
import gregtech.api.GregTech_API;
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.Materials;
@@ -58,16 +56,13 @@ import gregtech.api.util.GT_Utility;
import gtPlusPlus.GTplusplus;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.api.objects.data.AutoMap;
-import gtPlusPlus.api.objects.data.Pair;
import gtPlusPlus.core.item.ModItems;
import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.core.util.minecraft.FluidUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.minecraft.NBTUtils;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
import gtPlusPlus.core.util.sys.SystemUtils;
import gtPlusPlus.plugin.villagers.tile.TileEntityGenericSpawner;
import ic2.core.Ic2Items;
@@ -807,63 +802,6 @@ public class Utils {
return GT_Utility.copy(new Object[] { rStack });
}
- @SuppressWarnings({ "unused", "unchecked" })
- public static Pair<Integer, Integer> getGregtechVersion() {
- Pair<Integer, Integer> version;
- if (GT_Mod.VERSION == 509) {
- Class<GT_Mod> clazz;
- try {
-
- if (LoadedMods.BeyondRealityCore) {
- // Safely assume it's Beyond Reality running .28-pre (If it's not, tough shit really?)
- return new Pair<Integer, Integer>(9, 28);
- }
-
- clazz = (Class<GT_Mod>) ReflectionUtils.getClass("gregtech.GT_Mod");
- Field mSubversion = ReflectionUtils.getField(clazz, "SUBVERSION");
- if (mSubversion != null) {
- int mSub = 0;
- mSub = mSubversion.getInt(clazz);
- if (mSub != 0) {
- version = new Pair<Integer, Integer>(9, mSub);
- return version;
- }
- }
- } catch (Throwable t) {
-
- }
- }
- // 5.08.33
- else if (GT_Mod.VERSION == 508) {
- version = new Pair<Integer, Integer>(8, 33);
- return version;
-
- }
- // 5.07.07
- else if (GT_Mod.VERSION == 507) {
- version = new Pair<Integer, Integer>(7, 7);
- return version;
- }
- // Returb Bad Value
- version = new Pair<Integer, Integer>(0, 0);
- return version;
- }
-
- public static int getGregtechVersionAsInt() {
- Pair<Integer, Integer> ver = getGregtechVersion();
- return 50000 + (ver.getKey() * 100) + (ver.getValue());
- }
-
- public static String getGregtechVersionAsString() {
- Pair<Integer, Integer> ver = getGregtechVersion();
- return "5." + ver.getKey() + "." + ver.getValue();
- }
-
- public static int getGregtechSubVersion() {
- Pair<Integer, Integer> ver = getGregtechVersion();
- return ver.getValue();
- }
-
public static SecureRandom generateSecureRandom() {
SecureRandom secRan;
String secRanType;
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/HazmatUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/HazmatUtils.java
index 80536189ce..b4e6a8fceb 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/HazmatUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/HazmatUtils.java
@@ -56,21 +56,19 @@ public class HazmatUtils {
// Make Nano a hazmat suit
// Make Quantum a hazmat suit
- if (LoadedMods.IndustrialCraft2 || LoadedMods.IndustrialCraft2Classic) {
- AutoMap<ItemStack> aVanillaIC2Armour = new AutoMap<ItemStack>();
- aVanillaIC2Armour.add(ItemUtils.getSimpleStack(Ic2Items.nanoHelmet, 1));
- aVanillaIC2Armour.add(ItemUtils.getSimpleStack(Ic2Items.nanoBodyarmor, 1));
- aVanillaIC2Armour.add(ItemUtils.getSimpleStack(Ic2Items.nanoLeggings, 1));
- aVanillaIC2Armour.add(ItemUtils.getSimpleStack(Ic2Items.nanoBoots, 1));
- aVanillaIC2Armour.add(ItemUtils.getSimpleStack(Ic2Items.quantumHelmet, 1));
- aVanillaIC2Armour.add(ItemUtils.getSimpleStack(Ic2Items.quantumBodyarmor, 1));
- aVanillaIC2Armour.add(ItemUtils.getSimpleStack(Ic2Items.quantumLeggings, 1));
- aVanillaIC2Armour.add(ItemUtils.getSimpleStack(Ic2Items.quantumBoots, 1));
- for (ItemStack aItem : aVanillaIC2Armour) {
- addProtection(aItem);
- }
- Logger.INFO("[Hazmat] Registered IC2 Items as hazmat gear.");
+ AutoMap<ItemStack> aVanillaIC2Armour = new AutoMap<ItemStack>();
+ aVanillaIC2Armour.add(ItemUtils.getSimpleStack(Ic2Items.nanoHelmet, 1));
+ aVanillaIC2Armour.add(ItemUtils.getSimpleStack(Ic2Items.nanoBodyarmor, 1));
+ aVanillaIC2Armour.add(ItemUtils.getSimpleStack(Ic2Items.nanoLeggings, 1));
+ aVanillaIC2Armour.add(ItemUtils.getSimpleStack(Ic2Items.nanoBoots, 1));
+ aVanillaIC2Armour.add(ItemUtils.getSimpleStack(Ic2Items.quantumHelmet, 1));
+ aVanillaIC2Armour.add(ItemUtils.getSimpleStack(Ic2Items.quantumBodyarmor, 1));
+ aVanillaIC2Armour.add(ItemUtils.getSimpleStack(Ic2Items.quantumLeggings, 1));
+ aVanillaIC2Armour.add(ItemUtils.getSimpleStack(Ic2Items.quantumBoots, 1));
+ for (ItemStack aItem : aVanillaIC2Armour) {
+ addProtection(aItem);
}
+ Logger.INFO("[Hazmat] Registered IC2 Items as hazmat gear.");
if (LoadedMods.isModLoaded("EMT")) {
AutoMap<Field> aItemFields = new AutoMap<Field>();
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java
index 1722d22c13..6806e06315 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java
@@ -46,7 +46,6 @@ import gtPlusPlus.core.item.chemistry.GenericChem;
import gtPlusPlus.core.item.tool.staballoy.MultiPickaxeBase;
import gtPlusPlus.core.item.tool.staballoy.MultiSpadeBase;
import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.recipe.common.CI;
import gtPlusPlus.core.util.Utils;
@@ -269,7 +268,7 @@ public class ItemUtils {
} else {
temp2 = fqrnSplit[2];
}
- temp = ItemUtils.getItemStackWithMeta(LoadedMods.MiscUtils, fqrn, temp1, Integer.parseInt(temp2), stackSize);
+ temp = ItemUtils.getItemStackWithMeta(true, fqrn, temp1, Integer.parseInt(temp2), stackSize);
return temp;
}
@@ -350,14 +349,6 @@ public class ItemUtils {
return getSimpleStack(Items.clay_ball, amount);
}
- if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
- if (oredictName.toLowerCase().contains("rutile")) {
- mTemp = oredictName.replace("Rutile", "Titanium");
- }
- if (oredictName.toLowerCase().contains("vanadiumsteel")) {
- mTemp = oredictName.replace("VanadiumSteel", "StainlessSteel");
- }
- }
final ArrayList<ItemStack> oreDictList = OreDictionary.getOres(mTemp);
if (!oreDictList.isEmpty()) {
final ItemStack returnValue = oreDictList.get(0).copy();
@@ -873,12 +864,7 @@ public class ItemUtils {
}
public static ItemStack getGregtechCircuit(final int Meta) {
- return ItemUtils.getItemStackWithMeta(
- LoadedMods.Gregtech,
- "gregtech:gt.integrated_circuit",
- "Gregtech Circuit",
- Meta,
- 0);
+ return ItemUtils.getItemStackWithMeta(true, "gregtech:gt.integrated_circuit", "Gregtech Circuit", Meta, 0);
}
public static ItemStack[] getBlockDrops(final ArrayList<ItemStack> blockDrops) {
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
index daabb97b69..8c2b98b712 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
@@ -267,17 +267,12 @@ public class MaterialUtils {
}
private static Materials getMaterialByName(String materialName) {
-
- if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
- return (Materials) EnumUtils.getValue(gregtech.api.enums.Materials.class, materialName, false);
- } else {
- for (Materials m : Materials.values()) {
- if (MaterialUtils.getMaterialName(m).toLowerCase().equals(materialName.toLowerCase())) {
- return m;
- }
+ for (Materials m : Materials.values()) {
+ if (MaterialUtils.getMaterialName(m).toLowerCase().equals(materialName.toLowerCase())) {
+ return m;
}
- return null;
}
+ return null;
}
@SuppressWarnings("deprecation")
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java
index 639cd37f76..7441f0b4cf 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java
@@ -1,7 +1,5 @@
package gtPlusPlus.core.util.minecraft.gregtech;
-import static gtPlusPlus.core.lib.CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK;
-
import net.minecraft.item.ItemStack;
import net.minecraft.world.chunk.Chunk;
import net.minecraftforge.fluids.FluidStack;
@@ -16,7 +14,6 @@ import gregtech.common.GT_Pollution;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.api.objects.data.AutoMap;
import gtPlusPlus.core.item.base.cell.BaseItemCell;
-import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.material.MISC_MATERIALS;
import gtPlusPlus.core.material.MaterialGenerator;
import gtPlusPlus.core.util.minecraft.FluidUtils;
@@ -24,28 +21,14 @@ import gtPlusPlus.core.util.minecraft.ItemUtils;
public class PollutionUtils {
- private static boolean mIsPollutionEnabled = true;
-
public static AutoMap<FluidStack> mPollutionFluidStacks = new AutoMap<FluidStack>();
- static {
- if (MAIN_GREGTECH_5U_EXPERIMENTAL_FORK || CORE.GTNH) {
- mIsPollutionEnabled = mPollution();
- } else {
- mIsPollutionEnabled = false;
- }
- }
-
public static boolean isPollutionEnabled() {
- return mIsPollutionEnabled;
- }
-
- private static boolean mPollution() {
return GT_Mod.gregtechproxy.mPollution;
}
public static boolean addPollution(IGregTechTileEntity te, int pollutionValue) {
- if (mIsPollutionEnabled) {
+ if (GT_Mod.gregtechproxy.mPollution) {
GT_Pollution.addPollution(te, pollutionValue);
return true;
}
@@ -53,7 +36,7 @@ public class PollutionUtils {
}
public static boolean addPollution(IHasWorldObjectAndCoords aTileOfSomeSort, int pollutionValue) {
- if (mIsPollutionEnabled) {
+ if (GT_Mod.gregtechproxy.mPollution) {
IHasWorldObjectAndCoords j = (IHasWorldObjectAndCoords) aTileOfSomeSort;
Chunk c = j.getWorld().getChunkFromBlockCoords(j.getXCoord(), j.getZCoord());
return addPollution(c, pollutionValue);
@@ -62,7 +45,7 @@ public class PollutionUtils {
}
public static boolean addPollution(Chunk aChunk, int pollutionValue) {
- if (mIsPollutionEnabled) {
+ if (GT_Mod.gregtechproxy.mPollution) {
GT_Pollution.addPollution(aChunk, pollutionValue);
return true;
}
@@ -98,7 +81,7 @@ public class PollutionUtils {
}
public static boolean nullifyPollution(Chunk aChunk) {
- if (mIsPollutionEnabled) {
+ if (GT_Mod.gregtechproxy.mPollution) {
if (aChunk == null) {
return false;
}
diff --git a/src/main/java/gtPlusPlus/core/util/reflect/AddGregtechRecipe.java b/src/main/java/gtPlusPlus/core/util/reflect/AddGregtechRecipe.java
index 11217e1e47..3bd507fb38 100644
--- a/src/main/java/gtPlusPlus/core/util/reflect/AddGregtechRecipe.java
+++ b/src/main/java/gtPlusPlus/core/util/reflect/AddGregtechRecipe.java
@@ -132,49 +132,47 @@ public final class AddGregtechRecipe {
public static boolean addCircuitAssemblerRecipe(ItemStack[] aInputs, FluidStack aFluidInput, ItemStack aOutput,
int aDuration, int aEUt) {
- if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
- try {
- IGT_RecipeAdder IGT_RecipeAdder = GT_Values.RA;
- if (IGT_RecipeAdder != null) {
- Class<? extends IGT_RecipeAdder> classRA = IGT_RecipeAdder.getClass();
- Method addRecipe = classRA.getMethod(
- "addCircuitAssemblerRecipe",
- ItemStack.class,
- FluidStack.class,
- ItemStack.class,
- int.class,
- int.class);
- if (addRecipe != null) {
- if (aFluidInput.isFluidEqual(FluidUtils.getFluidStack("molten.tin", 1))) {
- boolean[] didAdd = new boolean[3];
- FluidStack moltenMetal = FluidUtils.getFluidStack("molten.tin", 144);
- // Tin
- didAdd[0] = (boolean) addRecipe
- .invoke(IGT_RecipeAdder, aInputs, moltenMetal, aOutput, aDuration, aEUt);
- moltenMetal = FluidUtils.getFluidStack("molten.lead", 144);
- // Lead
- didAdd[1] = (boolean) addRecipe
- .invoke(IGT_RecipeAdder, aInputs, moltenMetal, aOutput, aDuration, aEUt);
- moltenMetal = FluidUtils.getFluidStack("molten.solderingalloy", 144 / 2);
- // Soldering Alloy
- didAdd[2] = (boolean) addRecipe
- .invoke(IGT_RecipeAdder, aInputs, moltenMetal, aOutput, aDuration, aEUt);
-
- if (didAdd[0] && didAdd[1] && didAdd[2]) {
- return true;
- } else {
- return false;
- }
+ try {
+ IGT_RecipeAdder IGT_RecipeAdder = GT_Values.RA;
+ if (IGT_RecipeAdder != null) {
+ Class<? extends IGT_RecipeAdder> classRA = IGT_RecipeAdder.getClass();
+ Method addRecipe = classRA.getMethod(
+ "addCircuitAssemblerRecipe",
+ ItemStack.class,
+ FluidStack.class,
+ ItemStack.class,
+ int.class,
+ int.class);
+ if (addRecipe != null) {
+ if (aFluidInput.isFluidEqual(FluidUtils.getFluidStack("molten.tin", 1))) {
+ boolean[] didAdd = new boolean[3];
+ FluidStack moltenMetal = FluidUtils.getFluidStack("molten.tin", 144);
+ // Tin
+ didAdd[0] = (boolean) addRecipe
+ .invoke(IGT_RecipeAdder, aInputs, moltenMetal, aOutput, aDuration, aEUt);
+ moltenMetal = FluidUtils.getFluidStack("molten.lead", 144);
+ // Lead
+ didAdd[1] = (boolean) addRecipe
+ .invoke(IGT_RecipeAdder, aInputs, moltenMetal, aOutput, aDuration, aEUt);
+ moltenMetal = FluidUtils.getFluidStack("molten.solderingalloy", 144 / 2);
+ // Soldering Alloy
+ didAdd[2] = (boolean) addRecipe
+ .invoke(IGT_RecipeAdder, aInputs, moltenMetal, aOutput, aDuration, aEUt);
+
+ if (didAdd[0] && didAdd[1] && didAdd[2]) {
+ return true;
} else {
- return (boolean) addRecipe
- .invoke(IGT_RecipeAdder, aInputs, aFluidInput, aOutput, aDuration, aEUt);
+ return false;
}
+ } else {
+ return (boolean) addRecipe
+ .invoke(IGT_RecipeAdder, aInputs, aFluidInput, aOutput, aDuration, aEUt);
}
}
- } catch (SecurityException | NoSuchMethodException | IllegalAccessException | IllegalArgumentException
- | InvocationTargetException e) {
- return false;
}
+ } catch (SecurityException | NoSuchMethodException | IllegalAccessException | IllegalArgumentException
+ | InvocationTargetException e) {
+ return false;
}
return false;
}
@@ -183,31 +181,29 @@ public final class AddGregtechRecipe {
final FluidStack p2, final FluidStack p3, final ItemStack p4, final ItemStack p5, final int p6,
final int p7) {
- if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
- try {
- IGT_RecipeAdder IGT_RecipeAdder = GT_Values.RA;
- if (IGT_RecipeAdder != null) {
- Class<? extends IGT_RecipeAdder> classRA = IGT_RecipeAdder.getClass();
- // final ItemStack p0, final ItemStack p1, final FluidStack p2, final FluidStack p3, final ItemStack
- // p4, final ItemStack p5, final int p6, final int p7
- Method addRecipe = classRA.getMethod(
- "addChemicalRecipeForBasicMachineOnly",
- ItemStack.class,
- ItemStack.class,
- FluidStack.class,
- FluidStack.class,
- ItemStack.class,
- ItemStack.class,
- int.class,
- int.class);
- if (addRecipe != null) {
- return (boolean) addRecipe.invoke(IGT_RecipeAdder, p0, p1, p2, p3, p4, p5, p6, p7);
- }
+ try {
+ IGT_RecipeAdder IGT_RecipeAdder = GT_Values.RA;
+ if (IGT_RecipeAdder != null) {
+ Class<? extends IGT_RecipeAdder> classRA = IGT_RecipeAdder.getClass();
+ // final ItemStack p0, final ItemStack p1, final FluidStack p2, final FluidStack p3, final ItemStack
+ // p4, final ItemStack p5, final int p6, final int p7
+ Method addRecipe = classRA.getMethod(
+ "addChemicalRecipeForBasicMachineOnly",
+ ItemStack.class,
+ ItemStack.class,
+ FluidStack.class,
+ FluidStack.class,
+ ItemStack.class,
+ ItemStack.class,
+ int.class,
+ int.class);
+ if (addRecipe != null) {
+ return (boolean) addRecipe.invoke(IGT_RecipeAdder, p0, p1, p2, p3, p4, p5, p6, p7);
}
- } catch (SecurityException | NoSuchMethodException | IllegalAccessException | IllegalArgumentException
- | InvocationTargetException e) {
-
}
+ } catch (SecurityException | NoSuchMethodException | IllegalAccessException | IllegalArgumentException
+ | InvocationTargetException e) {
+
}
return GT_Values.RA.addChemicalRecipe(p0, p1, p2, p3, p4, p6);
diff --git a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java
index 76948631c1..30af2ae634 100644
--- a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java
+++ b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java
@@ -19,7 +19,6 @@ import gregtech.api.util.GT_Log;
import gregtech.common.blocks.GT_Block_Ores;
import gregtech.common.blocks.GT_TileEntity_Ores;
import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
@@ -44,7 +43,6 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT {
public final Material mBetween;
public final Material mSporadic;
- public static boolean mUpdated = CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK;
public static final Block mStoneTypes;
// public final String mBiome;
@@ -65,16 +63,12 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT {
public final String aTextWorldgen = "worldgen.";
static {
- if (mUpdated) {
- Object tempBlock = null;
- try {
- Field temp = ReflectionUtils.getField(GregTech_API.class, "sBlockStones");
- tempBlock = temp.get(null);
- } catch (IllegalArgumentException | IllegalAccessException e) {}
- mStoneTypes = (Block) tempBlock;
- } else {
- mStoneTypes = null;
- }
+ Object tempBlock = null;
+ try {
+ Field temp = ReflectionUtils.getField(GregTech_API.class, "sBlockStones");
+ tempBlock = temp.get(null);
+ } catch (IllegalArgumentException | IllegalAccessException e) {}
+ mStoneTypes = (Block) tempBlock;
}
public WorldGen_GT_Ore_Layer(String aName, int aMinY, int aMaxY, int aWeight, int aDensity, int aSize,
@@ -224,7 +218,7 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT {
|| tBlock.isReplaceableOreGen(aWorld, aChunkX + 8, tMinY, aChunkZ + 8, Blocks.netherrack)
|| tBlock.isReplaceableOreGen(aWorld, aChunkX + 8, tMinY, aChunkZ + 8, Blocks.end_stone)
|| tBlock.isReplaceableOreGen(aWorld, aChunkX + 8, tMinY, aChunkZ + 8, GregTech_API.sBlockGranites)
- || (mUpdated && tBlock.isReplaceableOreGen(aWorld, aChunkX + 8, tMinY, aChunkZ + 8, mStoneTypes))) {
+ || tBlock.isReplaceableOreGen(aWorld, aChunkX + 8, tMinY, aChunkZ + 8, mStoneTypes)) {
// Didn't reach, but could have placed. Save orevein for future use.
return NO_OVERLAP;
} else {
@@ -244,7 +238,7 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT {
|| tBlock.isReplaceableOreGen(aWorld, aChunkX + 8, tMinY, aChunkZ + 8, Blocks.netherrack)
|| tBlock.isReplaceableOreGen(aWorld, aChunkX + 8, tMinY, aChunkZ + 8, Blocks.end_stone)
|| tBlock.isReplaceableOreGen(aWorld, aChunkX + 8, tMinY, aChunkZ + 8, GregTech_API.sBlockGranites)
- || (mUpdated && tBlock.isReplaceableOreGen(aWorld, aChunkX + 8, tMinY, aChunkZ + 8, mStoneTypes))) {
+ || tBlock.isReplaceableOreGen(aWorld, aChunkX + 8, tMinY, aChunkZ + 8, mStoneTypes)) {
// Didn't reach, but could have placed. Save orevein for future use.
return NO_OVERLAP;
} else {
@@ -579,7 +573,7 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT {
|| tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.sand)
|| tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.dirt)
|| tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, GregTech_API.sBlockGranites)
- || (mUpdated && tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, mStoneTypes))
+ || tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, mStoneTypes)
|| tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Dimension_Everglades.blockSecondLayer)
|| tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Dimension_Everglades.blockMainFiller)
|| tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Dimension_Everglades.blockSecondaryFiller)
@@ -599,37 +593,22 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT {
// Get Class and Methods
Method setOres = null;
- boolean is08 = !CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK;
- // GT 5.08
- if (is08) {
- try {
- setOres = GT_TileEntity_Ores.class
- .getDeclaredMethod("setOreBlock", World.class, int.class, int.class, int.class, int.class);
- } catch (NoSuchMethodException | SecurityException e) {
-
- }
- }
- // GT 5.09
- else {
- try {
- setOres = GT_TileEntity_Ores.class.getDeclaredMethod(
- "setOreBlock",
- World.class,
- int.class,
- int.class,
- int.class,
- int.class,
- boolean.class);
- } catch (NoSuchMethodException | SecurityException e) {
+ try {
+ setOres = GT_TileEntity_Ores.class.getDeclaredMethod(
+ "setOreBlock",
+ World.class,
+ int.class,
+ int.class,
+ int.class,
+ int.class,
+ boolean.class);
+ } catch (NoSuchMethodException | SecurityException e) {
- }
}
try {
- if (is08 && setOres != null) {
- setOres.invoke(null, aWorld, aX, aY, aZ, mMetaItemSubID);
- } else if (!is08 && setOres != null) {
+ if (setOres != null) {
setOres.invoke(null, aWorld, aX, aY, aZ, mMetaItemSubID, useless);
} else {
return false;
diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java b/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java
index e105ae82f6..c2d1bb58b6 100644
--- a/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java
+++ b/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java
@@ -1,7 +1,5 @@
package gtPlusPlus.plugin.agrichem;
-import static gtPlusPlus.core.lib.CORE.GTNH;
-
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.ArrayList;
@@ -424,9 +422,9 @@ public class BioRecipes {
private static void recipeCatalystCarrier() {
// Assembly Recipe
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] { getBioChip(20), ItemUtils.getItemStackOfAmountFromOreDict("plateSteel", GTNH ? 8 : 4),
- ItemUtils.getItemStackOfAmountFromOreDict("wireFineCopper", GTNH ? 4 : 2),
- ItemUtils.getItemStackOfAmountFromOreDict("screwTin", GTNH ? 6 : 3) },
+ new ItemStack[] { getBioChip(20), ItemUtils.getItemStackOfAmountFromOreDict("plateSteel", 8),
+ ItemUtils.getItemStackOfAmountFromOreDict("wireFineCopper", 4),
+ ItemUtils.getItemStackOfAmountFromOreDict("screwTin", 6) },
GT_Values.NF,
CI.getEmptyCatalyst(1),
300 * 20,
diff --git a/src/main/java/gtPlusPlus/plugin/sulfurchem/Core_SulfuricChemistry.java b/src/main/java/gtPlusPlus/plugin/sulfurchem/Core_SulfuricChemistry.java
index 782aac0b0a..96f6d82e09 100644
--- a/src/main/java/gtPlusPlus/plugin/sulfurchem/Core_SulfuricChemistry.java
+++ b/src/main/java/gtPlusPlus/plugin/sulfurchem/Core_SulfuricChemistry.java
@@ -214,32 +214,29 @@ public class Core_SulfuricChemistry implements IPlugin {
}
// Multi Block Recipes
- if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
- recipe: for (GT_Recipe r : StaticFields59.getLargeChemicalReactorRecipeMap().mRecipeList) {
- for (ItemStack i : r.mOutputs) {
- i.stackSize = 1;
- if (ItemStack.areItemStacksEqual(
- i,
- ItemUtils.getItemStackOfAmountFromOreDict("cellSulfurTrioxide", 1))) {
- mRemovedRecipes1.put(r);
- r.mEnabled = false;
- r.mHidden = true;
- mDisabled++;
- continue recipe;
- }
- continue;
+ recipe: for (GT_Recipe r : StaticFields59.getLargeChemicalReactorRecipeMap().mRecipeList) {
+ for (ItemStack i : r.mOutputs) {
+ i.stackSize = 1;
+ if (ItemStack
+ .areItemStacksEqual(i, ItemUtils.getItemStackOfAmountFromOreDict("cellSulfurTrioxide", 1))) {
+ mRemovedRecipes1.put(r);
+ r.mEnabled = false;
+ r.mHidden = true;
+ mDisabled++;
+ continue recipe;
}
- for (FluidStack f : r.mFluidOutputs) {
- f.amount = 1;
- if (FluidStack.areFluidStackTagsEqual(f, mStack)) {
- mRemovedRecipes1.put(r);
- r.mEnabled = false;
- r.mHidden = true;
- mDisabled++;
- continue recipe;
- }
- continue;
+ continue;
+ }
+ for (FluidStack f : r.mFluidOutputs) {
+ f.amount = 1;
+ if (FluidStack.areFluidStackTagsEqual(f, mStack)) {
+ mRemovedRecipes1.put(r);
+ r.mEnabled = false;
+ r.mHidden = true;
+ mDisabled++;
+ continue recipe;
}
+ continue;
}
}
@@ -277,31 +274,28 @@ public class Core_SulfuricChemistry implements IPlugin {
}
// Multi Block Recipes
- if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
- recipe: for (GT_Recipe r : StaticFields59.getLargeChemicalReactorRecipeMap().mRecipeList) {
- for (ItemStack i : r.mOutputs) {
- i.stackSize = 1;
- if (ItemStack
- .areItemStacksEqual(i, ItemUtils.getItemStackOfAmountFromOreDict("cellSulfuricAcid", 1))) {
- mRemovedRecipes2.put(r);
- r.mEnabled = false;
- r.mHidden = true;
- mDisabled++;
- continue recipe;
- }
- continue;
+ recipe: for (GT_Recipe r : StaticFields59.getLargeChemicalReactorRecipeMap().mRecipeList) {
+ for (ItemStack i : r.mOutputs) {
+ i.stackSize = 1;
+ if (ItemStack.areItemStacksEqual(i, ItemUtils.getItemStackOfAmountFromOreDict("cellSulfuricAcid", 1))) {
+ mRemovedRecipes2.put(r);
+ r.mEnabled = false;
+ r.mHidden = true;
+ mDisabled++;
+ continue recipe;
}
- for (FluidStack f : r.mFluidOutputs) {
- f.amount = 1;
- if (FluidStack.areFluidStackTagsEqual(f, mStack)) {
- mRemovedRecipes2.put(r);
- r.mEnabled = false;
- r.mHidden = true;
- mDisabled++;
- continue recipe;
- }
- continue;
+ continue;
+ }
+ for (FluidStack f : r.mFluidOutputs) {
+ f.amount = 1;
+ if (FluidStack.areFluidStackTagsEqual(f, mStack)) {
+ mRemovedRecipes2.put(r);
+ r.mEnabled = false;
+ r.mHidden = true;
+ mDisabled++;
+ continue recipe;
}
+ continue;
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/BOP_Block_Registrator.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/BOP_Block_Registrator.java
index 316e826e37..f46713bdf8 100644
--- a/src/main/java/gtPlusPlus/xmod/bop/blocks/BOP_Block_Registrator.java
+++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/BOP_Block_Registrator.java
@@ -107,32 +107,6 @@ public class BOP_Block_Registrator {
160,
8);
- if (!CORE.GTNH) {
- GT_Values.RA.addAssemblerRecipe(
- GT_Utility.copyAmount(1L, aStack),
- ItemList.Circuit_Integrated.getWithDamage(0L, 2L, new Object[0]),
- Materials.SeedOil.getFluid(50L),
- ItemList.FR_Stick.get(1L, new Object[0]),
- 16,
- 8);
- GT_Values.RA.addAssemblerRecipe(
- GT_Utility.copyAmount(8L, aStack),
- ItemList.Circuit_Integrated.getWithDamage(0L, 8L, new Object[0]),
- Materials.SeedOil.getFluid(250L),
- ItemList.FR_Casing_Impregnated.get(1L, new Object[0]),
- 64,
- 16);
- GT_Values.RA.addChemicalBathRecipe(
- GT_Utility.copyAmount(1L, aStack),
- Materials.Creosote.getFluid(1000L),
- GT_ModHandler.getModItem("Railcraft", "tile.railcraft.cube", 1L, 8),
- null,
- null,
- null,
- 16,
- 16);
- }
-
final short aMeta = (short) aStack.getItemDamage();
if (aMeta == 32767) {
if (GT_Utility.areStacksEqual(
diff --git a/src/main/java/gtPlusPlus/xmod/cofh/HANDLER_COFH.java b/src/main/java/gtPlusPlus/xmod/cofh/HANDLER_COFH.java
index 04c34f09ce..c652a427ab 100644
--- a/src/main/java/gtPlusPlus/xmod/cofh/HANDLER_COFH.java
+++ b/src/main/java/gtPlusPlus/xmod/cofh/HANDLER_COFH.java
@@ -7,7 +7,7 @@ import gtPlusPlus.core.lib.LoadedMods;
public class HANDLER_COFH {
public static void initItems() {
- if (LoadedMods.CoFHCore && (LoadedMods.IndustrialCraft2 || LoadedMods.IndustrialCraft2Classic)) {
+ if (LoadedMods.CoFHCore) {
ModItems.RfEuBattery = new RF2EU_Battery();
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java
index c74bb116b0..fb77c4c2e0 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java
@@ -17,7 +17,6 @@ import net.minecraftforge.common.ChestGenHooks;
import cpw.mods.fml.common.Optional;
import cpw.mods.fml.common.registry.GameRegistry;
import forestry.core.utils.StringUtil;
-import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.lib.LoadedMods;
public class FR_ItemRegistry {
@@ -56,17 +55,10 @@ public class FR_ItemRegistry {
// Magic Bee like Frames
- if (!CORE.GTNH) {
- hiveFrameVoid = new MB_ItemFrame(
- MB_FrameType.VOID,
- EnumRarity.rare,
- "Makes your bee die in the blink of an eye.");
- } else {
- hiveFrameVoid = new MB_ItemFrame(
- MB_FrameType.USELESS,
- EnumRarity.common,
- "No more cheaty frames for GTNH players.");
- }
+ hiveFrameVoid = new MB_ItemFrame(
+ MB_FrameType.USELESS,
+ EnumRarity.common,
+ "No more cheaty frames for GTNH players.");
hiveFrameAccelerated = new MB_ItemFrame(
MB_FrameType.ACCELERATED,
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java
index ecf7232f02..3ba28fd98c 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java
@@ -4,7 +4,6 @@ import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
-import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.minecraft.RecipeUtils;
@@ -65,24 +64,10 @@ public class FR_Gregtech_Recipes {
rod_Uranium,
rod_Uranium,
hiveFrameMutagenic);
- if (!CORE.GTNH) {
- RecipeUtils.addShapedGregtechRecipe(
- "stickLongThaumium",
- "stickThaumium",
- "stickLongThaumium",
- "stickLongThaumium",
- ItemUtils.getSimpleStack(Items.ender_pearl),
- "stickLongThaumium",
- "stickThaumium",
- "stickThaumium",
- "stickThaumium",
- hiveFrameVoid);
- } else {
- if (LoadedMods.MagicBees) {
- RecipeUtils.addShapelessGregtechRecipe(
- new ItemStack[] { hiveFrameVoid },
- ItemUtils.getCorrectStacktype("MagicBees:frameOblivion", 1));
- }
+ if (LoadedMods.MagicBees) {
+ RecipeUtils.addShapelessGregtechRecipe(
+ new ItemStack[] { hiveFrameVoid },
+ ItemUtils.getCorrectStacktype("MagicBees:frameOblivion", 1));
}
RecipeUtils.addShapedGregtechRecipe(
"stickLongBlueSteel",
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java b/src/main/java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java
index 96b17f0685..51f5697cc4 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java
@@ -37,7 +37,6 @@ import gtPlusPlus.api.objects.minecraft.multi.NoEUBonusMultiBehaviour;
import gtPlusPlus.api.objects.minecraft.multi.NoOutputBonusMultiBehaviour;
import gtPlusPlus.api.objects.minecraft.multi.NoSpeedBonusMultiBehaviour;
import gtPlusPlus.core.handler.COMPAT_HANDLER;
-import gtPlusPlus.core.handler.OldCircuitHandler;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.lib.CORE.ConfigSwitches;
import gtPlusPlus.core.lib.LoadedMods;
@@ -88,10 +87,6 @@ public class HANDLER_GT {
GT_Materials.init(mMaterialProperties);
}
- if (ConfigSwitches.enableOldGTcircuits && !CORE.GTNH) {
- OldCircuitHandler.preInit();
- }
-
GregtechFluidHandler.run();
}
@@ -111,10 +106,6 @@ public class HANDLER_GT {
sMetaGeneratedToolInstance = MetaGeneratedGregtechTools.getInstance();
}
- if (ConfigSwitches.enableOldGTcircuits && !CORE.GTNH) {
- OldCircuitHandler.init();
- }
-
// Generates recipes for all gregtech smelting and alloy smelting combinations.
// RecipeGen_BlastSmelterGT.generateRecipes();
// new RecipeGen_BlastSmelterGT_Ex();
@@ -136,10 +127,6 @@ public class HANDLER_GT {
GregtechNitroDieselFix.run();
}
- if (ConfigSwitches.enableOldGTcircuits && !CORE.GTNH) {
- OldCircuitHandler.postInit();
- }
-
// Register custom singles to the PA
AddCustomMachineToPA.register();
@@ -508,7 +495,7 @@ public class HANDLER_GT {
Item aU;
Collection<GT_Recipe> aAssRecipes = GT_Recipe.GT_Recipe_Map.sAssemblerRecipes.mRecipeList;
// 170, 172, 174, 176
- if (aAssRecipes.size() > 0 && (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK || CORE.GTNH)) {
+ if (aAssRecipes.size() > 0) {
recipe: for (GT_Recipe aG : aAssRecipes) {
if (aG.mOutputs != null && aG.mOutputs.length > 0) {
outputs: for (ItemStack aI : aG.mOutputs) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DynamoBuffer.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DynamoBuffer.java
index 160ca2ceae..8b7f2bf685 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DynamoBuffer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DynamoBuffer.java
@@ -6,7 +6,6 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.MetaTileEntity;
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Dynamo;
import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.Utils;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
public class GT_MetaTileEntity_Hatch_DynamoBuffer extends GT_MetaTileEntity_Hatch_Dynamo {
@@ -56,18 +55,10 @@ public class GT_MetaTileEntity_Hatch_DynamoBuffer extends GT_MetaTileEntity_Hatc
@Override
public String[] getDescription() {
String[] g;
- if (CORE.GTNH || (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK && Utils.getGregtechVersionAsInt() >= 50932)) {
- g = new String[] { "Dynamo with internal storage and additional Amp capacity",
- "Does not accept more than " + (this.maxEUOutput() * this.maxAmperesIn()) + "EU/t as input",
- CORE.GT_Tooltip.get() };
+ g = new String[] { "Dynamo with internal storage and additional Amp capacity",
+ "Does not accept more than " + (this.maxEUOutput() * this.maxAmperesIn()) + "EU/t as input",
+ CORE.GT_Tooltip.get() };
- } else {
- g = new String[] { "Dynamo with internal storage and additional Amp capacity",
- "Stores " + maxEUStore() + "EU", "Amperage In: 4", "Amperage Out: 4",
- "Does not accept more than " + (this.maxEUOutput() * this.maxAmperesIn()) + "EU/t as input",
- "Large Turbines only supply 1A to this, other Multiblocks can inject more amps",
- CORE.GT_Tooltip.get() };
- }
return g;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler_Adv.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler_Adv.java
index 96bbde32b5..7897dda8bc 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler_Adv.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler_Adv.java
@@ -34,15 +34,13 @@ public class GT_MetaTileEntity_Hatch_Muffler_Adv extends GT_MetaTileEntity_Hatch
@Override
public void onConfigLoad(GT_Config aConfig) {
super.onConfigLoad(aConfig);
- if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK || CORE.GTNH) {
- try {
- Integer a1 = (int) StaticFields59.getFieldFromGregtechProxy("mPollutionSmogLimit");
- if (a1 != null && a1 > 0) {
- mPollutionSmogLimit = a1;
- }
- } catch (Throwable t) {
- mPollutionSmogLimit = 500000;
+ try {
+ Integer a1 = (int) StaticFields59.getFieldFromGregtechProxy("mPollutionSmogLimit");
+ if (a1 != null && a1 > 0) {
+ mPollutionSmogLimit = a1;
}
+ } catch (Throwable t) {
+ mPollutionSmogLimit = 500000;
}
}
@@ -58,23 +56,18 @@ public class GT_MetaTileEntity_Hatch_Muffler_Adv extends GT_MetaTileEntity_Hatch
}
public String[] getDescription() {
- if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
- String[] mDescArray = StaticFields59.getDescriptionArray(this);
- String[] desc = new String[mDescArray.length + 7];
- System.arraycopy(mDescArray, 0, desc, 0, mDescArray.length);
- desc[mDescArray.length] = "DO NOT OBSTRUCT THE OUTPUT!";
- desc[mDescArray.length + 1] = "Requires 3 Air on the exhaust face";
- desc[mDescArray.length + 2] = "Requires Air Filters";
- desc[mDescArray.length + 3] = "Mufflers require T2 Filters from IV-" + GT_Values.VN[9];
- desc[mDescArray.length + 4] = "Reduces Pollution to " + this.calculatePollutionReductionForTooltip(100)
- + "%";
- desc[mDescArray.length + 5] = "Recovers " + (105 - this.calculatePollutionReductionForTooltip(100))
- + "% of CO2/CO/SO2";
- desc[mDescArray.length + 6] = CORE.GT_Tooltip.get();
- return desc;
- } else {
- return new String[] {};
- }
+ String[] mDescArray = StaticFields59.getDescriptionArray(this);
+ String[] desc = new String[mDescArray.length + 7];
+ System.arraycopy(mDescArray, 0, desc, 0, mDescArray.length);
+ desc[mDescArray.length] = "DO NOT OBSTRUCT THE OUTPUT!";
+ desc[mDescArray.length + 1] = "Requires 3 Air on the exhaust face";
+ desc[mDescArray.length + 2] = "Requires Air Filters";
+ desc[mDescArray.length + 3] = "Mufflers require T2 Filters from IV-" + GT_Values.VN[9];
+ desc[mDescArray.length + 4] = "Reduces Pollution to " + this.calculatePollutionReductionForTooltip(100) + "%";
+ desc[mDescArray.length + 5] = "Recovers " + (105 - this.calculatePollutionReductionForTooltip(100))
+ + "% of CO2/CO/SO2";
+ desc[mDescArray.length + 6] = CORE.GT_Tooltip.get();
+ return desc;
}
public ITexture[] getTexturesActive(ITexture aBaseTexture) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java
index 1605448cfb..edb9a357a7 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java
@@ -1,7 +1,5 @@
package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations;
-import static gtPlusPlus.core.lib.CORE.GTNH;
-
import gregtech.api.enums.*;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -16,13 +14,11 @@ public class GregtechMetaPipeEntity_Cable extends GT_MetaPipeEntity_Cable implem
private static Textures.BlockIcons INSULATION_MEDIUM_PLUS;
static {
- if (GTNH) {
- try {
- INSULATION_MEDIUM_PLUS = (Textures.BlockIcons) GT_Utility
- .getField(Textures.BlockIcons.class, "INSULATION_MEDIUM_PLUS").get(null);
- } catch (IllegalAccessException | NullPointerException e) {
- throw new Error(e);
- }
+ try {
+ INSULATION_MEDIUM_PLUS = (Textures.BlockIcons) GT_Utility
+ .getField(Textures.BlockIcons.class, "INSULATION_MEDIUM_PLUS").get(null);
+ } catch (IllegalAccessException | NullPointerException e) {
+ throw new Error(e);
}
}
@@ -92,8 +88,7 @@ public class GregtechMetaPipeEntity_Cable extends GT_MetaPipeEntity_Cable implem
@Override
public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aConnections,
byte aColorIndex, boolean aConnected, boolean aRedstone) {
- return GTNH ? getTextureGTNH(aBaseMetaTileEntity, aSide, aConnections, aColorIndex, aConnected, aRedstone)
- : getTexturePure(aBaseMetaTileEntity, aSide, aConnections, aColorIndex, aConnected, aRedstone);
+ return getTextureGTNH(aBaseMetaTileEntity, aSide, aConnections, aColorIndex, aConnected, aRedstone);
}
private ITexture[] getTextureGTNH(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aConnections,
@@ -152,70 +147,4 @@ public class GregtechMetaPipeEntity_Cable extends GT_MetaPipeEntity_Cable implem
Textures.BlockIcons.INSULATION_FULL,
Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) };
}
-
- private ITexture[] getTexturePure(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aConnections,
- byte aColorIndex, boolean aConnected, boolean aRedstone) {
-
- // if (this.vRGB == null || this.vRGB.length < 3 || this.vRGB.length > 4){
- // this.vRGB = new short[]{200, 0, 200, 0};
- // }
- // if (this.vRGB.length != 4){
- // short[] tempRGB = this.vRGB;
- // this.vRGB = new short[]{tempRGB[0], tempRGB[1], tempRGB[2], 0};
- // }
- //
- // Materials wireMaterial = this.mMaterial;
- //
- // if (wireMaterial == null){
- // wireMaterial = Materials.Iron;
- // }
-
- // With the code in constructors it should work
- Materials wireMaterial = mMaterial;
- if (wireMaterial == null) {
- wireMaterial = Materials.Iron;
- }
-
- if (!(this.mInsulated)) return new ITexture[] { new GT_RenderedTexture(
- wireMaterial.mIconSet.mTextures[69],
- Dyes.getModulation(aColorIndex, this.vRGB)) };
- if (aConnected) {
- float tThickNess = getThickNess();
- if (tThickNess < 0.124F) return new ITexture[] { new GT_RenderedTexture(
- Textures.BlockIcons.INSULATION_FULL,
- Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) };
- if (tThickNess < 0.374F)
- return new ITexture[] { new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[69], this.vRGB),
- new GT_RenderedTexture(
- Textures.BlockIcons.INSULATION_TINY,
- Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) };
- if (tThickNess < 0.499F)
- return new ITexture[] { new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[69], this.vRGB),
- new GT_RenderedTexture(
- Textures.BlockIcons.INSULATION_SMALL,
- Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) };
- if (tThickNess < 0.624F)
- return new ITexture[] { new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[69], this.vRGB),
- new GT_RenderedTexture(
- Textures.BlockIcons.INSULATION_MEDIUM,
- Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) };
- if (tThickNess < 0.749F)
- return new ITexture[] { new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[69], this.vRGB),
- new GT_RenderedTexture(
- Textures.BlockIcons.INSULATION_LARGE,
- Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) };
- if (tThickNess < 0.874F)
- return new ITexture[] { new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[69], this.vRGB),
- new GT_RenderedTexture(
- Textures.BlockIcons.INSULATION_HUGE,
- Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) };
- return new ITexture[] { new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[69], this.vRGB),
- new GT_RenderedTexture(
- Textures.BlockIcons.INSULATION_FULL,
- Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) };
- }
- return new ITexture[] { new GT_RenderedTexture(
- Textures.BlockIcons.INSULATION_FULL,
- Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) };
- }
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaPipeEntityBase_Cable.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaPipeEntityBase_Cable.java
index 6a5fb9d4d2..0a06c89549 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaPipeEntityBase_Cable.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaPipeEntityBase_Cable.java
@@ -35,7 +35,6 @@ import gregtech.api.objects.GT_RenderedTexture;
import gregtech.api.util.GT_Utility;
import gregtech.common.GT_Proxy;
import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
import ic2.api.energy.tile.IEnergySink;
@@ -83,22 +82,20 @@ public class GregtechMetaPipeEntityBase_Cable extends MetaPipeEntity implements
final String lookingForValue = "mWireHeatingTicks";
int temp = 4;
Field field;
- if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
- try {
- field = clazz.getClass().getField(lookingForValue);
- final Class<?> clazzType = field.getType();
- if (clazzType.toString().equals("int")) {
- temp = (field.getInt(clazz));
- } else {
- temp = 4;
- }
- } catch (NoSuchFieldException | SecurityException | IllegalArgumentException | IllegalAccessException e) {
- // Utils.LOG_INFO("FATAL ERROR - REFLECTION FAILED FOR GT CABLES
- // - PLEASE REPORT THIS.");
- Logger.WARNING("FATAL ERROR - REFLECTION FAILED FOR GT CABLES - PLEASE REPORT THIS.");
- Logger.ERROR("FATAL ERROR - REFLECTION FAILED FOR GT CABLES - PLEASE REPORT THIS.");
+ try {
+ field = clazz.getClass().getField(lookingForValue);
+ final Class<?> clazzType = field.getType();
+ if (clazzType.toString().equals("int")) {
+ temp = (field.getInt(clazz));
+ } else {
temp = 4;
}
+ } catch (NoSuchFieldException | SecurityException | IllegalArgumentException | IllegalAccessException e) {
+ // Utils.LOG_INFO("FATAL ERROR - REFLECTION FAILED FOR GT CABLES
+ // - PLEASE REPORT THIS.");
+ Logger.WARNING("FATAL ERROR - REFLECTION FAILED FOR GT CABLES - PLEASE REPORT THIS.");
+ Logger.ERROR("FATAL ERROR - REFLECTION FAILED FOR GT CABLES - PLEASE REPORT THIS.");
+ temp = 4;
}
return temp;
}
@@ -365,20 +362,12 @@ public class GregtechMetaPipeEntityBase_Cable extends MetaPipeEntity implements
this.mTransferredAmperageLast20 = Math.max(this.mTransferredAmperageLast20, this.mTransferredAmperage);
if ((aVoltage > this.mVoltage) || (this.mTransferredAmperage > this.mAmperage)) {
- // GT 5.09
- if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
- if (this.mOverheat > (this.mWireHeatingTicks * 100)) {
- this.getBaseMetaTileEntity().setToFire();
- } else {
- this.mOverheat += 100;
- }
- return aAmperage;
- }
- // GT 5.08
- else {
+ if (this.mOverheat > (this.mWireHeatingTicks * 100)) {
this.getBaseMetaTileEntity().setToFire();
- return aAmperage;
+ } else {
+ this.mOverheat += 100;
}
+ return aAmperage;
}
return rUsedAmperes;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
index 75bb0ce94f..88215b7f44 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
@@ -68,7 +68,6 @@ import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.api.objects.data.*;
import gtPlusPlus.api.objects.minecraft.BlockPos;
import gtPlusPlus.api.objects.minecraft.multi.SpecialMultiBehaviour;
-import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.core.recipe.common.CI;
import gtPlusPlus.core.util.math.MathUtils;
@@ -1886,37 +1885,20 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
"Invalid recipe, Fallback lookup. " + this.getRecipeMap().mRecipeList.size()
+ " | "
+ this.getRecipeMap().mNEIName);
- if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
- try {
- return (GT_Recipe) findRecipe08.invoke(
- getRecipeMap(),
- aTileEntity,
- aRecipe,
- aNotUnificated,
- aVoltage,
- aFluids,
- aSpecialSlot,
- aInputs);
- } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
- e.printStackTrace();
- return null;
- }
- } else {
- try {
- return (GT_Recipe) findRecipe09.invoke(
- getRecipeMap(),
- aTileEntity,
- aRecipe,
- aNotUnificated,
- aDontCheckStackSizes,
- aVoltage,
- aFluids,
- aSpecialSlot,
- aInputs);
- } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
- e.printStackTrace();
- return null;
- }
+ try {
+ return (GT_Recipe) findRecipe09.invoke(
+ getRecipeMap(),
+ aTileEntity,
+ aRecipe,
+ aNotUnificated,
+ aDontCheckStackSizes,
+ aVoltage,
+ aFluids,
+ aSpecialSlot,
+ aInputs);
+ } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
+ e.printStackTrace();
+ return null;
}
} else {
return mRecipeResult;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_GT_Ore_Layer.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_GT_Ore_Layer.java
index e3f33f45e4..6e87662ef1 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_GT_Ore_Layer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_GT_Ore_Layer.java
@@ -16,7 +16,6 @@ import gregtech.api.enums.GT_Values;
import gregtech.api.enums.Materials;
import gregtech.common.blocks.GT_TileEntity_Ores;
import gregtech.loaders.misc.GT_Achievements;
-import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.material.Material;
public class GTPP_Worldgen_GT_Ore_Layer extends GTPP_Worldgen {
@@ -241,18 +240,10 @@ public class GTPP_Worldgen_GT_Ore_Layer extends GTPP_Worldgen {
}
if (mSetOre != null) {
- if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
- try {
- return (boolean) mSetOre.invoke(world, x, y, z, secondarymeta, bool);
- } catch (IllegalArgumentException | IllegalAccessException | InvocationTargetException t) {
- return false;
- }
- } else {
- try {
- return (boolean) mSetOre.invoke(world, x, y, z, secondarymeta);
- } catch (IllegalArgumentException | IllegalAccessException | InvocationTargetException t) {
- return false;
- }
+ try {
+ return (boolean) mSetOre.invoke(world, x, y, z, secondarymeta, bool);
+ } catch (IllegalArgumentException | IllegalAccessException | InvocationTargetException t) {
+ return false;
}
} else {
return false;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java
index 2ae449e012..a33a74c151 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java
@@ -42,7 +42,6 @@ import gtPlusPlus.xmod.gregtech.api.metatileentity.BaseCustomTileEntity;
import gtPlusPlus.xmod.gregtech.api.metatileentity.custom.power.BaseCustomPower_MTE;
import gtPlusPlus.xmod.gregtech.common.covers.CoverManager;
import gtPlusPlus.xmod.gregtech.common.helpers.MachineUpdateHandler;
-import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_WorldAccelerator;
import ic2.core.init.BlocksItems;
import ic2.core.init.InternalName;
@@ -364,28 +363,22 @@ public class Meta_GT_Proxy {
}
public static boolean setTileEntityClassAsBlacklistedInWorldAccelerator(String aClassName) {
- if (CORE.GTNH) {
- Class aMainModClass = ReflectionUtils.getClass("com.dreammaster.main.MainRegistry");
- Class aCoreModConfig = ReflectionUtils.getClass("com.dreammaster.config");
- if (aMainModClass != null && aCoreModConfig != null) {
- Field aCoreConfig = ReflectionUtils.getField(aMainModClass, "CoreConfig");
- if (aCoreConfig != null) {
- Field aBlackList = ReflectionUtils.getField(aCoreModConfig, "BlacklistedTileEntiyClassNames");
- Object aInstance = ReflectionUtils.getFieldValue(aCoreConfig);
- if (aBlackList != null && aInstance != null) {
- String[] aBlackListValue = (String[]) ReflectionUtils.getFieldValue(aBlackList, aInstance);
- if (aBlackListValue != null) {
- aBlackListValue = ArrayUtils.add(aBlackListValue, aClassName);
- ReflectionUtils.setField(aInstance, aBlackList, aBlackListValue);
- return true;
- }
+ Class aMainModClass = ReflectionUtils.getClass("com.dreammaster.main.MainRegistry");
+ Class aCoreModConfig = ReflectionUtils.getClass("com.dreammaster.config");
+ if (aMainModClass != null && aCoreModConfig != null) {
+ Field aCoreConfig = ReflectionUtils.getField(aMainModClass, "CoreConfig");
+ if (aCoreConfig != null) {
+ Field aBlackList = ReflectionUtils.getField(aCoreModConfig, "BlacklistedTileEntiyClassNames");
+ Object aInstance = ReflectionUtils.getFieldValue(aCoreConfig);
+ if (aBlackList != null && aInstance != null) {
+ String[] aBlackListValue = (String[]) ReflectionUtils.getFieldValue(aBlackList, aInstance);
+ if (aBlackListValue != null) {
+ aBlackListValue = ArrayUtils.add(aBlackListValue, aClassName);
+ ReflectionUtils.setField(aInstance, aBlackList, aBlackListValue);
+ return true;
}
}
}
- } else {
- GT_MetaTileEntity_WorldAccelerator.BlacklistedTileEntiyClassNames = ArrayUtils
- .add(GT_MetaTileEntity_WorldAccelerator.BlacklistedTileEntiyClassNames, aClassName);
- return true;
}
return false;
}
@@ -394,21 +387,8 @@ public class Meta_GT_Proxy {
for (int i = 0; i <= 6; i++) {
GT_ValidHeatingCoilMetas.put(i);
}
- if (CORE.GTNH) {
- for (int i = 7; i <= 8; i++) {
- GT_ValidHeatingCoilMetas.put(i);
- }
- }
- }
-
- public static boolean areWeUsingGregtech5uExperimental() {
- final int version = GregTech_API.VERSION;
- if ((version == 508) || (version == 507)) {
- return false;
- } else if (version == 509) {
- return true;
- } else {
- return false;
+ for (int i = 7; i <= 8; i++) {
+ GT_ValidHeatingCoilMetas.put(i);
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/StaticFields59.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/StaticFields59.java
index 502674fb18..02148c3ef9 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/StaticFields59.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/StaticFields59.java
@@ -25,7 +25,6 @@ import gregtech.api.util.GT_Recipe;
import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
import gregtech.common.GT_Proxy;
import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.reflect.ProxyFinder;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
@@ -97,22 +96,13 @@ public class StaticFields59 {
Logger.INFO("[SH] Got Method: calculatePollutionReduction");
// Yep...
- if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
- mAddFurnaceRecipe = getMethod(
- GT_ModHandler.class,
- "addSmeltingAndAlloySmeltingRecipe",
- ItemStack.class,
- ItemStack.class);
- Logger.INFO("[SH] Got Method: addSmeltingAndAlloySmeltingRecipe");
- } else {
- mAddFurnaceRecipe = getMethod(
- GT_ModHandler.class,
- "addSmeltingAndAlloySmeltingRecipe",
- ItemStack.class,
- ItemStack.class,
- boolean.class);
- Logger.INFO("[SH] Got Method: addSmeltingAndAlloySmeltingRecipe");
- }
+ mAddFurnaceRecipe = getMethod(
+ GT_ModHandler.class,
+ "addSmeltingAndAlloySmeltingRecipe",
+ ItemStack.class,
+ ItemStack.class,
+ boolean.class);
+ Logger.INFO("[SH] Got Method: addSmeltingAndAlloySmeltingRecipe");
}
public static final synchronized Block getBlockCasings5() {
@@ -293,7 +283,7 @@ public class StaticFields59 {
Logger.INFO("Heating Coils are bad.");
mHeatingCapacity = 0;
}
- if (CORE.GTNH && aCoilTier <= 10) {
+ if (aCoilTier <= 10) {
mHeatingCapacity += 1;
}
return mHeatingCapacity;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java
index f42768c451..ed3254921c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java
@@ -87,103 +87,101 @@ public class GregtechFluidHandler {
}
}
- if (LoadedMods.IndustrialCraft2) {
- Logger.INFO("Adding in GT Fluids for various nuclear related content.");
-
- FluidUtils.addGtFluid(
- "hydrofluoricAcid",
- "Industrial Strength Hydrofluoric Acid",
- GT_Materials.HydrofluoricAcid,
- 1,
- 120,
- GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.HydrofluoricAcid, 1L),
- ItemUtils.getEmptyCell(),
- 1000,
- false);
- generateIC2FluidCell("HydrofluoricAcid");
-
- FluidUtils.generateFluidNoPrefix(
- "SulfurDioxide",
- "High Quality Sulfur Dioxide",
- 263,
- GT_Materials.SulfurDioxide.mRGBa);
-
- FluidUtils.addGtFluid(
- "sulfurousAcid",
- "Sulfurous Acid",
- GT_Materials.SulfurousAcid,
- 4,
- 75,
- GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.SulfurousAcid, 1L),
- ItemUtils.getEmptyCell(),
- 1000,
- false);
- generateIC2FluidCell("SulfurousAcid");
-
- FluidUtils.addGtFluid(
- "sulfuricApatite",
- "Sulfuric Apatite Mix",
- GT_Materials.SulfuricApatite,
- 4,
- 500,
- GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.SulfuricApatite, 1L),
- ItemUtils.getEmptyCell(),
- 1000,
- false);
- generateIC2FluidCell("SulfuricApatite");
-
- // Check for IHL Hydrogen Chloride
- if (!LoadedMods.IHL || (ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogenChloride", 1) == null)) {
- if (FluidUtils.getFluidStack("hydrogenchloride", 1) == null) {
- if (LoadedMods.IHL) {
- Logger.INFO(
- "IHL Loaded but hydrogen chloride could not be found for some reason. How about we add our own.");
- } else {
- Logger.INFO("No Suitable versions of Hydrogen Chloride available, adding our own.");
- }
- FluidUtils.addGtFluid(
- "hydrogenChloride",
- "Industrial Strength Hydrogen Chloride",
- GT_Materials.HydrogenChloride,
- 4,
- 75,
- GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.HydrogenChloride, 1L),
- ItemUtils.getEmptyCell(),
- 1000,
- false);
- generateIC2FluidCell("HydrogenChloride");
+ Logger.INFO("Adding in GT Fluids for various nuclear related content.");
+
+ FluidUtils.addGtFluid(
+ "hydrofluoricAcid",
+ "Industrial Strength Hydrofluoric Acid",
+ GT_Materials.HydrofluoricAcid,
+ 1,
+ 120,
+ GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.HydrofluoricAcid, 1L),
+ ItemUtils.getEmptyCell(),
+ 1000,
+ false);
+ generateIC2FluidCell("HydrofluoricAcid");
+
+ FluidUtils.generateFluidNoPrefix(
+ "SulfurDioxide",
+ "High Quality Sulfur Dioxide",
+ 263,
+ GT_Materials.SulfurDioxide.mRGBa);
+
+ FluidUtils.addGtFluid(
+ "sulfurousAcid",
+ "Sulfurous Acid",
+ GT_Materials.SulfurousAcid,
+ 4,
+ 75,
+ GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.SulfurousAcid, 1L),
+ ItemUtils.getEmptyCell(),
+ 1000,
+ false);
+ generateIC2FluidCell("SulfurousAcid");
+
+ FluidUtils.addGtFluid(
+ "sulfuricApatite",
+ "Sulfuric Apatite Mix",
+ GT_Materials.SulfuricApatite,
+ 4,
+ 500,
+ GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.SulfuricApatite, 1L),
+ ItemUtils.getEmptyCell(),
+ 1000,
+ false);
+ generateIC2FluidCell("SulfuricApatite");
+
+ // Check for IHL Hydrogen Chloride
+ if (!LoadedMods.IHL || (ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogenChloride", 1) == null)) {
+ if (FluidUtils.getFluidStack("hydrogenchloride", 1) == null) {
+ if (LoadedMods.IHL) {
+ Logger.INFO(
+ "IHL Loaded but hydrogen chloride could not be found for some reason. How about we add our own.");
+ } else {
+ Logger.INFO("No Suitable versions of Hydrogen Chloride available, adding our own.");
}
+ FluidUtils.addGtFluid(
+ "hydrogenChloride",
+ "Industrial Strength Hydrogen Chloride",
+ GT_Materials.HydrogenChloride,
+ 4,
+ 75,
+ GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.HydrogenChloride, 1L),
+ ItemUtils.getEmptyCell(),
+ 1000,
+ false);
+ generateIC2FluidCell("HydrogenChloride");
}
-
- FluidUtils.addGtFluid(
- "sulfuricLithium",
- "Sulfuric Lithium Mix",
- GT_Materials.SulfuricLithium,
- 4,
- 280,
- GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.SulfuricLithium, 1L),
- ItemUtils.getEmptyCell(),
- 1000,
- false);
- generateIC2FluidCell("SulfuricLithium");
-
- FluidUtils.addGtFluid(
- "lithiumHydroxide",
- "Lithium Hydroxide",
- GT_Materials.LithiumHydroxide,
- 4,
- 500,
- GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.LithiumHydroxide, 1L),
- ItemUtils.getEmptyCell(),
- 1000,
- false);
- generateIC2FluidCell("LithiumHydroxide");
}
+
+ FluidUtils.addGtFluid(
+ "sulfuricLithium",
+ "Sulfuric Lithium Mix",
+ GT_Materials.SulfuricLithium,
+ 4,
+ 280,
+ GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.SulfuricLithium, 1L),
+ ItemUtils.getEmptyCell(),
+ 1000,
+ false);
+ generateIC2FluidCell("SulfuricLithium");
+
+ FluidUtils.addGtFluid(
+ "lithiumHydroxide",
+ "Lithium Hydroxide",
+ GT_Materials.LithiumHydroxide,
+ 4,
+ 500,
+ GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.LithiumHydroxide, 1L),
+ ItemUtils.getEmptyCell(),
+ 1000,
+ false);
+ generateIC2FluidCell("LithiumHydroxide");
}
private static ItemStack generateIC2FluidCell(final String fluidNameWithCaps) {
Logger.INFO("Adding a Cell for " + fluidNameWithCaps);
- if (LoadedMods.IndustrialCraft2 && !LoadedMods.IndustrialCraft2Classic) {
+ if (!LoadedMods.IndustrialCraft2Classic) {
return Utils.createInternalNameAndFluidCell(fluidNameWithCaps);
}
return null;
@@ -191,7 +189,7 @@ public class GregtechFluidHandler {
private static ItemStack generateIC2FluidCellNoOreDict(final String fluidNameWithCaps) {
Logger.INFO("Adding a Cell for " + fluidNameWithCaps);
- if (LoadedMods.IndustrialCraft2 && !LoadedMods.IndustrialCraft2Classic) {
+ if (!LoadedMods.IndustrialCraft2Classic) {
return Utils.createInternalNameAndFluidCellNoOreDict(fluidNameWithCaps);
}
return null;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow_Item.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow_Item.java
index 27cd5be67e..c8152dcca7 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow_Item.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow_Item.java
@@ -12,7 +12,6 @@ import gregtech.api.interfaces.tileentity.ICoverable;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.util.GT_CoverBehavior;
import gregtech.api.util.GT_Utility;
-import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.minecraft.LangUtils;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
@@ -31,12 +30,7 @@ public class GTPP_Cover_Overflow_Item extends GT_CoverBehavior {
sQuantumChest = ReflectionUtils.getClass("gregtech.common.tileentities.storage.GT_MetaTileEntity_QuantumChest");
sSuperChestGTPP = ReflectionUtils
.getClass("gtPlusPlus.xmod.gregtech.common.tileentities.storage.GT_MetaTileEntity_TieredChest");
- if (CORE.GTNH) {
- sSuperChestGTNH = ReflectionUtils
- .getClass("gregtech.common.tileentities.storage.GT_MetaTileEntity_SuperChest");
- } else {
- sSuperChestGTNH = null;
- }
+ sSuperChestGTNH = ReflectionUtils.getClass("gregtech.common.tileentities.storage.GT_MetaTileEntity_SuperChest");
if (sQuantumChest != null) {
mItemAmountFields.put(0, ReflectionUtils.getField(sQuantumChest, "mItemCount"));
mItemTypeFields.put(0, ReflectionUtils.getField(sQuantumChest, "mItemStack"));
@@ -81,7 +75,7 @@ public class GTPP_Cover_Overflow_Item extends GT_CoverBehavior {
} else if (sSuperChestGTPP.isInstance(aMetaTileEntity)) {
didHandle = handleDigitalChest(aMetaTileEntity, 1);
- } else if (CORE.GTNH && sSuperChestGTNH != null && sSuperChestGTNH.isInstance(aMetaTileEntity)) {
+ } else if (sSuperChestGTNH != null && sSuperChestGTNH.isInstance(aMetaTileEntity)) {
didHandle = handleDigitalChest(aMetaTileEntity, 2);
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
index 4ccec0bb93..0aa7f8cee9 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
@@ -14,8 +14,6 @@ import gregtech.api.enums.Textures;
import gregtech.api.interfaces.ITexture;
import gregtech.api.objects.GT_MultiTexture;
import gregtech.api.objects.GT_RenderedTexture;
-import gregtech.api.objects.ItemData;
-import gregtech.api.objects.MaterialStack;
import gregtech.api.util.GT_FoodStat;
import gregtech.api.util.GT_ModHandler;
import gregtech.common.covers.GT_Cover_Arm;
@@ -24,7 +22,6 @@ import gregtech.common.covers.GT_Cover_Pump;
import gregtech.common.items.behaviors.Behaviour_DataOrb;
import gregtech.common.items.behaviors.Behaviour_DataStick;
import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.handler.OldCircuitHandler;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.data.StringUtils;
@@ -54,572 +51,15 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
int tLastID = 0;
registerCustomCircuits();
- OldCircuitHandler.addCircuitItems();
- if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
- Logger.INFO(
- "Gregtech 5.09 not found, using fallback components. (I like how I have to add compat to something I added first and had stolen.)");
- GregtechItemList.Electric_Pump_LuV.set(
- this.addItem(
- tLastID = 0,
- "Electric Pump (LuV)",
- "163920 L/sec (as Cover)",
- new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
- getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L),
- getTcAspectStack(TC_Aspects.AQUA, 1L) }));
- GregtechItemList.Electric_Pump_ZPM.set(
- this.addItem(
- tLastID = 1,
- "Electric Pump (ZPM)",
- "655680 L/sec (as Cover)",
- new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 2L),
- getTcAspectStack(TC_Aspects.MACHINA, 2L), getTcAspectStack(TC_Aspects.ITER, 2L),
- getTcAspectStack(TC_Aspects.AQUA, 2L) }));
- GregtechItemList.Electric_Pump_UV.set(
- this.addItem(
- tLastID = 2,
- "Electric Pump (UV)",
- "2622720 L/sec (as Cover)",
- new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 4L),
- getTcAspectStack(TC_Aspects.MACHINA, 4L), getTcAspectStack(TC_Aspects.ITER, 4L),
- getTcAspectStack(TC_Aspects.AQUA, 4L) }));
- GregtechItemList.Electric_Pump_MAX.set(
- this.addItem(
- tLastID = 3,
- "Electric Pump (MAX)",
- "10490880 L/sec (as Cover)",
- new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
- getTcAspectStack(TC_Aspects.MACHINA, 8L), getTcAspectStack(TC_Aspects.ITER, 8L),
- getTcAspectStack(TC_Aspects.AQUA, 8L) }));
- GregTech_API.registerCover(
- GregtechItemList.Electric_Pump_LuV.get(1L),
- new GT_MultiTexture(
- new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[5][0],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PUMP) }),
- new GT_Cover_Pump(8196));
- GregTech_API.registerCover(
- GregtechItemList.Electric_Pump_ZPM.get(1L),
- new GT_MultiTexture(
- new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[6][0],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PUMP) }),
- new GT_Cover_Pump(32768));
- GregTech_API.registerCover(
- GregtechItemList.Electric_Pump_UV.get(1L),
- new GT_MultiTexture(
- new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[7][0],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PUMP) }),
- new GT_Cover_Pump(131072));
- GregTech_API.registerCover(
- GregtechItemList.Electric_Pump_MAX.get(1L),
- new GT_MultiTexture(
- new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[8][0],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PUMP) }),
- new GT_Cover_Pump(524288));
- // GT_ModHandler.addCraftingRecipe(GregtechItemList.Electric_Pump_LuV.get(1L),
- // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
- // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"SXO", "dPw", "OMW", Character.valueOf('M'),
- // GregtechItemList.Electric_Motor_LuV, Character.valueOf('O'), OrePrefixes.ring.get(Materials.Rubber),
- // Character.valueOf('X'), OrePrefixes.rotor.get(Materials.Tin), Character.valueOf('S'),
- // OrePrefixes.screw.get(Materials.Tin), Character.valueOf('W'), OrePrefixes.cableGt01.get(Materials.Tin),
- // Character.valueOf('P'), OrePrefixes.pipeMedium.get(Materials.Bronze)});
- // GT_ModHandler.addCraftingRecipe(GregtechItemList.Electric_Pump_ZPM.get(1L),
- // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
- // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"SXO", "dPw", "OMW", Character.valueOf('M'),
- // GregtechItemList.Electric_Motor_ZPM, Character.valueOf('O'), OrePrefixes.ring.get(Materials.Rubber),
- // Character.valueOf('X'), OrePrefixes.rotor.get(Materials.Bronze), Character.valueOf('S'),
- // OrePrefixes.screw.get(Materials.Bronze), Character.valueOf('W'),
- // OrePrefixes.cableGt01.get(Materials.AnyCopper), Character.valueOf('P'),
- // OrePrefixes.pipeMedium.get(Materials.Steel)});
- // GT_ModHandler.addCraftingRecipe(GregtechItemList.Electric_Pump_UV.get(1L),
- // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
- // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"SXO", "dPw", "OMW", Character.valueOf('M'),
- // GregtechItemList.Electric_Motor_UV, Character.valueOf('O'), OrePrefixes.ring.get(Materials.Rubber),
- // Character.valueOf('X'), OrePrefixes.rotor.get(Materials.Steel), Character.valueOf('S'),
- // OrePrefixes.screw.get(Materials.Steel), Character.valueOf('W'),
- // OrePrefixes.cableGt01.get(Materials.Gold), Character.valueOf('P'),
- // OrePrefixes.pipeMedium.get(Materials.StainlessSteel)});
- // GT_ModHandler.addCraftingRecipe(GregtechItemList.Electric_Pump_MAX.get(1L),
- // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
- // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"SXO", "dPw", "OMW", Character.valueOf('M'),
- // GregtechItemList.Electric_Motor_MAX, Character.valueOf('O'), OrePrefixes.ring.get(Materials.Rubber),
- // Character.valueOf('X'), OrePrefixes.rotor.get(Materials.StainlessSteel), Character.valueOf('S'),
- // OrePrefixes.screw.get(Materials.StainlessSteel), Character.valueOf('W'),
- // OrePrefixes.cableGt01.get(Materials.Aluminium), Character.valueOf('P'),
- // OrePrefixes.pipeMedium.get(Materials.Titanium)});
- tLastID = 4;
- GregtechItemList.Electric_Motor_LuV.set(
- this.addItem(
- tLastID = 4,
- "Electric Motor (LuV)",
- "",
- new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
- getTcAspectStack(TC_Aspects.MACHINA, 1L),
- getTcAspectStack(TC_Aspects.MOTUS, 1L) }));
- GregtechItemList.Electric_Motor_ZPM.set(
- this.addItem(
- tLastID = 5,
- "Electric Motor (ZPM)",
- "",
- new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 2L),
- getTcAspectStack(TC_Aspects.MACHINA, 2L),
- getTcAspectStack(TC_Aspects.MOTUS, 2L) }));
- GregtechItemList.Electric_Motor_UV.set(
- this.addItem(
- tLastID = 6,
- "Electric Motor (UV)",
- "",
- new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 4L),
- getTcAspectStack(TC_Aspects.MACHINA, 4L),
- getTcAspectStack(TC_Aspects.MOTUS, 4L) }));
- GregtechItemList.Electric_Motor_MAX.set(
- this.addItem(
- tLastID = 7,
- "Electric Motor (MAX)",
- "",
- new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
- getTcAspectStack(TC_Aspects.MACHINA, 8L),
- getTcAspectStack(TC_Aspects.MOTUS, 8L) }));
- // GT_ModHandler.addCraftingRecipe(GregtechItemList.Electric_Motor_LuV.get(1L),
- // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
- // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"CWR", "WIW", "RWC", Character.valueOf('I'),
- // OrePrefixes.stick.get(Materials.IronMagnetic), Character.valueOf('R'),
- // OrePrefixes.stick.get(Materials.AnyIron), Character.valueOf('W'),
- // OrePrefixes.wireGt01.get(Materials.AnyCopper), Character.valueOf('C'),
- // OrePrefixes.cableGt01.get(Materials.Tin)});
- // GT_ModHandler.addCraftingRecipe(GregtechItemList.Electric_Motor_ZPM.get(1L),
- // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
- // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"CWR", "WIW", "RWC", Character.valueOf('I'),
- // OrePrefixes.stick.get(Materials.SteelMagnetic), Character.valueOf('R'),
- // OrePrefixes.stick.get(Materials.Aluminium), Character.valueOf('W'),
- // OrePrefixes.wireGt01.get(Materials.Electrum), Character.valueOf('C'),
- // OrePrefixes.cableGt01.get(Materials.Silver)});
- // GT_ModHandler.addCraftingRecipe(GregtechItemList.Electric_Motor_UV.get(1L),
- // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
- // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"CWR", "WIW", "RWC", Character.valueOf('I'),
- // OrePrefixes.stick.get(Materials.SteelMagnetic), Character.valueOf('R'),
- // OrePrefixes.stick.get(Materials.StainlessSteel), Character.valueOf('W'),
- // OrePrefixes.wireGt02.get(Materials.Cupronickel), Character.valueOf('C'),
- // OrePrefixes.cableGt01.get(Materials.Gold)});
- // GT_ModHandler.addCraftingRecipe(GregtechItemList.Electric_Motor_MAX.get(1L),
- // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
- // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"CWR", "WIW", "RWC", Character.valueOf('I'),
- // OrePrefixes.stick.get(Materials.NeodymiumMagnetic), Character.valueOf('R'),
- // OrePrefixes.stick.get(Materials.Titanium), Character.valueOf('W'),
- // OrePrefixes.wireGt02.get(Materials.TungstenSteel), Character.valueOf('C'),
- // OrePrefixes.cableGt01.get(Materials.Nichrome)});
-
- tLastID = 8;
- GregtechItemList.Conveyor_Module_LuV.set(
- this.addItem(
- tLastID = 8,
- "Conveyor Module (LuV)",
- "1 Stack every 20 secs (as Cover)",
- new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
- getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L) }));
- GregtechItemList.Conveyor_Module_ZPM.set(
- this.addItem(
- tLastID = 9,
- "Conveyor Module (ZPM)",
- "1 Stack every 5 secs (as Cover)",
- new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 2L),
- getTcAspectStack(TC_Aspects.MACHINA, 2L), getTcAspectStack(TC_Aspects.ITER, 2L) }));
- GregtechItemList.Conveyor_Module_UV.set(
- this.addItem(
- tLastID = 10,
- "Conveyor Module (UV)",
- "1 Stack every 1 sec (as Cover)",
- new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 4L),
- getTcAspectStack(TC_Aspects.MACHINA, 4L), getTcAspectStack(TC_Aspects.ITER, 4L) }));
- GregtechItemList.Conveyor_Module_MAX.set(
- this.addItem(
- tLastID = 11,
- "Conveyor Module (MAX)",
- "1 Stack every 1/5 sec (as Cover)",
- new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
- getTcAspectStack(TC_Aspects.MACHINA, 8L), getTcAspectStack(TC_Aspects.ITER, 8L) }));
- // GT_ModHandler.addCraftingRecipe(GregtechItemList.Conveyor_Module_LuV.get(1L),
- // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
- // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"RRR", "MCM", "RRR", Character.valueOf('M'),
- // GregtechItemList.Electric_Motor_LuV, Character.valueOf('C'), OrePrefixes.cableGt01.get(Materials.Tin),
- // Character.valueOf('R'), OrePrefixes.plate.get(Materials.Rubber)});
- // GT_ModHandler.addCraftingRecipe(GregtechItemList.Conveyor_Module_ZPM.get(1L),
- // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
- // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"RRR", "MCM", "RRR", Character.valueOf('M'),
- // GregtechItemList.Electric_Motor_ZPM, Character.valueOf('C'),
- // OrePrefixes.cableGt01.get(Materials.AnyCopper), Character.valueOf('R'),
- // OrePrefixes.plate.get(Materials.Rubber)});
- // GT_ModHandler.addCraftingRecipe(GregtechItemList.Conveyor_Module_UV.get(1L),
- // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
- // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"RRR", "MCM", "RRR", Character.valueOf('M'),
- // GregtechItemList.Electric_Motor_UV, Character.valueOf('C'), OrePrefixes.cableGt01.get(Materials.Gold),
- // Character.valueOf('R'), OrePrefixes.plate.get(Materials.Rubber)});
- // GT_ModHandler.addCraftingRecipe(GregtechItemList.Conveyor_Module_MAX.get(1L),
- // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
- // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"RRR", "MCM", "RRR", Character.valueOf('M'),
- // GregtechItemList.Electric_Motor_MAX, Character.valueOf('C'),
- // OrePrefixes.cableGt01.get(Materials.Aluminium), Character.valueOf('R'),
- // OrePrefixes.plate.get(Materials.Rubber)});
- GregTech_API.registerCover(
- GregtechItemList.Conveyor_Module_LuV.get(1L),
- new GT_MultiTexture(
- new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[1][0],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_CONVEYOR) }),
- new GT_Cover_Conveyor(400));
- GregTech_API.registerCover(
- GregtechItemList.Conveyor_Module_ZPM.get(1L),
- new GT_MultiTexture(
- new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[2][0],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_CONVEYOR) }),
- new GT_Cover_Conveyor(100));
- GregTech_API.registerCover(
- GregtechItemList.Conveyor_Module_UV.get(1L),
- new GT_MultiTexture(
- new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[3][0],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_CONVEYOR) }),
- new GT_Cover_Conveyor(20));
- GregTech_API.registerCover(
- GregtechItemList.Conveyor_Module_MAX.get(1L),
- new GT_MultiTexture(
- new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[4][0],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_CONVEYOR) }),
- new GT_Cover_Conveyor(4));
- tLastID = 12;
- GregtechItemList.Electric_Piston_LuV.set(
- this.addItem(
- tLastID = 12,
- "Electric Piston (LuV)",
- "",
- new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
- getTcAspectStack(TC_Aspects.MACHINA, 2L),
- getTcAspectStack(TC_Aspects.MOTUS, 1L) }));
- GregtechItemList.Electric_Piston_ZPM.set(
- this.addItem(
- tLastID = 13,
- "Electric Piston (ZPM)",
- "",
- new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 2L),
- getTcAspectStack(TC_Aspects.MACHINA, 4L),
- getTcAspectStack(TC_Aspects.MOTUS, 2L) }));
- GregtechItemList.Electric_Piston_UV.set(
- this.addItem(
- tLastID = 14,
- "Electric Piston (UV)",
- "",
- new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 4L),
- getTcAspectStack(TC_Aspects.MACHINA, 8L),
- getTcAspectStack(TC_Aspects.MOTUS, 4L) }));
- GregtechItemList.Electric_Piston_MAX.set(
- this.addItem(
- tLastID = 15,
- "Electric Piston (MAX)",
- "",
- new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
- getTcAspectStack(TC_Aspects.MACHINA, 16L),
- getTcAspectStack(TC_Aspects.MOTUS, 8L) }));
- // GT_ModHandler.addCraftingRecipe(GregtechItemList.Electric_Piston_LuV.get(1L),
- // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
- // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"PPP", "CSS", "CMG", Character.valueOf('P'),
- // OrePrefixes.plate.get(Materials.Steel), Character.valueOf('S'), OrePrefixes.stick.get(Materials.Steel),
- // Character.valueOf('G'), OrePrefixes.gearGtSmall.get(Materials.Steel), Character.valueOf('M'),
- // GregtechItemList.Electric_Motor_LuV, Character.valueOf('C'), OrePrefixes.cableGt01.get(Materials.Tin)});
- // GT_ModHandler.addCraftingRecipe(GregtechItemList.Electric_Piston_ZPM.get(1L),
- // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
- // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"PPP", "CSS", "CMG", Character.valueOf('P'),
- // OrePrefixes.plate.get(Materials.Aluminium), Character.valueOf('S'),
- // OrePrefixes.stick.get(Materials.Aluminium), Character.valueOf('G'),
- // OrePrefixes.gearGtSmall.get(Materials.Aluminium), Character.valueOf('M'),
- // GregtechItemList.Electric_Motor_ZPM, Character.valueOf('C'),
- // OrePrefixes.cableGt01.get(Materials.AnyCopper)});
- // GT_ModHandler.addCraftingRecipe(GregtechItemList.Electric_Piston_UV.get(1L),
- // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
- // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"PPP", "CSS", "CMG", Character.valueOf('P'),
- // OrePrefixes.plate.get(Materials.StainlessSteel), Character.valueOf('S'),
- // OrePrefixes.stick.get(Materials.StainlessSteel), Character.valueOf('G'),
- // OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), Character.valueOf('M'),
- // GregtechItemList.Electric_Motor_UV, Character.valueOf('C'), OrePrefixes.cableGt01.get(Materials.Gold)});
- // GT_ModHandler.addCraftingRecipe(GregtechItemList.Electric_Piston_MAX.get(1L),
- // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
- // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"PPP", "CSS", "CMG", Character.valueOf('P'),
- // OrePrefixes.plate.get(Materials.Titanium), Character.valueOf('S'),
- // OrePrefixes.stick.get(Materials.Titanium), Character.valueOf('G'),
- // OrePrefixes.gearGtSmall.get(Materials.Titanium), Character.valueOf('M'),
- // GregtechItemList.Electric_Motor_MAX, Character.valueOf('C'),
- // OrePrefixes.cableGt01.get(Materials.Aluminium)});
- tLastID = 16;
- GregtechItemList.Robot_Arm_LuV.set(
- this.addItem(
- tLastID = 16,
- "Robot Arm (LuV)",
- "Inserts into specific Slots (as Cover)",
- new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
- getTcAspectStack(TC_Aspects.MACHINA, 2L), getTcAspectStack(TC_Aspects.MOTUS, 1L),
- Utils.getTcAspectStack("COGNITIO", 1L) }));
- GregtechItemList.Robot_Arm_ZPM.set(
- this.addItem(
- tLastID = 17,
- "Robot Arm (ZPM)",
- "Inserts into specific Slots (as Cover)",
- new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 2L),
- getTcAspectStack(TC_Aspects.MACHINA, 4L), getTcAspectStack(TC_Aspects.MOTUS, 2L),
- getTcAspectStack("COGNITIO", 2L) }));
- GregtechItemList.Robot_Arm_UV.set(
- this.addItem(
- tLastID = 18,
- "Robot Arm (UV)",
- "Inserts into specific Slots (as Cover)",
- new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 4L),
- getTcAspectStack(TC_Aspects.MACHINA, 8L), getTcAspectStack(TC_Aspects.MOTUS, 4L),
- getTcAspectStack("COGNITIO", 4L) }));
- GregtechItemList.Robot_Arm_MAX.set(
- this.addItem(
- tLastID = 19,
- "Robot Arm (MAX)",
- "Inserts into specific Slots (as Cover)",
- new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
- getTcAspectStack(TC_Aspects.MACHINA, 16L), getTcAspectStack(TC_Aspects.MOTUS, 8L),
- getTcAspectStack("COGNITIO", 8L) }));
- // GT_ModHandler.addCraftingRecipe(GregtechItemList.Robot_Arm_LuV.get(1L),
- // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
- // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"CCC", "MSM", "PES", Character.valueOf('S'),
- // OrePrefixes.stick.get(Materials.Steel), Character.valueOf('M'), GregtechItemList.Electric_Motor_LuV,
- // Character.valueOf('P'), GregtechItemList.Electric_Piston_LuV, Character.valueOf('E'),
- // OrePrefixes.circuit.get(Materials.Basic), Character.valueOf('C'),
- // OrePrefixes.cableGt01.get(Materials.Tin)});
- // GT_ModHandler.addCraftingRecipe(GregtechItemList.Robot_Arm_ZPM.get(1L),
- // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
- // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"CCC", "MSM", "PES", Character.valueOf('S'),
- // OrePrefixes.stick.get(Materials.Aluminium), Character.valueOf('M'), GregtechItemList.Electric_Motor_ZPM,
- // Character.valueOf('P'), GregtechItemList.Electric_Piston_ZPM, Character.valueOf('E'),
- // OrePrefixes.circuit.get(Materials.Good), Character.valueOf('C'),
- // OrePrefixes.cableGt01.get(Materials.AnyCopper)});
- // GT_ModHandler.addCraftingRecipe(GregtechItemList.Robot_Arm_UV.get(1L),
- // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
- // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"CCC", "MSM", "PES", Character.valueOf('S'),
- // OrePrefixes.stick.get(Materials.StainlessSteel), Character.valueOf('M'),
- // GregtechItemList.Electric_Motor_UV, Character.valueOf('P'), GregtechItemList.Electric_Piston_UV,
- // Character.valueOf('E'), OrePrefixes.circuit.get(Materials.Advanced), Character.valueOf('C'),
- // OrePrefixes.cableGt01.get(Materials.Gold)});
- // GT_ModHandler.addCraftingRecipe(GregtechItemList.Robot_Arm_MAX.get(1L),
- // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
- // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"CCC", "MSM", "PES", Character.valueOf('S'),
- // OrePrefixes.stick.get(Materials.Titanium), Character.valueOf('M'), GregtechItemList.Electric_Motor_MAX,
- // Character.valueOf('P'), GregtechItemList.Electric_Piston_MAX, Character.valueOf('E'),
- // OrePrefixes.circuit.get(Materials.Elite), Character.valueOf('C'),
- // OrePrefixes.cableGt01.get(Materials.Aluminium)});
- GregTech_API.registerCover(
- GregtechItemList.Robot_Arm_LuV.get(1L),
- new GT_MultiTexture(
- new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[1][0],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_ARM) }),
- new GT_Cover_Arm(400));
- GregTech_API.registerCover(
- GregtechItemList.Robot_Arm_ZPM.get(1L),
- new GT_MultiTexture(
- new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[2][0],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_ARM) }),
- new GT_Cover_Arm(100));
- GregTech_API.registerCover(
- GregtechItemList.Robot_Arm_UV.get(1L),
- new GT_MultiTexture(
- new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[3][0],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_ARM) }),
- new GT_Cover_Arm(20));
- GregTech_API.registerCover(
- GregtechItemList.Robot_Arm_MAX.get(1L),
- new GT_MultiTexture(
- new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[4][0],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_ARM) }),
- new GT_Cover_Arm(4));
- tLastID = 20;
- GregtechItemList.Field_Generator_LuV.set(
- this.addItem(
- tLastID = 20,
- "Field Generator (LuV)",
- "",
- new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 2L),
- getTcAspectStack(TC_Aspects.MACHINA, 1L),
- getTcAspectStack(TC_Aspects.TUTAMEN, 1L) }));
- GregtechItemList.Field_Generator_ZPM.set(
- this.addItem(
- tLastID = 21,
- "Field Generator (ZPM)",
- "",
- new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 4L),
- getTcAspectStack(TC_Aspects.MACHINA, 2L),
- getTcAspectStack(TC_Aspects.TUTAMEN, 2L) }));
- GregtechItemList.Field_Generator_UV.set(
- this.addItem(
- tLastID = 22,
- "Field Generator (UV)",
- "",
- new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
- getTcAspectStack(TC_Aspects.MACHINA, 4L),
- getTcAspectStack(TC_Aspects.TUTAMEN, 4L) }));
- GregtechItemList.Field_Generator_MAX.set(
- this.addItem(
- tLastID = 23,
- "Field Generator (MAX)",
- "",
- new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 16L),
- getTcAspectStack(TC_Aspects.MACHINA, 8L),
- getTcAspectStack(TC_Aspects.TUTAMEN, 8L) }));
- // GT_ModHandler.addCraftingRecipe(GregtechItemList.Field_Generator_LuV.get(1L),
- // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
- // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"WCW", "CGC", "WCW", Character.valueOf('G'),
- // OrePrefixes.gem.get(Materials.EnderPearl), Character.valueOf('C'),
- // OrePrefixes.circuit.get(Materials.Basic), Character.valueOf('W'),
- // OrePrefixes.wireGt01.get(Materials.Osmium)});
- // GT_ModHandler.addCraftingRecipe(GregtechItemList.Field_Generator_ZPM.get(1L),
- // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
- // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"WCW", "CGC", "WCW", Character.valueOf('G'),
- // OrePrefixes.gem.get(Materials.EnderEye), Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Good),
- // Character.valueOf('W'), OrePrefixes.wireGt02.get(Materials.Osmium)});
- // GT_ModHandler.addCraftingRecipe(GregtechItemList.Field_Generator_UV.get(1L),
- // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
- // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"WCW", "CGC", "WCW", Character.valueOf('G'),
- // OrePrefixes.gem.get(Materials.NetherStar), Character.valueOf('C'),
- // OrePrefixes.circuit.get(Materials.Advanced), Character.valueOf('W'),
- // OrePrefixes.wireGt04.get(Materials.Osmium)});
- // GT_ModHandler.addCraftingRecipe(GregtechItemList.Field_Generator_MAX.get(1L),
- // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
- // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"WCW", "CGC", "WCW", Character.valueOf('G'),
- // OrePrefixes.gem.get(Materials.NetherStar), Character.valueOf('C'),
- // OrePrefixes.circuit.get(Materials.Elite), Character.valueOf('W'),
- // OrePrefixes.wireGt08.get(Materials.Osmium)});
- tLastID = 24;
- GregtechItemList.Emitter_LuV.set(
- this.addItem(
- tLastID = 24,
- "Emitter (LuV)",
- "",
- new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
- getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.LUX, 1L) }));
- GregtechItemList.Emitter_ZPM.set(
- this.addItem(
- tLastID = 25,
- "Emitter (ZPM)",
- "",
- new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 2L),
- getTcAspectStack(TC_Aspects.MACHINA, 2L), getTcAspectStack(TC_Aspects.LUX, 2L) }));
- GregtechItemList.Emitter_UV.set(
- this.addItem(
- tLastID = 26,
- "Emitter (UV)",
- "",
- new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 4L),
- getTcAspectStack(TC_Aspects.MACHINA, 4L), getTcAspectStack(TC_Aspects.LUX, 4L) }));
- GregtechItemList.Emitter_MAX.set(
- this.addItem(
- tLastID = 27,
- "Emitter (MAX)",
- "",
- new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
- getTcAspectStack(TC_Aspects.MACHINA, 8L), getTcAspectStack(TC_Aspects.LUX, 8L) }));
- // GT_ModHandler.addCraftingRecipe(GregtechItemList.Emitter_LuV.get(1L),
- // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
- // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"SSC", "WQS", "CWS", Character.valueOf('Q'),
- // OrePrefixes.gem.get(Materials.Quartzite), Character.valueOf('S'), OrePrefixes.stick.get(Materials.Brass),
- // Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Basic), Character.valueOf('W'),
- // OrePrefixes.cableGt01.get(Materials.Tin)});
- // GT_ModHandler.addCraftingRecipe(GregtechItemList.Emitter_ZPM.get(1L),
- // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
- // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"SSC", "WQS", "CWS", Character.valueOf('Q'),
- // OrePrefixes.gem.get(Materials.NetherQuartz), Character.valueOf('S'),
- // OrePrefixes.stick.get(Materials.Electrum), Character.valueOf('C'),
- // OrePrefixes.circuit.get(Materials.Good), Character.valueOf('W'),
- // OrePrefixes.cableGt01.get(Materials.AnyCopper)});
- // GT_ModHandler.addCraftingRecipe(GregtechItemList.Emitter_UV.get(1L),
- // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
- // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"SSC", "WQS", "CWS", Character.valueOf('Q'),
- // OrePrefixes.gem.get(Materials.Emerald), Character.valueOf('S'), OrePrefixes.stick.get(Materials.Chrome),
- // Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Advanced), Character.valueOf('W'),
- // OrePrefixes.cableGt01.get(Materials.Gold)});
- // GT_ModHandler.addCraftingRecipe(GregtechItemList.Emitter_MAX.get(1L),
- // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
- // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"SSC", "WQS", "CWS", Character.valueOf('Q'),
- // OrePrefixes.gem.get(Materials.EnderPearl), Character.valueOf('S'),
- // OrePrefixes.stick.get(Materials.Platinum), Character.valueOf('C'),
- // OrePrefixes.circuit.get(Materials.Elite), Character.valueOf('W'),
- // OrePrefixes.cableGt01.get(Materials.Aluminium)});
- tLastID = 28;
- GregtechItemList.Sensor_LuV.set(
- this.addItem(
- tLastID = 28,
- "Sensor (LuV)",
- "",
- new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
- getTcAspectStack(TC_Aspects.MACHINA, 1L),
- getTcAspectStack(TC_Aspects.SENSUS, 1L) }));
- GregtechItemList.Sensor_ZPM.set(
- this.addItem(
- tLastID = 29,
- "Sensor (ZPM)",
- "",
- new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 2L),
- getTcAspectStack(TC_Aspects.MACHINA, 2L),
- getTcAspectStack(TC_Aspects.SENSUS, 2L) }));
- GregtechItemList.Sensor_UV.set(
- this.addItem(
- tLastID = 30,
- "Sensor (UV)",
- "",
- new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 4L),
- getTcAspectStack(TC_Aspects.MACHINA, 4L),
- getTcAspectStack(TC_Aspects.SENSUS, 4L) }));
- GregtechItemList.Sensor_MAX.set(
- this.addItem(
- tLastID = 31,
- "Sensor (MAX)",
- "",
- new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
- getTcAspectStack(TC_Aspects.MACHINA, 8L),
- getTcAspectStack(TC_Aspects.SENSUS, 8L) }));
- // GT_ModHandler.addCraftingRecipe(GregtechItemList.Sensor_LuV.get(1L),
- // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
- // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"P Q", "PS ", "CPP", Character.valueOf('Q'),
- // OrePrefixes.gem.get(Materials.Quartzite), Character.valueOf('S'), OrePrefixes.stick.get(Materials.Brass),
- // Character.valueOf('P'), OrePrefixes.plate.get(Materials.Steel), Character.valueOf('C'),
- // OrePrefixes.circuit.get(Materials.Basic)});
- // GT_ModHandler.addCraftingRecipe(GregtechItemList.Sensor_ZPM.get(1L),
- // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
- // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"P Q", "PS ", "CPP", Character.valueOf('Q'),
- // OrePrefixes.gem.get(Materials.NetherQuartz), Character.valueOf('S'),
- // OrePrefixes.stick.get(Materials.Electrum), Character.valueOf('P'),
- // OrePrefixes.plate.get(Materials.Aluminium), Character.valueOf('C'),
- // OrePrefixes.circuit.get(Materials.Good)});
- // GT_ModHandler.addCraftingRecipe(GregtechItemList.Sensor_UV.get(1L),
- // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
- // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"P Q", "PS ", "CPP", Character.valueOf('Q'),
- // OrePrefixes.gem.get(Materials.Emerald), Character.valueOf('S'), OrePrefixes.stick.get(Materials.Chrome),
- // Character.valueOf('P'), OrePrefixes.plate.get(Materials.StainlessSteel), Character.valueOf('C'),
- // OrePrefixes.circuit.get(Materials.Advanced)});
- // GT_ModHandler.addCraftingRecipe(GregtechItemList.Sensor_MAX.get(1L),
- // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
- // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"P Q", "PS ", "CPP", Character.valueOf('Q'),
- // OrePrefixes.gem.get(Materials.EnderPearl), Character.valueOf('S'),
- // OrePrefixes.stick.get(Materials.Platinum), Character.valueOf('P'),
- // OrePrefixes.plate.get(Materials.Titanium), Character.valueOf('C'),
- // OrePrefixes.circuit.get(Materials.Elite)});
-
- // Handler for ULV Components
- registerComponents_ULV();
-
- } else {
- // Simplify life.
- registerComponents_ULV();
- registerComponents_MAX();
- }
+ // Simplify life.
+ registerComponents_ULV();
+ registerComponents_MAX();
// Extruder Shape
GregtechItemList.Shape_Extruder_WindmillShaft
.set(this.addItem(tLastID = 40, "Extruder Shape (Shaft)", "Extruder Shape for making Windmill Shafts"));
- // GTNH Already adds this.
- if (!CORE.GTNH) {
- GregtechItemList.Shape_Extruder_SmallGear
- .set(this.addItem(221, "Extruder Shape (Small Gear)", "Extruder Shape for making small gears"));
- }
-
// Batteries
GregtechItemList.Battery_RE_EV_Sodium.set(
this.addItem(
@@ -756,64 +196,6 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
getTcAspectStack(TC_Aspects.CORPUS, 1L), getTcAspectStack(TC_Aspects.FAMES, 1L),
getTcAspectStack(TC_Aspects.IGNIS, 1L) }));
- if (!CORE.GTNH) {
- GregtechItemList.Fluid_Cell_144L.set(
- this.addItem(
- tLastID = 61,
- "144L Invar Fluid Cell",
- "Holds exactly one dust worth of liquid.",
- new Object[] {
- new ItemData(
- Materials.Invar,
- (OrePrefixes.plate.mMaterialAmount * 8L)
- + (4L * OrePrefixes.ring.mMaterialAmount),
- new MaterialStack[0]),
- getTcAspectStack(TC_Aspects.VACUOS, 2L), getTcAspectStack(TC_Aspects.AQUA, 1L) }));
- this.setFluidContainerStats(32000 + tLastID, 144L, 64L);
-
- GregtechItemList.Fluid_Cell_36L.set(
- this.addItem(
- tLastID = 62,
- "36L Brass Fluid Cell",
- "Holds exactly one small dust worth of liquid.",
- new Object[] {
- new ItemData(
- Materials.Brass,
- (OrePrefixes.plate.mMaterialAmount * 8L)
- + (4L * OrePrefixes.ring.mMaterialAmount),
- new MaterialStack[0]),
- getTcAspectStack(TC_Aspects.VACUOS, 2L), getTcAspectStack(TC_Aspects.AQUA, 1L) }));
- this.setFluidContainerStats(32000 + tLastID, 36L, 64L);
-
- GregtechItemList.Fluid_Cell_16L.set(
- this.addItem(
- tLastID = 63,
- "16L Bronze Fluid Cell",
- "Holds exactly one tiny dust / nugget worth of liquid.",
- new Object[] {
- new ItemData(
- Materials.Bronze,
- (OrePrefixes.plate.mMaterialAmount * 8L)
- + (4L * OrePrefixes.ring.mMaterialAmount),
- new MaterialStack[0]),
- getTcAspectStack(TC_Aspects.VACUOS, 2L), getTcAspectStack(TC_Aspects.AQUA, 1L) }));
- this.setFluidContainerStats(32000 + tLastID, 16L, 64L);
-
- GregtechItemList.Fluid_Cell_1L.set(
- this.addItem(
- tLastID = 64,
- "1L Wrought Iron Fluid Cell",
- "Holds exactly one litre worth of liquid.",
- new Object[] {
- new ItemData(
- Materials.WroughtIron,
- (OrePrefixes.plate.mMaterialAmount * 8L)
- + (4L * OrePrefixes.ring.mMaterialAmount),
- new MaterialStack[0]),
- getTcAspectStack(TC_Aspects.VACUOS, 2L), getTcAspectStack(TC_Aspects.AQUA, 1L) }));
- this.setFluidContainerStats(32000 + tLastID, 1L, 64L);
- }
-
GregtechItemList.Cover_Overflow_ULV.set(
this.addItem(
71,
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java
index 7534c0035c..80e7db9bbf 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java
@@ -165,10 +165,7 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi
@Override
public void onConfigLoad(final GT_Config aConfig) {
- int J = 1;
- if (CORE.GTNH) {
- J = 4;
- }
+ int J = 4;
TESSERACT_ENERGY_COST = 128 * J;
TESSERACT_ENERGY_COST_DIMENSIONAL = 512 * J;
}
@@ -535,9 +532,7 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi
? TESSERACT_ENERGY_COST
: TESSERACT_ENERGY_COST_DIMENSIONAL);
- if (CORE.GTNH) {
- J *= 4;
- }
+ J *= 4;
this.mNeededEnergy += J;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java
index b7742d2d4e..2cab13f04f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java
@@ -134,13 +134,8 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic
@Override
public void onConfigLoad(final GT_Config aConfig) {
sInterDimensionalTesseractAllowed = true;
- if (CORE.GTNH) {
- TESSERACT_ENERGY_COST = 512;
- TESSERACT_ENERGY_COST_DIMENSIONAL = 2048;
- } else {
- TESSERACT_ENERGY_COST = 128;
- TESSERACT_ENERGY_COST_DIMENSIONAL = 512;
- }
+ TESSERACT_ENERGY_COST = 512;
+ TESSERACT_ENERGY_COST_DIMENSIONAL = 2048;
}
@Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_RfConvertor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_RfConvertor.java
index cbee852fea..d763490539 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_RfConvertor.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_RfConvertor.java
@@ -205,7 +205,7 @@ public class GT_MetaTileEntity_RfConvertor extends GregtechMetaEnergyBuffer impl
aCurrentOutputAmperage = aTest;
PlayerUtils.messagePlayer(aPlayer, "Now handling " + maxAmperesOut() + " Amps.");
} else {
- if (this.mTier < (CORE.GTNH ? GT_Values.V.length : 9)) {
+ if (this.mTier < GT_Values.V.length) {
this.mTier++;
} else {
this.mTier = 0;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaGarbageCollector.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaGarbageCollector.java
index 9818e0fc52..de4d8f1890 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaGarbageCollector.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaGarbageCollector.java
@@ -376,7 +376,7 @@ public class GregtechMetaGarbageCollector extends GregtechMetaTileEntity {
mLocalTickVar = System.currentTimeMillis();
long aDiff = mLocalTickVar - this.mLastCleanup;
if (Utils.getSecondsFromMillis(aDiff) >= (this.mFrequency * 60)) {
- CORE.gc();
+ System.gc();
this.mLastCleanup = mLocalTickVar;
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IronBlastFurnace.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IronBlastFurnace.java
index fc6dfb6482..e0d35ff7d2 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IronBlastFurnace.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IronBlastFurnace.java
@@ -27,7 +27,6 @@ import gregtech.api.objects.GT_RenderedTexture;
import gregtech.api.util.GT_OreDictUnificator;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.xmod.gregtech.api.gui.GTPP_UITextures;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
@@ -55,18 +54,10 @@ public class GregtechMetaTileEntity_IronBlastFurnace extends MetaTileEntity impl
@Override
public String[] getDescription() {
- if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
- return new String[] { "Iron is a much better furnace material!", "Can be Automated",
- "Multiblock: 3x3x5 hollow with opening on top",
- "Same shape as Bronze/Bricked blast furnace, except one ring of 8 taller.",
- "40 Iron Plated Bricks required", };
- } else {
- return new String[] { "Sloooowly, Skip the Bronze age, Get some Steel!",
- "Multiblock: 3x3x5 hollow with opening on top", "40 Iron Plated Bricks required", "----",
- "Even though Iron melts hotter than bronze,", "this machine is to help players skip looking",
- "for tin and copper, which are not as common",
- "as Iron is. This machine takes 5x longer than the bronze", "blast furnace as a result.", "----", };
- }
+ return new String[] { "Iron is a much better furnace material!", "Can be Automated",
+ "Multiblock: 3x3x5 hollow with opening on top",
+ "Same shape as Bronze/Bricked blast furnace, except one ring of 8 taller.",
+ "40 Iron Plated Bricks required", };
}
@Override
@@ -345,11 +336,7 @@ public class GregtechMetaTileEntity_IronBlastFurnace extends MetaTileEntity impl
}
private int getProperTime(int time) {
- if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
- return (int) (time / 3);
- } else {
- return time;
- }
+ return time / 3;
}
private boolean checkRecipe() {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java
index 3a4f2b81a5..9242389d50 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java
@@ -6,7 +6,6 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose
import static gregtech.api.enums.GT_HatchElement.*;
import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
-import java.lang.reflect.Field;
import java.util.ArrayList;
import net.minecraft.entity.player.EntityPlayer;
@@ -35,7 +34,6 @@ import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.minecraft.PlayerUtils;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.helpers.CraftingHelper;
import gtPlusPlus.xmod.gregtech.common.helpers.autocrafter.AC_Helper_Utils;
@@ -52,12 +50,11 @@ public class GT4Entity_AutoCrafter extends GregtechMeta_MultiBlockBase<GT4Entity
/** The crafting matrix inventory (3x3). */
public CraftingHelper mInventoryCrafter;
- public static enum MODE {
+ public enum MODE {
- CRAFTING("CIRCUIT", "ASSEMBLY"),
+ CRAFTING("DISASSEMBLY", "ASSEMBLY"),
ASSEMBLY("CRAFTING", "DISASSEMBLY"),
- DISASSEMBLY("ASSEMBLY", "CIRCUIT"),
- CIRCUIT("DISASSEMBLY", "CRAFTING");
+ DISASSEMBLY("ASSEMBLY", "CRAFTING");
private final String lastMode;
private final String nextMode;
@@ -88,9 +85,7 @@ public class GT4Entity_AutoCrafter extends GregtechMeta_MultiBlockBase<GT4Entity
@Override
public String getMachineType() {
- String sType = "Assembler, Disassembler, "
- + ((CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK && !CORE.GTNH) ? "Circuit Assembler" : "");
- return sType;
+ return "Assembler, Disassembler";
}
@Override
@@ -208,78 +203,32 @@ public class GT4Entity_AutoCrafter extends GregtechMeta_MultiBlockBase<GT4Entity
public GT_Recipe.GT_Recipe_Map getRecipeMap() {
if (this.mMachineMode == MODE.ASSEMBLY) {
return GT_Recipe.GT_Recipe_Map.sAssemblerRecipes;
- } else if (this.mMachineMode == MODE.CIRCUIT && !CORE.GTNH) {
- if (fCircuitMap != null) {
- return fCircuitMap;
- }
- GT_Recipe_Map r;
- try {
- Field f = ReflectionUtils.getField(GT_Recipe.GT_Recipe_Map.class, "sCircuitAssemblerRecipes");
- if (f != null) {
- r = (GT_Recipe_Map) f.get(null);
- if (r != null) {
- fCircuitMap = r;
- return r;
- }
- }
- } catch (IllegalArgumentException | IllegalAccessException e) {}
} else if (this.mMachineMode == MODE.DISASSEMBLY || this.mMachineMode == MODE.CRAFTING) {
return null;
}
return GT_Recipe.GT_Recipe_Map.sAssemblerRecipes;
}
- private boolean isModernGT = true;
-
@Override
public void onModeChangeByScrewdriver(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
- if (isModernGT && !CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
- isModernGT = false;
- }
- // 5.09 support
- if (isModernGT && !CORE.GTNH) {
+ if (mMachineMode.nextMode() == MODE.CRAFTING) {
+ mMachineMode = MODE.ASSEMBLY;
+ } else {
mMachineMode = mMachineMode.nextMode();
- if (mMachineMode == MODE.CRAFTING) {
- PlayerUtils.messagePlayer(
- aPlayer,
- "Running the Auto-Crafter in mode: " + EnumChatFormatting.AQUA + "AutoCrafting");
- } else if (mMachineMode == MODE.ASSEMBLY) {
- PlayerUtils.messagePlayer(
- aPlayer,
- "Running the Auto-Crafter in mode: " + EnumChatFormatting.GREEN + "Assembly");
- } else if (mMachineMode == MODE.DISASSEMBLY) {
- PlayerUtils.messagePlayer(
- aPlayer,
- "Running the Auto-Crafter in mode: " + EnumChatFormatting.RED + "Disassembly");
- } else {
- PlayerUtils.messagePlayer(
- aPlayer,
- "Running the Auto-Crafter in mode: " + EnumChatFormatting.YELLOW + "Circuit Assembly");
- }
}
- // 5.08 support
- else {
- if (mMachineMode.nextMode() == MODE.CIRCUIT) {
- mMachineMode = MODE.ASSEMBLY;
- } else if (mMachineMode.nextMode() == MODE.CRAFTING) {
- mMachineMode = MODE.ASSEMBLY;
- } else {
- mMachineMode = mMachineMode.nextMode();
- }
- if (mMachineMode == MODE.CRAFTING) {
- PlayerUtils.messagePlayer(
- aPlayer,
- "You are now running the Auto-Crafter in mode: " + EnumChatFormatting.AQUA + "AutoCrafting");
- } else if (mMachineMode == MODE.ASSEMBLY) {
- PlayerUtils.messagePlayer(
- aPlayer,
- "You are now running the Auto-Crafter in mode: " + EnumChatFormatting.GREEN + "Assembly");
- } else {
- PlayerUtils.messagePlayer(
- aPlayer,
- "You are now running the Auto-Crafter in mode: " + EnumChatFormatting.RED + "Disassembly");
- }
+ if (mMachineMode == MODE.CRAFTING) {
+ PlayerUtils.messagePlayer(
+ aPlayer,
+ "You are now running the Auto-Crafter in mode: " + EnumChatFormatting.AQUA + "AutoCrafting");
+ } else if (mMachineMode == MODE.ASSEMBLY) {
+ PlayerUtils.messagePlayer(
+ aPlayer,
+ "You are now running the Auto-Crafter in mode: " + EnumChatFormatting.GREEN + "Assembly");
+ } else {
+ PlayerUtils.messagePlayer(
+ aPlayer,
+ "You are now running the Auto-Crafter in mode: " + EnumChatFormatting.RED + "Disassembly");
}
}
@@ -484,8 +433,8 @@ public class GT4Entity_AutoCrafter extends GregtechMeta_MultiBlockBase<GT4Entity
if (mMachineMode == MODE.DISASSEMBLY) {
tMode = "§cDisassembly";
tSpecialText = "" + (60 + 12 * this.mTier) + "% chance to recover disassembled parts.";
- } else if (mMachineMode == MODE.ASSEMBLY || mMachineMode == MODE.CIRCUIT) {
- tMode = mMachineMode == MODE.ASSEMBLY ? "§aAssembly" : "§eCircuit Assembly";
+ } else if (mMachineMode == MODE.ASSEMBLY) {
+ tMode = "§aAssembly";
if (mLastRecipeToBuffer != null && mLastRecipeToBuffer.mOutputs[0].getDisplayName() != null) {
tSpecialText = "Currently processing: " + mLastRecipeToBuffer.mOutputs[0].getDisplayName();
} else {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatformBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatformBase.java
index 2c40e6875a..6543720022 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatformBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatformBase.java
@@ -474,9 +474,7 @@ public abstract class GregtechMetaTileEntity_BedrockMiningPlatformBase extends G
if (LoadedMods.Railcraft || OreDictUtils.containsValidEntries("oreSaltpeter")) {
mMixedOreData.put(new Pair<String, Integer>("oreSaltpeter", 10));
}
- if (LoadedMods.IndustrialCraft2 || OreDictUtils.containsValidEntries("oreUranium")) {
- mMixedOreData.put(new Pair<String, Integer>("oreUranium", 10));
- }
+ mMixedOreData.put(new Pair<String, Integer>("oreUranium", 10));
if (OreDictUtils.containsValidEntries("oreSulfur")) {
mMixedOreData.put(new Pair<String, Integer>("oreSulfur", 15));
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/GT_Material_Loader.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/GT_Material_Loader.java
index 980efc1bdb..3d66558c4f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/GT_Material_Loader.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/GT_Material_Loader.java
@@ -8,7 +8,6 @@ import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.api.objects.data.AutoMap;
-import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.minecraft.MaterialUtils;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
@@ -39,7 +38,7 @@ public class GT_Material_Loader {
// Try Reflectively add ourselves to the GT loader.
Class mInterface = ReflectionUtils.getClass("gregtech.api.interfaces.IMaterialHandler");
- if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK && mInterface != null) {
+ if (mInterface != null) {
// Make this class Dynamically implement IMaterialHandler
if (mProxyObject == null) {
@@ -114,10 +113,6 @@ public class GT_Material_Loader {
*/
private static synchronized boolean tryEnableMaterial(Materials mMaterial) {
- if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
- return false;
- }
-
boolean value = ReflectionUtils.setField(mMaterial, "mHasParentMod", true);
if (value) {
Logger.DEBUG_MATERIALS("Set mHasParentMod true for " + mMaterial.mDefaultLocalName);
@@ -128,9 +123,6 @@ public class GT_Material_Loader {
}
private static synchronized boolean tryEnableMaterialPart(OrePrefixes prefix, Materials mMaterial) {
- if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
- return false;
- }
try {
Method enableComponent = ReflectionUtils.getClass("gregtech.api.enums.OrePrefixes")
.getDeclaredMethod("enableComponent", Materials.class);
@@ -157,9 +149,6 @@ public class GT_Material_Loader {
}
private static synchronized boolean tryEnableAllComponentsForMaterial(Materials material) {
- if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
- return false;
- }
try {
tryEnableMaterial(material);
int mValid = 0;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_Ex.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_Ex.java
index 97807f3053..c0f1ba3b77 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_Ex.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_Ex.java
@@ -26,13 +26,10 @@ public class RecipeGen_BlastSmelterGT_Ex implements IOreRecipeRegistrator {
@Override
public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName,
ItemStack aStack) {
-
- boolean keepHighTempRecipes = !CORE.GTNH;
-
switch (aPrefix) {
case dust:
ItemStack tDustStack;
- if (keepHighTempRecipes || aMaterial.mBlastFurnaceTemp <= 3600) {
+ if (aMaterial.mBlastFurnaceTemp <= 3600) {
if ((null != (tDustStack = GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial.mSmeltInto, 1L)))
&& (!aMaterial.contains(SubTag.NO_SMELTING))) {
if (aMaterial.mBlastFurnaceRequired) {
@@ -58,7 +55,7 @@ public class RecipeGen_BlastSmelterGT_Ex implements IOreRecipeRegistrator {
}
}
case ingot:
- if (keepHighTempRecipes || aMaterial.mBlastFurnaceTemp <= 3600) {
+ if (aMaterial.mBlastFurnaceTemp <= 3600) {
if ((null != (tDustStack = GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial.mSmeltInto, 1L)))
&& (!aMaterial.contains(SubTag.NO_SMELTING))) {
if (aMaterial.mBlastFurnaceRequired) {
@@ -80,7 +77,7 @@ public class RecipeGen_BlastSmelterGT_Ex implements IOreRecipeRegistrator {
}
break;
case dustSmall:
- if (keepHighTempRecipes || aMaterial.mBlastFurnaceTemp <= 3600) {
+ if (aMaterial.mBlastFurnaceTemp <= 3600) {
if (aMaterial.mBlastFurnaceRequired) {
addBlastRecipe(
GT_Utility.copyAmount(4L, new Object[] { aStack }),
@@ -102,7 +99,7 @@ public class RecipeGen_BlastSmelterGT_Ex implements IOreRecipeRegistrator {
}
break;
case dustTiny:
- if (keepHighTempRecipes || aMaterial.mBlastFurnaceTemp <= 3600) {
+ if (aMaterial.mBlastFurnaceTemp <= 3600) {
if (!aMaterial.contains(gregtech.api.enums.SubTag.NO_SMELTING)) {
if (aMaterial.mBlastFurnaceRequired) {
addBlastRecipe(
@@ -127,7 +124,7 @@ public class RecipeGen_BlastSmelterGT_Ex implements IOreRecipeRegistrator {
}
break;
default:
- if (keepHighTempRecipes || aMaterial.mBlastFurnaceTemp <= 3600) {
+ if (aMaterial.mBlastFurnaceTemp <= 3600) {
if (!aMaterial.contains(SubTag.NO_SMELTING)) {
if ((aMaterial.mBlastFurnaceRequired) || (aMaterial.mDirectSmelting.mBlastFurnaceRequired)) {
addBlastRecipe(
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_GTNH.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_GTNH.java
index bfd5fdc2cb..4a82c5e92f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_GTNH.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_GTNH.java
@@ -77,10 +77,7 @@ public class RecipeGen_BlastSmelterGT_GTNH {
if (x.mInputs[0] != null) {
for (int tag : OreDictionary.getOreIDs(x.mInputs[0])) {
String oreName = OreDictionary.getOreName(tag).toLowerCase();
- String mType = "dust";
- if (CORE.GTNH) {
- mType = "ingot";
- }
+ String mType = "ingot";
if (oreName.startsWith(mType) && !oreName.contains("double")
&& !oreName.contains("triple")
&& !oreName.contains("quad")
@@ -154,8 +151,8 @@ public class RecipeGen_BlastSmelterGT_GTNH {
enabled = x.mEnabled;
special = x.mSpecialValue;
- // Check for GTNH, if it's found, continue to next recipe if the Temp is too high.
- if (CORE.GTNH && special > 3600) {
+ // continue to next recipe if the Temp is too high.
+ if (special > 3600) {
Logger.MACHINE_INFO("[ABS] Skipping ABS addition for GTNH due to temp.");
continue;
} else {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java
index 9f12a591ff..35d1a987e2 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java
@@ -7,7 +7,6 @@ import gregtech.api.enums.GT_Values;
import gregtech.api.enums.ItemList;
import gtPlusPlus.api.interfaces.RunnableWithInfo;
import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.material.MaterialGenerator;
import gtPlusPlus.core.util.minecraft.ItemUtils;
@@ -118,144 +117,141 @@ public class RecipeGen_Fluids extends RecipeGen_Base {
(144 * 9) + "l fluid molder from 1 block Recipe: " + material.getLocalizedName() + " - Failed");
}
- if (CORE.GTNH) {
+ // GTNH
- // GTNH
+ // Shape_Mold_Rod
+ // Shape_Mold_Rod_Long
+ // Shape_Mold_Bolt,
+ // Shape_Mold_Screw,
+ // Shape_Mold_Ring,
- // Shape_Mold_Rod
- // Shape_Mold_Rod_Long
- // Shape_Mold_Bolt,
- // Shape_Mold_Screw,
- // Shape_Mold_Ring,
+ ItemList mold_Rod = ItemUtils.getValueOfItemList("Shape_Mold_Rod", null);
+ ItemList mold_Rod_Long = ItemUtils.getValueOfItemList("Shape_Mold_Rod_Long", null);
+ ItemList mold_Bolt = ItemUtils.getValueOfItemList("Shape_Mold_Bolt", null);
+ ItemList mold_Screw = ItemUtils.getValueOfItemList("Shape_Mold_Screw", null);
+ ItemList mold_Ring = ItemUtils.getValueOfItemList("Shape_Mold_Ring", null);
+ ItemList mold_Rotor = ItemUtils.getValueOfItemList("Shape_Mold_Rotor", null);
- ItemList mold_Rod = ItemUtils.getValueOfItemList("Shape_Mold_Rod", null);
- ItemList mold_Rod_Long = ItemUtils.getValueOfItemList("Shape_Mold_Rod_Long", null);
- ItemList mold_Bolt = ItemUtils.getValueOfItemList("Shape_Mold_Bolt", null);
- ItemList mold_Screw = ItemUtils.getValueOfItemList("Shape_Mold_Screw", null);
- ItemList mold_Ring = ItemUtils.getValueOfItemList("Shape_Mold_Ring", null);
- ItemList mold_Rotor = ItemUtils.getValueOfItemList("Shape_Mold_Rotor", null);
+ // Rod
+ if (ItemUtils.checkForInvalidItems(material.getRod(1)))
+ if (mold_Rod != null && GT_Values.RA.addFluidSolidifierRecipe(
+ mold_Rod.get(0), // Item Shape
+ material.getFluidStack(72), // Fluid Input
+ material.getRod(1), // output
+ 150, // Duration
+ material.vVoltageMultiplier // Eu Tick
+ )) {
+ Logger.WARNING(
+ (144 * 9) + "l fluid molder from 1 rod Recipe: "
+ + material.getLocalizedName()
+ + " - Success");
+ } else {
+ Logger.WARNING(
+ (144 * 9) + "l fluid molder from 1 rod Recipe: "
+ + material.getLocalizedName()
+ + " - Failed");
+ }
- // Rod
- if (ItemUtils.checkForInvalidItems(material.getRod(1)))
- if (mold_Rod != null && GT_Values.RA.addFluidSolidifierRecipe(
- mold_Rod.get(0), // Item Shape
- material.getFluidStack(72), // Fluid Input
- material.getRod(1), // output
- 150, // Duration
- material.vVoltageMultiplier // Eu Tick
- )) {
- Logger.WARNING(
- (144 * 9) + "l fluid molder from 1 rod Recipe: "
- + material.getLocalizedName()
- + " - Success");
- } else {
- Logger.WARNING(
- (144 * 9) + "l fluid molder from 1 rod Recipe: "
- + material.getLocalizedName()
- + " - Failed");
- }
+ // Rod Long
+ if (ItemUtils.checkForInvalidItems(material.getLongRod(1)))
+ if (mold_Rod_Long != null && GT_Values.RA.addFluidSolidifierRecipe(
+ mold_Rod_Long.get(0), // Item
+ // Shape
+ material.getFluidStack(144), // Fluid Input
+ material.getLongRod(1), // output
+ 300, // Duration
+ material.vVoltageMultiplier // Eu Tick
+ )) {
+ Logger.WARNING(
+ (144 * 9) + "l fluid molder from 1 rod long Recipe: "
+ + material.getLocalizedName()
+ + " - Success");
+ } else {
+ Logger.WARNING(
+ (144 * 9) + "l fluid molder from 1 rod long Recipe: "
+ + material.getLocalizedName()
+ + " - Failed");
+ }
- // Rod Long
- if (ItemUtils.checkForInvalidItems(material.getLongRod(1)))
- if (mold_Rod_Long != null && GT_Values.RA.addFluidSolidifierRecipe(
- mold_Rod_Long.get(0), // Item
- // Shape
- material.getFluidStack(144), // Fluid Input
- material.getLongRod(1), // output
- 300, // Duration
- material.vVoltageMultiplier // Eu Tick
- )) {
- Logger.WARNING(
- (144 * 9) + "l fluid molder from 1 rod long Recipe: "
- + material.getLocalizedName()
- + " - Success");
- } else {
- Logger.WARNING(
- (144 * 9) + "l fluid molder from 1 rod long Recipe: "
- + material.getLocalizedName()
- + " - Failed");
- }
+ // Bolt
+ if (ItemUtils.checkForInvalidItems(material.getBolt(1)))
+ if (mold_Bolt != null && GT_Values.RA.addFluidSolidifierRecipe(
+ mold_Bolt.get(0), // Item Shape
+ material.getFluidStack(18), // Fluid Input
+ material.getBolt(1), // output
+ 50, // Duration
+ material.vVoltageMultiplier // Eu Tick
+ )) {
+ Logger.WARNING(
+ (144 * 9) + "l fluid molder from 1 bolt Recipe: "
+ + material.getLocalizedName()
+ + " - Success");
+ } else {
+ Logger.WARNING(
+ (144 * 9) + "l fluid molder from 1 bolt Recipe: "
+ + material.getLocalizedName()
+ + " - Failed");
+ }
- // Bolt
- if (ItemUtils.checkForInvalidItems(material.getBolt(1)))
- if (mold_Bolt != null && GT_Values.RA.addFluidSolidifierRecipe(
- mold_Bolt.get(0), // Item Shape
- material.getFluidStack(18), // Fluid Input
- material.getBolt(1), // output
- 50, // Duration
- material.vVoltageMultiplier // Eu Tick
- )) {
- Logger.WARNING(
- (144 * 9) + "l fluid molder from 1 bolt Recipe: "
- + material.getLocalizedName()
- + " - Success");
- } else {
- Logger.WARNING(
- (144 * 9) + "l fluid molder from 1 bolt Recipe: "
- + material.getLocalizedName()
- + " - Failed");
- }
+ // Screw
+ if (ItemUtils.checkForInvalidItems(material.getScrew(1)))
+ if (mold_Screw != null && GT_Values.RA.addFluidSolidifierRecipe(
+ mold_Screw.get(0), // Item Shape
+ material.getFluidStack(18), // Fluid Input
+ material.getScrew(1), // output
+ 50, // Duration
+ material.vVoltageMultiplier // Eu Tick
+ )) {
+ Logger.WARNING(
+ (144 * 9) + "l fluid molder from 1 screw Recipe: "
+ + material.getLocalizedName()
+ + " - Success");
+ } else {
+ Logger.WARNING(
+ (144 * 9) + "l fluid molder from 1 screw Recipe: "
+ + material.getLocalizedName()
+ + " - Failed");
+ }
- // Screw
- if (ItemUtils.checkForInvalidItems(material.getScrew(1)))
- if (mold_Screw != null && GT_Values.RA.addFluidSolidifierRecipe(
- mold_Screw.get(0), // Item Shape
- material.getFluidStack(18), // Fluid Input
- material.getScrew(1), // output
- 50, // Duration
- material.vVoltageMultiplier // Eu Tick
- )) {
- Logger.WARNING(
- (144 * 9) + "l fluid molder from 1 screw Recipe: "
- + material.getLocalizedName()
- + " - Success");
- } else {
- Logger.WARNING(
- (144 * 9) + "l fluid molder from 1 screw Recipe: "
- + material.getLocalizedName()
- + " - Failed");
- }
+ // Ring
+ if (ItemUtils.checkForInvalidItems(material.getRing(1)))
+ if (mold_Ring != null && GT_Values.RA.addFluidSolidifierRecipe(
+ mold_Ring.get(0), // Item Shape
+ material.getFluidStack(36), // Fluid Input
+ material.getRing(1), // output
+ 100, // Duration
+ material.vVoltageMultiplier // Eu Tick
+ )) {
+ Logger.WARNING(
+ (144 * 9) + "l fluid molder from 1 ring Recipe: "
+ + material.getLocalizedName()
+ + " - Success");
+ } else {
+ Logger.WARNING(
+ (144 * 9) + "l fluid molder from 1 ring Recipe: "
+ + material.getLocalizedName()
+ + " - Failed");
+ }
- // Ring
- if (ItemUtils.checkForInvalidItems(material.getRing(1)))
- if (mold_Ring != null && GT_Values.RA.addFluidSolidifierRecipe(
- mold_Ring.get(0), // Item Shape
- material.getFluidStack(36), // Fluid Input
- material.getRing(1), // output
- 100, // Duration
- material.vVoltageMultiplier // Eu Tick
- )) {
- Logger.WARNING(
- (144 * 9) + "l fluid molder from 1 ring Recipe: "
- + material.getLocalizedName()
- + " - Success");
- } else {
- Logger.WARNING(
- (144 * 9) + "l fluid molder from 1 ring Recipe: "
- + material.getLocalizedName()
- + " - Failed");
- }
-
- // Rotor
- if (ItemUtils.checkForInvalidItems(material.getRotor(1)))
- if (mold_Rotor != null && GT_Values.RA.addFluidSolidifierRecipe(
- mold_Rotor.get(0), // Item Shape
- material.getFluidStack(612), // Fluid Input
- material.getRotor(1), // output
- 100, // Duration
- material.vVoltageMultiplier // Eu Tick
- )) {
- Logger.WARNING(
- (144 * 9) + "l fluid molder from 1 rotor Recipe: "
- + material.getLocalizedName()
- + " - Success");
- } else {
- Logger.WARNING(
- (144 * 9) + "l fluid molder from 1 rotor Recipe: "
- + material.getLocalizedName()
- + " - Failed");
- }
- }
+ // Rotor
+ if (ItemUtils.checkForInvalidItems(material.getRotor(1)))
+ if (mold_Rotor != null && GT_Values.RA.addFluidSolidifierRecipe(
+ mold_Rotor.get(0), // Item Shape
+ material.getFluidStack(612), // Fluid Input
+ material.getRotor(1), // output
+ 100, // Duration
+ material.vVoltageMultiplier // Eu Tick
+ )) {
+ Logger.WARNING(
+ (144 * 9) + "l fluid molder from 1 rotor Recipe: "
+ + material.getLocalizedName()
+ + " - Success");
+ } else {
+ Logger.WARNING(
+ (144 * 9) + "l fluid molder from 1 rotor Recipe: "
+ + material.getLocalizedName()
+ + " - Failed");
+ }
}
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java
index 1c938e0da4..d821751c7b 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java
@@ -383,14 +383,6 @@ public class RecipeGen_Recycling implements Runnable {
return ItemUtils.getSimpleStack(Items.clay_ball, amount);
}
- if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
- if (oredictName.toLowerCase().contains("rutile")) {
- mTemp = oredictName.replace("Rutile", "Titanium");
- }
- if (oredictName.toLowerCase().contains("vanadiumsteel")) {
- mTemp = oredictName.replace("VanadiumSteel", "StainlessSteel");
- }
- }
final ArrayList<ItemStack> oreDictList = OreDictionary.getOres(mTemp);
if (!oreDictList.isEmpty()) {
final ItemStack returnValue = oreDictList.get(0).copy();
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java
index 8bc90b6ba0..e414d8c511 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java
@@ -6,11 +6,9 @@ import java.util.Set;
import gregtech.api.util.GT_ModHandler;
import gtPlusPlus.api.interfaces.RunnableWithInfo;
import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.material.MaterialGenerator;
import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.core.util.minecraft.RecipeUtils;
public class RecipeGen_ShapedCrafting extends RecipeGen_Base {
@@ -33,19 +31,6 @@ public class RecipeGen_ShapedCrafting extends RecipeGen_Base {
private void generateRecipes(final Material material) {
Logger.WARNING("Generating Shaped Crafting recipes for " + material.getLocalizedName()); // TODO
- if (!CORE.GTNH) {
- // Nuggets
- if (ItemUtils.checkForInvalidItems(material.getNugget(1))
- && ItemUtils.checkForInvalidItems(material.getIngot(1)))
- GT_ModHandler.addShapelessCraftingRecipe(
- material.getIngot(1),
- new Object[] { material.getNugget(1), material.getNugget(1), material.getNugget(1),
- material.getNugget(1), material.getNugget(1), material.getNugget(1),
- material.getNugget(1), material.getNugget(1), material.getNugget(1) });
- }
-
- // Plates
-
// Single Plate Shaped/Shapeless
if (ItemUtils.checkForInvalidItems(material.getPlate(1))
&& ItemUtils.checkForInvalidItems(material.getIngot(1)))
@@ -83,32 +68,13 @@ public class RecipeGen_ShapedCrafting extends RecipeGen_Base {
// Ring Recipe
if (!material.isRadioactive && ItemUtils.checkForInvalidItems(material.getRing(1))
&& ItemUtils.checkForInvalidItems(material.getRod(1))) {
- if (CORE.GTNH) {
- if (GT_ModHandler.addCraftingRecipe(
- material.getRing(1),
- gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
- | gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] { "h ", "fR", 'R', material.getRod(1) })) {
- Logger.WARNING("GT:NH Ring Recipe: " + material.getLocalizedName() + " - Success");
- } else {
- Logger.WARNING("GT:NH Ring Recipe: " + material.getLocalizedName() + " - Failed");
- }
+ if (GT_ModHandler.addCraftingRecipe(
+ material.getRing(1),
+ GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED,
+ new Object[] { "h ", "fR", 'R', material.getRod(1) })) {
+ Logger.WARNING("GT:NH Ring Recipe: " + material.getLocalizedName() + " - Success");
} else {
- if (RecipeUtils.addShapedRecipe(
- "craftingToolHardHammer",
- null,
- null,
- null,
- material.getRod(1),
- null,
- null,
- null,
- null,
- material.getRing(1))) {
- Logger.WARNING("Ring Recipe: " + material.getLocalizedName() + " - Success");
- } else {
- Logger.WARNING("Ring Recipe: " + material.getLocalizedName() + " - Failed");
- }
+ Logger.WARNING("GT:NH Ring Recipe: " + material.getLocalizedName() + " - Failed");
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java
index 2a6715c1ac..7595fc7af7 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java
@@ -1,7 +1,5 @@
package gtPlusPlus.xmod.gregtech.loaders.recipe;
-import static gtPlusPlus.core.lib.CORE.GTNH;
-
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
@@ -20,7 +18,6 @@ import gtPlusPlus.core.material.MISC_MATERIALS;
import gtPlusPlus.core.material.nuclear.FLUORIDES;
import gtPlusPlus.core.material.nuclear.NUCLIDE;
import gtPlusPlus.core.recipe.common.CI;
-import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.minecraft.FluidUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
@@ -208,119 +205,55 @@ public class RecipeLoader_Nuclear {
300 * 20);
// LFTR Fuel Related Compounds
- if (GTNH) {
- // Hydroxide
- GT_Values.RA.addChemicalRecipe(
- ItemUtils.getGregtechCircuit(3),
- ELEMENT.getInstance().OXYGEN.getCell(1),
- ELEMENT.getInstance().HYDROGEN.getFluidStack(1000),
- MISC_MATERIALS.HYDROXIDE.getFluidStack(2000),
- CI.emptyCells(1),
- GT_Values.NI,
- 8 * 20,
- 30);
- // Beryllium Hydroxide
- GT_Values.RA.addChemicalRecipe(
- ItemUtils.getGregtechCircuit(3),
- ELEMENT.getInstance().BERYLLIUM.getDust(7),
- MISC_MATERIALS.HYDROXIDE.getFluidStack(1000),
- FLUORIDES.BERYLLIUM_HYDROXIDE.getFluidStack(2000),
- GT_Values.NI,
- 8 * 20,
- 30);
+ // Hydroxide
+ GT_Values.RA.addChemicalRecipe(
+ ItemUtils.getGregtechCircuit(3),
+ ELEMENT.getInstance().OXYGEN.getCell(1),
+ ELEMENT.getInstance().HYDROGEN.getFluidStack(1000),
+ MISC_MATERIALS.HYDROXIDE.getFluidStack(2000),
+ CI.emptyCells(1),
+ GT_Values.NI,
+ 8 * 20,
+ 30);
+ // Beryllium Hydroxide
+ GT_Values.RA.addChemicalRecipe(
+ ItemUtils.getGregtechCircuit(3),
+ ELEMENT.getInstance().BERYLLIUM.getDust(7),
+ MISC_MATERIALS.HYDROXIDE.getFluidStack(1000),
+ FLUORIDES.BERYLLIUM_HYDROXIDE.getFluidStack(2000),
+ GT_Values.NI,
+ 8 * 20,
+ 30);
+ // Ammonium Bifluoride
+ GT_Values.RA.addChemicalRecipe(
+ ItemUtils.getGregtechCircuit(3),
+ ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 1),
+ MISC_MATERIALS.AMMONIUM.getFluidStack(1000),
+ FLUORIDES.AMMONIUM_BIFLUORIDE.getFluidStack(2000),
+ CI.emptyCells(1),
+ 20 * 20,
+ 30);
+ if (aGtHydrofluoricAcid != null) {
// Ammonium Bifluoride
GT_Values.RA.addChemicalRecipe(
ItemUtils.getGregtechCircuit(3),
- ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 1),
+ aGtHydrofluoricAcid,
MISC_MATERIALS.AMMONIUM.getFluidStack(1000),
FLUORIDES.AMMONIUM_BIFLUORIDE.getFluidStack(2000),
- CI.emptyCells(1),
- 20 * 20,
- 30);
- if (aGtHydrofluoricAcid != null) {
- // Ammonium Bifluoride
- GT_Values.RA.addChemicalRecipe(
- ItemUtils.getGregtechCircuit(3),
- aGtHydrofluoricAcid,
- MISC_MATERIALS.AMMONIUM.getFluidStack(1000),
- FLUORIDES.AMMONIUM_BIFLUORIDE.getFluidStack(2000),
- CI.emptyCells(2),
- 40 * 20,
- 30);
- }
- // Ammonium
- GT_Values.RA.addChemicalRecipe(
- ItemUtils.getGregtechCircuit(3),
- ELEMENT.getInstance().HYDROGEN.getCell(1),
- MISC_MATERIALS.AMMONIA.getFluidStack(1000),
- MISC_MATERIALS.AMMONIUM.getFluidStack(2000),
- CI.emptyCells(1),
- GT_Values.NI,
- 20 * 20,
- 30);
- }
-
- if (!GTNH) {
- // Hydroxide
- GT_Values.RA.addChemicalRecipe(
- ItemUtils.getGregtechCircuit(3),
- ELEMENT.getInstance().OXYGEN.getCell(1),
- ELEMENT.getInstance().HYDROGEN.getFluidStack(1000),
- MISC_MATERIALS.HYDROXIDE.getFluidStack(2000),
- CI.emptyCells(1),
- GT_Values.NI,
- 8 * 20,
- 30);
- // Beryllium Hydroxide
- GT_Values.RA.addChemicalRecipe(
- ItemUtils.getGregtechCircuit(3),
- ELEMENT.getInstance().BERYLLIUM.getDust(7),
- MISC_MATERIALS.HYDROXIDE.getFluidStack(1000),
- FLUORIDES.BERYLLIUM_HYDROXIDE.getFluidStack(2000),
- GT_Values.NI,
- 8 * 20,
- 30);
- // Ammonium Bifluoride
- GT_Values.RA.addChemicalRecipe(
- ItemUtils.getGregtechCircuit(3),
- ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 1),
- MISC_MATERIALS.AMMONIUM.getFluidStack(1000),
- FLUORIDES.AMMONIUM_BIFLUORIDE.getFluidStack(3000),
- CI.emptyCells(1),
- 20 * 20,
- 30);
-
- if (aGtHydrofluoricAcid != null) {
- // Ammonium Bifluoride
- GT_Values.RA.addChemicalRecipe(
- ItemUtils.getGregtechCircuit(3),
- aGtHydrofluoricAcid,
- MISC_MATERIALS.AMMONIUM.getFluidStack(1000),
- FLUORIDES.AMMONIUM_BIFLUORIDE.getFluidStack(2000),
- CI.emptyCells(2),
- 40 * 20,
- 30);
- }
-
- // Ammonium
- GT_Values.RA.addChemicalRecipe(
- ItemUtils.getGregtechCircuit(3),
- ELEMENT.getInstance().HYDROGEN.getCell(1),
- MISC_MATERIALS.AMMONIA.getFluidStack(1000),
- MISC_MATERIALS.AMMONIUM.getFluidStack(2000),
- CI.emptyCells(1),
- GT_Values.NI,
- 20 * 20,
+ CI.emptyCells(2),
+ 40 * 20,
30);
- // Ammonia
- GT_Values.RA.addChemicalRecipe(
- ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 3),
- ItemUtils.getItemStackOfAmountFromOreDict("dustMagnetite", 0),
- FluidUtils.getFluidStack("nitrogen", 1000),
- FluidUtils.getFluidStack("ammonia", 1000),
- CI.emptyCells(3),
- 14 * 20);
}
+ // Ammonium
+ GT_Values.RA.addChemicalRecipe(
+ ItemUtils.getGregtechCircuit(3),
+ ELEMENT.getInstance().HYDROGEN.getCell(1),
+ MISC_MATERIALS.AMMONIA.getFluidStack(1000),
+ MISC_MATERIALS.AMMONIUM.getFluidStack(2000),
+ CI.emptyCells(1),
+ GT_Values.NI,
+ 20 * 20,
+ 30);
// Technetium
GT_Values.RA.addChemicalRecipe(
@@ -445,18 +378,15 @@ public class RecipeLoader_Nuclear {
500); // EU
// Zirconium Chloride -> TetraFluoride
- FluidStack aGregtechHydro = FluidUtils.getFluidStack("hydrofluoricacid_gt5u", 1);
- if (aGregtechHydro != null || Utils.getGregtechVersionAsInt() >= 50929) {
- CORE.RA.addDehydratorRecipe(
- new ItemStack[] { CI.getNumberedAdvancedCircuit(10),
- ItemUtils.getItemStackOfAmountFromOreDict("dustCookedZrCl4", 9) },
- FluidUtils.getFluidStack("hydrofluoricacid_gt5u", 18 * 144),
- aHydrogenChloride,
- new ItemStack[] { FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getDust(9) },
- new int[] { 10000 },
- 240 * 20, // Time in ticks
- 500); // EU
- }
+ CORE.RA.addDehydratorRecipe(
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(10),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustCookedZrCl4", 9) },
+ FluidUtils.getFluidStack("hydrofluoricacid_gt5u", 18 * 144),
+ aHydrogenChloride,
+ new ItemStack[] { FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getDust(9) },
+ new int[] { 10000 },
+ 240 * 20, // Time in ticks
+ 500); // EU
// Be(OH)2 + 2 (NH4)HF2 → (NH4)2BeF4 + 2 H2O
CORE.RA.addDehydratorRecipe(
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java b/src/main/java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
index e836112814..6620813386 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
@@ -1,13 +1,9 @@
package gtPlusPlus.xmod.gregtech.recipes;
-import static gregtech.GT_Mod.GT_FML_LOGGER;
import static gregtech.api.enums.GT_Values.RA;
-import static gtPlusPlus.core.lib.CORE.GTNH;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
import net.minecraft.item.ItemStack;
@@ -17,12 +13,10 @@ import net.minecraftforge.oredict.OreDictionary;
import gregtech.api.GregTech_API;
import gregtech.api.enums.ConfigCategories;
import gregtech.api.enums.GT_Values;
-import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
import gregtech.api.interfaces.internal.IGT_RecipeAdder;
import gregtech.api.util.*;
import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map;
-import gregtech.api.util.GT_Recipe.GT_Recipe_AssemblyLine;
import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.api.objects.data.AutoMap;
@@ -809,31 +803,7 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
@Override
public boolean addComponentMakerRecipe(ItemStack[] aInputs, FluidStack aFluidInput, ItemStack aOutput1,
int aDuration, int aEUt) {
- if (areItemsAndFluidsBothNull(aInputs, new FluidStack[] { aFluidInput })) {
- return false;
- }
- if (aOutput1 == null) {
- return false;
- }
- if ((aDuration = GregTech_API.sRecipeFile.get("machinecomponents", aOutput1, aDuration)) <= 0) {
- return false;
- }
- if (GTNH) {
- return false;
- }
- GTPP_Recipe aRecipe = new GTPP_Recipe(
- false,
- aInputs,
- new ItemStack[] { aOutput1 },
- null,
- new int[] {},
- new FluidStack[] { aFluidInput },
- new FluidStack[] {},
- aDuration,
- aEUt,
- 0);
- GTPP_Recipe.GTPP_Recipe_Map.sComponentAssemblerRecipes.addRecipe(aRecipe);
- return true;
+ return false;
}
public boolean addMultiblockCentrifugeRecipe(ItemStack[] aInputs, FluidStack[] aFluidInputs,
@@ -1119,133 +1089,120 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
ItemStack.class,
int.class);
- if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK || CORE.GTNH) {
- // 6 Slot Assembler
- mSixSlotAssembly = ReflectionUtils.getMethod(
- clazz,
- "addAssemblerRecipe",
- ItemStack[].class,
- FluidStack.class,
- ItemStack.class,
- int.class,
- int.class);
- // Assembly Line
- mAssemblyLine = ReflectionUtils.getMethod(
- clazz,
- "addAssemblylineRecipe",
- ItemStack.class,
- int.class,
- ItemStack[].class,
- FluidStack[].class,
- ItemStack.class,
- int.class,
- int.class);
-
- Method T = null;
- if (LoadedMods.TecTech) {
- Class TTRecipeAdder = ReflectionUtils.getClass("com.github.technus.tectech.recipe.TT_recipeAdder");
- if (TTRecipeAdder != null) {
- Method ttTest = ReflectionUtils.getMethod(
- TTRecipeAdder,
- "addResearchableAssemblylineRecipe",
- ItemStack.class,
- int.class,
- int.class,
- int.class,
- int.class,
- Object[].class,
- FluidStack[].class,
- ItemStack.class,
- int.class,
- int.class);
- if (ttTest != null) {
- T = ttTest;
- } else {
- Method[] aDump = TTRecipeAdder.getDeclaredMethods();
- for (Method m : aDump) {
- if (m != null) {
- Logger.INFO(
- "Found " + m.getName()
- + " | "
- + m.getModifiers()
- + " | "
- + ArrayUtils.toString(m.getParameters(), "EMPTY")
- + "");
- if (m.getName().toLowerCase().equals("addresearchableassemblylinerecipe")) {
- Logger.INFO("Types: " + ArrayUtils.toString(m.getParameterTypes()));
- }
+ // 6 Slot Assembler
+ mSixSlotAssembly = ReflectionUtils.getMethod(
+ clazz,
+ "addAssemblerRecipe",
+ ItemStack[].class,
+ FluidStack.class,
+ ItemStack.class,
+ int.class,
+ int.class);
+ // Assembly Line
+ mAssemblyLine = ReflectionUtils.getMethod(
+ clazz,
+ "addAssemblylineRecipe",
+ ItemStack.class,
+ int.class,
+ ItemStack[].class,
+ FluidStack[].class,
+ ItemStack.class,
+ int.class,
+ int.class);
+
+ Method T = null;
+ if (LoadedMods.TecTech) {
+ Class TTRecipeAdder = ReflectionUtils.getClass("com.github.technus.tectech.recipe.TT_recipeAdder");
+ if (TTRecipeAdder != null) {
+ Method ttTest = ReflectionUtils.getMethod(
+ TTRecipeAdder,
+ "addResearchableAssemblylineRecipe",
+ ItemStack.class,
+ int.class,
+ int.class,
+ int.class,
+ int.class,
+ Object[].class,
+ FluidStack[].class,
+ ItemStack.class,
+ int.class,
+ int.class);
+ if (ttTest != null) {
+ T = ttTest;
+ } else {
+ Method[] aDump = TTRecipeAdder.getDeclaredMethods();
+ for (Method m : aDump) {
+ if (m != null) {
+ Logger.INFO(
+ "Found " + m.getName()
+ + " | "
+ + m.getModifiers()
+ + " | "
+ + ArrayUtils.toString(m.getParameters(), "EMPTY")
+ + "");
+ if (m.getName().toLowerCase().equals("addresearchableassemblylinerecipe")) {
+ Logger.INFO("Types: " + ArrayUtils.toString(m.getParameterTypes()));
}
}
}
}
- } else {
- T = null;
}
- mScannerTT = T;
-
- mChemicalRecipe[1] = ReflectionUtils.getMethod(
- clazz,
- "addChemicalRecipe",
- ItemStack.class,
- ItemStack.class,
- FluidStack.class,
- FluidStack.class,
- ItemStack.class,
- int.class,
- int.class);
- mChemicalRecipe[2] = ReflectionUtils.getMethod(
- clazz,
- "addChemicalRecipe",
- ItemStack.class,
- ItemStack.class,
- FluidStack.class,
- FluidStack.class,
- ItemStack.class,
- ItemStack.class,
- int.class);
-
- mLargeChemReactor = ReflectionUtils.getMethod(
- clazz,
- "addMultiblockChemicalRecipe",
- ItemStack[].class,
- FluidStack[].class,
- FluidStack[].class,
- ItemStack[].class,
- int.class,
- int.class);
-
- mPyroOven = ReflectionUtils.getMethod(
- clazz,
- "addPyrolyseRecipe",
- ItemStack.class,
- FluidStack.class,
- int.class,
- ItemStack.class,
- FluidStack.class,
- int.class,
- int.class);
-
} else {
- mSixSlotAssembly = null;
- mAssemblyLine = null;
- mLargeChemReactor = null;
- mScannerTT = null;
- mPyroOven = null;
+ T = null;
}
+ mScannerTT = T;
+
+ mChemicalRecipe[1] = ReflectionUtils.getMethod(
+ clazz,
+ "addChemicalRecipe",
+ ItemStack.class,
+ ItemStack.class,
+ FluidStack.class,
+ FluidStack.class,
+ ItemStack.class,
+ int.class,
+ int.class);
+ mChemicalRecipe[2] = ReflectionUtils.getMethod(
+ clazz,
+ "addChemicalRecipe",
+ ItemStack.class,
+ ItemStack.class,
+ FluidStack.class,
+ FluidStack.class,
+ ItemStack.class,
+ ItemStack.class,
+ int.class);
+
+ mLargeChemReactor = ReflectionUtils.getMethod(
+ clazz,
+ "addMultiblockChemicalRecipe",
+ ItemStack[].class,
+ FluidStack[].class,
+ FluidStack[].class,
+ ItemStack[].class,
+ int.class,
+ int.class);
+
+ mPyroOven = ReflectionUtils.getMethod(
+ clazz,
+ "addPyrolyseRecipe",
+ ItemStack.class,
+ FluidStack.class,
+ int.class,
+ ItemStack.class,
+ FluidStack.class,
+ int.class,
+ int.class);
+
}
public boolean addSixSlotAssemblingRecipe(ItemStack[] aInputs, FluidStack aInputFluid, ItemStack aOutput1,
int aDuration, int aEUt) {
- if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK || CORE.GTNH) {
- if (mSixSlotAssembly != null) {
- try {
- return (boolean) mSixSlotAssembly
- .invoke(GT_Values.RA, aInputs, aInputFluid, aOutput1, aDuration, aEUt);
- } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
- if (CORE.GTNH) {
- return false;
- }
- }
+ if (mSixSlotAssembly != null) {
+ try {
+ return (boolean) mSixSlotAssembly.invoke(GT_Values.RA, aInputs, aInputFluid, aOutput1, aDuration, aEUt);
+ } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
+ return false;
}
}
return CORE.RA.addComponentMakerRecipe(aInputs, aInputFluid, aOutput1, aDuration, aEUt);
@@ -1254,148 +1211,13 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
@Override
public boolean addAssemblylineRecipe(ItemStack aResearchItem, int aResearchTime, ItemStack[] aInputs,
FluidStack[] aFluidInputs, ItemStack aOutput, int aDuration, int aEUt) {
- if (GTNH) return RA
- .addAssemblylineRecipe(aResearchItem, aResearchTime, aInputs, aFluidInputs, aOutput, aDuration, aEUt);
- if ((aResearchItem == null) || (aResearchTime <= 0)
- || (aInputs == null)
- || (aOutput == null)
- || aInputs.length > 15
- || aInputs.length < 4) {
- return false;
- }
- if ((aDuration = GregTech_API.sRecipeFile.get("assemblingline", aOutput, aDuration)) <= 0) {
- return false;
- }
- for (ItemStack tItem : aInputs) {
- if (tItem == null) {
- GT_FML_LOGGER.info(
- "addAssemblingLineRecipe " + aResearchItem.getDisplayName()
- + " --> "
- + aOutput.getUnlocalizedName()
- + " there is some null item in that recipe");
- }
- }
- GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe(
- false,
- new ItemStack[] { aResearchItem },
- new ItemStack[] { aOutput },
- new ItemStack[] { ItemList.Tool_DataStick.getWithName(1L, "Writes Research result", new Object[0]) },
- null,
- null,
- aResearchTime,
- 30,
- -201);
- GT_Recipe.GT_Recipe_Map.sAssemblylineVisualRecipes.addFakeRecipe(
- false,
- aInputs,
- new ItemStack[] { aOutput },
- new ItemStack[] { ItemList.Tool_DataStick.getWithName(1L, "Reads Research result", new Object[0]) },
- aFluidInputs,
- null,
- aDuration,
- aEUt,
- 0,
- false);
- GT_Recipe.GT_Recipe_AssemblyLine.sAssemblylineRecipes.add(
- new GT_Recipe_AssemblyLine(
- aResearchItem,
- aResearchTime,
- aInputs,
- aFluidInputs,
- aOutput,
- aDuration,
- aEUt));
- return true;
+ return RA.addAssemblylineRecipe(aResearchItem, aResearchTime, aInputs, aFluidInputs, aOutput, aDuration, aEUt);
}
@Override
public boolean addAssemblylineRecipe(ItemStack aResearchItem, int aResearchTime, Object[] aInputs,
FluidStack[] aFluidInputs, ItemStack aOutput, int aDuration, int aEUt) {
- if (GTNH) return RA
- .addAssemblylineRecipe(aResearchItem, aResearchTime, aInputs, aFluidInputs, aOutput, aDuration, aEUt);
- if ((aResearchItem == null) || (aResearchTime <= 0)
- || (aInputs == null)
- || (aOutput == null)
- || aInputs.length > 15
- || aInputs.length < 4) {
- return false;
- }
- if ((aDuration = GregTech_API.sRecipeFile.get("assemblingline", aOutput, aDuration)) <= 0) {
- return false;
- }
- ItemStack[] tInputs = new ItemStack[aInputs.length];
- ItemStack[][] tAlts = new ItemStack[aInputs.length][];
- for (int i = 0; i < aInputs.length; i++) {
- Object obj = aInputs[i];
- if (obj instanceof ItemStack) {
- tInputs[i] = (ItemStack) obj;
- tAlts[i] = null;
- continue;
- } else if (obj instanceof ItemStack[]) {
- ItemStack[] aStacks = (ItemStack[]) obj;
- if (aStacks.length > 0) {
- tInputs[i] = aStacks[0];
- tAlts[i] = (ItemStack[]) Arrays.copyOf(aStacks, aStacks.length);
- continue;
- }
- } else if (obj instanceof Object[]) {
- Object[] objs = (Object[]) obj;
- List<ItemStack> tList;
- if (objs.length >= 2 && !(tList = GT_OreDictUnificator.getOres(objs[0])).isEmpty()) {
- try {
- int tAmount = ((Number) objs[1]).intValue();
- List<ItemStack> uList = new ArrayList<>();
- for (ItemStack tStack : tList) {
- ItemStack uStack = GT_Utility.copyAmount(tAmount, tStack);
- if (GT_Utility.isStackValid(uStack)) {
- uList.add(uStack);
- if (tInputs[i] == null) tInputs[i] = uStack;
- }
- }
- tAlts[i] = uList.toArray(new ItemStack[uList.size()]);
- continue;
- } catch (Exception t) {}
- }
- }
- GT_FML_LOGGER.info(
- "addAssemblingLineRecipe " + aResearchItem.getDisplayName()
- + " --> "
- + aOutput.getUnlocalizedName()
- + " there is some null item in that recipe");
- }
- GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe(
- false,
- new ItemStack[] { aResearchItem },
- new ItemStack[] { aOutput },
- new ItemStack[] { ItemList.Tool_DataStick.getWithName(1L, "Writes Research result", new Object[0]) },
- null,
- null,
- aResearchTime,
- 30,
- -201);
- GT_Recipe.GT_Recipe_Map.sAssemblylineVisualRecipes.addFakeRecipe(
- false,
- tInputs,
- new ItemStack[] { aOutput },
- new ItemStack[] { ItemList.Tool_DataStick.getWithName(1L, "Reads Research result", new Object[0]) },
- aFluidInputs,
- null,
- aDuration,
- aEUt,
- 0,
- tAlts,
- false);
- GT_Recipe.GT_Recipe_AssemblyLine.sAssemblylineRecipes.add(
- new GT_Recipe_AssemblyLine(
- aResearchItem,
- aResearchTime,
- tInputs,
- aFluidInputs,
- aOutput,
- aDuration,
- aEUt,
- tAlts));
- return true;
+ return RA.addAssemblylineRecipe(aResearchItem, aResearchTime, aInputs, aFluidInputs, aOutput, aDuration, aEUt);
}
private boolean tryAddTecTechScannerRecipe(ItemStack aResearchItem, Object[] aInputs, FluidStack[] aFluidInputs,
@@ -1447,13 +1269,8 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
public boolean addChemicalRecipe(ItemStack input1, ItemStack input2, FluidStack inputFluid, FluidStack outputFluid,
ItemStack output, Object object, int time, int eu) {
try {
- if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
- return (boolean) mChemicalRecipe[0]
- .invoke(GT_Values.RA, input1, input2, inputFluid, outputFluid, output, time);
- } else {
- return (boolean) mChemicalRecipe[1]
- .invoke(GT_Values.RA, input1, input2, inputFluid, outputFluid, output, time, eu);
- }
+ return (boolean) mChemicalRecipe[1]
+ .invoke(GT_Values.RA, input1, input2, inputFluid, outputFluid, output, time, eu);
} catch (Throwable t) {
return false;
}
@@ -1463,13 +1280,8 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
public boolean addChemicalRecipe(ItemStack input1, ItemStack input2, FluidStack inputFluid, FluidStack outputFluid,
ItemStack output, ItemStack output2, int time) {
try {
- if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
- return (boolean) mChemicalRecipe[0]
- .invoke(GT_Values.RA, input1, input2, inputFluid, outputFluid, output, time);
- } else {
- return (boolean) mChemicalRecipe[2]
- .invoke(GT_Values.RA, input1, input2, inputFluid, outputFluid, output, output2, time);
- }
+ return (boolean) mChemicalRecipe[2]
+ .invoke(GT_Values.RA, input1, input2, inputFluid, outputFluid, output, output2, time);
} catch (Throwable t) {
return false;
}
@@ -1498,7 +1310,7 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
@Override
public boolean addMultiblockChemicalRecipe(ItemStack[] itemStacks, FluidStack[] fluidStacks,
FluidStack[] fluidStacks2, ItemStack[] outputs, int time, int eu) {
- if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK || mLargeChemReactor == null) {
+ if (mLargeChemReactor == null) {
return false;
}
try {
@@ -1589,18 +1401,10 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
@Override
public boolean addSmeltingAndAlloySmeltingRecipe(ItemStack aDust, ItemStack aOutput) {
Method m = StaticFields59.mAddFurnaceRecipe;
- if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
- try {
- return (boolean) m.invoke(null, aDust, aOutput);
- } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
- return false;
- }
- } else {
- try {
- return (boolean) m.invoke(null, aDust, aOutput, true);
- } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
- return false;
- }
+ try {
+ return (boolean) m.invoke(null, aDust, aOutput, true);
+ } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
+ return false;
}
}
@@ -1879,7 +1683,7 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
@Override
public boolean addPyrolyseRecipe(ItemStack aInput, FluidStack aFluidInput, int intCircuit, ItemStack aOutput,
FluidStack aFluidOutput, int aDuration, int aEUt) {
- if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK || mPyroOven == null) {
+ if (mPyroOven == null) {
return false;
}
try {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java
index 36035364c0..db616360d0 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java
@@ -3,7 +3,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech;
import gregtech.api.GregTech_API;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import gtPlusPlus.xmod.gregtech.common.tileentities.automation.*;
import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_CropHarvestor;
@@ -20,18 +19,16 @@ public class Gregtech4Content {
// ID Range 828, 829, 833 - 850
public static void run() {
- if (LoadedMods.Gregtech) {
- Logger.INFO("Max MTE: " + GregTech_API.METATILEENTITIES.length + " | " + GregTech_API.MAXIMUM_METATILE_IDS);
- workbenches();
- thermalBoiler();
- multiCrafter();
- tesseracts();
- shelves();
- basic();
- automation();
- redstone();
- computer();
- }
+ Logger.INFO("Max MTE: " + GregTech_API.METATILEENTITIES.length + " | " + GregTech_API.MAXIMUM_METATILE_IDS);
+ workbenches();
+ thermalBoiler();
+ multiCrafter();
+ tesseracts();
+ shelves();
+ basic();
+ automation();
+ redstone();
+ computer();
}
private static void computer() {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java
index 23d9cb88fa..85d2f87513 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java
@@ -7,7 +7,6 @@ import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.util.GT_ModHandler;
import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.core.material.ALLOY;
import gtPlusPlus.core.recipe.RECIPES_MachineComponents;
import gtPlusPlus.core.util.minecraft.ItemUtils;
@@ -19,10 +18,8 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GT_MetaTileEntity
public class GregtechAdvancedBoilers {
public static void run() {
- if (LoadedMods.Gregtech) {
- Logger.INFO("Gregtech5u Content | Registering Advanced Boilers.");
- run1();
- }
+ Logger.INFO("Gregtech5u Content | Registering Advanced Boilers.");
+ run1();
}
private static void run1() {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAlgaeContent.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAlgaeContent.java
index 27de5556b2..63ca1a3d37 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAlgaeContent.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAlgaeContent.java
@@ -3,7 +3,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech;
import gregtech.api.GregTech_API;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.nbthandlers.GT_MetaTileEntity_Hatch_Catalysts;
import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.algae.GregtechMTE_AlgaePondBase;
@@ -12,10 +11,8 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.ch
public class GregtechAlgaeContent {
public static void run() {
- if (LoadedMods.Gregtech) {
- Logger.INFO("Gregtech5u Content | Registering Algae Content.");
- run1();
- }
+ Logger.INFO("Gregtech5u Content | Registering Algae Content.");
+ run1();
}
private static void run1() {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAmazonWarehouse.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAmazonWarehouse.java
index 4c0a32d12a..9dee13eddb 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAmazonWarehouse.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAmazonWarehouse.java
@@ -7,10 +7,8 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.misc.GMTE_Ama
public class GregtechAmazonWarehouse {
public static void run() {
- if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
- Logger.INFO("Gregtech5u Content | Registering Amazon Warehouse Multiblock.");
- run1();
- }
+ Logger.INFO("Gregtech5u Content | Registering Amazon Warehouse Multiblock.");
+ run1();
}
private static void run1() {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechComponentAssembler.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechComponentAssembler.java
index d2d42504db..dcd11a4dba 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechComponentAssembler.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechComponentAssembler.java
@@ -11,7 +11,6 @@ import net.minecraftforge.oredict.OreDictionary;
import gregtech.api.enums.*;
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe;
import gregtech.api.util.GTPP_Recipe;
-import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.recipe.common.CI;
import gtPlusPlus.core.util.minecraft.ItemUtils;
@@ -25,12 +24,6 @@ public class GregtechComponentAssembler {
return;
}
- if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
- Logger.INFO(
- "Component Assemblers cannot be created in 5.08.33 during the pre-release. Please wait for 1.7.0 release.");
- return;
- }
-
GregtechItemList.Machine_LV_Component_Maker.set(
new GT_MetaTileEntity_BasicMachine_GT_Recipe(
985,
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java
index aadf6f4a12..4a4c7f7e7a 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java
@@ -1,8 +1,5 @@
package gtPlusPlus.xmod.gregtech.registration.gregtech;
-import static gtPlusPlus.core.lib.CORE.GTNH;
-import static gtPlusPlus.core.lib.LoadedMods.Gregtech;
-
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
@@ -35,26 +32,6 @@ import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GregtechMetaP
public class GregtechConduits {
- /**
- *
- * The Voltage Tiers. Use this Array instead of the old named Voltage Variables public static final long[] V = new
- * long[] {0=8, 1=32, 2=128, 3=512, 4=2048, 5=8192, 6=32768, 7=131072, 8=524288, 9=Integer.MAX_VALUE,
- * Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE,
- * Integer.MAX_VALUE};
- *
- */
- public static OrePrefixes cableGt16;
-
- static {
- if (GTNH) {
- try {
- cableGt16 = (OrePrefixes) GT_Utility.getField(OrePrefixes.class, "cableGt16").get(null);
- } catch (IllegalAccessException | NullPointerException e) {
- e.printStackTrace();
- }
- }
- }
-
// 30000-30999
private static int BaseWireID = 30600;
@@ -62,119 +39,115 @@ public class GregtechConduits {
private static int BasePipeHexadecupleID = 30100;
public static void run() {
- if (Gregtech) {
- Logger.INFO("Gregtech5u Content | Registering Custom Cables/Wires/Pipes.");
- if (CORE.ConfigSwitches.enableCustom_Cables) {
- run1();
- }
- if (CORE.ConfigSwitches.enableCustom_Pipes) {
- run2();
- run3();
- }
+ Logger.INFO("Gregtech5u Content | Registering Custom Cables/Wires/Pipes.");
+ if (CORE.ConfigSwitches.enableCustom_Cables) {
+ run1();
+ }
+ if (CORE.ConfigSwitches.enableCustom_Pipes) {
+ run2();
+ run3();
}
}
private static void run3() {
- if (Utils.getGregtechVersionAsInt() >= 50930) {
- try {
- Class<GT_MetaPipeEntity_Fluid> aPipeEntity = GT_MetaPipeEntity_Fluid.class;
- Constructor<GT_MetaPipeEntity_Fluid> constructor = aPipeEntity.getConstructor(
- int.class,
- String.class,
- String.class,
- float.class,
- Materials.class,
- int.class,
- int.class,
- boolean.class,
- int.class);
- if (constructor != null) {
- Logger.INFO("Generating Hexadecuple pipes.");
- generateFluidMultiPipes(
- constructor,
- Materials.Copper,
- MaterialUtils.getMaterialName(Materials.Copper),
- "Copper",
- BasePipeHexadecupleID++,
- 60,
- 1000,
- true);
- generateFluidMultiPipes(
- constructor,
- Materials.Bronze,
- MaterialUtils.getMaterialName(Materials.Bronze),
- "Bronze",
- BasePipeHexadecupleID++,
- 120,
- 2000,
- true);
- generateFluidMultiPipes(
- constructor,
- Materials.Steel,
- MaterialUtils.getMaterialName(Materials.Steel),
- "Steel",
- BasePipeHexadecupleID++,
- 240,
- 2500,
- true);
- generateFluidMultiPipes(
- constructor,
- Materials.StainlessSteel,
- MaterialUtils.getMaterialName(Materials.StainlessSteel),
- "Stainless Steel",
- BasePipeHexadecupleID++,
- 360,
- 3000,
- true);
+ try {
+ Class<GT_MetaPipeEntity_Fluid> aPipeEntity = GT_MetaPipeEntity_Fluid.class;
+ Constructor<GT_MetaPipeEntity_Fluid> constructor = aPipeEntity.getConstructor(
+ int.class,
+ String.class,
+ String.class,
+ float.class,
+ Materials.class,
+ int.class,
+ int.class,
+ boolean.class,
+ int.class);
+ if (constructor != null) {
+ Logger.INFO("Generating Hexadecuple pipes.");
+ generateFluidMultiPipes(
+ constructor,
+ Materials.Copper,
+ MaterialUtils.getMaterialName(Materials.Copper),
+ "Copper",
+ BasePipeHexadecupleID++,
+ 60,
+ 1000,
+ true);
+ generateFluidMultiPipes(
+ constructor,
+ Materials.Bronze,
+ MaterialUtils.getMaterialName(Materials.Bronze),
+ "Bronze",
+ BasePipeHexadecupleID++,
+ 120,
+ 2000,
+ true);
+ generateFluidMultiPipes(
+ constructor,
+ Materials.Steel,
+ MaterialUtils.getMaterialName(Materials.Steel),
+ "Steel",
+ BasePipeHexadecupleID++,
+ 240,
+ 2500,
+ true);
+ generateFluidMultiPipes(
+ constructor,
+ Materials.StainlessSteel,
+ MaterialUtils.getMaterialName(Materials.StainlessSteel),
+ "Stainless Steel",
+ BasePipeHexadecupleID++,
+ 360,
+ 3000,
+ true);
+ generateFluidMultiPipes(
+ constructor,
+ Materials.Titanium,
+ MaterialUtils.getMaterialName(Materials.Titanium),
+ "Titanium",
+ BasePipeHexadecupleID++,
+ 480,
+ 5000,
+ true);
+ generateFluidMultiPipes(
+ constructor,
+ Materials.TungstenSteel,
+ MaterialUtils.getMaterialName(Materials.TungstenSteel),
+ "Tungsten Steel",
+ BasePipeHexadecupleID++,
+ 600,
+ 7500,
+ true);
+ generateFluidMultiPipes(
+ constructor,
+ Materials.Plastic,
+ MaterialUtils.getMaterialName(Materials.Plastic),
+ "Plastic",
+ BasePipeHexadecupleID++,
+ 360,
+ 350,
+ true);
+
+ Materials aPTFE = Materials.get("Polytetrafluoroethylene");
+ if (aPTFE != null) {
generateFluidMultiPipes(
constructor,
- Materials.Titanium,
- MaterialUtils.getMaterialName(Materials.Titanium),
- "Titanium",
+ aPTFE,
+ MaterialUtils.getMaterialName(aPTFE),
+ "PTFE",
BasePipeHexadecupleID++,
480,
- 5000,
- true);
- generateFluidMultiPipes(
- constructor,
- Materials.TungstenSteel,
- MaterialUtils.getMaterialName(Materials.TungstenSteel),
- "Tungsten Steel",
- BasePipeHexadecupleID++,
600,
- 7500,
- true);
- generateFluidMultiPipes(
- constructor,
- Materials.Plastic,
- MaterialUtils.getMaterialName(Materials.Plastic),
- "Plastic",
- BasePipeHexadecupleID++,
- 360,
- 350,
true);
-
- Materials aPTFE = Materials.get("Polytetrafluoroethylene");
- if (aPTFE != null) {
- generateFluidMultiPipes(
- constructor,
- aPTFE,
- MaterialUtils.getMaterialName(aPTFE),
- "PTFE",
- BasePipeHexadecupleID++,
- 480,
- 600,
- true);
- }
- } else {
- Logger.INFO("Failed during Hexadecuple pipe generation.");
}
-
- } catch (NoSuchMethodException | SecurityException e) {
- Logger.INFO("Failed during Hexadecuple pipe generation. [Ecx]");
- e.printStackTrace();
+ } else {
+ Logger.INFO("Failed during Hexadecuple pipe generation.");
}
+
+ } catch (NoSuchMethodException | SecurityException e) {
+ Logger.INFO("Failed during Hexadecuple pipe generation. [Ecx]");
+ e.printStackTrace();
}
// Generate Heat Pipes
@@ -227,13 +200,6 @@ public class GregtechConduits {
wireFactory("RedstoneAlloy", 32, BaseWireID + 45, 0, 2, 1, new short[] { 178, 34, 34, 0 });
}
- if (!GTNH) {
- customWireFactory(ALLOY.LEAGRISIUM, 512, BaseWireID + 56, 1, 2, 2);
- customWireFactory(ELEMENT.getInstance().ZIRCONIUM, 128, BaseWireID + 67, 1, 2, 2);
- customWireFactory(ALLOY.HG1223, 32768, BaseWireID + 78, 2, 8, 4);
- customWireFactory(ALLOY.TRINIUM_TITANIUM, 2048, BaseWireID + 89, 1, 2, 16);
- }
-
// need to go back id because fluid pipes already occupy
makeCustomWires(ELEMENT.STANDALONE.HYPOGEN, BaseWireID - 15, 0, 0, 8, GT_Values.V[11], false, true);
@@ -359,7 +325,7 @@ public class GregtechConduits {
aStartID + 4,
"wire." + aMaterial.name().toLowerCase() + ".12",
"12x " + aMaterial.mDefaultLocalName + " Wire",
- GTNH ? 0.625F : 0.75F,
+ 0.625F,
aMaterial,
aLoss,
12L * aAmperage,
@@ -374,7 +340,7 @@ public class GregtechConduits {
aStartID + 5,
"wire." + aMaterial.name().toLowerCase() + ".16",
"16x " + aMaterial.mDefaultLocalName + " Wire",
- GTNH ? 0.75F : 1.0F,
+ 0.75F,
aMaterial,
aLoss,
16L * aAmperage,
@@ -450,7 +416,7 @@ public class GregtechConduits {
aStartID + 10,
"cable." + aMaterial.name().toLowerCase() + ".12",
"12x " + aMaterial.mDefaultLocalName + " Cable",
- GTNH ? 0.75F : 0.875F,
+ 0.75F,
aMaterial,
aLossInsulated,
12L * aAmperage,
@@ -458,23 +424,21 @@ public class GregtechConduits {
true,
false,
aRGB).getStackForm(1L));
- if (GTNH) {
- GT_OreDictUnificator.registerOre(
- cableGt16,
- aMaterial,
- new GregtechMetaPipeEntity_Cable(
- aStartID + 11,
- "cable." + aMaterial.name().toLowerCase() + ".16",
- "16x " + aMaterial.mDefaultLocalName + " Cable",
- 0.875f,
- aMaterial,
- aLossInsulated,
- 16L * aAmperage,
- aVoltage,
- true,
- false,
- aRGB).getStackForm(1L));
- }
+ GT_OreDictUnificator.registerOre(
+ OrePrefixes.cableGt16,
+ aMaterial,
+ new GregtechMetaPipeEntity_Cable(
+ aStartID + 11,
+ "cable." + aMaterial.name().toLowerCase() + ".16",
+ "16x " + aMaterial.mDefaultLocalName + " Cable",
+ 0.875f,
+ aMaterial,
+ aLossInsulated,
+ 16L * aAmperage,
+ aVoltage,
+ true,
+ false,
+ aRGB).getStackForm(1L));
}
}
@@ -558,7 +522,7 @@ public class GregtechConduits {
aStartID + 4,
"wire." + aMaterial.getLocalizedName().toLowerCase() + ".12",
"12x " + aMaterial.getLocalizedName() + " Wire",
- GTNH ? 0.625F : 0.75F,
+ 0.625F,
aLoss,
12L * aAmperage,
aVoltage,
@@ -572,7 +536,7 @@ public class GregtechConduits {
aStartID + 5,
"wire." + aMaterial.getLocalizedName().toLowerCase() + ".16",
"16x " + aMaterial.getLocalizedName() + " Wire",
- GTNH ? 0.75F : 1.0F,
+ 0.75F,
aLoss,
16L * aAmperage,
aVoltage,
@@ -643,29 +607,27 @@ public class GregtechConduits {
aStartID + 10,
"cable." + aMaterial.getLocalizedName().toLowerCase() + ".12",
"12x " + aMaterial.getLocalizedName() + " Cable",
- GTNH ? 0.75F : 0.875F,
+ 0.75F,
aLossInsulated,
12L * aAmperage,
aVoltage,
true,
false,
aMaterial.getRGBA()).getStackForm(1L));
- if (GTNH) {
- registerOre(
- cableGt16,
- aMaterial,
- new GregtechMetaPipeEntity_Cable(
- aStartID + 11,
- "cable." + aMaterial.getLocalizedName().toLowerCase() + ".16",
- "16x " + aMaterial.getLocalizedName() + " Cable",
- 0.875f,
- aLossInsulated,
- 16L * aAmperage,
- aVoltage,
- true,
- false,
- aMaterial.getRGBA()).getStackForm(1L));
- }
+ registerOre(
+ OrePrefixes.cableGt16,
+ aMaterial,
+ new GregtechMetaPipeEntity_Cable(
+ aStartID + 11,
+ "cable." + aMaterial.getLocalizedName().toLowerCase() + ".16",
+ "16x " + aMaterial.getLocalizedName() + " Cable",
+ 0.875f,
+ aLossInsulated,
+ 16L * aAmperage,
+ aVoltage,
+ true,
+ false,
+ aMaterial.getRGBA()).getStackForm(1L));
}
}
@@ -758,7 +720,7 @@ public class GregtechConduits {
startID + 4,
"GT_Pipe_" + material.mDefaultLocalName + "_Huge",
"Huge " + material.mDefaultLocalName + " Fluid Pipe",
- GTNH ? 0.875F : 1.0F,
+ 0.875F,
material,
transferRatePerTick * 48,
heatResistance,
@@ -828,7 +790,7 @@ public class GregtechConduits {
startID + 4,
"GT_Pipe_" + material.mDefaultLocalName + "_Huge",
"Huge " + material.mDefaultLocalName + " Fluid Pipe",
- GTNH ? 0.875F : 1.0F,
+ 0.875F,
material,
transferRatePerTick * 48,
heatResistance,
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java
index 2cd484bc9f..08ceea038d 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java
@@ -11,15 +11,13 @@ import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GT_MetaT
public class GregtechCustomHatches {
public static void run() {
- if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
- Logger.INFO("Gregtech5u Content | Registering Custom Fluid Hatches.");
- run1();
- if (PollutionUtils.isPollutionEnabled()) {
- run2();
- }
- run3();
- run4();
+ Logger.INFO("Gregtech5u Content | Registering Custom Fluid Hatches.");
+ run1();
+ if (PollutionUtils.isPollutionEnabled()) {
+ run2();
}
+ run3();
+ run4();
}
private static void run1() {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCyclotron.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCyclotron.java
index 7312bae5f7..6bdfafefb4 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCyclotron.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCyclotron.java
@@ -7,10 +7,8 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.Gr
public class GregtechCyclotron {
public static void run() {
- if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
- Logger.INFO("Gregtech5u Content | Registering COMET Cyclotron.");
- run1();
- }
+ Logger.INFO("Gregtech5u Content | Registering COMET Cyclotron.");
+ run1();
}
private static void run1() {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java
index 7a42bf1c9c..a74d3b36ba 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java
@@ -9,7 +9,6 @@ import gregtech.api.enums.OrePrefixes;
import gregtech.api.util.GT_ModHandler;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.core.material.ALLOY;
import gtPlusPlus.core.recipe.common.CI;
import gtPlusPlus.core.util.minecraft.ItemUtils;
@@ -20,11 +19,9 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.Gr
public class GregtechDehydrator {
public static void run() {
- if (LoadedMods.Gregtech) {
- Logger.INFO("Gregtech5u Content | Registering Chemical Dehydrators.");
- if (CORE.ConfigSwitches.enableMachine_Dehydrators) {
- run1();
- }
+ Logger.INFO("Gregtech5u Content | Registering Chemical Dehydrators.");
+ if (CORE.ConfigSwitches.enableMachine_Dehydrators) {
+ run1();
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java
index 4d074619dc..1c06d512c3 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java
@@ -19,10 +19,8 @@ public class GregtechEnergyBuffer {
// public static Item itemBufferCore;
public static void run() {
- if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
- Logger.INFO("Gregtech5u Content | Registering Energy Buffer Blocks.");
- run1();
- }
+ Logger.INFO("Gregtech5u Content | Registering Energy Buffer Blocks.");
+ run1();
}
private static void run1() {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java
index 5a1638509c..b138383aff 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java
@@ -8,7 +8,6 @@ import gregtech.api.enums.OrePrefixes;
import gregtech.api.util.GT_ModHandler;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.core.material.ALLOY;
import gtPlusPlus.core.recipe.common.CI;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
@@ -17,11 +16,9 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GregtechMetaTileE
public class GregtechGeothermalThermalGenerator {
public static void run() {
- if (LoadedMods.Gregtech) {
- Logger.INFO("Gregtech5u Content | Registering Industrial Geothermal Engines.");
- if (CORE.ConfigSwitches.enableMachine_GeothermalEngines) {
- run1();
- }
+ Logger.INFO("Gregtech5u Content | Registering Industrial Geothermal Engines.");
+ if (CORE.ConfigSwitches.enableMachine_GeothermalEngines) {
+ run1();
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechHiAmpTransformer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechHiAmpTransformer.java
index 02a28e5b1f..410732ffbb 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechHiAmpTransformer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechHiAmpTransformer.java
@@ -1,14 +1,11 @@
package gtPlusPlus.xmod.gregtech.registration.gregtech;
-import static gtPlusPlus.core.lib.CORE.GTNH;
-
import net.minecraft.item.ItemStack;
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.util.GT_ModHandler;
-import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMetaTransformerHiAmp;
@@ -23,11 +20,7 @@ public class GregtechHiAmpTransformer {
| GT_ModHandler.RecipeBits.BUFFERED;
int mID = 877;
- String mHammerName = "Hammer";
-
- if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK || CORE.GTNH) {
- mHammerName = "Mallet";
- }
+ String mHammerName = "Mallet";
GregtechItemList.Transformer_HA_LV_ULV.set(
new GregtechMetaTransformerHiAmp(
@@ -85,162 +78,81 @@ public class GregtechHiAmpTransformer {
"ZPM Hi-Amp Transformer",
7,
"UV -> ZPM (Use Soft " + mHammerName + " to invert)").getStackForm(1L));
- if (!GTNH) {
- GregtechItemList.Transformer_HA_MAX_UV.set(
- new GregtechMetaTransformerHiAmp(
- mID++,
- "transformer.ha.tier.08",
- "UV Hi-Amp Transformer",
- 8,
- "Any Voltage -> UV (Use Soft " + mHammerName + " to invert)").getStackForm(1L));
- } else {
- GregtechItemList.Transformer_HA_MAX_UV.set(
- new GregtechMetaTransformerHiAmp(
- mID++,
- "transformer.ha.tier.08",
- "UV Hi-Amp Transformer",
- 8,
- "UHV -> UV (Use Soft " + mHammerName + " to invert)").getStackForm(1L));
- }
+ GregtechItemList.Transformer_HA_MAX_UV.set(
+ new GregtechMetaTransformerHiAmp(
+ mID++,
+ "transformer.ha.tier.08",
+ "UV Hi-Amp Transformer",
+ 8,
+ "UHV -> UV (Use Soft " + mHammerName + " to invert)").getStackForm(1L));
ItemStack mItem_1;
ItemStack mItem_2;
ItemStack mItem_3;
- if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
- mItem_1 = ItemUtils
- .simpleMetaStack(ItemUtils.getSimpleStack(StaticFields59.getBlockCasings5()).getItem(), 3, 1);
- mItem_2 = ItemUtils
- .simpleMetaStack(ItemUtils.getSimpleStack(StaticFields59.getBlockCasings5()).getItem(), 4, 1);
- mItem_3 = ItemUtils
- .simpleMetaStack(ItemUtils.getSimpleStack(StaticFields59.getBlockCasings5()).getItem(), 9, 1);
- } else {
- mItem_1 = ItemList.Circuit_Elite.get(1);
- mItem_2 = ItemList.Circuit_Master.get(1);
- mItem_3 = ItemList.Circuit_Ultimate.get(1);
- }
+ mItem_1 = ItemUtils
+ .simpleMetaStack(ItemUtils.getSimpleStack(StaticFields59.getBlockCasings5()).getItem(), 3, 1);
+ mItem_2 = ItemUtils
+ .simpleMetaStack(ItemUtils.getSimpleStack(StaticFields59.getBlockCasings5()).getItem(), 4, 1);
+ mItem_3 = ItemUtils
+ .simpleMetaStack(ItemUtils.getSimpleStack(StaticFields59.getBlockCasings5()).getItem(), 9, 1);
- if (!GTNH) {
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Transformer_HA_LV_ULV.get(1L, new Object[0]),
- bitsd,
- new Object[] { " BB", "CM ", " BB", Character.valueOf('M'), ItemList.Hull_ULV,
- Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.Tin), Character.valueOf('B'),
- OrePrefixes.wireGt04.get(Materials.Lead) });
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Transformer_HA_MV_LV.get(1L, new Object[0]),
- bitsd,
- new Object[] { " BB", "CM ", " BB", Character.valueOf('M'), ItemList.Hull_LV,
- Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.Copper), Character.valueOf('B'),
- OrePrefixes.wireGt04.get(Materials.Tin) });
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Transformer_HA_HV_MV.get(1L, new Object[0]),
- bitsd,
- new Object[] { " BB", "CM ", " BB", Character.valueOf('M'), ItemList.Hull_MV,
- Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.Gold), Character.valueOf('B'),
- OrePrefixes.wireGt04.get(Materials.AnnealedCopper) });
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Transformer_HA_EV_HV.get(1L, new Object[0]),
- bitsd,
- new Object[] { "KBB", "CM ", "KBB", Character.valueOf('M'), ItemList.Hull_HV,
- Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.Aluminium),
- Character.valueOf('B'), OrePrefixes.wireGt04.get(Materials.Gold), Character.valueOf('K'),
- ItemList.Casing_Coil_Cupronickel });
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Transformer_HA_IV_EV.get(1L, new Object[0]),
- bitsd,
- new Object[] { "KBB", "CM ", "KBB", Character.valueOf('M'), ItemList.Hull_EV,
- Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.Tungsten),
- Character.valueOf('B'), OrePrefixes.wireGt04.get(Materials.Aluminium),
- Character.valueOf('K'), ItemList.Casing_Coil_Kanthal });
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Transformer_HA_LuV_IV.get(1L, new Object[0]),
- bitsd,
- new Object[] { "KBB", "CM ", "KBB", Character.valueOf('M'), ItemList.Hull_IV,
- Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.VanadiumGallium),
- Character.valueOf('B'), OrePrefixes.wireGt04.get(Materials.Tungsten),
- Character.valueOf('K'), ItemList.Casing_Coil_Nichrome });
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Transformer_HA_ZPM_LuV.get(1L, new Object[0]),
- bitsd,
- new Object[] { "KBB", "CM ", "KBB", Character.valueOf('M'), ItemList.Hull_LuV,
- Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.Naquadah),
- Character.valueOf('B'), OrePrefixes.wireGt04.get(Materials.VanadiumGallium),
- Character.valueOf('K'), mItem_1 });
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Transformer_HA_UV_ZPM.get(1L, new Object[0]),
- bitsd,
- new Object[] { "KBB", "CM ", "KBB", Character.valueOf('M'), ItemList.Hull_ZPM,
- Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.NaquadahAlloy),
- Character.valueOf('B'), OrePrefixes.wireGt04.get(Materials.Naquadah),
- Character.valueOf('K'), mItem_2 });
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Transformer_HA_MAX_UV.get(1L, new Object[0]),
- bitsd,
- new Object[] { "KBB", "CM ", "KBB", Character.valueOf('M'), ItemList.Hull_UV,
- Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.Bedrockium),
- Character.valueOf('B'), OrePrefixes.wireGt04.get(Materials.NaquadahAlloy),
- Character.valueOf('K'), mItem_3 });
- } else {
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Transformer_HA_LV_ULV.get(1L, new Object[0]),
- bitsd,
- new Object[] { " BB", "CM ", " BB", Character.valueOf('M'), ItemList.Transformer_LV_ULV,
- Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.Tin), Character.valueOf('B'),
- OrePrefixes.wireGt04.get(Materials.Lead) });
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Transformer_HA_MV_LV.get(1L, new Object[0]),
- bitsd,
- new Object[] { " BB", "CM ", " BB", Character.valueOf('M'), ItemList.Transformer_MV_LV,
- Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.AnyCopper),
- Character.valueOf('B'), OrePrefixes.wireGt04.get(Materials.Tin) });
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Transformer_HA_HV_MV.get(1L, new Object[0]),
- bitsd,
- new Object[] { " BB", "CM ", " BB", Character.valueOf('M'), ItemList.Transformer_HV_MV,
- Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.Gold), Character.valueOf('B'),
- OrePrefixes.wireGt04.get(Materials.AnyCopper) });
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Transformer_HA_EV_HV.get(1L, new Object[0]),
- bitsd,
- new Object[] { "KBB", "CM ", "KBB", Character.valueOf('M'), ItemList.Transformer_EV_HV,
- Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.Aluminium),
- Character.valueOf('B'), OrePrefixes.wireGt04.get(Materials.Gold), Character.valueOf('K'),
- ItemList.Casing_Coil_Cupronickel });
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Transformer_HA_IV_EV.get(1L, new Object[0]),
- bitsd,
- new Object[] { "KBB", "CM ", "KBB", Character.valueOf('M'), ItemList.Transformer_IV_EV,
- Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.Tungsten),
- Character.valueOf('B'), OrePrefixes.wireGt04.get(Materials.Aluminium),
- Character.valueOf('K'), ItemList.Casing_Coil_Kanthal });
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Transformer_HA_LuV_IV.get(1L, new Object[0]),
- bitsd,
- new Object[] { "KBB", "CM ", "KBB", Character.valueOf('M'), ItemList.Transformer_LuV_IV,
- Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.VanadiumGallium),
- Character.valueOf('B'), OrePrefixes.wireGt04.get(Materials.Tungsten),
- Character.valueOf('K'), ItemList.Casing_Coil_Nichrome });
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Transformer_HA_ZPM_LuV.get(1L, new Object[0]),
- bitsd,
- new Object[] { "KBB", "CM ", "KBB", Character.valueOf('M'), ItemList.Transformer_ZPM_LuV,
- Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.Naquadah),
- Character.valueOf('B'), OrePrefixes.wireGt04.get(Materials.VanadiumGallium),
- Character.valueOf('K'), mItem_1 });
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Transformer_HA_UV_ZPM.get(1L, new Object[0]),
- bitsd,
- new Object[] { "KBB", "CM ", "KBB", Character.valueOf('M'), ItemList.Transformer_UV_ZPM,
- Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.NaquadahAlloy),
- Character.valueOf('B'), OrePrefixes.wireGt04.get(Materials.Naquadah),
- Character.valueOf('K'), mItem_2 });
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Transformer_HA_MAX_UV.get(1L, new Object[0]),
- bitsd,
- new Object[] { "KBB", "CM ", "KBB", Character.valueOf('M'), ItemList.Transformer_MAX_UV,
- Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.Bedrockium),
- Character.valueOf('B'), OrePrefixes.wireGt04.get(Materials.NaquadahAlloy),
- Character.valueOf('K'), mItem_3 });
- }
+ GT_ModHandler.addCraftingRecipe(
+ GregtechItemList.Transformer_HA_LV_ULV.get(1L, new Object[0]),
+ bitsd,
+ new Object[] { " BB", "CM ", " BB", Character.valueOf('M'), ItemList.Transformer_LV_ULV,
+ Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.Tin), Character.valueOf('B'),
+ OrePrefixes.wireGt04.get(Materials.Lead) });
+ GT_ModHandler.addCraftingRecipe(
+ GregtechItemList.Transformer_HA_MV_LV.get(1L, new Object[0]),
+ bitsd,
+ new Object[] { " BB", "CM ", " BB", Character.valueOf('M'), ItemList.Transformer_MV_LV,
+ Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.AnyCopper), Character.valueOf('B'),
+ OrePrefixes.wireGt04.get(Materials.Tin) });
+ GT_ModHandler.addCraftingRecipe(
+ GregtechItemList.Transformer_HA_HV_MV.get(1L, new Object[0]),
+ bitsd,
+ new Object[] { " BB", "CM ", " BB", Character.valueOf('M'), ItemList.Transformer_HV_MV,
+ Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.Gold), Character.valueOf('B'),
+ OrePrefixes.wireGt04.get(Materials.AnyCopper) });
+ GT_ModHandler.addCraftingRecipe(
+ GregtechItemList.Transformer_HA_EV_HV.get(1L, new Object[0]),
+ bitsd,
+ new Object[] { "KBB", "CM ", "KBB", Character.valueOf('M'), ItemList.Transformer_EV_HV,
+ Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.Aluminium), Character.valueOf('B'),
+ OrePrefixes.wireGt04.get(Materials.Gold), Character.valueOf('K'),
+ ItemList.Casing_Coil_Cupronickel });
+ GT_ModHandler.addCraftingRecipe(
+ GregtechItemList.Transformer_HA_IV_EV.get(1L, new Object[0]),
+ bitsd,
+ new Object[] { "KBB", "CM ", "KBB", Character.valueOf('M'), ItemList.Transformer_IV_EV,
+ Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.Tungsten), Character.valueOf('B'),
+ OrePrefixes.wireGt04.get(Materials.Aluminium), Character.valueOf('K'),
+ ItemList.Casing_Coil_Kanthal });
+ GT_ModHandler.addCraftingRecipe(
+ GregtechItemList.Transformer_HA_LuV_IV.get(1L, new Object[0]),
+ bitsd,
+ new Object[] { "KBB", "CM ", "KBB", Character.valueOf('M'), ItemList.Transformer_LuV_IV,
+ Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.VanadiumGallium),
+ Character.valueOf('B'), OrePrefixes.wireGt04.get(Materials.Tungsten), Character.valueOf('K'),
+ ItemList.Casing_Coil_Nichrome });
+ GT_ModHandler.addCraftingRecipe(
+ GregtechItemList.Transformer_HA_ZPM_LuV.get(1L, new Object[0]),
+ bitsd,
+ new Object[] { "KBB", "CM ", "KBB", Character.valueOf('M'), ItemList.Transformer_ZPM_LuV,
+ Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.Naquadah), Character.valueOf('B'),
+ OrePrefixes.wireGt04.get(Materials.VanadiumGallium), Character.valueOf('K'), mItem_1 });
+ GT_ModHandler.addCraftingRecipe(
+ GregtechItemList.Transformer_HA_UV_ZPM.get(1L, new Object[0]),
+ bitsd,
+ new Object[] { "KBB", "CM ", "KBB", Character.valueOf('M'), ItemList.Transformer_UV_ZPM,
+ Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.NaquadahAlloy),
+ Character.valueOf('B'), OrePrefixes.wireGt04.get(Materials.Naquadah), Character.valueOf('K'),
+ mItem_2 });
+ GT_ModHandler.addCraftingRecipe(
+ GregtechItemList.Transformer_HA_MAX_UV.get(1L, new Object[0]),
+ bitsd,
+ new Object[] { "KBB", "CM ", "KBB", Character.valueOf('M'), ItemList.Transformer_MAX_UV,
+ Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.Bedrockium), Character.valueOf('B'),
+ OrePrefixes.wireGt04.get(Materials.NaquadahAlloy), Character.valueOf('K'), mItem_3 });
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialAlloySmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialAlloySmelter.java
index 0ee6ce78d4..6430da1407 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialAlloySmelter.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialAlloySmelter.java
@@ -7,10 +7,8 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.Gr
public class GregtechIndustrialAlloySmelter {
public static void run() {
- if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
- Logger.INFO("Gregtech5u Content | Registering Industrial Alloy Smelter Multiblock.");
- run1();
- }
+ Logger.INFO("Gregtech5u Content | Registering Industrial Alloy Smelter Multiblock.");
+ run1();
}
private static void run1() {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialArcFurnace.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialArcFurnace.java
index 95d80847af..b956539aae 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialArcFurnace.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialArcFurnace.java
@@ -7,10 +7,8 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.Gr
public class GregtechIndustrialArcFurnace {
public static void run() {
- if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
- Logger.INFO("Gregtech5u Content | Registering Industrial Arc Furnace Multiblock.");
- run1();
- }
+ Logger.INFO("Gregtech5u Content | Registering Industrial Arc Furnace Multiblock.");
+ run1();
}
private static void run1() {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java
index f0a0bbd6aa..fad62a705b 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java
@@ -9,11 +9,9 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.me
public class GregtechIndustrialBlastSmelter {
public static void run() {
- if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
- Logger.INFO("Gregtech5u Content | Registering Industrial Alloy Blast Smelter Multiblock.");
- if (CORE.ConfigSwitches.enableMultiblock_AlloyBlastSmelter) {
- run1();
- }
+ Logger.INFO("Gregtech5u Content | Registering Industrial Alloy Blast Smelter Multiblock.");
+ if (CORE.ConfigSwitches.enableMultiblock_AlloyBlastSmelter) {
+ run1();
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java
index edeec33ec2..4edd919702 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java
@@ -8,11 +8,9 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.Gr
public class GregtechIndustrialCentrifuge {
public static void run() {
- if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
- Logger.INFO("Gregtech5u Content | Registering Industrial Centrifuge Multiblock.");
- if (CORE.ConfigSwitches.enableMultiblock_IndustrialCentrifuge) {
- run1();
- }
+ Logger.INFO("Gregtech5u Content | Registering Industrial Centrifuge Multiblock.");
+ if (CORE.ConfigSwitches.enableMultiblock_IndustrialCentrifuge) {
+ run1();
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java
index 0f989692cc..d4d4477f97 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java
@@ -8,11 +8,9 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.Gr
public class GregtechIndustrialCokeOven {
public static void run() {
- if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
- Logger.INFO("Gregtech5u Content | Registering Industrial Coke Oven Multiblock.");
- if (CORE.ConfigSwitches.enableMultiblock_IndustrialCokeOven) {
- run1();
- }
+ Logger.INFO("Gregtech5u Content | Registering Industrial Coke Oven Multiblock.");
+ if (CORE.ConfigSwitches.enableMultiblock_IndustrialCokeOven) {
+ run1();
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCuttingFactory.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCuttingFactory.java
index ed7076b8a8..cc9365b344 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCuttingFactory.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCuttingFactory.java
@@ -8,11 +8,9 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.Gr
public class GregtechIndustrialCuttingFactory {
public static void run() {
- if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
- Logger.INFO("Gregtech5u Content | Registering Industrial Cutting Factory Multiblock.");
- if (CORE.ConfigSwitches.enableMultiblock_IndustrialCuttingMachine) {
- run1();
- }
+ Logger.INFO("Gregtech5u Content | Registering Industrial Cutting Factory Multiblock.");
+ if (CORE.ConfigSwitches.enableMultiblock_IndustrialCuttingMachine) {
+ run1();
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElectrolyzer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElectrolyzer.java
index 99d13981e0..ddd7ad89bf 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElectrolyzer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElectrolyzer.java
@@ -8,11 +8,9 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.Gr
public class GregtechIndustrialElectrolyzer {
public static void run() {
- if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
- Logger.INFO("Gregtech5u Content | Registering Industrial Electrolyzer Multiblock.");
- if (CORE.ConfigSwitches.enableMultiblock_IndustrialElectrolyzer) {
- run1();
- }
+ Logger.INFO("Gregtech5u Content | Registering Industrial Electrolyzer Multiblock.");
+ if (CORE.ConfigSwitches.enableMultiblock_IndustrialElectrolyzer) {
+ run1();
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialExtruder.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialExtruder.java
index 0a591a640b..2f03a0f59f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialExtruder.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialExtruder.java
@@ -8,11 +8,9 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.Gr
public class GregtechIndustrialExtruder {
public static void run() {
- if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
- Logger.INFO("Gregtech5u Content | Registering Industrial Extrusion Multiblock.");
- if (CORE.ConfigSwitches.enableMultiblock_IndustrialExtrudingMachine) {
- run1();
- }
+ Logger.INFO("Gregtech5u Content | Registering Industrial Extrusion Multiblock.");
+ if (CORE.ConfigSwitches.enableMultiblock_IndustrialExtrudingMachine) {
+ run1();
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFishPond.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFishPond.java
index bc03c6e277..28a2a48da7 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFishPond.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFishPond.java
@@ -7,12 +7,8 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.Gr
public class GregtechIndustrialFishPond {
public static void run() {
- if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
- Logger.INFO("Gregtech5u Content | Registering Industrial Fishing Pond Multiblock.");
- // if (CORE.ConfigSwitches.enableMultiblock_IndustrialWashPlant) {
- run1();
- // }
- }
+ Logger.INFO("Gregtech5u Content | Registering Industrial Fishing Pond Multiblock.");
+ run1();
}
private static void run1() {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFluidHeater.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFluidHeater.java
index 878abd4409..decb0dbd04 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFluidHeater.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFluidHeater.java
@@ -7,10 +7,8 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.Gr
public class GregtechIndustrialFluidHeater {
public static void run() {
- if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
- Logger.INFO("Gregtech5u Content | Registering Industrial Thermal Centrifuge Multiblock.");
- run1();
- }
+ Logger.INFO("Gregtech5u Content | Registering Industrial Thermal Centrifuge Multiblock.");
+ run1();
}
private static void run1() {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialForgeHammer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialForgeHammer.java
index 67f95cbcda..df8311e761 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialForgeHammer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialForgeHammer.java
@@ -7,10 +7,8 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.Gr
public class GregtechIndustrialForgeHammer {
public static void run() {
- if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
- Logger.INFO("Gregtech5u Content | Registering Industrial Forge Hammer Multiblock.");
- run1();
- }
+ Logger.INFO("Gregtech5u Content | Registering Industrial Forge Hammer Multiblock.");
+ run1();
}
private static void run1() {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFuelRefinery.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFuelRefinery.java
index a73ad190ca..b4853c6c55 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFuelRefinery.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFuelRefinery.java
@@ -8,11 +8,9 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.Gr
public class GregtechIndustrialFuelRefinery {
public static void run() {
- if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
- Logger.INFO("Gregtech5u Content | Registering Industrial Fuel Processing and Refinery Multiblock.");
- if (CORE.ConfigSwitches.enableMultiblock_NuclearFuelRefinery) {
- run1();
- }
+ Logger.INFO("Gregtech5u Content | Registering Industrial Fuel Processing and Refinery Multiblock.");
+ if (CORE.ConfigSwitches.enableMultiblock_NuclearFuelRefinery) {
+ run1();
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialGeneratorArray.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialGeneratorArray.java
index e356de6398..d612a942a2 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialGeneratorArray.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialGeneratorArray.java
@@ -7,12 +7,10 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.Gr
public class GregtechIndustrialGeneratorArray {
public static void run() {
- if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
- Logger.INFO("Gregtech5u Content | Registering Industrial Generator Array Multiblock.");
- // if (CORE.ConfigSwitches.enableMultiblock_IndustrialSifter) { // TODO
- run1();
- // }
- }
+ Logger.INFO("Gregtech5u Content | Registering Industrial Generator Array Multiblock.");
+ // if (CORE.ConfigSwitches.enableMultiblock_IndustrialSifter) { // TODO
+ run1();
+ // }
}
private static void run1() {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java
index 9bcf0a44bb..a799719a8c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java
@@ -8,11 +8,9 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.Gr
public class GregtechIndustrialMacerator {
public static void run() {
- if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
- Logger.INFO("Gregtech5u Content | Registering Industrial Maceration Stack Multiblock.");
- if (CORE.ConfigSwitches.enableMultiblock_IndustrialMacerationStack) {
- run1();
- }
+ Logger.INFO("Gregtech5u Content | Registering Industrial Maceration Stack Multiblock.");
+ if (CORE.ConfigSwitches.enableMultiblock_IndustrialMacerationStack) {
+ run1();
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java
index 997a5f7a7c..cb4643b088 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java
@@ -17,12 +17,10 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.Gr
public class GregtechIndustrialMassFabricator {
public static void run() {
- if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
- Logger.INFO("Gregtech5u Content | Registering Industrial Matter Fabricator Multiblock.");
- if (CORE.ConfigSwitches.enableMultiblock_MatterFabricator) {
- generateRecipes();
- run1();
- }
+ Logger.INFO("Gregtech5u Content | Registering Industrial Matter Fabricator Multiblock.");
+ if (CORE.ConfigSwitches.enableMultiblock_MatterFabricator) {
+ generateRecipes();
+ run1();
}
}
@@ -67,65 +65,34 @@ public class GregtechIndustrialMassFabricator {
GTPP_Recipe.GTPP_Recipe_Map.sMatterFab2Recipes.add(UUA_From_Scrap);
GTPP_Recipe.GTPP_Recipe_Map.sMatterFab2Recipes.add(UUA_From_ScrapBoxes);
- if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
- // Basic UUM
- GT_Recipe generateUUM = new GTPP_Recipe(
- false,
- new ItemStack[] { CI.getNumberedCircuit(1) },
- new ItemStack[] { GT_Values.NI },
- null,
- null,
- new FluidStack[] { GT_Values.NF },
- new FluidStack[] { Materials.UUMatter.getFluid(1) },
- 160 * 20,
- 32,
- 0);
-
- // Basic UUM
- GT_Recipe generateUUMFromUUA = new GTPP_Recipe(
- false,
- new ItemStack[] { CI.getNumberedCircuit(2) },
- new ItemStack[] { GT_Values.NI },
- null,
- null,
- new FluidStack[] { Materials.UUAmplifier.getFluid(1) },
- new FluidStack[] { Materials.UUMatter.getFluid(1) },
- 40 * 20,
- 32,
- 0);
-
- GTPP_Recipe.GTPP_Recipe_Map.sMatterFab2Recipes.add(generateUUM);
- GTPP_Recipe.GTPP_Recipe_Map.sMatterFab2Recipes.add(generateUUMFromUUA);
- } else {
- // Basic UUM
- GT_Recipe generateUUM_LV = new GTPP_Recipe(
- false,
- new ItemStack[] { CI.getNumberedCircuit(1) },
- new ItemStack[] { GT_Values.NI },
- null,
- null,
- new FluidStack[] { GT_Values.NF },
- new FluidStack[] { Materials.UUMatter.getFluid(1) },
- 160 * 20,
- 256,
- 0);
+ // Basic UUM
+ GT_Recipe generateUUM_LV = new GTPP_Recipe(
+ false,
+ new ItemStack[] { CI.getNumberedCircuit(1) },
+ new ItemStack[] { GT_Values.NI },
+ null,
+ null,
+ new FluidStack[] { GT_Values.NF },
+ new FluidStack[] { Materials.UUMatter.getFluid(1) },
+ 160 * 20,
+ 256,
+ 0);
- // Basic UUM
- GT_Recipe generateUUMFromUUA_LV = new GTPP_Recipe(
- false,
- new ItemStack[] { CI.getNumberedCircuit(2) },
- new ItemStack[] { GT_Values.NI },
- null,
- null,
- new FluidStack[] { Materials.UUAmplifier.getFluid(1) },
- new FluidStack[] { Materials.UUMatter.getFluid(1) },
- 40 * 20,
- 256,
- 0);
+ // Basic UUM
+ GT_Recipe generateUUMFromUUA_LV = new GTPP_Recipe(
+ false,
+ new ItemStack[] { CI.getNumberedCircuit(2) },
+ new ItemStack[] { GT_Values.NI },
+ null,
+ null,
+ new FluidStack[] { Materials.UUAmplifier.getFluid(1) },
+ new FluidStack[] { Materials.UUMatter.getFluid(1) },
+ 40 * 20,
+ 256,
+ 0);
- GTPP_Recipe.GTPP_Recipe_Map.sMatterFab2Recipes.add(generateUUM_LV);
- GTPP_Recipe.GTPP_Recipe_Map.sMatterFab2Recipes.add(generateUUMFromUUA_LV);
- }
+ GTPP_Recipe.GTPP_Recipe_Map.sMatterFab2Recipes.add(generateUUM_LV);
+ GTPP_Recipe.GTPP_Recipe_Map.sMatterFab2Recipes.add(generateUUMFromUUA_LV);
Logger.INFO(
"Generated " + GTPP_Recipe.GTPP_Recipe_Map.sMatterFab2Recipes.mRecipeList.size()
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMixer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMixer.java
index fe348b0982..3b12b4e4d3 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMixer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMixer.java
@@ -8,11 +8,9 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.Gr
public class GregtechIndustrialMixer {
public static void run() {
- if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
- Logger.INFO("Gregtech5u Content | Registering Industrial Mixer Multiblock.");
- if (CORE.ConfigSwitches.enableMultiblock_IndustrialPlatePress) {
- run1();
- }
+ Logger.INFO("Gregtech5u Content | Registering Industrial Mixer Multiblock.");
+ if (CORE.ConfigSwitches.enableMultiblock_IndustrialPlatePress) {
+ run1();
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiMachine.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiMachine.java
index aa824c9cce..6b3797b9ca 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiMachine.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiMachine.java
@@ -8,11 +8,9 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.Gr
public class GregtechIndustrialMultiMachine {
public static void run() {
- if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
- Logger.INFO("Gregtech5u Content | Registering Industrial Multi-Machine Multiblock.");
- if (CORE.ConfigSwitches.enableMultiblock_IndustrialMultiMachine) {
- run1();
- }
+ Logger.INFO("Gregtech5u Content | Registering Industrial Multi-Machine Multiblock.");
+ if (CORE.ConfigSwitches.enableMultiblock_IndustrialMultiMachine) {
+ run1();
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialPlatePress.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialPlatePress.java
index 5aeb63fcd0..d68dfb47a2 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialPlatePress.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialPlatePress.java
@@ -8,11 +8,9 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.Gr
public class GregtechIndustrialPlatePress {
public static void run() {
- if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
- Logger.INFO("Gregtech5u Content | Registering Industrial Press Multiblock.");
- if (CORE.ConfigSwitches.enableMultiblock_IndustrialPlatePress) {
- run1();
- }
+ Logger.INFO("Gregtech5u Content | Registering Industrial Press Multiblock.");
+ if (CORE.ConfigSwitches.enableMultiblock_IndustrialPlatePress) {
+ run1();
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSifter.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSifter.java
index da538eb776..41fd0067ad 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSifter.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSifter.java
@@ -8,11 +8,9 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.Gr
public class GregtechIndustrialSifter {
public static void run() {
- if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
- Logger.INFO("Gregtech5u Content | Registering Industrial Sifter Multiblock.");
- if (CORE.ConfigSwitches.enableMultiblock_IndustrialSifter) { // TODO
- run1();
- }
+ Logger.INFO("Gregtech5u Content | Registering Industrial Sifter Multiblock.");
+ if (CORE.ConfigSwitches.enableMultiblock_IndustrialSifter) {
+ run1();
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialThermalCentrifuge.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialThermalCentrifuge.java
index ec647ba787..6a5e21108c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialThermalCentrifuge.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialThermalCentrifuge.java
@@ -8,11 +8,9 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.Gr
public class GregtechIndustrialThermalCentrifuge {
public static void run() {
- if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
- Logger.INFO("Gregtech5u Content | Registering Industrial Thermal Centrifuge Multiblock.");
- if (CORE.ConfigSwitches.enableMultiblock_IndustrialThermalCentrifuge) {
- run1();
- }
+ Logger.INFO("Gregtech5u Content | Registering Industrial Thermal Centrifuge Multiblock.");
+ if (CORE.ConfigSwitches.enableMultiblock_IndustrialThermalCentrifuge) {
+ run1();
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialTreeFarm.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialTreeFarm.java
index 43902f883a..cd65f7d030 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialTreeFarm.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialTreeFarm.java
@@ -8,11 +8,9 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.Gr
public class GregtechIndustrialTreeFarm {
public static void run() {
- if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
- if (CORE.ConfigSwitches.enableMultiblock_TreeFarmer) {
- Logger.INFO("Gregtech5u Content | Registering Tree Farm Multiblock.");
- run1();
- }
+ if (CORE.ConfigSwitches.enableMultiblock_TreeFarmer) {
+ Logger.INFO("Gregtech5u Content | Registering Tree Farm Multiblock.");
+ run1();
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWashPlant.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWashPlant.java
index 8093f1fcc1..c575f74cb6 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWashPlant.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWashPlant.java
@@ -8,11 +8,9 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.Gr
public class GregtechIndustrialWashPlant {
public static void run() {
- if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
- Logger.INFO("Gregtech5u Content | Registering Industrial Wash Plant Multiblock.");
- if (CORE.ConfigSwitches.enableMultiblock_IndustrialWashPlant) {
- run1();
- }
+ Logger.INFO("Gregtech5u Content | Registering Industrial Wash Plant Multiblock.");
+ if (CORE.ConfigSwitches.enableMultiblock_IndustrialWashPlant) {
+ run1();
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java
index e16a6fe09e..7457391f3f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java
@@ -8,11 +8,9 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.Gr
public class GregtechIndustrialWiremill {
public static void run() {
- if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
- Logger.INFO("Gregtech5u Content | Registering Industrial Wire Factory Multiblock.");
- if (CORE.ConfigSwitches.enableMultiblock_IndustrialWireMill) {
- run1();
- }
+ Logger.INFO("Gregtech5u Content | Registering Industrial Wire Factory Multiblock.");
+ if (CORE.ConfigSwitches.enableMultiblock_IndustrialWireMill) {
+ run1();
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIronBlastFurnace.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIronBlastFurnace.java
index c38e386c0f..2a1c1f68f7 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIronBlastFurnace.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIronBlastFurnace.java
@@ -8,11 +8,9 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.Gr
public class GregtechIronBlastFurnace {
public static void run() {
- if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
- Logger.INFO("Gregtech5u Content | Registering Iron Blast Furnace.");
- if (CORE.ConfigSwitches.enableMultiblock_IronBlastFurnace) {
- run1();
- }
+ Logger.INFO("Gregtech5u Content | Registering Iron Blast Furnace.");
+ if (CORE.ConfigSwitches.enableMultiblock_IronBlastFurnace) {
+ run1();
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java
index 5515b63f56..df032a35a1 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java
@@ -11,11 +11,9 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.Gr
public class GregtechLFTR {
public static void run() {
- if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
- Logger.INFO("Gregtech5u Content | Registering Liquid Fluorine Thorium Reactor [LFTR].");
- if (CORE.ConfigSwitches.enableMultiblock_LiquidFluorideThoriumReactor) {
- run1();
- }
+ Logger.INFO("Gregtech5u Content | Registering Liquid Fluorine Thorium Reactor [LFTR].");
+ if (CORE.ConfigSwitches.enableMultiblock_LiquidFluorideThoriumReactor) {
+ run1();
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLargeTurbinesAndHeatExchanger.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLargeTurbinesAndHeatExchanger.java
index aebe678984..d59c6a1397 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLargeTurbinesAndHeatExchanger.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLargeTurbinesAndHeatExchanger.java
@@ -10,10 +10,8 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.tu
public class GregtechLargeTurbinesAndHeatExchanger {
public static void run() {
- if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
- Logger.INFO("Gregtech5u Content | Registering Larger Turbines & Extra Large Heat Exchanger.");
- run1();
- }
+ Logger.INFO("Gregtech5u Content | Registering Larger Turbines & Extra Large Heat Exchanger.");
+ run1();
}
private static void run1() {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechMolecularTransformer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechMolecularTransformer.java
index 7d1d77f1b4..6a6cad76d1 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechMolecularTransformer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechMolecularTransformer.java
@@ -7,10 +7,8 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.Gr
public class GregtechMolecularTransformer {
public static void run() {
- if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
- Logger.INFO("Gregtech5u Content | Registering Molecular Transformer Multiblock.");
- run1();
- }
+ Logger.INFO("Gregtech5u Content | Registering Molecular Transformer Multiblock.");
+ run1();
}
private static void run1() {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNitroDieselFix.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNitroDieselFix.java
index 3a632049a9..e545ea19f0 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNitroDieselFix.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNitroDieselFix.java
@@ -19,7 +19,6 @@ import gregtech.api.util.GT_Recipe;
import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.minecraft.MaterialUtils;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
@@ -31,212 +30,201 @@ public class GregtechNitroDieselFix {
if (CORE.ConfigSwitches.enableNitroFix) {
Logger.INFO("Gregtech5u Content | Attempting to Fix Nitro-Diesel production.");
try {
- int mSub = Utils.getGregtechSubVersion();
- if (mSub != 0) {
- if (mSub >= 30) {
- Class mb = ReflectionUtils.getClass("gregtech.api.enums.MaterialBuilder");
- Object df = mb.getConstructor(int.class, TextureSet.class, String.class)
- .newInstance(975, TextureSet.SET_FLUID, "Nitro-Diesel [Old]");
- if (mb.isInstance(df)) {
-
- Logger.INFO("[Nitro] Created new instance of Material builder, for Nitro fix.");
-
- // Get Methods
- Method addFluid = mb.getDeclaredMethod("addFluid");
- Method addCell = mb.getDeclaredMethod("addCell");
- Method setColour = mb.getDeclaredMethod("setColor", Dyes.class);
- Method setFuelPower = mb.getDeclaredMethod("setFuelPower", int.class);
- Method setMaterials = mb.getDeclaredMethod("setMaterialList", List.class);
- Method setTemp = mb.getDeclaredMethod("setLiquidTemperature", int.class);
- Method setRGB = mb.getDeclaredMethod("setRGB", int.class, int.class, int.class);
- Method construct = mb.getDeclaredMethod("constructMaterial");
- Logger.INFO("[Nitro] Got internal methods for setting fields.");
-
- // Invoke the methods
- addFluid.invoke(df);
- addCell.invoke(df);
- setColour.invoke(df, Dyes.dyeLime);
- setFuelPower.invoke(df, 512000);
- setMaterials.invoke(
- df,
- Arrays.asList(
- new MaterialStack(Materials.Glyceryl, 1),
- new MaterialStack(Materials.Fuel, 4)));
- setTemp.invoke(df, 295);
- setRGB.invoke(df, 200, 255, 0);
- Materials mNitroFix = (Materials) construct.invoke(df);
- Logger.INFO("[Nitro] Invoked 8 method calls successfully.");
-
- GT_Mod.gregtechproxy.addFluid(
- "NitroFuel_Old",
- "Nitro Diesel [Old]",
- mNitroFix,
- 1,
- 295,
- GT_OreDictUnificator.get(OrePrefixes.cell, mNitroFix, 1L),
- ItemUtils.getEmptyCell(),
- 1000);
- Logger.INFO("[Nitro] Added a fluid.");
-
- /**
- * Reflectively get all the values to maintain 5.08.xx compat
- */
- GT_Recipe_Map recipeMapMultiblockChemReactor;
- recipeMapMultiblockChemReactor = (GT_Recipe_Map) FieldUtils
- .getDeclaredField(GT_Recipe_Map.class, "sMultiblockChemicalRecipes", true)
- .get(null);
-
- /**
- * Do Recipe Stuff
- */
-
- // Set up some Variables
- final Collection<GT_Recipe> xSingle = GT_Recipe.GT_Recipe_Map.sChemicalRecipes.mRecipeList;
- final Collection<GT_Recipe> xMulti = recipeMapMultiblockChemReactor.mRecipeList;
- final FluidStack mNitroStack = Materials.NitroFuel.getFluid(1000);
- GT_Recipe toRemoveSingle[] = new GT_Recipe[99];
- GT_Recipe toRemoveMulti[] = new GT_Recipe[99];
- int mIndexSingle = 0;
- int mIndexMulti = 0;
-
- // Iterate Single Block recipes for Nitro production.
- for (GT_Recipe rnd : xSingle) {
- for (FluidStack mOutputFluid : rnd.mFluidOutputs) {
- if (mOutputFluid.isFluidEqual(mNitroStack)) {
- toRemoveSingle[mIndexSingle++] = rnd;
- }
- }
- }
- Logger.INFO(
- "[Nitro] Found " + mIndexSingle
- + " single block Chemical Reactor recipes to remove.");
-
- // Iterate Multi Block recipes for Nitro production.
- for (GT_Recipe rnd : xMulti) {
- for (FluidStack mOutputFluid : rnd.mFluidOutputs) {
- if (mOutputFluid.isFluidEqual(mNitroStack)) {
- toRemoveMulti[mIndexMulti++] = rnd;
- }
- }
- }
- Logger.INFO(
- "[Nitro] Found " + mIndexMulti
- + " multi block Chemical Reactor recipes to remove.");
-
- // Remove Single Block recipes found.
- int mRemovedSingle = 0;
- int mRemovedMulti = 0;
- for (GT_Recipe single : toRemoveSingle) {
- if (GT_Recipe.GT_Recipe_Map.sChemicalRecipes.mRecipeList.remove(single)) {
- mRemovedSingle++;
- }
- }
- Logger.INFO(
- "[Nitro] Removed " + mRemovedSingle + " single block Chemical Reactor recipes.");
-
- // Remove Multi Block recipes found.
- for (GT_Recipe multi : toRemoveMulti) {
- if (recipeMapMultiblockChemReactor.mRecipeList.remove(multi)) {
- mRemovedMulti++;
- }
- }
- Logger.INFO("[Nitro] Removed " + mRemovedMulti + " multi block Chemical Reactor recipes.");
-
- Materials mGlycerol = Materials.valueOf("Glycerol");
- Materials mLightFuel = Materials.valueOf("LightFuel");
-
- // Build a New Recipe set
- Materials mFuels[] = { mLightFuel, Materials.Fuel };
- for (Materials fuel : mFuels) {
- boolean didAdd[] = new boolean[3];
- Logger.INFO(
- "[Nitro] Getting ready to add back in the old nitro-diesel recipe to the mixer, using "
- + fuel.mDefaultLocalName
- + " as the fuel input.");
- didAdd[0] = GT_Values.RA.addMixerRecipe(
- getCells(fuel, 4),
- getCells(mGlycerol, 1),
- GT_Values.NI,
- GT_Values.NI,
- GT_Values.NF,
- GT_Values.NF,
- getCells(mNitroFix, 5),
- 20,
- 30);
- didAdd[1] = GT_Values.RA.addMixerRecipe(
- getCells(fuel, 4),
- GT_Values.NI,
- GT_Values.NI,
- GT_Values.NI,
- mGlycerol.getFluid(1000L),
- mNitroFix.getFluid(5000L),
- ItemList.Cell_Empty.get(4L),
- 20,
- 30);
- didAdd[2] = GT_Values.RA.addMixerRecipe(
- getCells(mGlycerol, 1),
- GT_Values.NI,
- GT_Values.NI,
- GT_Values.NI,
- fuel.getFluid(4000L),
- mNitroFix.getFluid(5000L),
- ItemList.Cell_Empty.get(1L),
- 20,
- 30);
- Logger.INFO(
- "[Nitro] Did the recipes add? 1: " + didAdd[0]
- + " | 2: "
- + didAdd[1]
- + " | 3: "
- + didAdd[2]);
+ Class mb = ReflectionUtils.getClass("gregtech.api.enums.MaterialBuilder");
+ Object df = mb.getConstructor(int.class, TextureSet.class, String.class)
+ .newInstance(975, TextureSet.SET_FLUID, "Nitro-Diesel [Old]");
+ if (mb.isInstance(df)) {
+
+ Logger.INFO("[Nitro] Created new instance of Material builder, for Nitro fix.");
+
+ // Get Methods
+ Method addFluid = mb.getDeclaredMethod("addFluid");
+ Method addCell = mb.getDeclaredMethod("addCell");
+ Method setColour = mb.getDeclaredMethod("setColor", Dyes.class);
+ Method setFuelPower = mb.getDeclaredMethod("setFuelPower", int.class);
+ Method setMaterials = mb.getDeclaredMethod("setMaterialList", List.class);
+ Method setTemp = mb.getDeclaredMethod("setLiquidTemperature", int.class);
+ Method setRGB = mb.getDeclaredMethod("setRGB", int.class, int.class, int.class);
+ Method construct = mb.getDeclaredMethod("constructMaterial");
+ Logger.INFO("[Nitro] Got internal methods for setting fields.");
+
+ // Invoke the methods
+ addFluid.invoke(df);
+ addCell.invoke(df);
+ setColour.invoke(df, Dyes.dyeLime);
+ setFuelPower.invoke(df, 512000);
+ setMaterials.invoke(
+ df,
+ Arrays.asList(
+ new MaterialStack(Materials.Glyceryl, 1),
+ new MaterialStack(Materials.Fuel, 4)));
+ setTemp.invoke(df, 295);
+ setRGB.invoke(df, 200, 255, 0);
+ Materials mNitroFix = (Materials) construct.invoke(df);
+ Logger.INFO("[Nitro] Invoked 8 method calls successfully.");
+
+ GT_Mod.gregtechproxy.addFluid(
+ "NitroFuel_Old",
+ "Nitro Diesel [Old]",
+ mNitroFix,
+ 1,
+ 295,
+ GT_OreDictUnificator.get(OrePrefixes.cell, mNitroFix, 1L),
+ ItemUtils.getEmptyCell(),
+ 1000);
+ Logger.INFO("[Nitro] Added a fluid.");
+
+ /**
+ * Reflectively get all the values to maintain 5.08.xx compat
+ */
+ GT_Recipe_Map recipeMapMultiblockChemReactor;
+ recipeMapMultiblockChemReactor = (GT_Recipe_Map) FieldUtils
+ .getDeclaredField(GT_Recipe_Map.class, "sMultiblockChemicalRecipes", true).get(null);
+
+ /**
+ * Do Recipe Stuff
+ */
+
+ // Set up some Variables
+ final Collection<GT_Recipe> xSingle = GT_Recipe_Map.sChemicalRecipes.mRecipeList;
+ final Collection<GT_Recipe> xMulti = recipeMapMultiblockChemReactor.mRecipeList;
+ final FluidStack mNitroStack = Materials.NitroFuel.getFluid(1000);
+ GT_Recipe toRemoveSingle[] = new GT_Recipe[99];
+ GT_Recipe toRemoveMulti[] = new GT_Recipe[99];
+ int mIndexSingle = 0;
+ int mIndexMulti = 0;
+
+ // Iterate Single Block recipes for Nitro production.
+ for (GT_Recipe rnd : xSingle) {
+ for (FluidStack mOutputFluid : rnd.mFluidOutputs) {
+ if (mOutputFluid.isFluidEqual(mNitroStack)) {
+ toRemoveSingle[mIndexSingle++] = rnd;
}
+ }
+ }
+ Logger.INFO("[Nitro] Found " + mIndexSingle + " single block Chemical Reactor recipes to remove.");
- for (Materials fuel : mFuels) {
- boolean didAdd[] = new boolean[3];
- Logger.INFO(
- "[Nitro] Getting ready to add back in the old nitro-diesel recipe to the chemical reactors, using "
- + fuel.mDefaultLocalName
- + " as the fuel input.");
- didAdd[0] = GT_Values.RA.addChemicalRecipe(
- getCells(fuel, 4),
- getCells(mGlycerol, 1),
- GT_Values.NF,
- GT_Values.NF,
- getCells(mNitroFix, 5),
- 20);
- didAdd[1] = GT_Values.RA.addChemicalRecipe(
- getCells(fuel, 4),
- GT_Values.NI,
- mGlycerol.getFluid(1000L),
- mNitroFix.getFluid(5000L),
- ItemList.Cell_Empty.get(4L),
- 20);
- didAdd[2] = GT_Values.RA.addChemicalRecipe(
- getCells(mGlycerol, 1),
- GT_Values.NI,
- fuel.getFluid(4000L),
- mNitroFix.getFluid(5000L),
- ItemList.Cell_Empty.get(1L),
- 20);
- Logger.INFO(
- "[Nitro] Did the recipes add? 1: " + didAdd[0]
- + " | 2: "
- + didAdd[1]
- + " | 3: "
- + didAdd[2]);
+ // Iterate Multi Block recipes for Nitro production.
+ for (GT_Recipe rnd : xMulti) {
+ for (FluidStack mOutputFluid : rnd.mFluidOutputs) {
+ if (mOutputFluid.isFluidEqual(mNitroStack)) {
+ toRemoveMulti[mIndexMulti++] = rnd;
}
+ }
+ }
+ Logger.INFO("[Nitro] Found " + mIndexMulti + " multi block Chemical Reactor recipes to remove.");
+
+ // Remove Single Block recipes found.
+ int mRemovedSingle = 0;
+ int mRemovedMulti = 0;
+ for (GT_Recipe single : toRemoveSingle) {
+ if (GT_Recipe_Map.sChemicalRecipes.mRecipeList.remove(single)) {
+ mRemovedSingle++;
+ }
+ }
+ Logger.INFO("[Nitro] Removed " + mRemovedSingle + " single block Chemical Reactor recipes.");
- Logger.INFO("[Nitro] Getting ready to add back in the old glycerol recipe!");
- GT_Values.RA.addChemicalRecipe(
- getCells(Materials.Nitrogen, 1),
- getDust(Materials.Carbon, 1),
- Materials.Water.getFluid(2000L),
- mGlycerol.getFluid(3000L),
- ItemList.Cell_Empty.get(1),
- 3000);
- Logger.INFO("[Nitro] Added recipes.");
+ // Remove Multi Block recipes found.
+ for (GT_Recipe multi : toRemoveMulti) {
+ if (recipeMapMultiblockChemReactor.mRecipeList.remove(multi)) {
+ mRemovedMulti++;
}
}
+ Logger.INFO("[Nitro] Removed " + mRemovedMulti + " multi block Chemical Reactor recipes.");
+
+ Materials mGlycerol = Materials.valueOf("Glycerol");
+ Materials mLightFuel = Materials.valueOf("LightFuel");
+
+ // Build a New Recipe set
+ Materials mFuels[] = { mLightFuel, Materials.Fuel };
+ for (Materials fuel : mFuels) {
+ boolean didAdd[] = new boolean[3];
+ Logger.INFO(
+ "[Nitro] Getting ready to add back in the old nitro-diesel recipe to the mixer, using "
+ + fuel.mDefaultLocalName
+ + " as the fuel input.");
+ didAdd[0] = GT_Values.RA.addMixerRecipe(
+ getCells(fuel, 4),
+ getCells(mGlycerol, 1),
+ GT_Values.NI,
+ GT_Values.NI,
+ GT_Values.NF,
+ GT_Values.NF,
+ getCells(mNitroFix, 5),
+ 20,
+ 30);
+ didAdd[1] = GT_Values.RA.addMixerRecipe(
+ getCells(fuel, 4),
+ GT_Values.NI,
+ GT_Values.NI,
+ GT_Values.NI,
+ mGlycerol.getFluid(1000L),
+ mNitroFix.getFluid(5000L),
+ ItemList.Cell_Empty.get(4L),
+ 20,
+ 30);
+ didAdd[2] = GT_Values.RA.addMixerRecipe(
+ getCells(mGlycerol, 1),
+ GT_Values.NI,
+ GT_Values.NI,
+ GT_Values.NI,
+ fuel.getFluid(4000L),
+ mNitroFix.getFluid(5000L),
+ ItemList.Cell_Empty.get(1L),
+ 20,
+ 30);
+ Logger.INFO(
+ "[Nitro] Did the recipes add? 1: " + didAdd[0]
+ + " | 2: "
+ + didAdd[1]
+ + " | 3: "
+ + didAdd[2]);
+ }
+
+ for (Materials fuel : mFuels) {
+ boolean didAdd[] = new boolean[3];
+ Logger.INFO(
+ "[Nitro] Getting ready to add back in the old nitro-diesel recipe to the chemical reactors, using "
+ + fuel.mDefaultLocalName
+ + " as the fuel input.");
+ didAdd[0] = GT_Values.RA.addChemicalRecipe(
+ getCells(fuel, 4),
+ getCells(mGlycerol, 1),
+ GT_Values.NF,
+ GT_Values.NF,
+ getCells(mNitroFix, 5),
+ 20);
+ didAdd[1] = GT_Values.RA.addChemicalRecipe(
+ getCells(fuel, 4),
+ GT_Values.NI,
+ mGlycerol.getFluid(1000L),
+ mNitroFix.getFluid(5000L),
+ ItemList.Cell_Empty.get(4L),
+ 20);
+ didAdd[2] = GT_Values.RA.addChemicalRecipe(
+ getCells(mGlycerol, 1),
+ GT_Values.NI,
+ fuel.getFluid(4000L),
+ mNitroFix.getFluid(5000L),
+ ItemList.Cell_Empty.get(1L),
+ 20);
+ Logger.INFO(
+ "[Nitro] Did the recipes add? 1: " + didAdd[0]
+ + " | 2: "
+ + didAdd[1]
+ + " | 3: "
+ + didAdd[2]);
+ }
+
+ Logger.INFO("[Nitro] Getting ready to add back in the old glycerol recipe!");
+ GT_Values.RA.addChemicalRecipe(
+ getCells(Materials.Nitrogen, 1),
+ getDust(Materials.Carbon, 1),
+ Materials.Water.getFluid(2000L),
+ mGlycerol.getFluid(3000L),
+ ItemList.Cell_Empty.get(1),
+ 3000);
+ Logger.INFO("[Nitro] Added recipes.");
}
} catch (IllegalArgumentException | IllegalAccessException | InstantiationException
| InvocationTargetException | NoSuchMethodException | SecurityException e) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java
index 348f50d3c1..02e397ca35 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java
@@ -11,11 +11,9 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaP
public class GregtechPollutionDevices {
public static void run() {
- if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
- if (PollutionUtils.isPollutionEnabled()) {
- Logger.INFO("Gregtech5u Content | Registering Anti-Pollution Devices.");
- run1();
- }
+ if (PollutionUtils.isPollutionEnabled()) {
+ Logger.INFO("Gregtech5u Content | Registering Anti-Pollution Devices.");
+ run1();
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerBreakers.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerBreakers.java
index 25fd245ba4..1f3ad0a5f2 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerBreakers.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerBreakers.java
@@ -8,10 +8,8 @@ import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEn
public class GregtechPowerBreakers {
public static void run() {
- if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
- Logger.INFO("Gregtech5u Content | Registering Power Breakers.");
- run1();
- }
+ Logger.INFO("Gregtech5u Content | Registering Power Breakers.");
+ run1();
}
private static void run1() {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerSubStation.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerSubStation.java
index b9672c5382..b15e9c04aa 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerSubStation.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerSubStation.java
@@ -13,11 +13,9 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.storage.Gregt
public class GregtechPowerSubStation {
public static void run() {
- if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
- Logger.INFO("Gregtech5u Content | Registering Power Substation Node.");
- if (CORE.ConfigSwitches.enableMultiblock_PowerSubstation) {
- run1();
- }
+ Logger.INFO("Gregtech5u Content | Registering Power Substation Node.");
+ if (CORE.ConfigSwitches.enableMultiblock_PowerSubstation) {
+ run1();
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechQuantumForceTransformer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechQuantumForceTransformer.java
index 392c6eced8..561d70eb5b 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechQuantumForceTransformer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechQuantumForceTransformer.java
@@ -8,15 +8,13 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.Gr
public class GregtechQuantumForceTransformer {
public static void run() {
- if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
- Logger.INFO("Gregtech5u Content | Registering Quantum Force Transformer Multiblock.");
- if (CORE.ConfigSwitches.enableMultiblock_QuantumForceTransformer) {
- GregtechItemList.QuantumForceTransformer.set(
- new GregtechMetaTileEntity_QuantumForceTransformer(
- 31151,
- "quantumforcetransformer.controller.tier.single",
- "Quantum Force Transformer").getStackForm(1L));
- }
+ Logger.INFO("Gregtech5u Content | Registering Quantum Force Transformer Multiblock.");
+ if (CORE.ConfigSwitches.enableMultiblock_QuantumForceTransformer) {
+ GregtechItemList.QuantumForceTransformer.set(
+ new GregtechMetaTileEntity_QuantumForceTransformer(
+ 31151,
+ "quantumforcetransformer.controller.tier.single",
+ "Quantum Force Transformer").getStackForm(1L));
}
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRTG.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRTG.java
index 40a0c5820f..a5fc00542e 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRTG.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRTG.java
@@ -7,10 +7,8 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GregtechMetaTileE
public class GregtechRTG {
public static void run() {
- if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
- Logger.INFO("Gregtech5u Content | Registering RTG.");
- run1();
- }
+ Logger.INFO("Gregtech5u Content | Registering RTG.");
+ run1();
}
private static void run1() {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java
index 6d48652202..fd2382bd75 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java
@@ -8,7 +8,6 @@ import gregtech.api.enums.OrePrefixes;
import gregtech.api.util.GT_ModHandler;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.core.material.ALLOY;
import gtPlusPlus.core.recipe.common.CI;
import gtPlusPlus.core.util.minecraft.ItemUtils;
@@ -19,11 +18,9 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.Gr
public class GregtechRocketFuelGenerator {
public static void run() {
- if (LoadedMods.Gregtech) {
- Logger.INFO("Gregtech5u Content | Registering Industrial Rocket Engines.");
- if (CORE.ConfigSwitches.enableMachine_RocketEngines) {
- run1();
- }
+ Logger.INFO("Gregtech5u Content | Registering Industrial Rocket Engines.");
+ if (CORE.ConfigSwitches.enableMachine_RocketEngines) {
+ run1();
}
}
@@ -69,81 +66,38 @@ public class GregtechRocketFuelGenerator {
"advancedgenerator.rocketFuel.tier.03",
"Turbo Rocket Engine",
6).getStackForm(1L));
- if (!CORE.GTNH) {
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Rocket_Engine_EV.get(1L, new Object[0]),
- GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
- | GT_ModHandler.RecipeBits.REVERSIBLE
- | GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] { "PCP", "EME", "GWG", Character.valueOf('M'), ItemList.Hull_EV,
- Character.valueOf('P'), ItemList.Electric_Piston_EV, Character.valueOf('E'),
- ItemList.Electric_Motor_EV, Character.valueOf('C'),
- OrePrefixes.circuit.get(Materials.Ultimate), Character.valueOf('W'),
- OrePrefixes.cableGt02.get(Materials.Aluminium), Character.valueOf('G'),
- ALLOY.TANTALLOY_61.getGear(1) });
-
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Rocket_Engine_IV.get(1L, new Object[0]),
- GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
- | GT_ModHandler.RecipeBits.REVERSIBLE
- | GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] { "PCP", "EME", "GWG", Character.valueOf('M'), ItemList.Hull_IV,
- Character.valueOf('P'), ItemList.Electric_Piston_IV, Character.valueOf('E'),
- ItemList.Electric_Motor_IV, Character.valueOf('C'),
- OrePrefixes.circuit.get(Materials.Superconductor), Character.valueOf('W'),
- OrePrefixes.cableGt02.get(Materials.Platinum), Character.valueOf('G'),
- ALLOY.STELLITE.getGear(1) });
- }
- if (CORE.GTNH) {
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Rocket_Engine_EV.get(1L, new Object[0]),
- GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
- | GT_ModHandler.RecipeBits.REVERSIBLE
- | GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] { "PCP", "EME", "GWG", Character.valueOf('M'), ItemList.Hull_EV,
- Character.valueOf('P'), ItemList.Electric_Piston_EV, Character.valueOf('E'),
- ItemList.Electric_Motor_EV, Character.valueOf('C'),
- OrePrefixes.circuit.get(Materials.Elite), Character.valueOf('W'),
- OrePrefixes.cableGt02.get(Materials.Aluminium), Character.valueOf('G'),
- ALLOY.TANTALLOY_61.getGear(1) });
+ GT_ModHandler.addCraftingRecipe(
+ GregtechItemList.Rocket_Engine_EV.get(1L, new Object[0]),
+ GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+ | GT_ModHandler.RecipeBits.REVERSIBLE
+ | GT_ModHandler.RecipeBits.BUFFERED,
+ new Object[] { "PCP", "EME", "GWG", Character.valueOf('M'), ItemList.Hull_EV, Character.valueOf('P'),
+ ItemList.Electric_Piston_EV, Character.valueOf('E'), ItemList.Electric_Motor_EV,
+ Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Elite), Character.valueOf('W'),
+ OrePrefixes.cableGt02.get(Materials.Aluminium), Character.valueOf('G'),
+ ALLOY.TANTALLOY_61.getGear(1) });
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Rocket_Engine_IV.get(1L, new Object[0]),
- GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
- | GT_ModHandler.RecipeBits.REVERSIBLE
- | GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] { "PCP", "EME", "GWG", Character.valueOf('M'), ItemList.Hull_IV,
- Character.valueOf('P'), ItemList.Electric_Piston_IV, Character.valueOf('E'),
- ItemList.Electric_Motor_IV, Character.valueOf('C'),
- OrePrefixes.circuit.get(Materials.Master), Character.valueOf('W'),
- OrePrefixes.cableGt02.get(Materials.Platinum), Character.valueOf('G'),
- ALLOY.STELLITE.getGear(1) });
- }
+ GT_ModHandler.addCraftingRecipe(
+ GregtechItemList.Rocket_Engine_IV.get(1L, new Object[0]),
+ GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+ | GT_ModHandler.RecipeBits.REVERSIBLE
+ | GT_ModHandler.RecipeBits.BUFFERED,
+ new Object[] { "PCP", "EME", "GWG", Character.valueOf('M'), ItemList.Hull_IV, Character.valueOf('P'),
+ ItemList.Electric_Piston_IV, Character.valueOf('E'), ItemList.Electric_Motor_IV,
+ Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Master), Character.valueOf('W'),
+ OrePrefixes.cableGt02.get(Materials.Platinum), Character.valueOf('G'),
+ ALLOY.STELLITE.getGear(1) });
final ItemStack INGREDIENT_1 = CI.electricPiston_LuV;
final ItemStack INGREDIENT_2 = CI.electricMotor_LuV;
- if (!CORE.GTNH) {
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Rocket_Engine_LuV.get(1L, new Object[0]),
- GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
- | GT_ModHandler.RecipeBits.REVERSIBLE
- | GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] { "PCP", "EME", "GWG", Character.valueOf('M'), ItemList.Hull_LuV,
- Character.valueOf('P'), INGREDIENT_1, Character.valueOf('E'), INGREDIENT_2,
- Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Infinite), Character.valueOf('W'),
- OrePrefixes.cableGt02.get(Materials.Tungsten), Character.valueOf('G'),
- ALLOY.ZERON_100.getGear(1) });
- }
- if (CORE.GTNH) {
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Rocket_Engine_LuV.get(1L, new Object[0]),
- GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
- | GT_ModHandler.RecipeBits.REVERSIBLE
- | GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] { "PCP", "EME", "GWG", Character.valueOf('M'), ItemList.Hull_LuV,
- Character.valueOf('P'), INGREDIENT_1, Character.valueOf('E'), INGREDIENT_2,
- Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Ultimate), Character.valueOf('W'),
- OrePrefixes.cableGt02.get(Materials.Tungsten), Character.valueOf('G'),
- ALLOY.ZERON_100.getGear(1) });
- }
+ GT_ModHandler.addCraftingRecipe(
+ GregtechItemList.Rocket_Engine_LuV.get(1L, new Object[0]),
+ GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+ | GT_ModHandler.RecipeBits.REVERSIBLE
+ | GT_ModHandler.RecipeBits.BUFFERED,
+ new Object[] { "PCP", "EME", "GWG", Character.valueOf('M'), ItemList.Hull_LuV, Character.valueOf('P'),
+ INGREDIENT_1, Character.valueOf('E'), INGREDIENT_2, Character.valueOf('C'),
+ OrePrefixes.circuit.get(Materials.Ultimate), Character.valueOf('W'),
+ OrePrefixes.cableGt02.get(Materials.Tungsten), Character.valueOf('G'),
+ ALLOY.ZERON_100.getGear(1) });
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSafeBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSafeBlock.java
index 13a3e11340..a48c8ac39c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSafeBlock.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSafeBlock.java
@@ -10,11 +10,9 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GregtechMetaSafeBloc
public class GregtechSafeBlock {
public static void run() {
- if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
- Logger.INFO("Gregtech5u Content | Registering Lockable Safe Blocks.");
- if (CORE.ConfigSwitches.enableMachine_Safes) {
- run1();
- }
+ Logger.INFO("Gregtech5u Content | Registering Lockable Safe Blocks.");
+ if (CORE.ConfigSwitches.enableMachine_Safes) {
+ run1();
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java
index 01fdb612d4..038dc693ca 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java
@@ -40,18 +40,15 @@ public class GregtechSimpleWasher {
}
private static boolean generateDirtyDustRecipes() {
- boolean disablePlat = CORE.GTNH;
int mRecipeCount = 0;
// Generate Recipe Map for the Dust Washer.
ItemStack dustClean;
ItemStack dustDirty;
for (Materials v : Materials.values()) {
- if (disablePlat) {
- if (v == Materials.Platinum || v == Materials.Osmium
- || v == Materials.Iridium
- || v == Materials.Palladium) {
- continue;
- }
+ if (v == Materials.Platinum || v == Materials.Osmium
+ || v == Materials.Iridium
+ || v == Materials.Palladium) {
+ continue;
}
dustClean = GT_OreDictUnificator.get(OrePrefixes.dust, v, 1L);
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarGenerators.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarGenerators.java
index d686270bad..996462435c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarGenerators.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarGenerators.java
@@ -3,14 +3,13 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.lib.CORE.ConfigSwitches;
-import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntitySolarGenerator;
public class GregtechSolarGenerators {
public static void run() {
- if (LoadedMods.Gregtech && ConfigSwitches.enableMachine_SolarGenerators) {
+ if (ConfigSwitches.enableMachine_SolarGenerators) {
Logger.INFO("Gregtech5u Content | Registering Solar Generator Blocks.");
if (CORE.ConfigSwitches.enableMachine_SolarGenerators) {
run1();
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarTower.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarTower.java
index 3b86daf811..e9661befd4 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarTower.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarTower.java
@@ -12,10 +12,8 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.misc.TileEntitySolarHeater;
public class GregtechSolarTower {
public static void run() {
- if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
- Logger.INFO("Gregtech5u Content | Registering Solar Tower.");
- run1();
- }
+ Logger.INFO("Gregtech5u Content | Registering Solar Tower.");
+ run1();
}
private static void run1() {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamCondenser.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamCondenser.java
index 8caa859f61..0d52cc0fcb 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamCondenser.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamCondenser.java
@@ -8,11 +8,9 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaC
public class GregtechSteamCondenser {
public static void run() {
- if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
- Logger.INFO("Gregtech5u Content | Registering Steam Condensor.");
- if (CORE.ConfigSwitches.enableMachine_SteamConverter) {
- run1();
- }
+ Logger.INFO("Gregtech5u Content | Registering Steam Condensor.");
+ if (CORE.ConfigSwitches.enableMachine_SteamConverter) {
+ run1();
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperChests.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperChests.java
index fa2edaa030..03c600eda5 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperChests.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperChests.java
@@ -1,12 +1,5 @@
package gtPlusPlus.xmod.gregtech.registration.gregtech;
-import static gtPlusPlus.core.recipe.common.CI.bitsd;
-
-import gregtech.api.enums.ItemList;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_ModHandler;
-import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GT_MetaTileEntity_ConnectableCrate;
@@ -17,10 +10,7 @@ public class GregtechSuperChests {
public static void run() {
int mId = 946;
- String aSuffix = "";
- if (CORE.GTNH) {
- aSuffix = " [Disabled]";
- }
+ String aSuffix = " [Disabled]";
GregtechItemList.Super_Chest_LV.set(
(new GT_MetaTileEntity_TieredChest(mId++, "super.chest.gtpp.tier.01", "Super Chest I" + aSuffix, 1))
@@ -39,53 +29,11 @@ public class GregtechSuperChests {
.getStackForm(1L));
// Do not add Recipes for GTNH, hide them from NEI instead.
- if (CORE.GTNH) {
- ItemUtils.hideItemFromNEI(GregtechItemList.Super_Chest_LV.get(1L));
- ItemUtils.hideItemFromNEI(GregtechItemList.Super_Chest_MV.get(1L));
- ItemUtils.hideItemFromNEI(GregtechItemList.Super_Chest_HV.get(1L));
- ItemUtils.hideItemFromNEI(GregtechItemList.Super_Chest_EV.get(1L));
- ItemUtils.hideItemFromNEI(GregtechItemList.Super_Chest_IV.get(1L));
- } else {
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Super_Chest_LV.get(1L, new Object[0]),
- bitsd,
- new Object[] { "DPD", "PMP", "DGD", Character.valueOf('M'), ItemList.Hull_LV,
- Character.valueOf('G'), ItemList.Automation_ChestBuffer_LV, Character.valueOf('D'),
- OrePrefixes.circuit.get(Materials.Basic), Character.valueOf('P'),
- OrePrefixes.plate.get(Materials.Invar) });
-
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Super_Chest_MV.get(1L, new Object[0]),
- bitsd,
- new Object[] { "DPD", "PMP", "DGD", Character.valueOf('M'), ItemList.Hull_MV,
- Character.valueOf('G'), ItemList.Automation_ChestBuffer_MV, Character.valueOf('D'),
- OrePrefixes.circuit.get(Materials.Good), Character.valueOf('P'),
- OrePrefixes.plate.get(Materials.Aluminium) });
-
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Super_Chest_HV.get(1L, new Object[0]),
- bitsd,
- new Object[] { "DPD", "PMP", "DGD", Character.valueOf('M'), ItemList.Hull_HV,
- Character.valueOf('G'), ItemList.Automation_ChestBuffer_HV, Character.valueOf('D'),
- OrePrefixes.circuit.get(Materials.Advanced), Character.valueOf('P'),
- OrePrefixes.plate.get(Materials.StainlessSteel) });
-
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Super_Chest_EV.get(1L, new Object[0]),
- bitsd,
- new Object[] { "DPD", "PMP", "DGD", Character.valueOf('M'), ItemList.Hull_EV,
- Character.valueOf('G'), ItemList.Automation_ChestBuffer_EV, Character.valueOf('D'),
- OrePrefixes.circuit.get(Materials.Data), Character.valueOf('P'),
- OrePrefixes.plate.get(Materials.Titanium) });
-
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Super_Chest_IV.get(1L, new Object[0]),
- bitsd,
- new Object[] { "DPD", "PMP", "DGD", Character.valueOf('M'), ItemList.Hull_IV,
- Character.valueOf('G'), ItemList.Automation_ChestBuffer_IV, Character.valueOf('D'),
- OrePrefixes.circuit.get(Materials.Elite), Character.valueOf('P'),
- OrePrefixes.plate.get(Materials.Tungsten) });
- }
+ ItemUtils.hideItemFromNEI(GregtechItemList.Super_Chest_LV.get(1L));
+ ItemUtils.hideItemFromNEI(GregtechItemList.Super_Chest_MV.get(1L));
+ ItemUtils.hideItemFromNEI(GregtechItemList.Super_Chest_HV.get(1L));
+ ItemUtils.hideItemFromNEI(GregtechItemList.Super_Chest_EV.get(1L));
+ ItemUtils.hideItemFromNEI(GregtechItemList.Super_Chest_IV.get(1L));
// Test Thing
GregtechItemList.CrateStorage.set(
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperConductionPoint.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperConductionPoint.java
deleted file mode 100644
index b36a81e101..0000000000
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperConductionPoint.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package gtPlusPlus.xmod.gregtech.registration.gregtech;
-
-public class GregtechSuperConductionPoint {
-
- public static void run() {
- if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
- // Utils.LOG_INFO("Gregtech5u Content | Registering Super Conductor Input Node.");
- run1();
- }
- }
-
- private static void run1() {
- // Steam Condensors
- // GregtechItemList.SuperConductorInputNode.set(new GregtechMetaTileEntitySuperCondensor(811,
- // "superconductor.01.input.single", "Power Phase Shifting Station", 8).getStackForm(1L));
-
- }
-}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechThaumcraftDevices.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechThaumcraftDevices.java
index 4470ebe67e..bf5a5f7ba6 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechThaumcraftDevices.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechThaumcraftDevices.java
@@ -8,7 +8,7 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaP
public class GregtechThaumcraftDevices {
public static void run() {
- if (LoadedMods.Gregtech && LoadedMods.Thaumcraft) {
+ if (LoadedMods.Thaumcraft) {
Logger.INFO("Gregtech5u Content | Registering Thaumcraft content.");
run1();
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredChunkloaders.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredChunkloaders.java
index a3d1b3f22f..0d560610ff 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredChunkloaders.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredChunkloaders.java
@@ -1,17 +1,14 @@
package gtPlusPlus.xmod.gregtech.registration.gregtech;
import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaTileEntityChunkLoader;
public class GregtechTieredChunkloaders {
public static void run() {
- if (LoadedMods.Gregtech) {
- Logger.INFO("Gregtech5u Content | Registering Chunk Loaders.");
- run1();
- }
+ Logger.INFO("Gregtech5u Content | Registering Chunk Loaders.");
+ run1();
}
private static void run1() {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredFluidTanks.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredFluidTanks.java
index ac740b8210..e5116d01d4 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredFluidTanks.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredFluidTanks.java
@@ -2,26 +2,21 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GT_MetaTileEntity_TieredTank;
public class GregtechTieredFluidTanks {
public static void run() {
- if (LoadedMods.Gregtech) {
- Logger.INFO("Gregtech5u Content | Registering Portable Fluid Tanks.");
- if (CORE.ConfigSwitches.enableMachine_FluidTanks) {
- run1();
- }
+ Logger.INFO("Gregtech5u Content | Registering Portable Fluid Tanks.");
+ if (CORE.ConfigSwitches.enableMachine_FluidTanks) {
+ run1();
}
}
private static void run1() {
int ID = 817;
- if (CORE.GTNH) {
- Logger.INFO("Only loading ULV-IV tier tanks for New Horizons Modpack.");
- }
+ Logger.INFO("Only loading ULV-IV tier tanks for New Horizons Modpack.");
GregtechItemList.GT_FluidTank_ULV.set(
new GT_MetaTileEntity_TieredTank(ID++, "fluidtank.tier.00", "Ultra Low Voltage Fluid Tank", 0)
.getStackForm(1L));
@@ -34,25 +29,5 @@ public class GregtechTieredFluidTanks {
GregtechItemList.GT_FluidTank_HV.set(
new GT_MetaTileEntity_TieredTank(ID++, "fluidtank.tier.03", "High Voltage Fluid Tank", 3)
.getStackForm(1L));
- if (!CORE.GTNH) {
- GregtechItemList.GT_FluidTank_EV.set(
- new GT_MetaTileEntity_TieredTank(ID++, "fluidtank.tier.04", "Extreme Voltage Fluid Tank", 4)
- .getStackForm(1L));
- GregtechItemList.GT_FluidTank_IV.set(
- new GT_MetaTileEntity_TieredTank(ID++, "fluidtank.tier.05", "Insane Voltage Fluid Tank", 5)
- .getStackForm(1L));
- GregtechItemList.GT_FluidTank_LuV.set(
- new GT_MetaTileEntity_TieredTank(ID++, "fluidtank.tier.06", "Ludicrous Voltage Fluid Tank", 6)
- .getStackForm(1L));
- GregtechItemList.GT_FluidTank_ZPM.set(
- new GT_MetaTileEntity_TieredTank(ID++, "fluidtank.tier.07", "ZPM Voltage Fluid Tank", 7)
- .getStackForm(1L));
- GregtechItemList.GT_FluidTank_UV.set(
- new GT_MetaTileEntity_TieredTank(ID++, "fluidtank.tier.08", "Ultimate Voltage Fluid Tank", 8)
- .getStackForm(1L));
- GregtechItemList.GT_FluidTank_MAX.set(
- new GT_MetaTileEntity_TieredTank(ID++, "fluidtank.tier.09", "MAX Voltage Fluid Tank", 9)
- .getStackForm(1L));
- }
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTreeFarmerTE.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTreeFarmerTE.java
index 65c3e0b36a..2d79a3bd0b 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTreeFarmerTE.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTreeFarmerTE.java
@@ -8,11 +8,9 @@ import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GregtechMetaT
public class GregtechTreeFarmerTE {
public static void run() {
- if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
- Logger.INFO("Gregtech5u Content | Registering Tree Farmer Structural Block.");
- if (CORE.ConfigSwitches.enableMultiblock_TreeFarmer) {
- run1();
- }
+ Logger.INFO("Gregtech5u Content | Registering Tree Farmer Structural Block.");
+ if (CORE.ConfigSwitches.enableMultiblock_TreeFarmer) {
+ run1();
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java
index 413e9bb81c..fe7628933e 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java
@@ -11,88 +11,86 @@ public class GregtechWirelessChargers {
public static void run() {
- if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
- Logger.INFO("Gregtech5u Content | Registering Wireless Chargers.");
+ Logger.INFO("Gregtech5u Content | Registering Wireless Chargers.");
- long bitsd = GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
- | GT_ModHandler.RecipeBits.REVERSIBLE
- | GT_ModHandler.RecipeBits.BUFFERED;
- int mID = 890;
+ long bitsd = GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+ | GT_ModHandler.RecipeBits.REVERSIBLE
+ | GT_ModHandler.RecipeBits.BUFFERED;
+ int mID = 890;
- Utils.registerEvent(new ChargingHelper());
+ Utils.registerEvent(new ChargingHelper());
- GregtechItemList.Charger_LV.set(
- new GregtechMetaWirelessCharger(
- mID++,
- "wificharger.01.tier.single",
- "Wireless Charger MK I",
- 1,
- "Hopefully won't give you cancer.",
- 0).getStackForm(1L));
- GregtechItemList.Charger_MV.set(
- new GregtechMetaWirelessCharger(
- mID++,
- "wificharger.02.tier.single",
- "Wireless Charger MK II",
- 2,
- "Hopefully won't give you cancer.",
- 0).getStackForm(1L));
- GregtechItemList.Charger_HV.set(
- new GregtechMetaWirelessCharger(
- mID++,
- "wificharger.03.tier.single",
- "Wireless Charger MK III",
- 3,
- "Hopefully won't give you cancer.",
- 0).getStackForm(1L));
- GregtechItemList.Charger_EV.set(
- new GregtechMetaWirelessCharger(
- mID++,
- "wificharger.04.tier.single",
- "Wireless Charger MK IV",
- 4,
- "Hopefully won't give you cancer.",
- 0).getStackForm(1L));
- GregtechItemList.Charger_IV.set(
- new GregtechMetaWirelessCharger(
- mID++,
- "wificharger.05.tier.single",
- "Wireless Charger MK V",
- 5,
- "Hopefully won't give you cancer.",
- 0).getStackForm(1L));
- GregtechItemList.Charger_LuV.set(
- new GregtechMetaWirelessCharger(
- mID++,
- "wificharger.06.tier.single",
- "Wireless Charger MK VI",
- 6,
- "Hopefully won't give you cancer.",
- 0).getStackForm(1L));
- GregtechItemList.Charger_ZPM.set(
- new GregtechMetaWirelessCharger(
- mID++,
- "wificharger.07.tier.single",
- "Wireless Charger MK VII",
- 7,
- "Hopefully won't give you cancer.",
- 0).getStackForm(1L));
- GregtechItemList.Charger_UV.set(
- new GregtechMetaWirelessCharger(
- mID++,
- "wificharger.08.tier.single",
- "Wireless Charger MK VIII",
- 8,
- "Hopefully won't give you cancer.",
- 0).getStackForm(1L));
- GregtechItemList.Charger_MAX.set(
- new GregtechMetaWirelessCharger(
- mID++,
- "wificharger.09.tier.single",
- "Wireless Charger MK IX",
- 9,
- "Hopefully won't give you cancer.",
- 0).getStackForm(1L));
- }
+ GregtechItemList.Charger_LV.set(
+ new GregtechMetaWirelessCharger(
+ mID++,
+ "wificharger.01.tier.single",
+ "Wireless Charger MK I",
+ 1,
+ "Hopefully won't give you cancer.",
+ 0).getStackForm(1L));
+ GregtechItemList.Charger_MV.set(
+ new GregtechMetaWirelessCharger(
+ mID++,
+ "wificharger.02.tier.single",
+ "Wireless Charger MK II",
+ 2,
+ "Hopefully won't give you cancer.",
+ 0).getStackForm(1L));
+ GregtechItemList.Charger_HV.set(
+ new GregtechMetaWirelessCharger(
+ mID++,
+ "wificharger.03.tier.single",
+ "Wireless Charger MK III",
+ 3,
+ "Hopefully won't give you cancer.",
+ 0).getStackForm(1L));
+ GregtechItemList.Charger_EV.set(
+ new GregtechMetaWirelessCharger(
+ mID++,
+ "wificharger.04.tier.single",
+ "Wireless Charger MK IV",
+ 4,
+ "Hopefully won't give you cancer.",
+ 0).getStackForm(1L));
+ GregtechItemList.Charger_IV.set(
+ new GregtechMetaWirelessCharger(
+ mID++,
+ "wificharger.05.tier.single",
+ "Wireless Charger MK V",
+ 5,
+ "Hopefully won't give you cancer.",
+ 0).getStackForm(1L));
+ GregtechItemList.Charger_LuV.set(
+ new GregtechMetaWirelessCharger(
+ mID++,
+ "wificharger.06.tier.single",
+ "Wireless Charger MK VI",
+ 6,
+ "Hopefully won't give you cancer.",
+ 0).getStackForm(1L));
+ GregtechItemList.Charger_ZPM.set(
+ new GregtechMetaWirelessCharger(
+ mID++,
+ "wificharger.07.tier.single",
+ "Wireless Charger MK VII",
+ 7,
+ "Hopefully won't give you cancer.",
+ 0).getStackForm(1L));
+ GregtechItemList.Charger_UV.set(
+ new GregtechMetaWirelessCharger(
+ mID++,
+ "wificharger.08.tier.single",
+ "Wireless Charger MK VIII",
+ 8,
+ "Hopefully won't give you cancer.",
+ 0).getStackForm(1L));
+ GregtechItemList.Charger_MAX.set(
+ new GregtechMetaWirelessCharger(
+ mID++,
+ "wificharger.09.tier.single",
+ "Wireless Charger MK IX",
+ 9,
+ "Hopefully won't give you cancer.",
+ 0).getStackForm(1L));
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/NewHorizonsAccelerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/NewHorizonsAccelerator.java
deleted file mode 100644
index 5ed7046a93..0000000000
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/NewHorizonsAccelerator.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package gtPlusPlus.xmod.gregtech.registration.gregtech;
-
-import gregtech.api.enums.ItemList;
-import gregtech.api.util.GT_ModHandler;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.lib.LoadedMods;
-import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_WorldAccelerator;
-
-public class NewHorizonsAccelerator {
-
- public static void run() {
- if (LoadedMods.Gregtech && !CORE.GTNH) {
- Logger.INFO("New Horizons Content | Registering World Accelerators.");
- if (CORE.ConfigSwitches.enableMachine_WorldAccelerators) {
- run1();
- }
- }
- }
-
- private static void run1() {
- GregtechItemList.AcceleratorLV.set(
- new GT_MetaTileEntity_WorldAccelerator(
- 841,
- "basicmachine.accelerator.tier.01",
- "Basic World Accelerator",
- 1).getStackForm(1L));
- GregtechItemList.AcceleratorMV.set(
- new GT_MetaTileEntity_WorldAccelerator(
- 842,
- "basicmachine.accelerator.tier.02",
- "Advanced World Accelerator",
- 2).getStackForm(1L));
- GregtechItemList.AcceleratorHV.set(
- new GT_MetaTileEntity_WorldAccelerator(
- 843,
- "basicmachine.accelerator.tier.03",
- "Advanced World Accelerator II",
- 3).getStackForm(1L));
- GregtechItemList.AcceleratorEV.set(
- new GT_MetaTileEntity_WorldAccelerator(
- 844,
- "basicmachine.accelerator.tier.04",
- "Advanced World Accelerator III",
- 4).getStackForm(1L));
- GregtechItemList.AcceleratorIV.set(
- new GT_MetaTileEntity_WorldAccelerator(
- 845,
- "basicmachine.accelerator.tier.05",
- "Advanced World Accelerator IV",
- 5).getStackForm(1L));
- GregtechItemList.AcceleratorLuV.set(
- new GT_MetaTileEntity_WorldAccelerator(
- 846,
- "basicmachine.accelerator.tier.06",
- "Elite World Accelerator",
- 6).getStackForm(1L));
- GregtechItemList.AcceleratorZPM.set(
- new GT_MetaTileEntity_WorldAccelerator(
- 847,
- "basicmachine.accelerator.tier.07",
- "Elite World Accelerator II",
- 7).getStackForm(1L));
- GregtechItemList.AcceleratorUV.set(
- new GT_MetaTileEntity_WorldAccelerator(
- 848,
- "basicmachine.accelerator.tier.08",
- "Ultimate Time Anomaly",
- 8).getStackForm(1L));
-
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.AcceleratorLV.get(1L),
- GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
- | GT_ModHandler.RecipeBits.REVERSIBLE
- | GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] { "RMR", "PBC", "IMI", 'R', ItemList.Robot_Arm_LV, 'M', ItemList.Electric_Motor_LV, 'P',
- ItemList.Electric_Pump_LV, 'B', ItemList.Hull_LV, 'C', ItemList.Conveyor_Module_LV, 'I',
- ItemList.Electric_Piston_LV });
-
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.AcceleratorMV.get(1L),
- GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
- | GT_ModHandler.RecipeBits.REVERSIBLE
- | GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] { "RMR", "PBC", "IMI", 'R', ItemList.Robot_Arm_MV, 'M', ItemList.Electric_Motor_MV, 'P',
- ItemList.Electric_Pump_MV, 'B', ItemList.Hull_MV, 'C', ItemList.Conveyor_Module_MV, 'I',
- ItemList.Electric_Piston_MV });
-
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.AcceleratorHV.get(1L),
- GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
- | GT_ModHandler.RecipeBits.REVERSIBLE
- | GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] { "RMR", "PBC", "IMI", 'R', ItemList.Robot_Arm_HV, 'M', ItemList.Electric_Motor_HV, 'P',
- ItemList.Electric_Pump_HV, 'B', ItemList.Hull_HV, 'C', ItemList.Conveyor_Module_HV, 'I',
- ItemList.Electric_Piston_HV });
-
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.AcceleratorEV.get(1L),
- GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
- | GT_ModHandler.RecipeBits.REVERSIBLE
- | GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] { "RMR", "PBC", "IMI", 'R', ItemList.Robot_Arm_EV, 'M', ItemList.Electric_Motor_EV, 'P',
- ItemList.Electric_Pump_EV, 'B', ItemList.Hull_EV, 'C', ItemList.Conveyor_Module_EV, 'I',
- ItemList.Electric_Piston_EV });
-
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.AcceleratorIV.get(1L),
- GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
- | GT_ModHandler.RecipeBits.REVERSIBLE
- | GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] { "RMR", "PBC", "IMI", 'R', ItemList.Robot_Arm_IV, 'M', ItemList.Electric_Motor_IV, 'P',
- ItemList.Electric_Pump_IV, 'B', ItemList.Hull_IV, 'C', ItemList.Conveyor_Module_IV, 'I',
- ItemList.Electric_Piston_IV });
-
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.AcceleratorLuV.get(1L),
- GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
- | GT_ModHandler.RecipeBits.REVERSIBLE
- | GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] { "RMR", "PBC", "IMI", 'R', ItemList.Robot_Arm_LuV, 'M', ItemList.Electric_Motor_LuV, 'P',
- ItemList.Electric_Pump_LuV, 'B', ItemList.Hull_LuV, 'C', ItemList.Conveyor_Module_LuV, 'I',
- ItemList.Electric_Piston_LuV });
-
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.AcceleratorZPM.get(1L),
- GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
- | GT_ModHandler.RecipeBits.REVERSIBLE
- | GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] { "RMR", "PBC", "IMI", 'R', ItemList.Robot_Arm_ZPM, 'M', ItemList.Electric_Motor_ZPM, 'P',
- ItemList.Electric_Pump_ZPM, 'B', ItemList.Hull_ZPM, 'C', ItemList.Conveyor_Module_ZPM, 'I',
- ItemList.Electric_Piston_ZPM });
-
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.AcceleratorUV.get(1L),
- GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
- | GT_ModHandler.RecipeBits.REVERSIBLE
- | GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] { "RMR", "PBC", "IMI", 'R', ItemList.Robot_Arm_UV, 'M', ItemList.Electric_Motor_UV, 'P',
- ItemList.Electric_Pump_UV, 'B', ItemList.Hull_UV, 'C', ItemList.Conveyor_Module_UV, 'I',
- ItemList.Electric_Piston_UV });
- }
-}
diff --git a/src/main/java/gtPlusPlus/xmod/growthcraft/fishtrap/FishTrapHandler.java b/src/main/java/gtPlusPlus/xmod/growthcraft/fishtrap/FishTrapHandler.java
index e7abde5646..2cf1032c4b 100644
--- a/src/main/java/gtPlusPlus/xmod/growthcraft/fishtrap/FishTrapHandler.java
+++ b/src/main/java/gtPlusPlus/xmod/growthcraft/fishtrap/FishTrapHandler.java
@@ -173,44 +173,31 @@ public class FishTrapHandler {
}
private static void addGregtechCentrifugeRecipe(final ItemStack input) {
- if (LoadedMods.Gregtech) {
- GT_Values.RA.addCentrifugeRecipe(
- input,
- null,
- null,
- FluidUtils.getFluidStack("methane", 96),
- null,
- null,
- null,
- null,
- null,
- null,
- null,
- 19 * 20,
- 5);
- }
+ GT_Values.RA.addCentrifugeRecipe(
+ input,
+ null,
+ null,
+ FluidUtils.getFluidStack("methane", 96),
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ 19 * 20,
+ 5);
}
private static void addGregtechMaceratorRecipe(final ItemStack input) {
- if (LoadedMods.Gregtech) {
- GT_ModHandler.addPulverisationRecipe(
- input,
- ItemUtils.getItemStackOfAmountFromOreDict("dustMeatRaw", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustTinyBone", 1),
- 0);
- }
+ GT_ModHandler.addPulverisationRecipe(
+ input,
+ ItemUtils.getItemStackOfAmountFromOreDict("dustMeatRaw", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustTinyBone", 1),
+ 0);
}
private static void addGregtechFluidRecipe(final ItemStack input) {
- if (LoadedMods.Gregtech) {
- if (CORE.GTNH) {
- CORE.RA.addFluidExtractionRecipe(input, FluidUtils.getFluidStack("fishoil", 50), 16, 4);
- } else {
- CORE.RA.addFluidExtractionRecipe(input, FluidUtils.getFluidStack("fishoil", 4), 16, 4); // 4eu/t total
- // eu used = 64
- // so time =
- // 64/4
- }
- }
+ CORE.RA.addFluidExtractionRecipe(input, FluidUtils.getFluidStack("fishoil", 50), 16, 4);
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/ic2/HANDLER_IC2.java b/src/main/java/gtPlusPlus/xmod/ic2/HANDLER_IC2.java
index 66b9d9aabe..192e7f41d5 100644
--- a/src/main/java/gtPlusPlus/xmod/ic2/HANDLER_IC2.java
+++ b/src/main/java/gtPlusPlus/xmod/ic2/HANDLER_IC2.java
@@ -1,25 +1,17 @@
package gtPlusPlus.xmod.ic2;
-import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.xmod.ic2.item.IC2_Items;
import gtPlusPlus.xmod.ic2.recipe.RECIPE_IC2;
public class HANDLER_IC2 {
public static void preInit() {
- if (LoadedMods.IndustrialCraft2) {
- IC2_Items.register();
- // new BlockRTG(InternalName.beer);
- }
+ IC2_Items.register();
}
- public static void init() {
- if (LoadedMods.IndustrialCraft2) {}
- }
+ public static void init() {}
public static void postInit() {
- if (LoadedMods.IndustrialCraft2) {
- RECIPE_IC2.initRecipes();
- }
+ RECIPE_IC2.initRecipes();
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java b/src/main/java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java
index 0d76bd5db9..730ef865fc 100644
--- a/src/main/java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java
+++ b/src/main/java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java
@@ -90,107 +90,53 @@ public class RECIPE_IC2 {
checkForEnderIO();
addAdvancedHazmat();
- if (!CORE.GTNH) {
- // Rotor Blade Recipes
-
- RecipeUtils.addShapedRecipe(
- plate_T1,
- ingot_T1,
- plate_T1,
- plate_T1,
- ingot_T1,
- plate_T1,
- plate_T1,
- ingot_T1,
- plate_T1,
- rotor_blade_T1);
-
- RecipeUtils.addShapedRecipe(
- plate_T2,
- ingot_T2,
- plate_T2,
- plate_T2,
- ingot_T2,
- plate_T2,
- plate_T2,
- ingot_T2,
- plate_T2,
- rotor_blade_T2);
-
- RecipeUtils.addShapedRecipe(
- plate_T3,
- ingot_T3,
- plate_T3,
- plate_T3,
- ingot_T3,
- plate_T3,
- plate_T3,
- ingot_T3,
- plate_T3,
- rotor_blade_T3);
-
- RecipeUtils.addShapedRecipe(
- plate_T4,
- ingot_T4,
- plate_T4,
- plate_T4,
- ingot_T4,
- plate_T4,
- plate_T4,
- ingot_T4,
- plate_T4,
- rotor_blade_T4);
- }
- if (CORE.GTNH) {
-
- RecipeUtils.addShapedRecipe(
- plate_T1,
- plate_T1,
- plate_T1,
- plate_T1,
- ring_T1,
- plate_T1,
- plate_T1,
- plate_T1,
- plate_T1,
- rotor_blade_T1);
-
- RecipeUtils.addShapedRecipe(
- plate_T2,
- plate_T2,
- plate_T2,
- plate_T2,
- ring_T2,
- plate_T2,
- plate_T2,
- plate_T2,
- plate_T2,
- rotor_blade_T2);
-
- RecipeUtils.addShapedRecipe(
- plate_T3,
- plate_T3,
- plate_T3,
- plate_T3,
- ring_T3,
- plate_T3,
- plate_T3,
- plate_T3,
- plate_T3,
- rotor_blade_T3);
-
- RecipeUtils.addShapedRecipe(
- plate_T4,
- plate_T4,
- plate_T4,
- plate_T4,
- ring_T4,
- plate_T4,
- plate_T4,
- plate_T4,
- plate_T4,
- rotor_blade_T4);
- }
+ RecipeUtils.addShapedRecipe(
+ plate_T1,
+ plate_T1,
+ plate_T1,
+ plate_T1,
+ ring_T1,
+ plate_T1,
+ plate_T1,
+ plate_T1,
+ plate_T1,
+ rotor_blade_T1);
+
+ RecipeUtils.addShapedRecipe(
+ plate_T2,
+ plate_T2,
+ plate_T2,
+ plate_T2,
+ ring_T2,
+ plate_T2,
+ plate_T2,
+ plate_T2,
+ plate_T2,
+ rotor_blade_T2);
+
+ RecipeUtils.addShapedRecipe(
+ plate_T3,
+ plate_T3,
+ plate_T3,
+ plate_T3,
+ ring_T3,
+ plate_T3,
+ plate_T3,
+ plate_T3,
+ plate_T3,
+ rotor_blade_T3);
+
+ RecipeUtils.addShapedRecipe(
+ plate_T4,
+ plate_T4,
+ plate_T4,
+ plate_T4,
+ ring_T4,
+ plate_T4,
+ plate_T4,
+ plate_T4,
+ plate_T4,
+ rotor_blade_T4);
// Shaft Extruder Recipe
GT_ModHandler.addCraftingRecipe(
@@ -269,11 +215,7 @@ public class RECIPE_IC2 {
shaft_T1,
2560,
250);
- if (LoadedMods.EnderIO || CORE.GTNH) {
- Logger.INFO("Added recipe for GT5 Extruder: Windmill Shaft [Energetic]");
- } else {
- Logger.INFO("Added recipe for GT5 Extruder: Windmill Shaft [Magnalium]");
- }
+ Logger.INFO("Added recipe for GT5 Extruder: Windmill Shaft [Energetic]");
GT_Values.RA.addExtruderRecipe(
GT_Utility.copyAmount(9L, block_T2),
GregtechItemList.Shape_Extruder_WindmillShaft.get(0L, new Object[0]),
@@ -300,11 +242,7 @@ public class RECIPE_IC2 {
shaft_T3,
10240,
2000);
- if (LoadedMods.EnderIO || CORE.GTNH) {
- Logger.INFO("Added recipe for GT5 Extruder: Windmill Shaft [Vibrant]");
- } else {
- Logger.INFO("Added recipe for GT5 Extruder: Windmill Shaft [Ultimet]");
- }
+ Logger.INFO("Added recipe for GT5 Extruder: Windmill Shaft [Vibrant]");
GT_Values.RA.addExtruderRecipe(
GT_Utility.copyAmount(9L, block_T4),
GregtechItemList.Shape_Extruder_WindmillShaft.get(0L, new Object[0]),
@@ -319,105 +257,53 @@ public class RECIPE_IC2 {
4000);
Logger.INFO("Added recipe for GT5 Extruder: Windmill Shaft [Iridium]");
- if (!CORE.GTNH) {
- // Rotor Recipes
- RecipeUtils.addShapedRecipe(
- null,
- rotor_blade_T1,
- null,
- rotor_blade_T1,
- shaft_T1,
- rotor_blade_T1,
- null,
- rotor_blade_T1,
- null,
- rotor_T1);
-
- RecipeUtils.addShapedRecipe(
- null,
- rotor_blade_T2,
- null,
- rotor_blade_T2,
- shaft_T2,
- rotor_blade_T2,
- null,
- rotor_blade_T2,
- null,
- rotor_T2);
-
- RecipeUtils.addShapedRecipe(
- null,
- rotor_blade_T3,
- null,
- rotor_blade_T3,
- shaft_T3,
- rotor_blade_T3,
- null,
- rotor_blade_T3,
- null,
- rotor_T3);
-
- RecipeUtils.addShapedRecipe(
- null,
- rotor_blade_T4,
- null,
- rotor_blade_T4,
- shaft_T4,
- rotor_blade_T4,
- null,
- rotor_blade_T4,
- null,
- rotor_T4);
- }
- if (CORE.GTNH) {
- RecipeUtils.addShapedRecipe(
- shaft_T1,
- rotor_blade_T1,
- craftingToolHardHammer,
- rotor_blade_T1,
- ring_T1,
- rotor_blade_T1,
- craftingToolWrench,
- rotor_blade_T1,
- shaft_T1,
- rotor_T1);
-
- RecipeUtils.addShapedRecipe(
- shaft_T2,
- rotor_blade_T2,
- craftingToolHardHammer,
- rotor_blade_T2,
- ring_T2,
- rotor_blade_T2,
- craftingToolWrench,
- rotor_blade_T2,
- shaft_T2,
- rotor_T2);
-
- RecipeUtils.addShapedRecipe(
- shaft_T3,
- rotor_blade_T3,
- craftingToolHardHammer,
- rotor_blade_T3,
- ring_T3,
- rotor_blade_T3,
- craftingToolWrench,
- rotor_blade_T3,
- shaft_T3,
- rotor_T3);
-
- RecipeUtils.addShapedRecipe(
- shaft_T4,
- rotor_blade_T4,
- craftingToolHardHammer,
- rotor_blade_T4,
- ring_T4,
- rotor_blade_T4,
- craftingToolWrench,
- rotor_blade_T4,
- shaft_T4,
- rotor_T4);
- }
+ RecipeUtils.addShapedRecipe(
+ shaft_T1,
+ rotor_blade_T1,
+ craftingToolHardHammer,
+ rotor_blade_T1,
+ ring_T1,
+ rotor_blade_T1,
+ craftingToolWrench,
+ rotor_blade_T1,
+ shaft_T1,
+ rotor_T1);
+
+ RecipeUtils.addShapedRecipe(
+ shaft_T2,
+ rotor_blade_T2,
+ craftingToolHardHammer,
+ rotor_blade_T2,
+ ring_T2,
+ rotor_blade_T2,
+ craftingToolWrench,
+ rotor_blade_T2,
+ shaft_T2,
+ rotor_T2);
+
+ RecipeUtils.addShapedRecipe(
+ shaft_T3,
+ rotor_blade_T3,
+ craftingToolHardHammer,
+ rotor_blade_T3,
+ ring_T3,
+ rotor_blade_T3,
+ craftingToolWrench,
+ rotor_blade_T3,
+ shaft_T3,
+ rotor_T3);
+
+ RecipeUtils.addShapedRecipe(
+ shaft_T4,
+ rotor_blade_T4,
+ craftingToolHardHammer,
+ rotor_blade_T4,
+ ring_T4,
+ rotor_blade_T4,
+ craftingToolWrench,
+ rotor_blade_T4,
+ shaft_T4,
+ rotor_T4);
}
private static void addAdvancedHazmat() {
diff --git a/src/main/java/gtPlusPlus/xmod/ob/SprinklerHandler.java b/src/main/java/gtPlusPlus/xmod/ob/SprinklerHandler.java
index fadd712164..3b80442d45 100644
--- a/src/main/java/gtPlusPlus/xmod/ob/SprinklerHandler.java
+++ b/src/main/java/gtPlusPlus/xmod/ob/SprinklerHandler.java
@@ -55,11 +55,9 @@ public class SprinklerHandler {
registerSprinklerFertilizer(f);
}
}
- if (LoadedMods.IndustrialCraft2) {
- f = ItemUtils.getCorrectStacktype("IC2:itemFertilizer", 1);
- if (f != null) {
- registerSprinklerFertilizer(f);
- }
+ f = ItemUtils.getCorrectStacktype("IC2:itemFertilizer", 1);
+ if (f != null) {
+ registerSprinklerFertilizer(f);
}
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/reliquary/util/ReliquaryRecipeHandler.java b/src/main/java/gtPlusPlus/xmod/reliquary/util/ReliquaryRecipeHandler.java
index 4a8d9cd3f3..093c21f898 100644
--- a/src/main/java/gtPlusPlus/xmod/reliquary/util/ReliquaryRecipeHandler.java
+++ b/src/main/java/gtPlusPlus/xmod/reliquary/util/ReliquaryRecipeHandler.java
@@ -1,7 +1,5 @@
package gtPlusPlus.xmod.reliquary.util;
-import static gtPlusPlus.core.lib.CORE.GTNH;
-
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
@@ -56,9 +54,8 @@ public class ReliquaryRecipeHandler {
Logger.INFO("Added new recipe for Glowing Water.");
}
if (CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] { ItemUtils.simpleMetaStack(Items.ender_eye, 0, 32),
- CI.getFieldGenerator(5, GTNH ? 8 : 4),
- CI.getTieredComponent(OrePrefixes.plate, 5, GTNH ? 16 : 8), CI.getEmitter(3, 20) },
+ new ItemStack[] { ItemUtils.simpleMetaStack(Items.ender_eye, 0, 32), CI.getFieldGenerator(5, 8),
+ CI.getTieredComponent(OrePrefixes.plate, 5, 16), CI.getEmitter(3, 20) },
FluidUtils.getUUM(50),
ReliquaryItems.emptyVoidTear(),
20 * 2000,
diff --git a/src/main/java/gtPlusPlus/xmod/thermalfoundation/HANDLER_TF.java b/src/main/java/gtPlusPlus/xmod/thermalfoundation/HANDLER_TF.java
index 0ad922942b..624445a827 100644
--- a/src/main/java/gtPlusPlus/xmod/thermalfoundation/HANDLER_TF.java
+++ b/src/main/java/gtPlusPlus/xmod/thermalfoundation/HANDLER_TF.java
@@ -1,6 +1,5 @@
package gtPlusPlus.xmod.thermalfoundation;
-import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.xmod.thermalfoundation.block.TF_Blocks;
import gtPlusPlus.xmod.thermalfoundation.fluid.TF_Fluids;
@@ -14,11 +13,6 @@ public class HANDLER_TF {
TF_Fluids.preInit();
TF_Items.preInit();
TF_Blocks.preInit();
- if (LoadedMods.Gregtech) {
- if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
- // mGregMatLoader.enableMaterial(Materials.Enderium);
- }
- }
}
}
@@ -35,9 +29,7 @@ public class HANDLER_TF {
TF_Fluids.postInit();
TF_Items.postInit();
TF_Blocks.postInit();
- if (LoadedMods.Gregtech) {
- TF_Gregtech_Recipes.run();
- }
+ TF_Gregtech_Recipes.run();
}
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/thermalfoundation/item/TF_Items.java b/src/main/java/gtPlusPlus/xmod/thermalfoundation/item/TF_Items.java
index 849848fa94..c7c8dd7901 100644
--- a/src/main/java/gtPlusPlus/xmod/thermalfoundation/item/TF_Items.java
+++ b/src/main/java/gtPlusPlus/xmod/thermalfoundation/item/TF_Items.java
@@ -1,6 +1,5 @@
package gtPlusPlus.xmod.thermalfoundation.item;
-import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidContainerRegistry;
@@ -8,9 +7,7 @@ import cofh.core.item.ItemBase;
import cofh.core.item.ItemBucket;
import cofh.core.util.energy.FurnaceFuelHandler;
import cofh.core.util.fluid.BucketHandler;
-import cofh.lib.util.helpers.ItemHelper;
import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
import gtPlusPlus.xmod.thermalfoundation.block.TF_Blocks;
@@ -74,20 +71,5 @@ public class TF_Items {
.registerFluidContainer(TF_Fluids.fluidEnder, bucketEnder, FluidContainerRegistry.EMPTY_BUCKET);
}
- public static void postInit() {
- if (!CORE.GTNH) {
- ItemHelper.addRecipe(
- ItemHelper.ShapelessRecipe(
- ItemHelper.cloneStack(dustPyrotheum, 1),
- new Object[] { "dustCoal", "dustSulfur", "dustRedstone", "dustBlaze" }));
- ItemHelper.addRecipe(
- ItemHelper.ShapelessRecipe(
- ItemHelper.cloneStack(dustCryotheum, 1),
- new Object[] { Items.snowball, "dustSaltpeter", "dustRedstone", "dustBlizz" }));
- ItemHelper.addRecipe(
- ItemHelper.ShapelessRecipe(
- ItemHelper.cloneStack(dustCryotheum, 1),
- new Object[] { Items.snowball, "dustNitor", "dustRedstone", "dustBlizz" }));
- }
- }
+ public static void postInit() {}
}