From 204fb7fdf3591b79a5813763ea4c6069676dbe8d Mon Sep 17 00:00:00 2001 From: ProfMobius Date: Mon, 24 Mar 2014 19:09:30 +0100 Subject: [PATCH] Version bump --- .../opis/data/server/EntityProfiler.java | 20 ++++++++++++++++++- mcp/mobius/opis/modOpis.java | 2 +- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/mcp/mobius/opis/data/server/EntityProfiler.java b/mcp/mobius/opis/data/server/EntityProfiler.java index 8cf2972..cb0327e 100644 --- a/mcp/mobius/opis/data/server/EntityProfiler.java +++ b/mcp/mobius/opis/data/server/EntityProfiler.java @@ -1,5 +1,7 @@ package mcp.mobius.opis.data.server; +import java.util.concurrent.ConcurrentLinkedQueue; + import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; import net.minecraft.entity.Entity; @@ -12,6 +14,21 @@ public class EntityProfiler extends AbstractProfiler implements IProfilerEntity private Entity currentEntity = null; + /* + private ConcurrentLinkedQueue dataQueue = new ConcurrentLinkedQueue(); + + final class UpdateData{ + final long update; + final Entity entity; + + public UpdateData(long update, Entity entity){ + this.update = update; + this.entity = entity; + } + + } + */ + @Override public void FullEntityStart() {} @@ -20,7 +37,8 @@ public class EntityProfiler extends AbstractProfiler 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; diff --git a/mcp/mobius/opis/modOpis.java b/mcp/mobius/opis/modOpis.java index 66014c7..9493762 100644 --- a/mcp/mobius/opis/modOpis.java +++ b/mcp/mobius/opis/modOpis.java @@ -67,7 +67,7 @@ import cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.common.registry.TickRegistry; import cpw.mods.fml.relauncher.Side; -@Mod(modid="Opis", name="Opis", version="1.2.0_dev3_alpha") +@Mod(modid="Opis", name="Opis", version="1.2.0") @NetworkMod(channels={"Opis", "Opis_Chunk"},clientSideRequired=false, serverSideRequired=false, connectionHandler=OpisConnectionHandler.class, packetHandler=OpisPacketHandler.class) public class modOpis {