From f32d404a051f6ad9d181792d6b489ed6e4a8f80f Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Mon, 30 Jan 2023 10:40:55 -0800 Subject: [ci skip] spotlessApply with the new settings --- .../java/com/github/technus/tectech/Reference.java | 1 + .../java/com/github/technus/tectech/TecTech.java | 39 +- .../dreamcraft/DreamCraftRecipeLoader.java | 6052 ++++++++------------ .../dreamcraft/NoDreamCraftMachineLoader.java | 141 +- .../tectech/compatibility/gtpp/GtppAtomLoader.java | 20 +- .../openComputers/AvrArchitecture.java | 53 +- .../openmodularturrets/TT_turret_loader.java | 7 +- .../blocks/turretbases/TurretBaseEM.java | 9 +- .../blocks/turretbases/TurretBaseItemEM.java | 5 +- .../blocks/turretheads/TurretHeadEM.java | 7 +- .../blocks/turretheads/TurretHeadItemEM.java | 44 +- .../blocks/turretheads/TurretHeadItemRenderEM.java | 6 +- .../blocks/turretheads/TurretHeadRenderEM.java | 3 +- .../entity/projectiles/projectileEM.java | 45 +- .../entity/projectiles/projectileRenderEM.java | 19 +- .../tileentity/turret/TileTurretHeadEM.java | 17 +- .../tileentity/turretbase/TileTurretBaseEM.java | 10 +- .../spartakcore/SpartakCoreRecipeLoader.java | 1450 ++--- .../definitions/EMComplexAspectDefinition.java | 11 +- .../definitions/EMPrimalAspectDefinition.java | 10 +- .../transformations/AspectDefinitionCompat.java | 4 +- .../AspectDefinitionCompatEnabled.java | 48 +- .../thing/metaTileEntity/multi/EssentiaCompat.java | 4 +- .../multi/EssentiaCompatEnabled.java | 11 +- .../GT_MetaTileEntity_EM_essentiaDequantizer.java | 135 +- .../GT_MetaTileEntity_EM_essentiaQuantizer.java | 130 +- .../technus/tectech/font/TecTechFontRender.java | 30 +- .../technus/tectech/loader/ElementalLoader.java | 1 + .../technus/tectech/loader/EntityLoader.java | 2 + .../github/technus/tectech/loader/MainLoader.java | 41 +- .../technus/tectech/loader/NetworkDispatcher.java | 4 +- .../technus/tectech/loader/TecTechConfig.java | 17 +- .../technus/tectech/loader/gui/CreativeTabEM.java | 7 +- .../tectech/loader/gui/CreativeTabTecTech.java | 10 +- .../technus/tectech/loader/gui/ModGuiHandler.java | 6 +- .../tectech/loader/recipe/BaseRecipeLoader.java | 86 +- .../tectech/loader/recipe/BloodyRecipeLoader.java | 1956 +++---- .../tectech/loader/thing/ComponentLoader.java | 1 + .../technus/tectech/loader/thing/CoverLoader.java | 17 +- .../tectech/loader/thing/MachineLoader.java | 2152 ++++--- .../technus/tectech/loader/thing/ThingsLoader.java | 2 + .../tectech/mechanics/anomaly/AnomalyHandler.java | 115 +- .../tectech/mechanics/anomaly/CancerCommand.java | 5 +- .../tectech/mechanics/anomaly/ChargeCommand.java | 5 +- .../tectech/mechanics/anomaly/MassCommand.java | 5 +- .../tectech/mechanics/avr/SidedRedstone.java | 17 +- .../tectech/mechanics/commands/ConvertFloat.java | 17 +- .../tectech/mechanics/commands/ConvertInteger.java | 17 +- .../tectech/mechanics/data/ChunkDataHandler.java | 88 +- .../tectech/mechanics/data/ChunkDataMessage.java | 19 +- .../mechanics/data/IChunkMetaDataHandler.java | 9 +- .../tectech/mechanics/data/PlayerDataMessage.java | 14 +- .../tectech/mechanics/data/PlayerPersistence.java | 12 +- .../technus/tectech/mechanics/data/WorldData.java | 2 + .../mechanics/dataTransport/DataPacket.java | 5 +- .../dataTransport/InventoryDataPacket.java | 2 + .../mechanics/dataTransport/QuantumDataPacket.java | 4 +- .../elementalMatter/core/EMException.java | 1 + .../elementalMatter/core/IEMContainer.java | 1 + .../elementalMatter/core/commands/EMGive.java | 30 +- .../elementalMatter/core/commands/EMList.java | 40 +- .../elementalMatter/core/decay/EMDecay.java | 15 +- .../elementalMatter/core/decay/EMDecayResult.java | 1 + .../core/definitions/EMComplexTemplate.java | 7 +- .../core/definitions/EMPrimitiveTemplate.java | 28 +- .../core/definitions/IEMDefinition.java | 55 +- .../registry/EMDefinitionsRegistry.java | 17 +- .../core/definitions/registry/EMIndirectType.java | 13 +- .../core/definitions/registry/EMType.java | 6 +- .../core/maps/EMConstantStackMap.java | 13 +- .../core/maps/EMDefinitionStackMap.java | 9 +- .../core/maps/EMInstanceStackMap.java | 72 +- .../elementalMatter/core/maps/EMStackMap.java | 6 +- .../elementalMatter/core/maps/IEMMapRead.java | 47 +- .../elementalMatter/core/maps/IEMMapWrite.java | 7 +- .../core/maps/IEMMapWriteExact.java | 6 +- .../elementalMatter/core/recipes/EMRecipe.java | 14 +- .../elementalMatter/core/recipes/EMRecipeMap.java | 24 +- .../core/stacks/EMDefinitionStack.java | 4 +- .../core/stacks/EMInstanceStack.java | 161 +- .../elementalMatter/core/stacks/IEMStack.java | 4 +- .../core/transformations/EMDequantizationInfo.java | 4 +- .../transformations/EMFluidQuantizationInfo.java | 4 +- .../transformations/EMItemQuantizationInfo.java | 14 +- .../transformations/EMOredictQuantizationInfo.java | 5 +- .../transformations/EMTransformationRegistry.java | 21 +- .../core/transformations/OreDictionaryStack.java | 1 + .../definitions/complex/EMAtomDefinition.java | 1570 +++-- .../definitions/complex/EMHadronDefinition.java | 135 +- .../definitions/complex/EMNuclideIAEA.java | 48 +- .../definitions/primitive/EMBosonDefinition.java | 5 +- .../definitions/primitive/EMFermionDefinition.java | 5 +- .../primitive/EMGaugeBosonDefinition.java | 16 +- .../definitions/primitive/EMLeptonDefinition.java | 12 +- .../primitive/EMNeutrinoDefinition.java | 28 +- .../primitive/EMPrimitiveDefinition.java | 87 +- .../definitions/primitive/EMQuarkDefinition.java | 36 +- .../primitive/EMScalarBosonDefinition.java | 10 +- .../enderStorage/EnderFluidContainer.java | 7 +- .../enderStorage/EnderLinkCoverMessage.java | 24 +- .../mechanics/enderStorage/EnderLinkTag.java | 4 +- .../mechanics/enderStorage/EnderLinkTank.java | 5 +- .../enderStorage/EnderWorldSavedData.java | 5 +- .../tectech/mechanics/pipe/IActivePipe.java | 1 + .../mechanics/pipe/IConnectsToDataPipe.java | 1 + .../mechanics/pipe/IConnectsToElementalPipe.java | 1 + .../mechanics/pipe/IConnectsToEnergyTunnel.java | 1 + .../mechanics/pipe/PipeActivityMessage.java | 16 +- .../tectech/mechanics/spark/RendererMessage.java | 25 +- .../tectech/mechanics/spark/ThaumSpark.java | 7 +- .../tectech/mechanics/tesla/ITeslaConnectable.java | 41 +- .../mechanics/tesla/ITeslaConnectableSimple.java | 1 + .../mechanics/tesla/TeslaCoverConnection.java | 1 + .../com/github/technus/tectech/nei/IMCForNEI.java | 3 +- .../github/technus/tectech/nei/NEI_TT_Config.java | 2 + .../tectech/nei/TT_NEI_ResearchHandler.java | 86 +- .../technus/tectech/nei/TT_NEI_ScannerHandler.java | 88 +- .../github/technus/tectech/proxy/ClientProxy.java | 92 +- .../github/technus/tectech/proxy/CommonProxy.java | 19 +- .../technus/tectech/recipe/EyeOfHarmonyRecipe.java | 128 +- .../tectech/recipe/EyeOfHarmonyRecipeStorage.java | 48 +- .../github/technus/tectech/recipe/TT_recipe.java | 348 +- .../technus/tectech/recipe/TT_recipeAdder.java | 371 +- .../technus/tectech/thing/CustomItemList.java | 8 +- .../tectech/thing/block/EyeOfHarmonyBlock.java | 25 +- .../tectech/thing/block/QuantumGlassBlock.java | 18 +- .../tectech/thing/block/QuantumGlassItem.java | 8 +- .../tectech/thing/block/QuantumGlassRender.java | 16 +- .../tectech/thing/block/QuantumStuffBlock.java | 17 +- .../tectech/thing/block/QuantumStuffRender.java | 28 +- .../tectech/thing/block/ReactorSimBlock.java | 21 +- .../tectech/thing/block/ReactorSimItem.java | 8 +- .../tectech/thing/block/RenderEyeOfHarmony.java | 14 +- .../tectech/thing/block/TileEyeOfHarmony.java | 17 +- .../tectech/thing/casing/GT_Block_CasingsBA0.java | 64 +- .../tectech/thing/casing/GT_Block_CasingsNH.java | 11 +- .../tectech/thing/casing/GT_Block_CasingsTT.java | 58 +- .../tectech/thing/casing/GT_Item_CasingsBA0.java | 49 +- .../tectech/thing/casing/GT_Item_CasingsNH.java | 4 +- .../tectech/thing/casing/GT_Item_CasingsTT.java | 105 +- .../thing/casing/GT_Item_Casings_Spacetime.java | 36 +- .../casing/GT_Item_Casings_Stabilisation.java | 25 +- .../casing/GT_Item_Casings_TimeAcceleration.java | 25 +- .../casing/SpacetimeCompressionFieldCasing.java | 18 +- .../thing/casing/StabilisationFieldCasing.java | 18 +- .../tectech/thing/casing/TT_Container_Casings.java | 4 +- .../thing/casing/TimeAccelerationFieldCasing.java | 18 +- .../thing/cover/GT_Cover_TM_EnderFluidLink.java | 144 +- .../thing/cover/GT_Cover_TM_PowerPassUpgrade.java | 21 +- .../tectech/thing/cover/GT_Cover_TM_TeslaCoil.java | 26 +- .../cover/GT_Cover_TM_TeslaCoil_Ultimate.java | 4 +- .../tectech/thing/gui/TecTechUITextures.java | 133 +- .../technus/tectech/thing/item/AvrProgrammer.java | 73 +- .../item/DebugElementalInstanceContainer_EM.java | 92 +- .../item/ElementalDefinitionContainer_EM.java | 24 +- .../item/ElementalDefinitionScanStorage_EM.java | 31 +- .../tectech/thing/item/EnderFluidLinkCover.java | 25 +- .../technus/tectech/thing/item/EuMeterGT.java | 87 +- .../tectech/thing/item/ParametrizerMemoryCard.java | 71 +- .../tectech/thing/item/PowerPassUpgradeCover.java | 26 +- .../tectech/thing/item/TeslaCoilCapacitor.java | 39 +- .../tectech/thing/item/TeslaCoilComponent.java | 16 +- .../technus/tectech/thing/item/TeslaCoilCover.java | 26 +- .../technus/tectech/thing/item/TeslaStaff.java | 12 +- .../tectech/thing/item/gui/ProgrammerScreen.java | 1 + .../tectech/thing/item/gui/ScanDisplayScreen.java | 60 +- .../thing/item/renderElemental/IElementalItem.java | 1 + .../item/renderElemental/RenderElementalName.java | 14 +- .../tectech/thing/metaTileEntity/Textures.java | 320 +- .../hatch/GT_MetaTileEntity_Hatch_Capacitor.java | 97 +- .../GT_MetaTileEntity_Hatch_CreativeData.java | 29 +- ...T_MetaTileEntity_Hatch_CreativeMaintenance.java | 44 +- .../GT_MetaTileEntity_Hatch_DataConnector.java | 83 +- .../hatch/GT_MetaTileEntity_Hatch_DynamoMulti.java | 35 +- .../GT_MetaTileEntity_Hatch_DynamoTunnel.java | 63 +- ...GT_MetaTileEntity_Hatch_ElementalContainer.java | 163 +- .../hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java | 43 +- .../GT_MetaTileEntity_Hatch_EnergyTunnel.java | 29 +- .../hatch/GT_MetaTileEntity_Hatch_Holder.java | 98 +- .../hatch/GT_MetaTileEntity_Hatch_InputData.java | 21 +- .../GT_MetaTileEntity_Hatch_InputDataItems.java | 66 +- .../GT_MetaTileEntity_Hatch_InputElemental.java | 16 +- .../hatch/GT_MetaTileEntity_Hatch_OutputData.java | 27 +- .../GT_MetaTileEntity_Hatch_OutputDataItems.java | 34 +- .../GT_MetaTileEntity_Hatch_OutputElemental.java | 23 +- .../GT_MetaTileEntity_Hatch_OverflowElemental.java | 153 +- .../hatch/GT_MetaTileEntity_Hatch_Param.java | 608 +- .../hatch/GT_MetaTileEntity_Hatch_ParamText.java | 216 +- .../hatch/GT_MetaTileEntity_Hatch_Rack.java | 158 +- .../hatch/GT_MetaTileEntity_Hatch_Uncertainty.java | 347 +- .../multi/GT_MetaTileEntity_EM_EyeOfHarmony.java | 2016 +++---- .../multi/GT_MetaTileEntity_EM_annihilation.java | 288 +- .../multi/GT_MetaTileEntity_EM_bhg.java | 3567 ++++-------- .../multi/GT_MetaTileEntity_EM_computer.java | 169 +- .../multi/GT_MetaTileEntity_EM_crafting.java | 140 +- .../multi/GT_MetaTileEntity_EM_dataBank.java | 138 +- .../multi/GT_MetaTileEntity_EM_decay.java | 254 +- .../multi/GT_MetaTileEntity_EM_dequantizer.java | 148 +- .../multi/GT_MetaTileEntity_EM_infuser.java | 119 +- .../multi/GT_MetaTileEntity_EM_junction.java | 128 +- .../multi/GT_MetaTileEntity_EM_quantizer.java | 206 +- .../multi/GT_MetaTileEntity_EM_research.java | 377 +- .../multi/GT_MetaTileEntity_EM_scanner.java | 293 +- .../multi/GT_MetaTileEntity_EM_stabilizer.java | 100 +- .../multi/GT_MetaTileEntity_EM_switch.java | 106 +- .../multi/GT_MetaTileEntity_EM_transformer.java | 108 +- .../multi/GT_MetaTileEntity_EM_wormhole.java | 249 +- .../multi/GT_MetaTileEntity_TM_microwave.java | 186 +- .../GT_MetaTileEntity_TM_proccessingStack.java | 143 +- .../multi/GT_MetaTileEntity_TM_teslaCoil.java | 662 ++- .../multi/base/GT_Container_MultiMachineEM.java | 42 +- .../multi/base/GT_GUIContainer_MultiMachineEM.java | 54 +- .../base/GT_MetaTileEntity_MultiblockBase_EM.java | 950 ++- .../metaTileEntity/multi/base/INameFunction.java | 1 + .../metaTileEntity/multi/base/IStatusFunction.java | 1 + .../thing/metaTileEntity/multi/base/LedStatus.java | 27 +- .../multi/base/MultiblockControl.java | 24 +- .../metaTileEntity/multi/base/Parameters.java | 13 +- .../thing/metaTileEntity/multi/base/SoundLoop.java | 17 +- .../render/TT_RenderedExtendedFacingTexture.java | 10 +- .../em_collider/GT_MetaTileEntity_EM_collider.java | 468 +- .../multi/em_collider/IColliderHandler.java | 1 + .../em_collider/IPrimitiveColliderHandler.java | 1 + .../multi/em_machine/Behaviour_Centrifuge.java | 131 +- .../multi/em_machine/Behaviour_Electrolyzer.java | 5 +- .../Behaviour_ElectromagneticSeparator.java | 150 +- .../multi/em_machine/Behaviour_PrecisionLaser.java | 5 +- .../multi/em_machine/Behaviour_Recycler.java | 5 +- .../multi/em_machine/Behaviour_Scanner.java | 5 +- .../em_machine/GT_MetaTileEntity_EM_machine.java | 129 +- .../pipe/GT_MetaTileEntity_PipeBlock_Data.java | 5 +- .../pipe/GT_MetaTileEntity_PipeBlock_EM.java | 5 +- .../pipe/GT_MetaTileEntity_PipeBlock_Energy.java | 5 +- .../pipe/GT_MetaTileEntity_Pipe_Data.java | 61 +- .../pipe/GT_MetaTileEntity_Pipe_EM.java | 96 +- .../pipe/GT_MetaTileEntity_Pipe_Energy.java | 95 +- .../single/GT_MetaTileEntity_BuckConverter.java | 113 +- .../single/GT_MetaTileEntity_DataReader.java | 41 +- .../single/GT_MetaTileEntity_DebugPollutor.java | 174 +- .../GT_MetaTileEntity_DebugPowerGenerator.java | 135 +- .../GT_MetaTileEntity_DebugStructureWriter.java | 177 +- .../single/GT_MetaTileEntity_MicroController.java | 49 +- .../single/GT_MetaTileEntity_OwnerDetector.java | 55 +- .../single/GT_MetaTileEntity_TT_Transformer.java | 52 +- .../single/GT_MetaTileEntity_TeslaCoil.java | 104 +- .../single/GT_MetaTileEntity_WetTransformer.java | 8 +- .../thing/tileEntity/ReactorSimTileEntity.java | 734 +-- .../github/technus/tectech/util/CommonValues.java | 22 +- .../com/github/technus/tectech/util/Converter.java | 1 + .../github/technus/tectech/util/DoubleCount.java | 3 +- .../technus/tectech/util/LightingHelper.java | 504 +- .../github/technus/tectech/util/TT_Utility.java | 90 +- .../java/com/github/technus/tectech/util/XSTR.java | 144 +- 253 files changed, 16104 insertions(+), 19075 deletions(-) (limited to 'src') diff --git a/src/main/java/com/github/technus/tectech/Reference.java b/src/main/java/com/github/technus/tectech/Reference.java index 99f944adec..2db595d5c2 100644 --- a/src/main/java/com/github/technus/tectech/Reference.java +++ b/src/main/java/com/github/technus/tectech/Reference.java @@ -1,6 +1,7 @@ package com.github.technus.tectech; public final class Reference { + public static final String MODID = "tectech"; public static final String NAME = "TecTech - Tec Technology!"; public static final String VERSION = "GRADLETOKEN_VERSION"; diff --git a/src/main/java/com/github/technus/tectech/TecTech.java b/src/main/java/com/github/technus/tectech/TecTech.java index 158f10da25..0a1aef7763 100644 --- a/src/main/java/com/github/technus/tectech/TecTech.java +++ b/src/main/java/com/github/technus/tectech/TecTech.java @@ -2,6 +2,16 @@ package com.github.technus.tectech; import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE; +import java.lang.reflect.Field; +import java.lang.reflect.Modifier; +import java.util.Collection; +import java.util.Iterator; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.MinecraftForge; + +import pers.gwyog.gtneioreplugin.plugin.block.ModBlocks; + import com.github.technus.tectech.loader.MainLoader; import com.github.technus.tectech.loader.TecTechConfig; import com.github.technus.tectech.loader.gui.CreativeTabEM; @@ -23,6 +33,7 @@ import com.github.technus.tectech.nei.IMCForNEI; import com.github.technus.tectech.proxy.CommonProxy; import com.github.technus.tectech.recipe.EyeOfHarmonyRecipeStorage; import com.github.technus.tectech.util.XSTR; + import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Mod; @@ -32,24 +43,22 @@ import eu.usrv.yamcore.auxiliary.IngameErrorLog; import eu.usrv.yamcore.auxiliary.LogHelper; import gregtech.GT_Mod; import gregtech.common.GT_Proxy; -import java.lang.reflect.Field; -import java.lang.reflect.Modifier; -import java.util.Collection; -import java.util.Iterator; -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.MinecraftForge; -import pers.gwyog.gtneioreplugin.plugin.block.ModBlocks; @Mod( modid = Reference.MODID, name = Reference.NAME, version = Reference.VERSION, dependencies = "required-after:Forge@[10.13.4.1614,);" + "required-after:YAMCore@[0.5.70,);" - + "required-after:structurelib;" + "after:ComputerCraft;" - + "after:OpenComputers;" + "required-after:gregtech;" - + "after:dreamcraft;" + "after:appliedenergistics2;" - + "after:CoFHCore;" + "after:Thaumcraft;") + + "required-after:structurelib;" + + "after:ComputerCraft;" + + "after:OpenComputers;" + + "required-after:gregtech;" + + "after:dreamcraft;" + + "after:appliedenergistics2;" + + "after:CoFHCore;" + + "after:Thaumcraft;") public class TecTech { + @SidedProxy(clientSide = Reference.CLIENTSIDE, serverSide = Reference.SERVERSIDE) public static CommonProxy proxy; @@ -93,8 +102,10 @@ public class TecTech { public void PreLoad(FMLPreInitializationEvent PreEvent) { LOGGER.setDebugOutput(true); - configTecTech = - new TecTechConfig(PreEvent.getModConfigurationDirectory(), Reference.COLLECTIONNAME, Reference.MODID); + configTecTech = new TecTechConfig( + PreEvent.getModConfigurationDirectory(), + Reference.COLLECTIONNAME, + Reference.MODID); if (!configTecTech.LoadConfig()) { LOGGER.error(Reference.MODID + " could not load its config file. Things are going to be weird!"); @@ -133,6 +144,7 @@ public class TecTech { field.setAccessible(true); modifiersField.setInt(field, field.getModifiers() & ~Modifier.FINAL); field.set(GT_Mod.gregtechproxy, new Collection() { + @Override public int size() { return 0; @@ -151,6 +163,7 @@ public class TecTech { @Override public Iterator iterator() { return new Iterator() { + @Override public boolean hasNext() { return false; diff --git a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java index 1c7a56cb5c..8df15c2f86 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java +++ b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java @@ -4,6 +4,14 @@ import static com.github.technus.tectech.loader.recipe.BaseRecipeLoader.getOrDef import static com.google.common.math.LongMath.pow; import static gregtech.api.util.GT_ModHandler.getModItem; +import java.lang.reflect.Method; + +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; + import com.github.technus.tectech.Reference; import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry; import com.github.technus.tectech.recipe.TT_recipeAdder; @@ -13,6 +21,7 @@ import com.github.technus.tectech.thing.metaTileEntity.multi.em_machine.Behaviou import com.github.technus.tectech.thing.metaTileEntity.multi.em_machine.Behaviour_ElectromagneticSeparator; import com.github.technus.tectech.thing.metaTileEntity.multi.em_machine.Behaviour_Recycler; import com.github.technus.tectech.thing.metaTileEntity.multi.em_machine.GT_MetaTileEntity_EM_machine; + import cpw.mods.fml.common.Loader; import gregtech.api.enums.*; import gregtech.api.interfaces.IItemContainer; @@ -23,17 +32,12 @@ import gtPlusPlus.core.material.ALLOY; import gtPlusPlus.core.material.ELEMENT; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import java.lang.reflect.Method; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; /** * Created by Tec on 06.08.2017. */ public class DreamCraftRecipeLoader { + // region reflect a bit @SuppressWarnings("rawtypes") private Class CUSTOM_ITEM_LIST; @@ -45,8 +49,8 @@ public class DreamCraftRecipeLoader { return (IItemContainer) Enum.valueOf(CUSTOM_ITEM_LIST, name); } - private void addAssemblerRecipeWithCleanroom( - ItemStack[] items, FluidStack fluid, ItemStack output, int time, int eut) { + private void addAssemblerRecipeWithCleanroom(ItemStack[] items, FluidStack fluid, ItemStack output, int time, + int eut) { try { ADD_ASSEMBLER_RECIPE.invoke(GT_Values.RA, items, fluid, output, time, eut, true); } catch (Exception e) { @@ -59,16 +63,14 @@ public class DreamCraftRecipeLoader { // region reflect a bit try { CUSTOM_ITEM_LIST = Class.forName("com.dreammaster.gthandler.CustomItemList"); - ADD_ASSEMBLER_RECIPE = GT_Values.RA - .getClass() - .getMethod( - "addAssemblerRecipe", - ItemStack[].class, - FluidStack.class, - ItemStack.class, - int.class, - int.class, - boolean.class); + ADD_ASSEMBLER_RECIPE = GT_Values.RA.getClass().getMethod( + "addAssemblerRecipe", + ItemStack[].class, + FluidStack.class, + ItemStack.class, + int.class, + int.class, + boolean.class); } catch (Exception e) { throw new Error(e); } @@ -83,7 +85,8 @@ public class DreamCraftRecipeLoader { // Quantum Glass GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {CustomItemList.eM_Containment.get(1), GT_ModHandler.getIC2Item("reinforcedGlass", 1L)}, + new ItemStack[] { CustomItemList.eM_Containment.get(1), + GT_ModHandler.getIC2Item("reinforcedGlass", 1L) }, getOrDefault("Trinium", Materials.Osmium).getMolten(576), new ItemStack(QuantumGlassBlock.INSTANCE, 1), 200, @@ -93,10 +96,8 @@ public class DreamCraftRecipeLoader { // Data addAssemblerRecipeWithCleanroom( - new ItemStack[] { - ItemList.Circuit_Parts_GlassFiber.get(8), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Silver, 8) - }, + new ItemStack[] { ItemList.Circuit_Parts_GlassFiber.get(8), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Silver, 8) }, Materials.Polytetrafluoroethylene.getMolten(144), CustomItemList.DATApipe.get(1), 200, @@ -104,7 +105,7 @@ public class DreamCraftRecipeLoader { // Data Casing addAssemblerRecipeWithCleanroom( - new ItemStack[] {CustomItemList.DATApipe.get(1), ItemList.Casing_LuV.get(1)}, + new ItemStack[] { CustomItemList.DATApipe.get(1), ItemList.Casing_LuV.get(1) }, null, CustomItemList.DATApipeBlock.get(1), 20, @@ -112,14 +113,12 @@ public class DreamCraftRecipeLoader { // Tunnel addAssemblerRecipeWithCleanroom( - new ItemStack[] { - CustomItemList.DATApipe.get(1), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Osmiridium, 4), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmium, 4), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUHV, 2), - ItemList.Field_Generator_MV.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Ultimate, 1) - }, + new ItemStack[] { CustomItemList.DATApipe.get(1), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Osmiridium, 4), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmium, 4), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUHV, 2), + ItemList.Field_Generator_MV.get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Ultimate, 1) }, Materials.Osmium.getMolten(288), CustomItemList.EMpipe.get(1), 400, @@ -127,7 +126,7 @@ public class DreamCraftRecipeLoader { // Tunnel Casing addAssemblerRecipeWithCleanroom( - new ItemStack[] {CustomItemList.EMpipe.get(1), ItemList.Casing_LuV.get(1)}, + new ItemStack[] { CustomItemList.EMpipe.get(1), ItemList.Casing_LuV.get(1) }, null, CustomItemList.EMpipeBlock.get(1), 20, @@ -135,11 +134,8 @@ public class DreamCraftRecipeLoader { // Laser addAssemblerRecipeWithCleanroom( - new ItemStack[] { - CustomItemList.DATApipe.get(1), - GT_ModHandler.getIC2Item("reinforcedGlass", 1L), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmiridium, 2) - }, + new ItemStack[] { CustomItemList.DATApipe.get(1), GT_ModHandler.getIC2Item("reinforcedGlass", 1L), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmiridium, 2) }, null, CustomItemList.LASERpipe.get(1), 100, @@ -147,7 +143,7 @@ public class DreamCraftRecipeLoader { // Laser Casing addAssemblerRecipeWithCleanroom( - new ItemStack[] {CustomItemList.LASERpipe.get(1), ItemList.Casing_LuV.get(1)}, + new ItemStack[] { CustomItemList.LASERpipe.get(1), ItemList.Casing_LuV.get(1) }, null, CustomItemList.LASERpipeBlock.get(1), 20, @@ -159,14 +155,12 @@ public class DreamCraftRecipeLoader { // High Power Casing GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Iridium, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Iridium, 6), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 1), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Cobalt, 16), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 16), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.NiobiumTitanium, 2) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Iridium, 1), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Iridium, 6), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 1), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Cobalt, 16), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 16), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.NiobiumTitanium, 2) }, Materials.TungstenSteel.getMolten(576), CustomItemList.eM_Power.get(1), 100, @@ -174,27 +168,25 @@ public class DreamCraftRecipeLoader { // Computer Casing GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_Power.get(1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 8), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Ultimate, 1), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.NiobiumTitanium, 2) - }, + new ItemStack[] { CustomItemList.eM_Power.get(1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 8), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Ultimate, 1), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.NiobiumTitanium, 2) }, Materials.Aluminium.getMolten(1296), CustomItemList.eM_Computer_Casing.get(1), 200, 122880); // Computer Vent Casing GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.StainlessSteel, 1), - ItemList.Electric_Motor_IV.get(2), - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.StainlessSteel, 2), - GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.StainlessSteel, 16), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Copper, 16), - GT_OreDictUnificator.get( - OrePrefixes.wireGt01, getOrDefault("SuperconductorIV", Materials.Superconductor), 1) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.StainlessSteel, 1), + ItemList.Electric_Motor_IV.get(2), + GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.StainlessSteel, 2), + GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.StainlessSteel, 16), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Copper, 16), + GT_OreDictUnificator.get( + OrePrefixes.wireGt01, + getOrDefault("SuperconductorIV", Materials.Superconductor), + 1) }, Materials.SolderingAlloy.getMolten(1296), CustomItemList.eM_Computer_Vent.get(1), 100, @@ -202,52 +194,48 @@ public class DreamCraftRecipeLoader { // Advanced Computer Casing addAssemblerRecipeWithCleanroom( - new ItemStack[] { - CustomItemList.eM_Computer_Casing.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Ultimate, 1), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Cobalt, 64), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 64), - GT_OreDictUnificator.get( - OrePrefixes.wireGt02, getOrDefault("SuperconductorLuV", Materials.Superconductor), 4) - }, + new ItemStack[] { CustomItemList.eM_Computer_Casing.get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Ultimate, 1), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Cobalt, 64), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 64), + GT_OreDictUnificator.get( + OrePrefixes.wireGt02, + getOrDefault("SuperconductorLuV", Materials.Superconductor), + 4) }, Materials.Iridium.getMolten(1296), CustomItemList.eM_Computer_Bus.get(1), 200, 122880); // Molecular Casing - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_Power.get(1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Osmiridium, 6), - GT_OreDictUnificator.get(OrePrefixes.foil, getOrDefault("Trinium", Materials.Osmium), 12), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.TungstenSteel, 24), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.TungstenSteel, 24), - ItemList.Field_Generator_IV.get(1) - }, - Materials.Osmium.getMolten(1296), - CustomItemList.eM_Containment.get(1), - 800, - 500000); + GT_Values.RA + .addAssemblerRecipe( + new ItemStack[] { CustomItemList.eM_Power.get(1), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Osmiridium, 6), + GT_OreDictUnificator + .get(OrePrefixes.foil, getOrDefault("Trinium", Materials.Osmium), 12), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.TungstenSteel, 24), + GT_OreDictUnificator.get(OrePrefixes.ring, Materials.TungstenSteel, 24), + ItemList.Field_Generator_IV.get(1) }, + Materials.Osmium.getMolten(1296), + CustomItemList.eM_Containment.get(1), + 800, + 500000); // Hollow Casing GT_Values.RA.addAssemblylineRecipe( CustomItemList.eM_Containment.get(1), 7500, - new ItemStack[] { - CustomItemList.eM_Containment.get(1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Europium, 2), - GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.Plutonium, 4), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Lead, 8), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Uranium, 16), - GT_OreDictUnificator.get(OrePrefixes.screw, getOrDefault("Quantium", Materials.Europium), 16), - }, - new FluidStack[] { - getOrDefault("Trinium", Materials.Osmium).getMolten(1296), - Materials.Osmium.getMolten(1296), - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), - Materials.Argon.getGas(1000), - }, + new ItemStack[] { CustomItemList.eM_Containment.get(1), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Europium, 2), + GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.Plutonium, 4), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Lead, 8), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Uranium, 16), + GT_OreDictUnificator + .get(OrePrefixes.screw, getOrDefault("Quantium", Materials.Europium), 16), }, + new FluidStack[] { getOrDefault("Trinium", Materials.Osmium).getMolten(1296), + Materials.Osmium.getMolten(1296), new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), + Materials.Argon.getGas(1000), }, CustomItemList.eM_Hollow.get(2), 200, 200000); @@ -256,19 +244,13 @@ public class DreamCraftRecipeLoader { GT_Values.RA.addAssemblylineRecipe( CustomItemList.eM_Hollow.get(1), 7500, - new ItemStack[] { - CustomItemList.eM_Hollow.get(1), - ItemList.Casing_Fusion_Coil.get(2), - ItemList.Casing_Coil_NaquadahAlloy.get(2), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 64), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Europium, 64), - }, - new FluidStack[] { - Materials.Glass.getMolten(2304), - Materials.Silicone.getMolten(1872), - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), - getOrDefault("Trinium", Materials.Osmium).getMolten(1296), - }, + new ItemStack[] { CustomItemList.eM_Hollow.get(1), ItemList.Casing_Fusion_Coil.get(2), + ItemList.Casing_Coil_NaquadahAlloy.get(2), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 64), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Europium, 64), }, + new FluidStack[] { Materials.Glass.getMolten(2304), Materials.Silicone.getMolten(1872), + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), + getOrDefault("Trinium", Materials.Osmium).getMolten(1296), }, CustomItemList.eM_Coil.get(4), 800, 200000); @@ -280,18 +262,14 @@ public class DreamCraftRecipeLoader { 2048, 2000000, 4, - new Object[] { - ItemList.OilDrill4.get(1), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 4), - new Object[] {OrePrefixes.circuit.get(Materials.Infinite), 4L}, - ItemList.Electric_Motor_UHV.get(4), - ItemList.Electric_Pump_UHV.get(4), - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Neutronium, 4), - ItemList.Sensor_UHV.get(3), - ItemList.Field_Generator_UHV.get(3), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Neutronium, 12) - }, - new FluidStack[] {new FluidStack(solderUEV, 1296), Materials.Neutronium.getMolten(576)}, + new Object[] { ItemList.OilDrill4.get(1), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 4), + new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 4L }, + ItemList.Electric_Motor_UHV.get(4), ItemList.Electric_Pump_UHV.get(4), + GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Neutronium, 4), + ItemList.Sensor_UHV.get(3), ItemList.Field_Generator_UHV.get(3), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Neutronium, 12) }, + new FluidStack[] { new FluidStack(solderUEV, 1296), Materials.Neutronium.getMolten(576) }, ItemList.OilDrillInfinite.get(1), 6000, 2000000); @@ -303,16 +281,12 @@ public class DreamCraftRecipeLoader { 2048, 8_000_000, 1, - new Object[] { - new Object[] {OrePrefixes.circuit.get(Materials.Infinite), 1L}, - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Infinity, 8), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Infinity, 8), - getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), - getModItem("dreamcraft", "item.MicaInsulatorFoil", 32, 0) - }, - new FluidStack[] { - Materials.DraconiumAwakened.getMolten(576), - }, + new Object[] { new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 1L }, + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Infinity, 8), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Infinity, 8), + getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), + getModItem("dreamcraft", "item.MicaInsulatorFoil", 32, 0) }, + new FluidStack[] { Materials.DraconiumAwakened.getMolten(576), }, ItemList.Casing_Coil_Infinity.get(1), 60 * 20, 8_000_000); @@ -325,17 +299,13 @@ public class DreamCraftRecipeLoader { 2048 * 2, 32_000_000, 1, - new Object[] { - new Object[] {OrePrefixes.circuit.get(Materials.Bio), 1L}, - GT_OreDictUnificator.get("wireGt02Hypogen", 8L), - getModItem("miscutils", "itemScrewHypogen", 8, 0), - getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), - getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), - getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), - }, - new FluidStack[] { - Materials.Infinity.getMolten(576), - }, + new Object[] { new Object[] { OrePrefixes.circuit.get(Materials.Bio), 1L }, + GT_OreDictUnificator.get("wireGt02Hypogen", 8L), + getModItem("miscutils", "itemScrewHypogen", 8, 0), + getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), + getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), + getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), }, + new FluidStack[] { Materials.Infinity.getMolten(576), }, ItemList.Casing_Coil_Hypogen.get(1), 60 * 20, 8000000 * 4); @@ -347,21 +317,17 @@ public class DreamCraftRecipeLoader { 8_192, 128_000_000, 1, - new Object[] { - new Object[] {OrePrefixes.circuit.get(Materials.Optical), 1L}, - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SpaceTime, 8), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.SpaceTime, 8), - getModItem("eternalsingularity", "eternal_singularity", 1L), - getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), - getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), - getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), - getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), - getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), - getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), - }, - new FluidStack[] { - new FluidStack(FluidRegistry.getFluid("molten.hypogen"), 576), - }, + new Object[] { new Object[] { OrePrefixes.circuit.get(Materials.Optical), 1L }, + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SpaceTime, 8), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.SpaceTime, 8), + getModItem("eternalsingularity", "eternal_singularity", 1L), + getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), + getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), + getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), + getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), + getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), + getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), }, + new FluidStack[] { new FluidStack(FluidRegistry.getFluid("molten.hypogen"), 576), }, ItemList.Casing_Coil_Eternal.get(1), 60 * 20, 8_000_000 * 16); @@ -369,10 +335,8 @@ public class DreamCraftRecipeLoader { // Tesla Base GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NickelZincFerrite, 6), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.NickelZincFerrite, 1) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NickelZincFerrite, 6), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.NickelZincFerrite, 1) }, null, CustomItemList.tM_TeslaBase.get(1), 50, @@ -380,21 +344,12 @@ public class DreamCraftRecipeLoader { GT_ModHandler.addCraftingRecipe( CustomItemList.tM_TeslaBase.get(1), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { - "PhP", - "PFP", - "PwP", - 'P', - OrePrefixes.plate.get(Materials.NickelZincFerrite), - 'F', - OrePrefixes.frameGt.get(Materials.NickelZincFerrite) - }); + new Object[] { "PhP", "PFP", "PwP", 'P', OrePrefixes.plate.get(Materials.NickelZincFerrite), 'F', + OrePrefixes.frameGt.get(Materials.NickelZincFerrite) }); // Tesla Toroid GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 6), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Aluminium, 1) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 6), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Aluminium, 1) }, null, CustomItemList.tM_TeslaToroid.get(1), 50, @@ -402,91 +357,68 @@ public class DreamCraftRecipeLoader { GT_ModHandler.addCraftingRecipe( CustomItemList.tM_TeslaToroid.get(1), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { - "PhP", - "PFP", - "PwP", - 'P', - OrePrefixes.foil.get(Materials.Aluminium), - 'F', - OrePrefixes.frameGt.get(Materials.Aluminium) - }); + new Object[] { "PhP", "PFP", "PwP", 'P', OrePrefixes.foil.get(Materials.Aluminium), 'F', + OrePrefixes.frameGt.get(Materials.Aluminium) }); // Tesla Secondary Windings GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.teslaComponent.getWithDamage(8, 0), - getItemContainer("MicaInsulatorFoil").get(12) - }, + new ItemStack[] { CustomItemList.teslaComponent.getWithDamage(8, 0), + getItemContainer("MicaInsulatorFoil").get(12) }, Materials.Silver.getMolten(144), CustomItemList.tM_TeslaSecondary.get(1), 200, 120); // Tesla Primary Coils T0 GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.RedstoneAlloy, 8), - getItemContainer("MicaInsulatorFoil").get(8) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.RedstoneAlloy, 8), + getItemContainer("MicaInsulatorFoil").get(8) }, Materials.RedAlloy.getMolten(144), CustomItemList.tM_TeslaPrimary_0.get(1), 200, 30); // Tesla Primary Coils T1 GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorMV, 8), - getItemContainer("MicaInsulatorFoil").get(12) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorMV, 8), + getItemContainer("MicaInsulatorFoil").get(12) }, Materials.Magnesium.getMolten(144), CustomItemList.tM_TeslaPrimary_1.get(1), 200, 120); // Tesla Primary Coils T2 GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorHV, 8), - getItemContainer("MicaInsulatorFoil").get(16) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorHV, 8), + getItemContainer("MicaInsulatorFoil").get(16) }, Materials.Barium.getMolten(144), CustomItemList.tM_TeslaPrimary_2.get(1), 200, 480); // Tesla Primary Coils T3 GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorEV, 8), - getItemContainer("MicaInsulatorFoil").get(20) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorEV, 8), + getItemContainer("MicaInsulatorFoil").get(20) }, Materials.Platinum.getMolten(144), CustomItemList.tM_TeslaPrimary_3.get(1), 200, 1920); // Tesla Primary Coils T4 GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorIV, 8), - getItemContainer("MicaInsulatorFoil").get(24) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorIV, 8), + getItemContainer("MicaInsulatorFoil").get(24) }, Materials.Vanadium.getMolten(144), CustomItemList.tM_TeslaPrimary_4.get(1), 200, 7680); // Tesla Primary Coils T5 GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorLuV, 8), - getItemContainer("MicaInsulatorFoil").get(28) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorLuV, 8), + getItemContainer("MicaInsulatorFoil").get(28) }, Materials.Indium.getMolten(144), CustomItemList.tM_TeslaPrimary_5.get(1), 200, 30720); // Tesla Primary Coils T6 GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorZPM, 8), - getItemContainer("MicaInsulatorFoil").get(32) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorZPM, 8), + getItemContainer("MicaInsulatorFoil").get(32) }, Materials.Naquadah.getMolten(144), CustomItemList.tM_TeslaPrimary_6.get(1), 200, @@ -498,594 +430,490 @@ public class DreamCraftRecipeLoader { // Dynamo Hatches EV-UMV GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hatch_Dynamo_EV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Aluminium, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 2) - }, + new ItemStack[] { ItemList.Hatch_Dynamo_EV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Aluminium, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 2) }, Materials.Silver.getMolten(144), CustomItemList.eM_dynamoMulti4_EV.get(1), 100, 480); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_dynamoMulti4_EV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Aluminium, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 4) - }, + new ItemStack[] { CustomItemList.eM_dynamoMulti4_EV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Aluminium, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 4) }, Materials.Electrum.getMolten(144), CustomItemList.eM_dynamoMulti16_EV.get(1), 200, 480); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - CustomItemList.eM_dynamoMulti16_EV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Aluminium, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 6) - }, + new ItemStack[] { CustomItemList.eM_dynamoMulti16_EV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Aluminium, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 6) }, Materials.Tungsten.getMolten(144), CustomItemList.eM_dynamoMulti64_EV.get(1), 400, 480); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hatch_Dynamo_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Tungsten, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 2) - }, + new ItemStack[] { ItemList.Hatch_Dynamo_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Tungsten, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 2) }, Materials.Silver.getMolten(144), CustomItemList.eM_dynamoMulti4_IV.get(1), 100, 1920); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Transformer_LuV_IV.get(1), - CustomItemList.eM_dynamoMulti4_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Tungsten, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 4) - }, + new ItemStack[] { ItemList.Transformer_LuV_IV.get(1), CustomItemList.eM_dynamoMulti4_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Tungsten, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 4) }, Materials.Electrum.getMolten(144), CustomItemList.eM_dynamoMulti16_IV.get(1), 200, 1920); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("WetTransformer_LuV_IV").get(1), - CustomItemList.eM_dynamoMulti16_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Tungsten, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 6) - }, + new ItemStack[] { getItemContainer("WetTransformer_LuV_IV").get(1), + CustomItemList.eM_dynamoMulti16_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Tungsten, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 6) }, Materials.Tungsten.getMolten(144), CustomItemList.eM_dynamoMulti64_IV.get(1), 400, 1920); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hatch_Dynamo_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.VanadiumGallium, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Chrome, 2) - }, + new ItemStack[] { ItemList.Hatch_Dynamo_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.VanadiumGallium, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Chrome, 2) }, Materials.Silver.getMolten(288), CustomItemList.eM_dynamoMulti4_LuV.get(1), 100, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Transformer_ZPM_LuV.get(1), - CustomItemList.eM_dynamoMulti4_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.VanadiumGallium, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Chrome, 4) - }, + new ItemStack[] { ItemList.Transformer_ZPM_LuV.get(1), CustomItemList.eM_dynamoMulti4_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.VanadiumGallium, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Chrome, 4) }, Materials.Electrum.getMolten(288), CustomItemList.eM_dynamoMulti16_LuV.get(1), 200, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("WetTransformer_ZPM_LuV").get(1), - CustomItemList.eM_dynamoMulti16_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.VanadiumGallium, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Chrome, 6) - }, + new ItemStack[] { getItemContainer("WetTransformer_ZPM_LuV").get(1), + CustomItemList.eM_dynamoMulti16_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.VanadiumGallium, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Chrome, 6) }, Materials.Tungsten.getMolten(288), CustomItemList.eM_dynamoMulti64_LuV.get(1), 400, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hatch_Dynamo_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Naquadah, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 2) - }, + new ItemStack[] { ItemList.Hatch_Dynamo_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Naquadah, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 2) }, Materials.Silver.getMolten(576), CustomItemList.eM_dynamoMulti4_ZPM.get(1), 100, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Transformer_UV_ZPM.get(1), - CustomItemList.eM_dynamoMulti4_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Naquadah, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 4) - }, + new ItemStack[] { ItemList.Transformer_UV_ZPM.get(1), CustomItemList.eM_dynamoMulti4_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Naquadah, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 4) }, Materials.Electrum.getMolten(576), CustomItemList.eM_dynamoMulti16_ZPM.get(1), 200, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - getItemContainer("WetTransformer_UV_ZPM").get(1), - CustomItemList.eM_dynamoMulti16_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Naquadah, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 6) - }, + new ItemStack[] { getItemContainer("WetTransformer_UV_ZPM").get(1), + CustomItemList.eM_dynamoMulti16_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Naquadah, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 6) }, Materials.Tungsten.getMolten(576), CustomItemList.eM_dynamoMulti64_ZPM.get(1), 400, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hatch_Dynamo_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NaquadahAlloy, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 2) - }, + new ItemStack[] { ItemList.Hatch_Dynamo_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NaquadahAlloy