mirror of
https://github.com/GTNewHorizons/Opis.git
synced 2026-11-21 20:52:14 +00:00
Cleanup
This commit is contained in:
1 parent
82e04a415e
commit
3438b5cb9a
34 files changed
+31
-138
No files matched your search
@@ -1,14 +1,9 @@
|
||||
package mcp.mobius.opis.data.managers;
|
||||
|
||||
import java.io.DataOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
import mcp.mobius.mobiuscore.profiler.ProfilerSection;
|
||||
import mcp.mobius.opis.api.IMessageHandler;
|
||||
import mcp.mobius.opis.data.holders.ISerializable;
|
||||
@@ -23,8 +18,6 @@ import mcp.mobius.opis.data.profilers.ProfilerTileEntityUpdate;
|
||||
import mcp.mobius.opis.network.PacketBase;
|
||||
import mcp.mobius.opis.network.enums.Message;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.ChunkCoordinates;
|
||||
import net.minecraft.world.ChunkCoordIntPair;
|
||||
import net.minecraft.world.WorldServer;
|
||||
import net.minecraft.world.chunk.Chunk;
|
||||
|
||||
@@ -3,26 +3,14 @@ package mcp.mobius.opis.data.managers;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.EntityList;
|
||||
import net.minecraft.entity.item.EntityItem;
|
||||
import net.minecraft.entity.monster.EntityMob;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.potion.PotionEffect;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import net.minecraft.util.ChunkCoordinates;
|
||||
import net.minecraft.util.MathHelper;
|
||||
import net.minecraft.world.Teleporter;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.WorldProvider;
|
||||
import net.minecraft.world.WorldServer;
|
||||
import net.minecraftforge.common.DimensionManager;
|
||||
import mcp.mobius.mobiuscore.profiler.ProfilerSection;
|
||||
|
||||
@@ -9,8 +9,6 @@ import com.google.common.collect.BiMap;
|
||||
import com.google.common.collect.HashBiMap;
|
||||
import com.google.common.collect.Maps;
|
||||
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import mcp.mobius.opis.modOpis;
|
||||
import mcp.mobius.opis.api.IMessageHandler;
|
||||
import mcp.mobius.opis.data.holders.ISerializable;
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
package mcp.mobius.opis.data.managers;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
@@ -18,13 +17,9 @@ import mcp.mobius.opis.data.holders.newtypes.DataTileEntity;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataTiming;
|
||||
import mcp.mobius.opis.data.holders.stats.StatsChunk;
|
||||
import mcp.mobius.opis.data.profilers.ProfilerTileEntityUpdate;
|
||||
import mcp.mobius.opis.helpers.ModIdentification;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.MovingObjectPosition;
|
||||
import net.minecraft.util.Vec3;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.WorldServer;
|
||||
import net.minecraftforge.common.DimensionManager;
|
||||
|
||||
@@ -1,11 +1,8 @@
|
||||
package mcp.mobius.opis.data.profilers;
|
||||
|
||||
import java.lang.management.ManagementFactory;
|
||||
import java.lang.management.ThreadInfo;
|
||||
import java.lang.management.ThreadMXBean;
|
||||
|
||||
import javax.management.ObjectName;
|
||||
|
||||
public class Clock {
|
||||
|
||||
public interface IClock{
|
||||
@@ -21,16 +18,22 @@ public class Clock {
|
||||
public class ClockMX implements IClock{
|
||||
public long startTime = 0;
|
||||
public long timeDelta = 0;
|
||||
@Override
|
||||
public void start(){this.startTime = threadMX.getCurrentThreadCpuTime();}
|
||||
@Override
|
||||
public void stop() {this.timeDelta = threadMX.getCurrentThreadCpuTime() - this.startTime;}
|
||||
@Override
|
||||
public long getDelta() {return this.timeDelta;}
|
||||
}
|
||||
|
||||
public class ClockNano implements IClock{
|
||||
public long startTime = 0;
|
||||
public long timeDelta = 0;
|
||||
@Override
|
||||
public void start(){this.startTime = System.nanoTime();}
|
||||
@Override
|
||||
public void stop() {this.timeDelta = System.nanoTime() - this.startTime;}
|
||||
@Override
|
||||
public long getDelta() {return this.timeDelta;}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,16 +1,9 @@
|
||||
package mcp.mobius.opis.data.profilers;
|
||||
|
||||
import java.util.Set;
|
||||
import java.util.concurrent.ArrayBlockingQueue;
|
||||
import java.util.concurrent.BlockingQueue;
|
||||
import java.util.concurrent.LinkedBlockingQueue;
|
||||
import java.util.concurrent.Semaphore;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import java.util.concurrent.atomic.AtomicLong;
|
||||
import java.util.concurrent.locks.Lock;
|
||||
import java.util.concurrent.locks.LockSupport;
|
||||
import java.util.concurrent.locks.ReentrantLock;
|
||||
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
|
||||
public class DeadManSwitch implements Runnable{
|
||||
|
||||
@@ -36,6 +36,6 @@ public class ProfilerDimBlockTick extends ProfilerAbstract implements IProfilerB
|
||||
if (DimensionManager.getWorld(dim).isRemote) return;
|
||||
|
||||
clock.stop();
|
||||
data.get(dim).addValue((double)clock.getDelta());
|
||||
data.get(dim).addValue(clock.getDelta());
|
||||
}
|
||||
}
|
||||
@@ -34,6 +34,6 @@ public class ProfilerDimTick extends ProfilerAbstract implements IProfilerBase {
|
||||
if (world.isRemote) return;
|
||||
|
||||
clock.stop();
|
||||
data.get(world.provider.dimensionId).addValue((double)clock.getDelta());
|
||||
data.get(world.provider.dimensionId).addValue(clock.getDelta());
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,5 @@
|
||||
package mcp.mobius.opis.data.profilers;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.WeakHashMap;
|
||||
|
||||
import net.minecraft.entity.Entity;
|
||||
@@ -38,7 +37,7 @@ public class ProfilerEntityUpdate extends ProfilerAbstract implements IProfilerB
|
||||
|
||||
clock.stop();
|
||||
try{
|
||||
data.get(entity).addValue((double)clock.getDelta());
|
||||
data.get(entity).addValue(clock.getDelta());
|
||||
} catch (Exception e){
|
||||
modOpis.log.warning(String.format("Error while profiling entity %s\n", key));
|
||||
}
|
||||
|
||||
@@ -5,8 +5,6 @@ import mcp.mobius.opis.data.profilers.Clock.IClock;
|
||||
import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
|
||||
|
||||
import com.google.common.collect.HashBasedTable;
|
||||
import com.google.common.collect.HashMultimap;
|
||||
|
||||
import cpw.mods.fml.common.ModContainer;
|
||||
|
||||
public class ProfilerEvent extends ProfilerAbstract {
|
||||
@@ -37,24 +35,24 @@ public class ProfilerEvent extends ProfilerAbstract {
|
||||
|
||||
try{
|
||||
String name = (String)pkg + "|" + handler.getClass().getSimpleName();
|
||||
dataTick.get(event.getClass(), name).addValue((double)clock.getDelta());
|
||||
dataTick.get(event.getClass(), name).addValue(clock.getDelta());
|
||||
} catch (Exception e) {
|
||||
String name = (String)pkg + "|" + handler.getClass().getSimpleName();
|
||||
dataTick.put(event.getClass(), name, new DescriptiveStatistics(250));
|
||||
dataModTick.put(event.getClass(), name, ((ModContainer)mod).getName());
|
||||
dataTick.get(event.getClass(), name).addValue((double)clock.getDelta());
|
||||
dataTick.get(event.getClass(), name).addValue(clock.getDelta());
|
||||
}
|
||||
|
||||
} else {
|
||||
|
||||
try{
|
||||
String name = (String)pkg + "|" + handler.getClass().getSimpleName();
|
||||
data.get(event.getClass(), name).addValue((double)clock.getDelta());
|
||||
data.get(event.getClass(), name).addValue(clock.getDelta());
|
||||
} catch (Exception e) {
|
||||
String name = (String)pkg + "|" + handler.getClass().getSimpleName();
|
||||
data.put(event.getClass(), name, new DescriptiveStatistics(250));
|
||||
dataMod.put(event.getClass(), name, ((ModContainer)mod).getName());
|
||||
data.get(event.getClass(), name).addValue((double)clock.getDelta());
|
||||
data.get(event.getClass(), name).addValue(clock.getDelta());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -22,7 +22,7 @@ public class ProfilerNetworkTick extends ProfilerAbstract {
|
||||
@Override
|
||||
public void stop(){
|
||||
clock.stop();
|
||||
data.addValue((double)clock.getDelta());
|
||||
data.addValue(clock.getDelta());
|
||||
}
|
||||
|
||||
}
|
||||
@@ -4,7 +4,6 @@ import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
|
||||
import net.minecraft.network.Packet;
|
||||
import net.minecraft.network.play.client.C17PacketCustomPayload;
|
||||
import cpw.mods.fml.common.network.internal.FMLProxyPacket;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataPacket;
|
||||
|
||||
@@ -5,8 +5,6 @@ import java.util.HashMap;
|
||||
import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock;
|
||||
import mcp.mobius.opis.data.profilers.Clock.IClock;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
|
||||
|
||||
public class ProfilerRenderBlock extends ProfilerAbstract {
|
||||
@@ -32,7 +30,7 @@ public class ProfilerRenderBlock extends ProfilerAbstract {
|
||||
CoordinatesBlock coord = new CoordinatesBlock(Minecraft.getMinecraft().theWorld.provider.dimensionId, (Integer)key2, (Integer)key3, (Integer)key4);
|
||||
|
||||
clock.stop();
|
||||
data.get(coord).addValue((double)clock.getDelta());
|
||||
data.get(coord).addValue(clock.getDelta());
|
||||
}
|
||||
|
||||
}
|
||||
@@ -32,7 +32,7 @@ public class ProfilerRenderEntity extends ProfilerAbstract {
|
||||
clock.stop();
|
||||
try{
|
||||
//data.get((Entity)key).addValue((double)clock.getDelta());
|
||||
data.get(key).addValue((double)clock.getDelta());
|
||||
data.get(key).addValue(clock.getDelta());
|
||||
} catch (Exception e) {
|
||||
modOpis.log.warning(String.format("Error while profiling entity %s\n", key));
|
||||
}
|
||||
|
||||
@@ -31,7 +31,7 @@ public class ProfilerRenderTileEntity extends ProfilerAbstract {
|
||||
public void stop(Object key){
|
||||
clock.stop();
|
||||
try{
|
||||
data.get((TileEntity)key).addValue((double)clock.getDelta());
|
||||
data.get(key).addValue(clock.getDelta());
|
||||
} catch (Exception e) {
|
||||
modOpis.log.warning(String.format("Error while profiling entity %s\n", key));
|
||||
}
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
package mcp.mobius.opis.data.profilers;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
import mcp.mobius.opis.data.profilers.Clock.IClock;
|
||||
|
||||
import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
|
||||
@@ -25,7 +23,7 @@ public class ProfilerTick extends ProfilerAbstract {
|
||||
@Override
|
||||
public void stop() {
|
||||
this.clock.stop();
|
||||
this.data.addValue((double)clock.getDelta());
|
||||
this.data.addValue(clock.getDelta());
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,8 +1,6 @@
|
||||
package mcp.mobius.opis.data.profilers;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.WeakHashMap;
|
||||
|
||||
import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
|
||||
|
||||
import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock;
|
||||
@@ -43,6 +41,6 @@ public class ProfilerTileEntityUpdate extends ProfilerAbstract {
|
||||
clock.stop();
|
||||
CoordinatesBlock coord = new CoordinatesBlock(tileent);
|
||||
|
||||
data.get(coord).addValue((double)clock.getDelta());
|
||||
data.get(coord).addValue(clock.getDelta());
|
||||
}
|
||||
}
|
||||
@@ -2,16 +2,12 @@ package mcp.mobius.opis.events;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.EnumSet;
|
||||
import java.util.logging.Level;
|
||||
|
||||
import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
|
||||
|
||||
import com.google.common.collect.HashBasedTable;
|
||||
import com.google.common.collect.Table.Cell;
|
||||
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import mcp.mobius.mobiuscore.profiler.ProfilerSection;
|
||||
import mcp.mobius.opis.modOpis;
|
||||
|
||||
@@ -1,11 +1,5 @@
|
||||
package mcp.mobius.opis.events;
|
||||
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.entity.item.EntityItem;
|
||||
import net.minecraftforge.event.entity.EntityEvent;
|
||||
|
||||
public class OpisServerEventHandler {
|
||||
|
||||
public static boolean printEntityTrace = false;
|
||||
|
||||
@@ -1,26 +1,12 @@
|
||||
package mcp.mobius.opis.events;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.EnumSet;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
|
||||
import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
|
||||
|
||||
import com.google.common.collect.HashBasedTable;
|
||||
import com.google.common.collect.Table;
|
||||
import com.google.common.collect.Table.Cell;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraftforge.common.DimensionManager;
|
||||
import mcp.mobius.opis.modOpis;
|
||||
import mcp.mobius.opis.data.holders.basetypes.AmountHolder;
|
||||
import mcp.mobius.opis.data.holders.basetypes.CoordinatesChunk;
|
||||
import mcp.mobius.opis.data.holders.basetypes.SerialDouble;
|
||||
import mcp.mobius.opis.data.holders.basetypes.SerialInt;
|
||||
import mcp.mobius.opis.data.holders.basetypes.SerialLong;
|
||||
import mcp.mobius.opis.data.holders.newtypes.CachedString;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataDimension;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataPacket;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataPacket250;
|
||||
@@ -31,7 +17,6 @@ import mcp.mobius.opis.data.managers.ChunkManager;
|
||||
import mcp.mobius.opis.data.managers.EntityManager;
|
||||
import mcp.mobius.opis.data.managers.StringCache;
|
||||
import mcp.mobius.opis.data.managers.TileEntityManager;
|
||||
import mcp.mobius.opis.data.profilers.ProfilerEvent;
|
||||
import mcp.mobius.opis.data.profilers.ProfilerPacket;
|
||||
import mcp.mobius.opis.data.profilers.ProfilerTick;
|
||||
import mcp.mobius.opis.gui.overlay.OverlayStatus;
|
||||
|
||||
@@ -14,7 +14,6 @@ import mcp.mobius.opis.network.enums.AccessLevel;
|
||||
import mcp.mobius.opis.network.enums.Message;
|
||||
import mcp.mobius.opis.network.packets.server.NetDataValue;
|
||||
import mcp.mobius.opis.swing.SelectedTab;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
package mcp.mobius.opis.helpers;
|
||||
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
|
||||
public class Helpers {
|
||||
|
||||
@@ -1,15 +1,10 @@
|
||||
package mcp.mobius.opis.helpers;
|
||||
|
||||
import java.io.UnsupportedEncodingException;
|
||||
import java.lang.reflect.Field;
|
||||
import java.net.URLDecoder;
|
||||
import java.util.HashMap;
|
||||
import java.util.Set;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.nbt.NBTTagList;
|
||||
import cpw.mods.fml.common.Loader;
|
||||
import cpw.mods.fml.common.ModContainer;
|
||||
import cpw.mods.fml.common.registry.GameData;
|
||||
|
||||
@@ -3,18 +3,12 @@ package mcp.mobius.opis.helpers;
|
||||
import java.io.DataInputStream;
|
||||
import java.io.DataOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.util.HashSet;
|
||||
import java.util.logging.Level;
|
||||
|
||||
import net.minecraft.nbt.CompressedStreamTools;
|
||||
import net.minecraft.nbt.NBTBase;
|
||||
import net.minecraft.nbt.NBTTagByte;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.nbt.NBTTagInt;
|
||||
import net.minecraft.nbt.NBTTagList;
|
||||
import net.minecraft.nbt.NBTTagLong;
|
||||
import net.minecraft.nbt.NBTTagShort;
|
||||
import net.minecraft.nbt.NBTTagString;
|
||||
|
||||
public class NBTUtil {
|
||||
|
||||
|
||||
@@ -3,9 +3,7 @@ package mcp.mobius.opis.helpers;
|
||||
import java.util.Iterator;
|
||||
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.EntityList;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
@@ -15,9 +13,7 @@ import net.minecraft.network.play.server.S1DPacketEntityEffect;
|
||||
import net.minecraft.potion.PotionEffect;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import net.minecraft.server.management.ServerConfigurationManager;
|
||||
import net.minecraft.util.ChunkCoordinates;
|
||||
import net.minecraft.util.MathHelper;
|
||||
import net.minecraft.world.Teleporter;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.WorldProvider;
|
||||
import net.minecraft.world.WorldServer;
|
||||
@@ -101,8 +97,8 @@ public class Teleport {
|
||||
float f = ent.rotationYaw;
|
||||
|
||||
srcWorld.theProfiler.startSection("placing");
|
||||
d0 = (double)MathHelper.clamp_int((int)d0, -29999872, 29999872);
|
||||
d1 = (double)MathHelper.clamp_int((int)d1, -29999872, 29999872);
|
||||
d0 = MathHelper.clamp_int((int)d0, -29999872, 29999872);
|
||||
d1 = MathHelper.clamp_int((int)d1, -29999872, 29999872);
|
||||
|
||||
if (ent.isEntityAlive())
|
||||
{
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
package mcp.mobius.opis.network;
|
||||
|
||||
import java.io.DataInputStream;
|
||||
import java.lang.reflect.Method;
|
||||
import java.util.ArrayList;
|
||||
|
||||
@@ -9,7 +8,6 @@ import mcp.mobius.opis.data.holders.newtypes.DataError;
|
||||
import mcp.mobius.opis.network.enums.Message;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.network.Packet;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import com.google.common.io.ByteArrayDataInput;
|
||||
|
||||
@@ -3,12 +3,10 @@ package mcp.mobius.opis.network;
|
||||
import static cpw.mods.fml.relauncher.Side.CLIENT;
|
||||
import static cpw.mods.fml.relauncher.Side.SERVER;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import io.netty.channel.ChannelFutureListener;
|
||||
import io.netty.channel.ChannelHandlerContext;
|
||||
import io.netty.channel.ChannelHandler.Sharable;
|
||||
import io.netty.channel.SimpleChannelInboundHandler;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.lang.reflect.Constructor;
|
||||
import java.util.ArrayList;
|
||||
import java.util.EnumMap;
|
||||
@@ -16,9 +14,6 @@ import java.util.EnumMap;
|
||||
import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
|
||||
import org.apache.logging.log4j.Level;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
|
||||
import com.google.common.base.Charsets;
|
||||
import com.google.common.collect.HashBasedTable;
|
||||
import com.google.common.collect.Maps;
|
||||
import com.google.common.collect.Table.Cell;
|
||||
@@ -27,7 +22,6 @@ import com.google.common.io.ByteArrayDataOutput;
|
||||
import com.google.common.io.ByteStreams;
|
||||
|
||||
import mcp.mobius.mobiuscore.profiler.ProfilerSection;
|
||||
import mcp.mobius.opis.modOpis;
|
||||
import mcp.mobius.opis.data.holders.ISerializable;
|
||||
import mcp.mobius.opis.data.holders.basetypes.AmountHolder;
|
||||
import mcp.mobius.opis.data.holders.basetypes.SerialInt;
|
||||
@@ -56,8 +50,6 @@ import mcp.mobius.opis.network.packets.server.PacketChunks;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.nbt.CompressedStreamTools;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import cpw.mods.fml.common.network.FMLEmbeddedChannel;
|
||||
import cpw.mods.fml.common.network.FMLIndexedMessageToMessageCodec;
|
||||
|
||||
@@ -6,20 +6,16 @@ import java.util.logging.Level;
|
||||
|
||||
import net.minecraft.entity.item.EntityItem;
|
||||
import net.minecraft.entity.monster.EntityMob;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.DimensionManager;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import mcp.mobius.mobiuscore.profiler.ProfilerSection;
|
||||
import mcp.mobius.opis.modOpis;
|
||||
import mcp.mobius.opis.commands.server.CommandAmountEntities;
|
||||
import mcp.mobius.opis.data.client.DataCache;
|
||||
import mcp.mobius.opis.data.holders.ISerializable;
|
||||
import mcp.mobius.opis.data.holders.basetypes.AmountHolder;
|
||||
import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock;
|
||||
import mcp.mobius.opis.data.holders.basetypes.CoordinatesChunk;
|
||||
import mcp.mobius.opis.data.holders.basetypes.SerialDouble;
|
||||
import mcp.mobius.opis.data.holders.basetypes.SerialInt;
|
||||
import mcp.mobius.opis.data.holders.basetypes.SerialLong;
|
||||
import mcp.mobius.opis.data.holders.basetypes.SerialString;
|
||||
@@ -153,7 +149,7 @@ public class ServerMessageHandler {
|
||||
}
|
||||
|
||||
else if (maintype == Message.COMMAND_TELEPORT_BLOCK){
|
||||
EntityManager.INSTANCE.teleportPlayer((CoordinatesBlock)param1, (EntityPlayerMP)player);
|
||||
EntityManager.INSTANCE.teleportPlayer((CoordinatesBlock)param1, player);
|
||||
PacketManager.validateAndSend(new NetDataValue(Message.CLIENT_HIGHLIGHT_BLOCK, param1), player);
|
||||
}
|
||||
|
||||
@@ -172,7 +168,7 @@ public class ServerMessageHandler {
|
||||
|
||||
CoordinatesBlock blockCoord = new CoordinatesBlock(chunkCoord.dim, chunkCoord.x + 8, world.getTopSolidOrLiquidBlock(chunkCoord.x, chunkCoord.z), chunkCoord.z + 8);
|
||||
|
||||
EntityManager.INSTANCE.teleportPlayer(blockCoord, (EntityPlayerMP)player);
|
||||
EntityManager.INSTANCE.teleportPlayer(blockCoord, player);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -2,12 +2,9 @@ package mcp.mobius.opis.network.packets.client;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.chunk.Chunk;
|
||||
import net.minecraftforge.common.DimensionManager;
|
||||
|
||||
import com.google.common.io.ByteArrayDataInput;
|
||||
import com.google.common.io.ByteArrayDataOutput;
|
||||
|
||||
|
||||
@@ -1,20 +1,12 @@
|
||||
package mcp.mobius.opis.network.packets.client;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
import mcp.mobius.opis.data.holders.DataType;
|
||||
import mcp.mobius.opis.data.holders.ISerializable;
|
||||
import mcp.mobius.opis.data.holders.basetypes.CoordinatesChunk;
|
||||
import mcp.mobius.opis.events.PlayerTracker;
|
||||
import mcp.mobius.opis.network.PacketBase;
|
||||
import mcp.mobius.opis.network.ServerMessageHandler;
|
||||
import mcp.mobius.opis.network.enums.AccessLevel;
|
||||
import mcp.mobius.opis.network.enums.Message;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.chunk.Chunk;
|
||||
|
||||
import com.google.common.io.ByteArrayDataInput;
|
||||
import com.google.common.io.ByteArrayDataOutput;
|
||||
|
||||
|
||||
@@ -30,7 +30,8 @@ public class NetDataCommand extends PacketBase {
|
||||
this.msg = Message.values()[input.readInt()];
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void actionClient(World world, EntityPlayer player){
|
||||
MessageHandlerRegistrar.INSTANCE.routeMessage(this.msg, this);
|
||||
}
|
||||
|
||||
@@ -54,7 +54,8 @@ public class NetDataList extends PacketBase {
|
||||
this.array.add(dataRead(this.clazz, input));
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void actionClient(World world, EntityPlayer player){
|
||||
MessageHandlerRegistrar.INSTANCE.routeMessage(this.msg, this);
|
||||
}
|
||||
|
||||
@@ -1,8 +1,5 @@
|
||||
package mcp.mobius.opis.network.packets.server;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
@@ -41,7 +38,8 @@ public class NetDataValue extends PacketBase {
|
||||
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void actionClient(World world, EntityPlayer player){
|
||||
MessageHandlerRegistrar.INSTANCE.routeMessage(this.msg, this);
|
||||
}
|
||||
|
||||
@@ -10,7 +10,6 @@ import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import mapwriter.Mw;
|
||||
import mapwriter.region.MwChunk;
|
||||
import mcp.mobius.opis.api.MessageHandlerRegistrar;
|
||||
import mcp.mobius.opis.network.PacketBase;
|
||||
|
||||
public class PacketChunks extends PacketBase{
|
||||
@@ -30,7 +29,8 @@ public class PacketChunks extends PacketBase{
|
||||
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void actionClient(World world, EntityPlayer player){
|
||||
Mw.instance.chunkManager.forceChunks(this.chunks);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user