diff options
Diffstat (limited to 'src/main/java/gregtech/loaders')
3 files changed, 19 insertions, 2 deletions
diff --git a/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java index 8c6bfc8100..03c1f2a280 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java @@ -883,5 +883,6 @@ public class AssemblyLineRecipes implements Runnable { .duration(60 * SECONDS) .eut(TierEU.RECIPE_UHV) .addTo(AssemblyLine); + } } diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java index 7a0c7cfb84..04412da4c7 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java @@ -52,6 +52,7 @@ import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; import gregtech.common.blocks.GT_Block_Casings1; +import gregtech.common.blocks.GT_Block_Casings10; import gregtech.common.blocks.GT_Block_Casings2; import gregtech.common.blocks.GT_Block_Casings3; import gregtech.common.blocks.GT_Block_Casings4; @@ -536,6 +537,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { GregTech_API.sBlockCasings6 = new GT_Block_Casings6(); GregTech_API.sBlockCasings8 = new GT_Block_Casings8(); GregTech_API.sBlockCasings9 = new GT_Block_Casings9(); + GregTech_API.sBlockCasings10 = new GT_Block_Casings10(); GregTech_API.sBlockGranites = new GT_Block_Granites(); GregTech_API.sBlockLongDistancePipes = new GT_Block_LongDistancePipe(); GregTech_API.sBlockConcretes = new GT_Block_Concretes(); diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java index 31d917e868..5bd342cc48 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java @@ -146,6 +146,7 @@ import static gregtech.api.enums.MetaTileEntityIDs.HULL_WROUGHT_IRON; import static gregtech.api.enums.MetaTileEntityIDs.HULL_ZPM; import static gregtech.api.enums.MetaTileEntityIDs.IMPLOSION_COMPRESSOR_CONTROLLER; import static gregtech.api.enums.MetaTileEntityIDs.INDUSTRIAL_APIARY; +import static gregtech.api.enums.MetaTileEntityIDs.INDUSTRIAL_ELECTROMAGNETIC_SEPARATOR_CONTROLLER; import static gregtech.api.enums.MetaTileEntityIDs.INPUT_BUS_EV; import static gregtech.api.enums.MetaTileEntityIDs.INPUT_BUS_HV; import static gregtech.api.enums.MetaTileEntityIDs.INPUT_BUS_IV; @@ -224,6 +225,7 @@ import static gregtech.api.enums.MetaTileEntityIDs.MAGIC_ENERGY_ABSORBER_MV; import static gregtech.api.enums.MetaTileEntityIDs.MAGIC_ENERGY_CONVERTER_HV; import static gregtech.api.enums.MetaTileEntityIDs.MAGIC_ENERGY_CONVERTER_LV; import static gregtech.api.enums.MetaTileEntityIDs.MAGIC_ENERGY_CONVERTER_MV; +import static gregtech.api.enums.MetaTileEntityIDs.MAG_HATCH; import static gregtech.api.enums.MetaTileEntityIDs.MAINTENANCE_HATCH; import static gregtech.api.enums.MetaTileEntityIDs.MASS_FABRICATOR_EV; import static gregtech.api.enums.MetaTileEntityIDs.MASS_FABRICATOR_HV; @@ -483,6 +485,7 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Multi import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_OutputBus; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_QuadrupleHumongous; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MagHatch; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Transformer; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Wireless_Dynamo; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Wireless_Hatch; @@ -551,6 +554,7 @@ import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_FusionCompu import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_FusionComputer3; import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_HeatExchanger; import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_ImplosionCompressor; +import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_IndustrialElectromagneticSeparator; import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_IntegratedOreFactory; import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_LargeBoiler_Bronze; import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_LargeBoiler_Steel; @@ -602,8 +606,6 @@ import gregtech.common.tileentities.storage.GT_MetaTileEntity_SuperChest; import gregtech.common.tileentities.storage.GT_MetaTileEntity_SuperTank; // Free IDs left for machines in GT as of 29th of July 2022 - Colen. Please try use them up in order. -// 358 -// 359 // 366 // 367 // 368 @@ -1038,6 +1040,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC new GT_MetaTileEntity_DroneCentre(Drone_Centre.ID, "multimachine_DroneCentre", "Drone Centre") .getStackForm(1)); + ItemList.Machine_Multi_IndustrialElectromagneticSeparator.set( + new GT_MetaTileEntity_IndustrialElectromagneticSeparator( + INDUSTRIAL_ELECTROMAGNETIC_SEPARATOR_CONTROLLER.ID, + "multimachine.electromagneticseparator", + "Magnetic Flux Exhibitor").getStackForm(1)); + ItemList.Machine_Multi_Canner.set( new GT_MetaTileEntity_MultiCanner(MULTI_CANNER_CONTROLLER.ID, "multimachine.canner", "TurboCan Pro") .getStackForm(1)); @@ -2366,6 +2374,11 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "Crafting Input Slave").getStackForm(1L)); } + private static void registerMagHatch() { + ItemList.Hatch_Electromagnet.set( + new GT_MetaTileEntity_MagHatch(MAG_HATCH.ID, "hatch.mag_hatch", "Electromagnet Housing").getStackForm(1L)); + } + private static void registerInputBus() { ItemList.Hatch_Input_Bus_ULV.set( new GT_MetaTileEntity_Hatch_InputBus(INPUT_BUS_ULV.ID, "hatch.input_bus.tier.00", "Input Bus (ULV)", 0) @@ -4042,6 +4055,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC registerSuperChest(); registerLongDistancePipe(); registerAE2Hatches(); + registerMagHatch(); registerInputBus(); registerOutputBus(); registerMufflerHatch(); |