aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/loaders/preload
diff options
context:
space:
mode:
authorMary <33456283+FourIsTheNumber@users.noreply.github.com>2024-08-11 20:28:26 -0400
committerGitHub <noreply@github.com>2024-08-11 20:28:26 -0400
commitb5f7c6d2016aef8032d5f0b8ff735a99cf1c197a (patch)
tree32dbb8df20c664858c922200b9e25282f6c9f8b6 /src/main/java/gregtech/loaders/preload
parent8a43306ab657d7c07f9ea1fe7087da8874004a83 (diff)
downloadGT5-Unofficial-b5f7c6d2016aef8032d5f0b8ff735a99cf1c197a.tar.gz
GT5-Unofficial-b5f7c6d2016aef8032d5f0b8ff735a99cf1c197a.tar.bz2
GT5-Unofficial-b5f7c6d2016aef8032d5f0b8ff735a99cf1c197a.zip
Removed galacticraft dependency for laser render (#2868)
* Removed cursed galacticraft dependency. Sorry mitch :( * spotless * Spotless * Update GT_Loader_MetaTileEntities.java --------- Co-authored-by: ah-OOG-ah <75745146+ah-OOG-ah@users.noreply.github.com>
Diffstat (limited to 'src/main/java/gregtech/loaders/preload')
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java16
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java13
2 files changed, 10 insertions, 19 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 f22633ecd0..4b412e2796 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,7 +38,6 @@ 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;
@@ -555,12 +554,9 @@ 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();
- } else {
- GregTech_API.sLaserRender = null;
- }
+
// meta ID order, DO NOT CHANGE ORDER
GregTech_API.sBlockMetal1 = new GT_Block_Metal(
@@ -687,14 +683,12 @@ 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 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 35cc7af6ad..d3644c5efe 100644
--- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
+++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
@@ -483,7 +483,6 @@ 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;
@@ -1139,13 +1138,11 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
"multimachine.wormhole",
"Miniature Wormhole Generator").getStackForm(1));
- if (Mods.GalacticraftCore.isModLoaded()) {
- 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_IndustrialLaserEngraver.set(
+ new GT_MetaTileEntity_IndustrialLaserEngraver(
+ INDUSTRIAL_LASER_ENGRAVER_CONTROLLER.ID,
+ "multimachine.engraver",
+ "Hyper-Intensity Laser Emitter").getStackForm(1));
ItemList.Machine_Multi_Lathe.set(
new GT_MetaTileEntity_MultiLathe(