diff options
Diffstat (limited to 'src/main/java/com')
3 files changed, 5 insertions, 20 deletions
diff --git a/src/main/java/com/github/technus/tectech/auxiliary/TecTechConfig.java b/src/main/java/com/github/technus/tectech/auxiliary/TecTechConfig.java index 9344ec286b..001e198d64 100644 --- a/src/main/java/com/github/technus/tectech/auxiliary/TecTechConfig.java +++ b/src/main/java/com/github/technus/tectech/auxiliary/TecTechConfig.java @@ -22,7 +22,6 @@ public class TecTechConfig extends ConfigManager { @Override protected void PreInit() { ModAdminErrorLogs_Enabled = false; - //DEBUG_MODE = false; BOOM_ENABLE = true; NERF_FUSION = false; ENABLE_TURRET_EXPLOSIONS = true; @@ -34,8 +33,6 @@ public class TecTechConfig extends ConfigManager { protected void Init() { ModAdminErrorLogs_Enabled = _mainConfig.getBoolean("AdminErrorLog", "Modules", ModAdminErrorLogs_Enabled, "If set to true, every op/admin will receive all errors occoured during the startup phase as ingame message on join"); - //DEBUG_MODE = _mainConfig.getBoolean("DebugPrint", "Debug", DEBUG_MODE, - // "Enables logging"); BOOM_ENABLE = _mainConfig.getBoolean("BoomEnable", "Features", BOOM_ENABLE, "Set to false to disable explosions on everything bad that you can do"); NERF_FUSION = _mainConfig.getBoolean("NerfFusion", "Features", NERF_FUSION, diff --git a/src/main/java/com/github/technus/tectech/loader/EntityLoader.java b/src/main/java/com/github/technus/tectech/loader/EntityLoader.java index f77312850c..389238e6c6 100644 --- a/src/main/java/com/github/technus/tectech/loader/EntityLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/EntityLoader.java @@ -1,6 +1,7 @@ package com.github.technus.tectech.loader; import com.github.technus.tectech.TecTech; +import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.EntityRegistry; import openmodularturrets.entity.projectiles.projectileEM; @@ -10,6 +11,7 @@ import openmodularturrets.entity.projectiles.projectileEM; public class EntityLoader implements Runnable { @Override public void run() { - EntityRegistry.registerModEntity(projectileEM.class, "projectileEM", 0, TecTech.instance, 16, 5, true); + if(Loader.isModLoaded("openmodularturrets")) + EntityRegistry.registerModEntity(projectileEM.class, "projectileEM", 0, TecTech.instance, 16, 5, true); } } diff --git a/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java b/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java index 89eae43bcd..d8555e19fe 100644 --- a/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java +++ b/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java @@ -5,7 +5,6 @@ import com.github.technus.tectech.entity.fx.BlockHint; import com.github.technus.tectech.thing.block.QuantumGlassRender; import com.github.technus.tectech.thing.block.QuantumStuffRender; import cpw.mods.fml.client.FMLClientHandler; -import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.common.Loader; import gregtech.api.enums.Textures; @@ -18,17 +17,10 @@ import net.minecraft.client.gui.GuiNewChat; import net.minecraft.client.particle.EntityExplodeFX; import net.minecraft.client.particle.EntityFX; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.util.ChatComponentText; import net.minecraft.world.World; -import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.common.util.ForgeDirection; -import openmodularturrets.blocks.turretheads.TurretHeadEM; -import openmodularturrets.blocks.turretheads.TurretHeadItemRenderEM; -import openmodularturrets.blocks.turretheads.TurretHeadRenderEM; -import openmodularturrets.entity.projectiles.projectileEM; -import openmodularturrets.entity.projectiles.projectileRenderEM; -import openmodularturrets.tileentity.turret.TileTurretHeadEM; +import openmodularturrets.TT_turret_loader; import org.lwjgl.opengl.GL11; public class ClientProxy extends CommonProxy { @@ -46,13 +38,7 @@ public class ClientProxy extends CommonProxy { QuantumStuffRender.renderID = RenderingRegistry.getNextAvailableRenderId(); RenderingRegistry.registerBlockHandler(QuantumStuffRender.renderID, new QuantumStuffRender()); - if(Loader.isModLoaded("openmodularturrets")) { - TurretHeadRenderEM turretHeadRenderEM=new TurretHeadRenderEM(); - ClientRegistry.bindTileEntitySpecialRenderer(TileTurretHeadEM.class, turretHeadRenderEM); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(TurretHeadEM.INSTANCE), new TurretHeadItemRenderEM(turretHeadRenderEM, new TileTurretHeadEM())); - - RenderingRegistry.registerEntityRenderingHandler(projectileEM.class, new projectileRenderEM()); - } + if(Loader.isModLoaded("openmodularturrets")) new TT_turret_loader().run(); } @Override |