aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/loaders
diff options
context:
space:
mode:
authorJason Mitchell <mitchej@gmail.com>2024-08-11 12:51:41 -0700
committerGitHub <noreply@github.com>2024-08-11 15:51:41 -0400
commit5cd813a5405777a6c92b1af03f7439a97e9523f8 (patch)
tree0d81c74463e8401e893862758a411f5d90e45788 /src/main/java/gregtech/loaders
parent7e153794ad1f79afa0014b82593060ffedc54a61 (diff)
downloadGT5-Unofficial-5cd813a5405777a6c92b1af03f7439a97e9523f8.tar.gz
GT5-Unofficial-5cd813a5405777a6c92b1af03f7439a97e9523f8.tar.bz2
GT5-Unofficial-5cd813a5405777a6c92b1af03f7439a97e9523f8.zip
Faster dev boot times (120s --> 80s while profiling) (#2866)
* Faster dev boot times (120s --> 80s while profiling) * Clean up sloppy hard deps and properly gate them behind isModLoaded() checks. * Include CoreTweaks as runtime only non publishable for faster boot as well
Diffstat (limited to 'src/main/java/gregtech/loaders')
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java21
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java23
2 files changed, 28 insertions, 16 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 f4c7139c4f..e93387397f 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
@@ -38,6 +38,7 @@ import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
import gregtech.api.enums.MaterialsKevlar;
import gregtech.api.enums.MaterialsUEVplus;
+import gregtech.api.enums.Mods;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.enums.SubTag;
import gregtech.api.fluid.GT_FluidFactory;
@@ -554,8 +555,13 @@ 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.sLaserRender = new GT_Block_Laser();
- 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
GregTech_API.sBlockMetal1 = new GT_Block_Metal(
@@ -681,11 +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 LaserRender.");
- GameRegistry.registerTileEntity(TileLaser.class, "LaserRenderer");
- 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 e8222304a9..ed2b679cad 100644
--- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
+++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
@@ -483,6 +483,7 @@ import gregtech.api.enums.GT_Values;
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
import gregtech.api.enums.MaterialsUEVplus;
+import gregtech.api.enums.Mods;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Cable;
import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Fluid;
@@ -1132,16 +1133,18 @@ 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,
- "multimachine.engraver",
- "High Energy Laser Emitter").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,
+ "multimachine.engraver",
+ "High Energy Laser Emitter").getStackForm(1));
+ }
ItemList.Machine_Multi_Lathe.set(
new GT_MetaTileEntity_MultiLathe(