diff options
| author | BucketBrigade <138534411+CookieBrigade@users.noreply.github.com> | 2024-08-11 18:56:46 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-11 19:56:46 -0400 |
| commit | 8a43306ab657d7c07f9ea1fe7087da8874004a83 (patch) | |
| tree | cb018bfdc2cb7e3dd5f961cbbf27859321dfe83f /src/main/java/gregtech/loaders/preload | |
| parent | 5cd813a5405777a6c92b1af03f7439a97e9523f8 (diff) | |
| download | GT5-Unofficial-8a43306ab657d7c07f9ea1fe7087da8874004a83.tar.gz GT5-Unofficial-8a43306ab657d7c07f9ea1fe7087da8874004a83.tar.bz2 GT5-Unofficial-8a43306ab657d7c07f9ea1fe7087da8874004a83.zip | |
Wormhole Renderer dependancy fix (#2867)
* Remove Dependancy
* Now rendering again
* Spotless Apply
Diffstat (limited to 'src/main/java/gregtech/loaders/preload')
| -rw-r--r-- | src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java | 10 | ||||
| -rw-r--r-- | src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java | 11 |
2 files changed, 11 insertions, 10 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 e93387397f..f22633ecd0 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 @@ -555,12 +555,11 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { GregTech_API.sDroneRender = new GT_Block_Drone(); GregTech_API.sBlockGlass1 = new GT_Block_Glass1(); GregTech_API.sBlockTintedGlass = new GT_Block_TintedIndustrialGlass(); + GregTech_API.sWormholeRender = new GT_WormholeRenderBlock(); if (Mods.GalacticraftCore.isModLoaded()) { GregTech_API.sLaserRender = new GT_Block_Laser(); - GregTech_API.sWormholeRender = new GT_WormholeRenderBlock(); } else { GregTech_API.sLaserRender = null; - GregTech_API.sWormholeRender = null; } // meta ID order, DO NOT CHANGE ORDER @@ -688,13 +687,14 @@ 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 WormholeRender."); + GameRegistry.registerTileEntity(TileWormhole.class, "WormholeRender"); + if (Mods.GalacticraftCore.isModLoaded()) { 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"); FMLInterModComms.sendMessage(AppliedEnergistics2.ID, "whitelist-spatial", BaseMetaPipeEntity.class.getName()); 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 ed2b679cad..35cc7af6ad 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java @@ -1133,12 +1133,13 @@ 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)); + if (Mods.GalacticraftCore.isModLoaded()) { - 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, |