mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-20 04:09:43 +00:00
Stuff an thigns.
This commit is contained in:
1 parent
822ebff789
commit
4e6f877a09
7 files changed
+206
-357
No files matched your search
@@ -1,20 +1,15 @@
|
||||
package crazypants.enderio;
|
||||
|
||||
import crazypants.util.DebugGuiTPS;
|
||||
import java.text.DecimalFormat;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import java.text.DecimalFormat;
|
||||
|
||||
public class CommonProxy {
|
||||
|
||||
private static final DecimalFormat FORMAT = new DecimalFormat("########0.000");
|
||||
|
||||
private boolean showTpdGUI;
|
||||
|
||||
public CommonProxy() {
|
||||
String prop = System.getProperty("EnderIO.showTpsGui");
|
||||
showTpdGUI = prop != null && prop.trim().length() > 0;
|
||||
}
|
||||
|
||||
public World getClientWorld() {
|
||||
@@ -25,20 +20,17 @@ public class CommonProxy {
|
||||
return null;
|
||||
}
|
||||
|
||||
public void load() {
|
||||
if(showTpdGUI) {
|
||||
DebugGuiTPS.showTpsGUI();
|
||||
}
|
||||
}
|
||||
|
||||
//TODO:1.7
|
||||
// public ConduitRenderer getRendererForConduit(IConduit conduit) {
|
||||
// return null;
|
||||
// }
|
||||
// public ConduitRenderer getRendererForConduit(IConduit conduit) {
|
||||
// return null;
|
||||
// }
|
||||
|
||||
public double getReachDistanceForPlayer(EntityPlayer entityPlayer) {
|
||||
return 5;
|
||||
|
||||
}
|
||||
|
||||
public void load() {
|
||||
}
|
||||
|
||||
}
|
||||
@@ -29,10 +29,9 @@ public class BlockTravelAnchor extends Block implements IGuiHandler, ITileEntity
|
||||
//PacketHandler.instance.addPacketProcessor(pp);
|
||||
//NetworkRegistry.instance().registerConnectionHandler(pp);
|
||||
|
||||
//FMLCommonHandler.instance().bus().register(new TClientTickHandler());
|
||||
|
||||
EnderIO.packetPipeline.registerPacket(PacketAccessMode.class);
|
||||
EnderIO.packetPipeline.registerPacket(PacketTravelEvent.class);
|
||||
EnderIO.packetPipeline.registerPacket(PacketDrainStaff.class);
|
||||
|
||||
BlockTravelAnchor result = new BlockTravelAnchor();
|
||||
result.init();
|
||||
|
||||
@@ -118,9 +118,10 @@ public class ItemTravelStaff extends ItemEnergyContainer implements IEnergyConta
|
||||
public void addInformation(ItemStack itemStack, EntityPlayer par2EntityPlayer, List list, boolean par4) {
|
||||
super.addInformation(itemStack, par2EntityPlayer, list, par4);
|
||||
//TODO:1.7
|
||||
String str = getEnergyStored(itemStack) + "";
|
||||
// String str = PowerDisplayUtil.formatPower(getEnergyStored(itemStack)) + "/"
|
||||
// + PowerDisplayUtil.formatPower(getMaxEnergyStored(itemStack)) + " " + PowerDisplayUtil.abrevation();
|
||||
// list.add(str);
|
||||
list.add(str);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
package crazypants.enderio.teleport;
|
||||
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import io.netty.channel.ChannelHandlerContext;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import crazypants.enderio.EnderIO;
|
||||
import crazypants.enderio.network.IPacketEio;
|
||||
|
||||
public class PacketDrainStaff implements IPacketEio {
|
||||
|
||||
int powerUse;
|
||||
|
||||
public PacketDrainStaff() {
|
||||
}
|
||||
|
||||
public PacketDrainStaff(int powerUse) {
|
||||
this.powerUse = powerUse;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void encode(ChannelHandlerContext ctx, ByteBuf buffer) {
|
||||
buffer.writeInt(powerUse);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void decode(ChannelHandlerContext ctx, ByteBuf buffer) {
|
||||
powerUse = buffer.readInt();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void handleClientSide(EntityPlayer player) {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void handleServerSide(EntityPlayer ep) {
|
||||
if(ItemTravelStaff.isEquipped(ep)) {
|
||||
EnderIO.itemTravelStaff.extractInternal(ep.getCurrentEquippedItem(), powerUse);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -179,6 +179,8 @@ public class TravelController {
|
||||
if(requiredPower > 0) {
|
||||
//TODO:1.7
|
||||
// PacketDispatcher.sendPacketToServer(TravelPacketHandler.createDrainPowerPacket(requiredPower));
|
||||
PacketDrainStaff p = new PacketDrainStaff(requiredPower);
|
||||
EnderIO.packetPipeline.sendToServer(p);
|
||||
}
|
||||
player.openGui(EnderIO.instance, GuiHandler.GUI_ID_ENDERFACE, world, target.x,
|
||||
TravelController.instance.selectedCoord.y, TravelController.instance.selectedCoord.z);
|
||||
@@ -384,14 +386,6 @@ public class TravelController {
|
||||
}
|
||||
|
||||
public double getScaleForCandidate(Vector3d loc) {
|
||||
// try{
|
||||
// currentView.getEyePoint();
|
||||
// }catch(Exception e) {
|
||||
// //e.printStackTrace();
|
||||
// //System.out.println("crazypants.enderio.teleport.TravelController.getScaleForCandidate: " + currentView.getProjectionMatrix());
|
||||
// //System.out.println("crazypants.enderio.teleport.TravelController.getScaleForCandidate: " + currentView.getViewMatrix());
|
||||
// return 1;
|
||||
// }
|
||||
|
||||
BlockCoord bc = new BlockCoord((int) loc.x, (int) loc.y, (int) loc.z);
|
||||
float ratio = -1;
|
||||
@@ -440,10 +434,6 @@ public class TravelController {
|
||||
private void sendTravelEvent(BlockCoord bc, TravelSource source, int powerUse) {
|
||||
PacketTravelEvent p = new PacketTravelEvent(bc.x, bc.y, bc.z, powerUse, source.getConserveMomentum());
|
||||
EnderIO.packetPipeline.sendToServer(p);
|
||||
|
||||
//TODO:1.7
|
||||
// Packet p = TravelPacketHandler.createMovePacket(coord.x, coord.y, coord.z, powerUse, source.getConserveMomentum());
|
||||
// PacketDispatcher.sendPacketToServer(p);
|
||||
}
|
||||
|
||||
private BlockCoord getActiveTravelBlock(EntityClientPlayerMP player) {
|
||||
|
||||
@@ -1,261 +1,167 @@
|
||||
package crazypants.enderio.teleport;
|
||||
|
||||
|
||||
import crazypants.enderio.IPacketProcessor;
|
||||
import crazypants.enderio.PacketHandler;
|
||||
|
||||
|
||||
//TODO:1.7
|
||||
public class TravelPacketHandler implements IPacketProcessor/*, IConnectionHandler*/ {
|
||||
|
||||
public class TravelPacketHandler implements IPacketProcessor/*
|
||||
* ,
|
||||
* IConnectionHandler
|
||||
*/{
|
||||
|
||||
@Override
|
||||
public boolean canProcessPacket(int packetID) {
|
||||
return packetID == PacketHandler.ID_TRAVEL_AUTH_ACCESS_MODE || packetID == PacketHandler.ID_TRAVEL_AUTH_GUI || packetID == PacketHandler.ID_TRAVEL_PLATFORM
|
||||
|| packetID == PacketHandler.ID_TRAVEL_STAFF_DRAIN
|
||||
|| packetID == PacketHandler.ID_TRAVEL_SETTINGS;
|
||||
}
|
||||
|
||||
// public static Packet createAccessModePacket(int x, int y, int z, AccessMode mode) {
|
||||
// ByteArrayOutputStream bos = new ByteArrayOutputStream();
|
||||
// DataOutputStream dos = new DataOutputStream(bos);
|
||||
// try {
|
||||
// dos.writeInt(PacketHandler.ID_TRAVEL_AUTH_ACCESS_MODE);
|
||||
// dos.writeInt(x);
|
||||
// dos.writeInt(y);
|
||||
// dos.writeInt(z);
|
||||
// dos.writeShort(mode.ordinal());
|
||||
// } catch (IOException e) {
|
||||
// // never thrown
|
||||
// }
|
||||
// Packet250CustomPayload pkt = new Packet250CustomPayload();
|
||||
// pkt.channel = PacketHandler.CHANNEL;
|
||||
// pkt.data = bos.toByteArray();
|
||||
// pkt.length = bos.size();
|
||||
// pkt.isChunkDataPacket = true;
|
||||
// return pkt;
|
||||
// }
|
||||
//
|
||||
// private void processAuthModePacket(DataInputStream data, Player player) throws IOException {
|
||||
// if(!(player instanceof EntityPlayer)) {
|
||||
// return;
|
||||
// }
|
||||
// EntityPlayer ep = (EntityPlayer) player;
|
||||
// int x = data.readInt();
|
||||
// int y = data.readInt();
|
||||
// int z = data.readInt();
|
||||
// AccessMode mode = AccessMode.values()[data.readShort()];
|
||||
//
|
||||
// TileEntity te = ep.worldObj.getTileEntity(x, y, z);
|
||||
// if(te instanceof TileTravelAnchor) {
|
||||
// ((TileTravelAnchor) te).setAccessMode(mode);
|
||||
// ep.worldObj.markBlockForUpdate(x, y, z);
|
||||
// }
|
||||
//
|
||||
// }
|
||||
//
|
||||
// public static Packet createOpenAuthGuiPacket(int x, int y, int z) {
|
||||
// ByteArrayOutputStream bos = new ByteArrayOutputStream();
|
||||
// DataOutputStream dos = new DataOutputStream(bos);
|
||||
// try {
|
||||
// dos.writeInt(PacketHandler.ID_TRAVEL_AUTH_GUI);
|
||||
// dos.writeInt(x);
|
||||
// dos.writeInt(y);
|
||||
// dos.writeInt(z);
|
||||
// } catch (IOException e) {
|
||||
// // never thrown
|
||||
// }
|
||||
// Packet250CustomPayload pkt = new Packet250CustomPayload();
|
||||
// pkt.channel = PacketHandler.CHANNEL;
|
||||
// pkt.data = bos.toByteArray();
|
||||
// pkt.length = bos.size();
|
||||
// pkt.isChunkDataPacket = true;
|
||||
// return pkt;
|
||||
// }
|
||||
//
|
||||
// private void processOpenGuiPacket(DataInputStream data, Player player) throws IOException {
|
||||
// if(!(player instanceof EntityPlayer)) {
|
||||
// return;
|
||||
// }
|
||||
// EntityPlayer ep = (EntityPlayer) player;
|
||||
// int x = data.readInt();
|
||||
// int y = data.readInt();
|
||||
// int z = data.readInt();
|
||||
// ep.openGui(EnderIO.instance, GuiHandler.GUI_ID_TRAVEL_AUTH, ep.worldObj, x, y, z);
|
||||
// }
|
||||
//
|
||||
// public static Packet createDrainPowerPacket(int powerUse) {
|
||||
// ByteArrayOutputStream bos = new ByteArrayOutputStream();
|
||||
// DataOutputStream dos = new DataOutputStream(bos);
|
||||
// try {
|
||||
// dos.writeInt(PacketHandler.ID_TRAVEL_STAFF_DRAIN);
|
||||
// dos.writeInt(powerUse);
|
||||
// } catch (IOException e) {
|
||||
// // never thrown
|
||||
// }
|
||||
// Packet250CustomPayload pkt = new Packet250CustomPayload();
|
||||
// pkt.channel = PacketHandler.CHANNEL;
|
||||
// pkt.data = bos.toByteArray();
|
||||
// pkt.length = bos.size();
|
||||
// pkt.isChunkDataPacket = true;
|
||||
// return pkt;
|
||||
// }
|
||||
//
|
||||
// public static Packet createMovePacket(int x, int y, int z, int powerUse, boolean conserveMotion) {
|
||||
// ByteArrayOutputStream bos = new ByteArrayOutputStream();
|
||||
// DataOutputStream dos = new DataOutputStream(bos);
|
||||
// try {
|
||||
// dos.writeInt(PacketHandler.ID_TRAVEL_PLATFORM);
|
||||
// dos.writeInt(x);
|
||||
// dos.writeInt(y);
|
||||
// dos.writeInt(z);
|
||||
// dos.writeInt(powerUse);
|
||||
// dos.writeBoolean(conserveMotion);
|
||||
// } catch (IOException e) {
|
||||
// // never thrown
|
||||
// }
|
||||
// Packet250CustomPayload pkt = new Packet250CustomPayload();
|
||||
// pkt.channel = PacketHandler.CHANNEL;
|
||||
// pkt.data = bos.toByteArray();
|
||||
// pkt.length = bos.size();
|
||||
// pkt.isChunkDataPacket = true;
|
||||
// return pkt;
|
||||
// }
|
||||
//
|
||||
// public static Packet createTravelSettingsPacket() {
|
||||
// ByteArrayOutputStream bos = new ByteArrayOutputStream();
|
||||
// DataOutputStream dos = new DataOutputStream(bos);
|
||||
// try {
|
||||
// dos.writeInt(PacketHandler.ID_TRAVEL_SETTINGS);
|
||||
// dos.writeBoolean(Config.travelAnchorEnabled);
|
||||
// dos.writeInt(Config.travelAnchorMaxDistance);
|
||||
//
|
||||
// dos.writeBoolean(Config.travelStaffEnabled);
|
||||
// dos.writeBoolean(Config.travelStaffBlinkEnabled);
|
||||
// dos.writeBoolean(Config.travelStaffBlinkThroughSolidBlocksEnabled);
|
||||
// dos.writeBoolean(Config.travelStaffBlinkThroughClearBlocksEnabled);
|
||||
//
|
||||
// dos.writeInt(Config.travelStaffBlinkPauseTicks);
|
||||
// dos.writeInt(Config.travelStaffMaxDistance);
|
||||
// dos.writeInt(Config.travelStaffMaxPowerIo);
|
||||
// dos.writeInt(Config.travelStaffMaxBlinkDistance);
|
||||
// dos.writeFloat(Config.travelStaffPowerPerBlock);
|
||||
//
|
||||
// } catch (IOException e) {
|
||||
// // never thrown
|
||||
// }
|
||||
// Packet250CustomPayload pkt = new Packet250CustomPayload();
|
||||
// pkt.channel = PacketHandler.CHANNEL;
|
||||
// pkt.data = bos.toByteArray();
|
||||
// pkt.length = bos.size();
|
||||
// pkt.isChunkDataPacket = true;
|
||||
// return pkt;
|
||||
// }
|
||||
//
|
||||
// private void processSettingsPacket(DataInputStream data, Player player) throws IOException {
|
||||
// Config.travelAnchorEnabled = data.readBoolean();
|
||||
// Config.travelAnchorMaxDistance = data.readInt();
|
||||
//
|
||||
// Config.travelStaffEnabled = data.readBoolean();
|
||||
// Config.travelStaffBlinkEnabled = data.readBoolean();
|
||||
// Config.travelStaffBlinkThroughSolidBlocksEnabled = data.readBoolean();
|
||||
// Config.travelStaffBlinkThroughClearBlocksEnabled = data.readBoolean();
|
||||
// Config.travelStaffBlinkPauseTicks = data.readInt();
|
||||
// Config.travelStaffMaxDistance = data.readInt();
|
||||
// Config.travelStaffMaxPowerIo = data.readInt();
|
||||
// Config.travelStaffMaxBlinkDistance = data.readInt();
|
||||
// Config.travelStaffPowerPerBlock = data.readFloat();
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void processPacket(int packetID, INetworkManager manager, DataInputStream data, Player player) throws IOException {
|
||||
// if(packetID == PacketHandler.ID_TRAVEL_PLATFORM) {
|
||||
// processMovePacket(data, player);
|
||||
// } else if(packetID == PacketHandler.ID_TRAVEL_STAFF_DRAIN) {
|
||||
// processDrainPacket(data, player);
|
||||
// } else if(packetID == PacketHandler.ID_TRAVEL_SETTINGS) {
|
||||
// processSettingsPacket(data, player);
|
||||
// } else if(packetID == PacketHandler.ID_TRAVEL_AUTH_GUI) {
|
||||
// processOpenGuiPacket(data, player);
|
||||
// } else if(packetID == PacketHandler.ID_TRAVEL_AUTH_ACCESS_MODE) {
|
||||
// processAuthModePacket(data, player);
|
||||
// } else {
|
||||
// Log.warn("Recieved unkown packet with ID " + packetID);
|
||||
// }
|
||||
//
|
||||
// }
|
||||
//
|
||||
// private void processDrainPacket(DataInputStream data, Player player) throws IOException {
|
||||
// if(!(player instanceof EntityPlayer)) {
|
||||
// return;
|
||||
// }
|
||||
// int powerUse = data.readInt();
|
||||
// EntityPlayer ep = (EntityPlayer) player;
|
||||
// if(ItemTravelStaff.isEquipped(ep)) {
|
||||
// EnderIO.itemTravelStaff.extractInternal(ep.getCurrentEquippedItem(), powerUse);
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// private void processMovePacket(DataInputStream data, Player player) throws IOException {
|
||||
// if(!(player instanceof EntityPlayer)) {
|
||||
// return;
|
||||
// }
|
||||
// int x = data.readInt();
|
||||
// int y = data.readInt();
|
||||
// int z = data.readInt();
|
||||
// int powerUse = data.readInt();
|
||||
// boolean conserveMotion = data.readBoolean();
|
||||
//
|
||||
// EntityPlayer ep = (EntityPlayer) player;
|
||||
//
|
||||
// ep.worldObj.playSoundEffect(ep.posX, ep.posY, ep.posZ, "mob.endermen.portal", 1.0F, 1.0F);
|
||||
//
|
||||
// ep.playSound("mob.endermen.portal", 1.0F, 1.0F);
|
||||
//
|
||||
// ep.setPositionAndUpdate(x + 0.5, y + 1.1, z + 0.5);
|
||||
//
|
||||
// ep.worldObj.playSoundEffect(x, y, z, "mob.endermen.portal", 1.0F, 1.0F);
|
||||
// ep.fallDistance = 0;
|
||||
//
|
||||
// if(conserveMotion) {
|
||||
// Vector3d velocityVex = Util.getLookVecEio(ep);
|
||||
// Packet28EntityVelocity p = new Packet28EntityVelocity(ep.entityId, velocityVex.x, velocityVex.y, velocityVex.z);
|
||||
// PacketDispatcher.sendPacketToPlayer(p, player);
|
||||
// }
|
||||
//
|
||||
// if(powerUse > 0 && ep.getCurrentEquippedItem() != null && ep.getCurrentEquippedItem().itemID == ModObject.itemTravelStaff.actualId) {
|
||||
// ItemStack item = ep.getCurrentEquippedItem().copy();
|
||||
// EnderIO.itemTravelStaff.extractInternal(item, powerUse);
|
||||
// ep.setCurrentItemOrArmor(0, item);
|
||||
//
|
||||
// }
|
||||
//
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void playerLoggedIn(Player player, NetHandler netHandler, INetworkManager manager) {
|
||||
// //send config values to players when they log in
|
||||
// PacketDispatcher.sendPacketToPlayer(createTravelSettingsPacket(), player);
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public String connectionReceived(NetLoginHandler netHandler, INetworkManager manager) {
|
||||
// return null;
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void connectionOpened(NetHandler netClientHandler, String server, int port, INetworkManager manager) {
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void connectionOpened(NetHandler netClientHandler, MinecraftServer server, INetworkManager manager) {
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void connectionClosed(INetworkManager manager) {
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void clientLoggedIn(NetHandler clientHandler, INetworkManager manager, Packet1Login login) {
|
||||
// }
|
||||
// public static Packet createAccessModePacket(int x, int y, int z, AccessMode mode) {
|
||||
// ByteArrayOutputStream bos = new ByteArrayOutputStream();
|
||||
// DataOutputStream dos = new DataOutputStream(bos);
|
||||
// try {
|
||||
// dos.writeInt(PacketHandler.ID_TRAVEL_AUTH_ACCESS_MODE);
|
||||
// dos.writeInt(x);
|
||||
// dos.writeInt(y);
|
||||
// dos.writeInt(z);
|
||||
// dos.writeShort(mode.ordinal());
|
||||
// } catch (IOException e) {
|
||||
// // never thrown
|
||||
// }
|
||||
// Packet250CustomPayload pkt = new Packet250CustomPayload();
|
||||
// pkt.channel = PacketHandler.CHANNEL;
|
||||
// pkt.data = bos.toByteArray();
|
||||
// pkt.length = bos.size();
|
||||
// pkt.isChunkDataPacket = true;
|
||||
// return pkt;
|
||||
// }
|
||||
//
|
||||
// private void processAuthModePacket(DataInputStream data, Player player) throws IOException {
|
||||
// if(!(player instanceof EntityPlayer)) {
|
||||
// return;
|
||||
// }
|
||||
// EntityPlayer ep = (EntityPlayer) player;
|
||||
// int x = data.readInt();
|
||||
// int y = data.readInt();
|
||||
// int z = data.readInt();
|
||||
// AccessMode mode = AccessMode.values()[data.readShort()];
|
||||
//
|
||||
// TileEntity te = ep.worldObj.getTileEntity(x, y, z);
|
||||
// if(te instanceof TileTravelAnchor) {
|
||||
// ((TileTravelAnchor) te).setAccessMode(mode);
|
||||
// ep.worldObj.markBlockForUpdate(x, y, z);
|
||||
// }
|
||||
//
|
||||
// }
|
||||
//
|
||||
// public static Packet createOpenAuthGuiPacket(int x, int y, int z) {
|
||||
// ByteArrayOutputStream bos = new ByteArrayOutputStream();
|
||||
// DataOutputStream dos = new DataOutputStream(bos);
|
||||
// try {
|
||||
// dos.writeInt(PacketHandler.ID_TRAVEL_AUTH_GUI);
|
||||
// dos.writeInt(x);
|
||||
// dos.writeInt(y);
|
||||
// dos.writeInt(z);
|
||||
// } catch (IOException e) {
|
||||
// // never thrown
|
||||
// }
|
||||
// Packet250CustomPayload pkt = new Packet250CustomPayload();
|
||||
// pkt.channel = PacketHandler.CHANNEL;
|
||||
// pkt.data = bos.toByteArray();
|
||||
// pkt.length = bos.size();
|
||||
// pkt.isChunkDataPacket = true;
|
||||
// return pkt;
|
||||
// }
|
||||
//
|
||||
// private void processOpenGuiPacket(DataInputStream data, Player player) throws IOException {
|
||||
// if(!(player instanceof EntityPlayer)) {
|
||||
// return;
|
||||
// }
|
||||
// EntityPlayer ep = (EntityPlayer) player;
|
||||
// int x = data.readInt();
|
||||
// int y = data.readInt();
|
||||
// int z = data.readInt();
|
||||
// ep.openGui(EnderIO.instance, GuiHandler.GUI_ID_TRAVEL_AUTH, ep.worldObj, x, y, z);
|
||||
// }
|
||||
//
|
||||
//
|
||||
//
|
||||
// public static Packet createTravelSettingsPacket() {
|
||||
// ByteArrayOutputStream bos = new ByteArrayOutputStream();
|
||||
// DataOutputStream dos = new DataOutputStream(bos);
|
||||
// try {
|
||||
// dos.writeInt(PacketHandler.ID_TRAVEL_SETTINGS);
|
||||
// dos.writeBoolean(Config.travelAnchorEnabled);
|
||||
// dos.writeInt(Config.travelAnchorMaxDistance);
|
||||
//
|
||||
// dos.writeBoolean(Config.travelStaffEnabled);
|
||||
// dos.writeBoolean(Config.travelStaffBlinkEnabled);
|
||||
// dos.writeBoolean(Config.travelStaffBlinkThroughSolidBlocksEnabled);
|
||||
// dos.writeBoolean(Config.travelStaffBlinkThroughClearBlocksEnabled);
|
||||
//
|
||||
// dos.writeInt(Config.travelStaffBlinkPauseTicks);
|
||||
// dos.writeInt(Config.travelStaffMaxDistance);
|
||||
// dos.writeInt(Config.travelStaffMaxPowerIo);
|
||||
// dos.writeInt(Config.travelStaffMaxBlinkDistance);
|
||||
// dos.writeFloat(Config.travelStaffPowerPerBlock);
|
||||
//
|
||||
// } catch (IOException e) {
|
||||
// // never thrown
|
||||
// }
|
||||
// Packet250CustomPayload pkt = new Packet250CustomPayload();
|
||||
// pkt.channel = PacketHandler.CHANNEL;
|
||||
// pkt.data = bos.toByteArray();
|
||||
// pkt.length = bos.size();
|
||||
// pkt.isChunkDataPacket = true;
|
||||
// return pkt;
|
||||
// }
|
||||
//
|
||||
// private void processSettingsPacket(DataInputStream data, Player player) throws IOException {
|
||||
// Config.travelAnchorEnabled = data.readBoolean();
|
||||
// Config.travelAnchorMaxDistance = data.readInt();
|
||||
//
|
||||
// Config.travelStaffEnabled = data.readBoolean();
|
||||
// Config.travelStaffBlinkEnabled = data.readBoolean();
|
||||
// Config.travelStaffBlinkThroughSolidBlocksEnabled = data.readBoolean();
|
||||
// Config.travelStaffBlinkThroughClearBlocksEnabled = data.readBoolean();
|
||||
// Config.travelStaffBlinkPauseTicks = data.readInt();
|
||||
// Config.travelStaffMaxDistance = data.readInt();
|
||||
// Config.travelStaffMaxPowerIo = data.readInt();
|
||||
// Config.travelStaffMaxBlinkDistance = data.readInt();
|
||||
// Config.travelStaffPowerPerBlock = data.readFloat();
|
||||
// }
|
||||
//
|
||||
//
|
||||
//
|
||||
|
||||
//
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void playerLoggedIn(Player player, NetHandler netHandler, INetworkManager manager) {
|
||||
// //send config values to players when they log in
|
||||
// PacketDispatcher.sendPacketToPlayer(createTravelSettingsPacket(), player);
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public String connectionReceived(NetLoginHandler netHandler, INetworkManager manager) {
|
||||
// return null;
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void connectionOpened(NetHandler netClientHandler, String server, int port, INetworkManager manager) {
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void connectionOpened(NetHandler netClientHandler, MinecraftServer server, INetworkManager manager) {
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void connectionClosed(INetworkManager manager) {
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void clientLoggedIn(NetHandler clientHandler, INetworkManager manager, Packet1Login login) {
|
||||
// }
|
||||
|
||||
}
|
||||
@@ -1,80 +0,0 @@
|
||||
package crazypants.util;
|
||||
|
||||
import java.awt.BorderLayout;
|
||||
import java.awt.event.ActionEvent;
|
||||
import java.awt.event.ActionListener;
|
||||
import java.text.DecimalFormat;
|
||||
|
||||
import javax.swing.BoxLayout;
|
||||
import javax.swing.JFrame;
|
||||
import javax.swing.JLabel;
|
||||
import javax.swing.JPanel;
|
||||
import javax.swing.Timer;
|
||||
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import net.minecraftforge.common.DimensionManager;
|
||||
|
||||
public class DebugGuiTPS extends JFrame {
|
||||
|
||||
public static void showTpsGUI() {
|
||||
DebugGuiTPS g = new DebugGuiTPS();
|
||||
g.setVisible(true);
|
||||
}
|
||||
|
||||
private static final DecimalFormat FORMAT = new DecimalFormat("########0.000");
|
||||
|
||||
private JPanel contentPane = new JPanel();
|
||||
|
||||
private DebugGuiTPS() {
|
||||
Timer timer = new Timer(2000, new ActionListener() {
|
||||
|
||||
@Override
|
||||
public void actionPerformed(ActionEvent arg0) {
|
||||
updateTps();
|
||||
}
|
||||
});
|
||||
timer.setRepeats(true);
|
||||
timer.start();
|
||||
|
||||
contentPane.setLayout(new BoxLayout(contentPane, BoxLayout.Y_AXIS));
|
||||
|
||||
setTitle("TPS");
|
||||
setLayout(new BorderLayout());
|
||||
add(contentPane, BorderLayout.CENTER);
|
||||
setSize(200, 120);
|
||||
}
|
||||
|
||||
private void updateTps() {
|
||||
|
||||
contentPane.removeAll();
|
||||
|
||||
MinecraftServer server = MinecraftServer.getServer();
|
||||
if(server == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
String s = "Avg tick: " + FORMAT.format(average(server.tickTimeArray) * 1.0E-6D) + " ms";
|
||||
JLabel l = new JLabel(s);
|
||||
contentPane.add(l);
|
||||
|
||||
if(server.worldServers != null) {
|
||||
for (Integer id : DimensionManager.getIDs()) {
|
||||
s = "Lvl " + id + " tick: " + FORMAT.format(average(server.worldTickTimes.get(id)) * 1.0E-6D) + " ms";
|
||||
l = new JLabel(s);
|
||||
contentPane.add(l);
|
||||
}
|
||||
}
|
||||
revalidate();
|
||||
repaint();
|
||||
|
||||
}
|
||||
|
||||
private double average(long[] values) {
|
||||
long i = 0L;
|
||||
for (int j = 0; j < values.length; ++j) {
|
||||
i += values[j];
|
||||
}
|
||||
return (double) i / (double) values.length;
|
||||
}
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user