diff options
Diffstat (limited to 'src/main/java/gregtech')
6 files changed, 37 insertions, 18 deletions
diff --git a/src/main/java/gregtech/api/enums/Mods.java b/src/main/java/gregtech/api/enums/Mods.java index f0cc3b2541..05d5da27ae 100644 --- a/src/main/java/gregtech/api/enums/Mods.java +++ b/src/main/java/gregtech/api/enums/Mods.java @@ -110,6 +110,7 @@ public enum Mods { MineAndBladeBattleGear2(Names.MINE_AND_BLADE_BATTLE_GEAR2), Minecraft(Names.MINECRAFT), MineTweaker(Names.MINE_TWEAKER), + MobsInfo(Names.MOBS_INFO), NEICustomDiagrams(Names.N_E_I_CUSTOM_DIAGRAMS), NEIOrePlugin(Names.N_E_I_ORE_PLUGIN), Natura(Names.NATURA), @@ -293,6 +294,7 @@ public enum Mods { public static final String MINE_AND_BLADE_BATTLE_GEAR2 = "battlegear2"; public static final String MINECRAFT = "minecraft"; public static final String MINE_TWEAKER = "MineTweaker3"; + public static final String MOBS_INFO = "mobsinfo"; public static final String N_E_I_CUSTOM_DIAGRAMS = "neicustomdiagram"; public static final String N_E_I_ORE_PLUGIN = "gtneioreplugin"; public static final String NATURA = "Natura"; diff --git a/src/main/java/gregtech/common/GT_Client.java b/src/main/java/gregtech/common/GT_Client.java index 9de59e8661..95b19e756c 100644 --- a/src/main/java/gregtech/common/GT_Client.java +++ b/src/main/java/gregtech/common/GT_Client.java @@ -62,6 +62,7 @@ import gregtech.api.GregTech_API; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; +import gregtech.api.enums.Mods; import gregtech.api.enums.SoundResource; import gregtech.api.gui.GT_GUIColorOverride; import gregtech.api.gui.modularui.FallbackableSteamTexture; @@ -624,8 +625,10 @@ public class GT_Client extends GT_Proxy implements Runnable { GT_Renderer_Block.register(); new GT_MultiTile_Renderer(); new GT_RenderDrone(); - new GT_LaserRenderer(); - new GT_WormholeRenderer(); + if (Mods.GalacticraftCore.isModLoaded()) { + new GT_LaserRenderer(); + new GT_WormholeRenderer(); + } metaGeneratedItemRenderer = new GT_MetaGenerated_Item_Renderer(); for (GT_MetaGenerated_Item item : GT_MetaGenerated_Item.sInstances.values()) { metaGeneratedItemRenderer.registerItem(item); diff --git a/src/main/java/gregtech/common/tileentities/render/TileLaser.java b/src/main/java/gregtech/common/tileentities/render/TileLaser.java index 5cc9020cd4..b7457353f4 100644 --- a/src/main/java/gregtech/common/tileentities/render/TileLaser.java +++ b/src/main/java/gregtech/common/tileentities/render/TileLaser.java @@ -11,6 +11,7 @@ import cpw.mods.fml.relauncher.Side; import micdoodle8.mods.galacticraft.core.tile.TileEntityAdvanced; import micdoodle8.mods.galacticraft.core.util.Annotations; +// This should either move to gt5u tiles, or get moved to GTNH-Intergalactic public class TileLaser extends TileEntityAdvanced { @Annotations.NetworkedField(targetSide = Side.CLIENT) diff --git a/src/main/java/gregtech/common/tileentities/render/TileWormhole.java b/src/main/java/gregtech/common/tileentities/render/TileWormhole.java index f219cfe989..1bb012aaf6 100644 --- a/src/main/java/gregtech/common/tileentities/render/TileWormhole.java +++ b/src/main/java/gregtech/common/tileentities/render/TileWormhole.java @@ -14,6 +14,7 @@ import micdoodle8.mods.galacticraft.core.util.Annotations; import pers.gwyog.gtneioreplugin.plugin.block.ModBlocks; import pers.gwyog.gtneioreplugin.util.DimensionHelper; +// This should either move to gt5u tiles, or get moved to GTNH-Intergalactic public class TileWormhole extends TileEntityAdvanced { @Annotations.NetworkedField(targetSide = Side.CLIENT) 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( |