diff options
Diffstat (limited to 'src/main/java/gregtech/loaders')
| -rw-r--r-- | src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java | 5 | ||||
| -rw-r--r-- | src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java | 8 |
2 files changed, 13 insertions, 0 deletions
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 f54f78f915..118baaf116 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 @@ -64,6 +64,7 @@ import gregtech.common.blocks.GT_Block_Casings9; import gregtech.common.blocks.GT_Block_Concretes; import gregtech.common.blocks.GT_Block_Drone; import gregtech.common.blocks.GT_Block_Granites; +import gregtech.common.blocks.GT_Block_Laser; import gregtech.common.blocks.GT_Block_Machines; import gregtech.common.blocks.GT_Block_Metal; import gregtech.common.blocks.GT_Block_Ores; @@ -84,6 +85,7 @@ import gregtech.common.items.GT_NeutronReflector_Item; import gregtech.common.items.GT_TierDrone; import gregtech.common.items.GT_VolumetricFlask; import gregtech.common.tileentities.render.TileDrone; +import gregtech.common.tileentities.render.TileLaser; public class GT_Loader_Item_Block_And_Fluid implements Runnable { @@ -546,6 +548,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { GregTech_API.sBlockStones = new GT_Block_Stones(); GregTech_API.sBlockOres1 = new GT_Block_Ores(); GregTech_API.sDroneRender = new GT_Block_Drone(); + GregTech_API.sLaserRender = new GT_Block_Laser(); // meta ID order, DO NOT CHANGE ORDER GregTech_API.sBlockMetal1 = new GT_Block_Metal( @@ -671,6 +674,8 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { GT_Log.out.println("GT_Mod: Registering the DroneRender."); 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 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 2a7c39d3e0..c72459e9cf 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java @@ -147,6 +147,7 @@ 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.INDUSTRIAL_LASER_ENGRAVER_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; @@ -556,6 +557,7 @@ import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_FusionCompu 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_IndustrialLaserEngraver; 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; @@ -1052,6 +1054,12 @@ 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.Machine_Multi_IndustrialLaserEngraver.set( + new GT_MetaTileEntity_IndustrialLaserEngraver( + INDUSTRIAL_LASER_ENGRAVER_CONTROLLER.ID, + "multimachine.engraver", + "High Energy Laser Emitter").getStackForm(1)); + ItemList.Machine_Multi_Lathe.set( new GT_MetaTileEntity_MultiLathe( MULTI_LATHE_CONTROLLER.ID, |