From 89156d0d8485753e0cea91637fced1b66897a6df Mon Sep 17 00:00:00 2001 From: RecursivePineapple Date: Thu, 8 Aug 2024 09:16:57 -0400 Subject: Added the miniature wormhole generator (#2800) * Added the miniature wormhole generator * Updated structure & tooltip and added hatch hask * Fixed controller promotion not working * Initial work wormhole render + spotless + git strangeness * Fix wildcard imports * Removed redundant code + added more reasonable defaults * fix * sa * Remove debug print statements --------- Co-authored-by: Martin Robertz Co-authored-by: CookieBrigade <138534411+cookiebrigade@users.noreply.github.com> --- .../gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java | 5 +++++ .../java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java | 7 +++++++ 2 files changed, 12 insertions(+) (limited to 'src/main/java/gregtech/loaders') 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 00ccea451e..f4c7139c4f 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 @@ -74,6 +74,7 @@ import gregtech.common.blocks.GT_Block_Stones; import gregtech.common.blocks.GT_Block_TintedIndustrialGlass; import gregtech.common.blocks.GT_Cyclotron_Coils; import gregtech.common.blocks.GT_TileEntity_Ores; +import gregtech.common.blocks.GT_WormholeRenderBlock; import gregtech.common.items.GT_DepletetCell_Item; import gregtech.common.items.GT_FluidDisplayItem; import gregtech.common.items.GT_IntegratedCircuit_Item; @@ -88,6 +89,7 @@ import gregtech.common.items.GT_TierDrone; import gregtech.common.items.GT_VolumetricFlask; import gregtech.common.tileentities.render.TileDrone; import gregtech.common.tileentities.render.TileLaser; +import gregtech.common.tileentities.render.TileWormhole; public class GT_Loader_Item_Block_And_Fluid implements Runnable { @@ -553,6 +555,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { GregTech_API.sBlockGlass1 = new GT_Block_Glass1(); GregTech_API.sBlockTintedGlass = new GT_Block_TintedIndustrialGlass(); GregTech_API.sLaserRender = new GT_Block_Laser(); + GregTech_API.sWormholeRender = new GT_WormholeRenderBlock(); // meta ID order, DO NOT CHANGE ORDER GregTech_API.sBlockMetal1 = new GT_Block_Metal( @@ -680,6 +683,8 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { GameRegistry.registerTileEntity(TileDrone.class, "DroneRender"); GT_Log.out.println("GT_Mod: Registering the LaserRender."); GameRegistry.registerTileEntity(TileLaser.class, "LaserRenderer"); + GT_Log.out.println("GT_Mod: Registering the WormholeRender."); + GameRegistry.registerTileEntity(TileWormhole.class, "WormholeRender"); GT_Log.out.println("GT_Mod: Registering the BaseMetaPipeEntity."); GameRegistry.registerTileEntity(BaseMetaPipeEntity.class, "BaseMetaPipeEntity"); 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 9929fbb1c2..e8222304a9 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java @@ -462,6 +462,7 @@ import static gregtech.api.enums.MetaTileEntityIDs.WIRELESS_HATCH_ENERGY_UMV; import static gregtech.api.enums.MetaTileEntityIDs.WIRELESS_HATCH_ENERGY_UV; import static gregtech.api.enums.MetaTileEntityIDs.WIRELESS_HATCH_ENERGY_UXV; import static gregtech.api.enums.MetaTileEntityIDs.WIRELESS_HATCH_ENERGY_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.WORMHOLE_GENERATOR_CONTROLLER; import static gregtech.api.enums.MetaTileEntityIDs.transformer_EV_HV; import static gregtech.api.enums.MetaTileEntityIDs.transformer_HV_MV; import static gregtech.api.enums.MetaTileEntityIDs.transformer_IV_EV; @@ -602,6 +603,7 @@ import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_ProcessingA import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_PyrolyseOven; import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_TranscendentPlasmaMixer; import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_VacuumFreezer; +import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_WormholeGenerator; import gregtech.common.tileentities.machines.multi.drone.GT_MetaTileEntity_DroneCentre; import gregtech.common.tileentities.machines.multi.drone.GT_MetaTileEntity_Hatch_DroneDownLink; import gregtech.common.tileentities.machines.multi.purification.GT_MetaTileEntity_Hatch_DegasifierControlHatch; @@ -1130,6 +1132,11 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC new GT_MetaTileEntity_MultiCanner(MULTI_CANNER_CONTROLLER.ID, "multimachine.canner", "TurboCan Pro") .getStackForm(1)); + ItemList.WormholeGenerator.set( + new GT_MetaTileEntity_WormholeGenerator( + WORMHOLE_GENERATOR_CONTROLLER.ID, + "multimachine.wormhole", + "Miniature Wormhole Generator").getStackForm(1)); ItemList.Machine_Multi_IndustrialLaserEngraver.set( new GT_MetaTileEntity_IndustrialLaserEngraver( INDUSTRIAL_LASER_ENGRAVER_CONTROLLER.ID, -- cgit