From 14df79c55cc00dbda7af3e7d6bafbe7b0d735bae Mon Sep 17 00:00:00 2001 From: ProfMobius Date: Mon, 9 Dec 2013 00:53:26 +0100 Subject: [PATCH] Removed some weird dependencies. Removed some potential overhead in the star/stop calls. --- mcp/mobius/opis/data/EntityProfiler.java | 4 ++-- mcp/mobius/opis/data/TileEntityProfiler.java | 4 ++-- mcp/mobius/opis/data/holders/CoordinatesBlock.java | 2 +- mcp/mobius/opis/tools/ModIdentification.java | 1 - 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/mcp/mobius/opis/data/EntityProfiler.java b/mcp/mobius/opis/data/EntityProfiler.java index 988f848..2d0699c 100644 --- a/mcp/mobius/opis/data/EntityProfiler.java +++ b/mcp/mobius/opis/data/EntityProfiler.java @@ -27,7 +27,7 @@ public class EntityProfiler implements IProfilerEntity { @Override public void Start(Entity ent) { - if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) return; + //if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) return; if ((!modOpis.profilerRun) || (OpisServerTickHandler.instance.profilerUpdateTickCounter % modOpis.profilerDelay != 0)) return; if (ent.worldObj.isRemote) return; @@ -39,7 +39,7 @@ public class EntityProfiler implements IProfilerEntity { @Override public void Stop(Entity ent) { - if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) return; + //if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) return; if ((!modOpis.profilerRun) || (OpisServerTickHandler.instance.profilerUpdateTickCounter % modOpis.profilerDelay != 0)) return; this.clock.stop(); diff --git a/mcp/mobius/opis/data/TileEntityProfiler.java b/mcp/mobius/opis/data/TileEntityProfiler.java index b1e7147..85273aa 100644 --- a/mcp/mobius/opis/data/TileEntityProfiler.java +++ b/mcp/mobius/opis/data/TileEntityProfiler.java @@ -28,7 +28,7 @@ public class TileEntityProfiler implements IProfilerTileEntity { @Override public void Start(TileEntity te) { - if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) return; + //if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) return; if ((!modOpis.profilerRun) || (OpisServerTickHandler.instance.profilerUpdateTickCounter % modOpis.profilerDelay != 0)) return; if (te.worldObj.isRemote) return; @@ -39,7 +39,7 @@ public class TileEntityProfiler implements IProfilerTileEntity { @Override public void Stop(TileEntity te) { - if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) return; + //if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) return; if ((!modOpis.profilerRun) || (OpisServerTickHandler.instance.profilerUpdateTickCounter % modOpis.profilerDelay != 0)) return; this.clock.stop(); diff --git a/mcp/mobius/opis/data/holders/CoordinatesBlock.java b/mcp/mobius/opis/data/holders/CoordinatesBlock.java index 237e432..8363ee6 100644 --- a/mcp/mobius/opis/data/holders/CoordinatesBlock.java +++ b/mcp/mobius/opis/data/holders/CoordinatesBlock.java @@ -4,8 +4,8 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import codechicken.lib.math.MathHelper; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.MathHelper; public final class CoordinatesBlock implements ISerializable { public final int dim, x, y, z; diff --git a/mcp/mobius/opis/tools/ModIdentification.java b/mcp/mobius/opis/tools/ModIdentification.java index 7a43f14..cb2299f 100644 --- a/mcp/mobius/opis/tools/ModIdentification.java +++ b/mcp/mobius/opis/tools/ModIdentification.java @@ -14,7 +14,6 @@ import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.ModContainer; import cpw.mods.fml.common.registry.GameData; import cpw.mods.fml.common.registry.ItemData; -import mcp.mobius.waila.mod_Waila; import net.minecraft.enchantment.Enchantment; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound;