mirror of
https://github.com/GTNewHorizons/Opis.git
synced 2026-11-19 19:59:37 +00:00
Overlays are all enums now
This commit is contained in:
1 parent
c5744d7e6f
commit
4772fa14ad
8 files changed
+22
-41
No files matched your search
@@ -40,8 +40,9 @@ import mcp.mobius.opis.network.enums.Message;
|
||||
import mcp.mobius.opis.network.packets.client.PacketReqChunks;
|
||||
import mcp.mobius.opis.network.packets.client.PacketReqData;
|
||||
|
||||
public class OverlayMeanTime implements IMwDataProvider, IMessageHandler{
|
||||
|
||||
public enum OverlayMeanTime implements IMwDataProvider, IMessageHandler{
|
||||
INSTANCE;
|
||||
|
||||
public class EntitiesTable extends ViewTable{
|
||||
MapView mapView;
|
||||
MapMode mapMode;
|
||||
@@ -125,20 +126,9 @@ public class OverlayMeanTime implements IMwDataProvider, IMessageHandler{
|
||||
}
|
||||
|
||||
CoordinatesChunk selectedChunk = null;
|
||||
private static OverlayMeanTime _instance;
|
||||
public boolean showList = false;
|
||||
public LayoutCanvas canvas = null;
|
||||
|
||||
private OverlayMeanTime(){
|
||||
|
||||
}
|
||||
|
||||
public static OverlayMeanTime instance(){
|
||||
if(_instance == null)
|
||||
_instance = new OverlayMeanTime();
|
||||
return _instance;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ArrayList<IMwChunkOverlay> getChunksOverlay(int dim, double centerX, double centerZ, double minX, double minZ, double maxX, double maxZ) {
|
||||
ArrayList<IMwChunkOverlay> overlays = new ArrayList<IMwChunkOverlay>();
|
||||
|
||||
@@ -33,8 +33,9 @@ import mcp.mobius.opis.network.enums.Message;
|
||||
import mcp.mobius.opis.network.packets.client.PacketReqChunks;
|
||||
import mcp.mobius.opis.network.packets.client.PacketReqData;
|
||||
|
||||
public class OverlayEntityPerChunk implements IMwDataProvider, IMessageHandler {
|
||||
|
||||
public enum OverlayEntityPerChunk implements IMwDataProvider, IMessageHandler {
|
||||
INSTANCE;
|
||||
|
||||
class ReducedData implements Comparable{
|
||||
CoordinatesChunk chunk;
|
||||
int amount;
|
||||
@@ -51,7 +52,6 @@ public class OverlayEntityPerChunk implements IMwDataProvider, IMessageHandler {
|
||||
|
||||
}
|
||||
|
||||
private static OverlayEntityPerChunk _instance;
|
||||
public boolean showList = false;
|
||||
public LayoutCanvas canvas = null;
|
||||
public HashMap<CoordinatesChunk, Integer> overlayData = new HashMap<CoordinatesChunk, Integer>();
|
||||
@@ -59,14 +59,6 @@ public class OverlayEntityPerChunk implements IMwDataProvider, IMessageHandler {
|
||||
public ArrayList<DataEntity> entStats = new ArrayList<DataEntity>();
|
||||
public CoordinatesChunk selectedChunk = null;
|
||||
|
||||
private OverlayEntityPerChunk(){}
|
||||
|
||||
public static OverlayEntityPerChunk instance(){
|
||||
if(_instance == null)
|
||||
_instance = new OverlayEntityPerChunk();
|
||||
return _instance;
|
||||
}
|
||||
|
||||
public void setEntStats(ArrayList<ISerializable> data){
|
||||
this.entStats.clear();
|
||||
for (ISerializable stat : data)
|
||||
|
||||
+3
-3
@@ -49,9 +49,9 @@ public class PacketDataOverlayChunkEntities extends PacketBase {
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void actionClient(World world, EntityPlayer player){
|
||||
OverlayEntityPerChunk.instance().overlayData = this.chunkStatus;
|
||||
OverlayEntityPerChunk.instance().reduceData();
|
||||
OverlayEntityPerChunk.instance().setupChunkTable();
|
||||
OverlayEntityPerChunk.INSTANCE.overlayData = this.chunkStatus;
|
||||
OverlayEntityPerChunk.INSTANCE.reduceData();
|
||||
OverlayEntityPerChunk.INSTANCE.setupChunkTable();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -61,8 +61,8 @@ public class ProxyClient extends ProxyServer implements IMessageHandler{
|
||||
public void init(){
|
||||
//MwAPI.registerDataProvider("Loaded chunks", OverlayLoadedChunks.instance);
|
||||
MwAPI.registerDataProvider("Loaded chunks", OverlayLoadedChunks.INSTANCE);
|
||||
MwAPI.registerDataProvider("Mean time", OverlayMeanTime.instance());
|
||||
MwAPI.registerDataProvider("Ent per chunk", OverlayEntityPerChunk.instance());
|
||||
MwAPI.registerDataProvider("Mean time", OverlayMeanTime.INSTANCE);
|
||||
MwAPI.registerDataProvider("Ent per chunk", OverlayEntityPerChunk.INSTANCE);
|
||||
|
||||
//fontMC12 = Fonts.createFont(new ResourceLocation("opis", "fonts/Minecraftia.ttf"), 12, false);
|
||||
//fontMC24 = Fonts.createFont(new ResourceLocation("opis", "fonts/Minecraftia.ttf"), 24, false);
|
||||
@@ -193,8 +193,9 @@ public class ProxyClient extends ProxyServer implements IMessageHandler{
|
||||
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.CLIENT_SHOW_RENDER_TICK, modOpis.proxy);
|
||||
|
||||
|
||||
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.LIST_CHUNK_ENTITIES, OverlayEntityPerChunk.instance());
|
||||
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.LIST_CHUNK_TILEENTS, OverlayMeanTime.instance());
|
||||
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.LIST_CHUNK_ENTITIES, OverlayEntityPerChunk.INSTANCE);
|
||||
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.LIST_CHUNK_TICKETS, OverlayLoadedChunks.INSTANCE);
|
||||
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.LIST_CHUNK_TILEENTS, OverlayMeanTime.INSTANCE);
|
||||
|
||||
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.LIST_TIMING_CHUNK, ChunkManager.INSTANCE);
|
||||
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.LIST_CHUNK_LOADED, ChunkManager.INSTANCE);
|
||||
@@ -202,8 +203,6 @@ public class ProxyClient extends ProxyServer implements IMessageHandler{
|
||||
|
||||
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.STATUS_STRINGUPD, StringCache.INSTANCE);
|
||||
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.STATUS_STRINGUPD_FULL, StringCache.INSTANCE);
|
||||
|
||||
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.LIST_CHUNK_TICKETS, OverlayLoadedChunks.INSTANCE);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -43,8 +43,8 @@ public class ActionPlayers implements ActionListener {
|
||||
CoordinatesBlock coord = data.pos;
|
||||
PacketManager.sendToServer(new PacketReqData(Message.OVERLAY_CHUNK_ENTITIES));
|
||||
PacketManager.sendToServer(new PacketReqData(Message.LIST_CHUNK_ENTITIES, data.pos.asCoordinatesChunk()));
|
||||
OverlayEntityPerChunk.instance().selectedChunk = coord.asCoordinatesChunk();
|
||||
MwAPI.setCurrentDataProvider(OverlayEntityPerChunk.instance());
|
||||
OverlayEntityPerChunk.INSTANCE.selectedChunk = coord.asCoordinatesChunk();
|
||||
MwAPI.setCurrentDataProvider(OverlayEntityPerChunk.INSTANCE);
|
||||
Minecraft.getMinecraft().displayGuiScreen(new MwGui(Mw.instance, coord.dim, coord.x, coord.z));
|
||||
}
|
||||
|
||||
|
||||
@@ -39,8 +39,8 @@ public class ActionTimingChunks implements ActionListener {
|
||||
StatsChunk data = (StatsChunk)table.getTableData().get(indexData);
|
||||
|
||||
if (e.getSource() == panel.getBtnCenter()){
|
||||
OverlayMeanTime.instance().setSelectedChunk(data.getChunk().dim, data.getChunk().chunkX, data.getChunk().chunkZ);
|
||||
MwAPI.setCurrentDataProvider(OverlayMeanTime.instance());
|
||||
OverlayMeanTime.INSTANCE.setSelectedChunk(data.getChunk().dim, data.getChunk().chunkX, data.getChunk().chunkZ);
|
||||
MwAPI.setCurrentDataProvider(OverlayMeanTime.INSTANCE);
|
||||
Minecraft.getMinecraft().displayGuiScreen(new MwGui(Mw.instance, data.getChunk().dim, data.getChunk().x + 8, data.getChunk().z + 8));
|
||||
}
|
||||
|
||||
|
||||
@@ -43,8 +43,8 @@ public class ActionTimingEntities implements ActionListener {
|
||||
CoordinatesBlock coord = data.pos;
|
||||
PacketManager.sendToServer(new PacketReqData(Message.OVERLAY_CHUNK_ENTITIES));
|
||||
PacketManager.sendToServer(new PacketReqData(Message.LIST_CHUNK_ENTITIES, data.pos.asCoordinatesChunk()));
|
||||
MwAPI.setCurrentDataProvider(OverlayEntityPerChunk.instance());
|
||||
OverlayEntityPerChunk.instance().selectedChunk = coord.asCoordinatesChunk();
|
||||
MwAPI.setCurrentDataProvider(OverlayEntityPerChunk.INSTANCE);
|
||||
OverlayEntityPerChunk.INSTANCE.selectedChunk = coord.asCoordinatesChunk();
|
||||
Minecraft.getMinecraft().displayGuiScreen(new MwGui(Mw.instance, coord.dim, coord.x, coord.z));
|
||||
}
|
||||
|
||||
|
||||
@@ -40,8 +40,8 @@ public class ActionTimingTileEnts implements ActionListener {
|
||||
|
||||
if (e.getSource() == panel.getBtnCenter()){
|
||||
CoordinatesBlock coord = data.pos;
|
||||
OverlayMeanTime.instance().setSelectedChunk(coord.dim, coord.x >> 4, coord.z >> 4);
|
||||
MwAPI.setCurrentDataProvider(OverlayMeanTime.instance());
|
||||
OverlayMeanTime.INSTANCE.setSelectedChunk(coord.dim, coord.x >> 4, coord.z >> 4);
|
||||
MwAPI.setCurrentDataProvider(OverlayMeanTime.INSTANCE);
|
||||
Minecraft.getMinecraft().displayGuiScreen(new MwGui(Mw.instance, coord.dim, coord.x, coord.z));
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user