mirror of
https://git.zelz.net/catfoolyou/Project164.git
synced 2025-12-14 15:37:41 +00:00
I don't even know anymore
This commit is contained in:
@@ -2,14 +2,7 @@ package net.lax1dude.eaglercraft;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
import net.minecraft.src.Minecraft;
|
||||
import net.minecraft.src.GuiButton;
|
||||
import net.minecraft.src.GuiDisconnected;
|
||||
import net.minecraft.src.GuiScreen;
|
||||
import net.minecraft.src.NetClientHandler;
|
||||
import net.minecraft.src.Packet250CustomPayload;
|
||||
import net.minecraft.src.Packet2ClientProtocol;
|
||||
import net.minecraft.src.WorldClient;
|
||||
import net.minecraft.src.*;
|
||||
|
||||
public class GuiScreenSingleplayerConnecting extends GuiScreen {
|
||||
|
||||
|
||||
@@ -50,7 +50,6 @@ public class IntegratedServer {
|
||||
public static void begin(String[] locale, String[] stats) {
|
||||
logException = true;
|
||||
if(!isWorkerAlive()) {
|
||||
System.out.println("beginning?");
|
||||
openConnections.clear();
|
||||
exceptions.clear();
|
||||
statusState = IntegratedState.WORLD_WORKER_BOOTING;
|
||||
|
||||
@@ -5,9 +5,7 @@ import java.io.DataInputStream;
|
||||
import java.io.DataOutputStream;
|
||||
import java.io.IOException;
|
||||
|
||||
import net.minecraft.src.INetworkManager;
|
||||
import net.minecraft.src.NetHandler;
|
||||
import net.minecraft.src.Packet;
|
||||
import net.minecraft.src.*;
|
||||
|
||||
public class WorkerNetworkManager implements INetworkManager {
|
||||
|
||||
@@ -60,6 +58,10 @@ public class WorkerNetworkManager implements INetworkManager {
|
||||
}
|
||||
|
||||
Packet pkt = Packet.getNewPacket(pktId);
|
||||
|
||||
if(pkt instanceof Packet252SharedKey || pkt instanceof Packet205ClientCommand || pkt instanceof Packet2ClientProtocol){
|
||||
System.out.println("Client processing packet " + pkt.getClass().getSimpleName());
|
||||
}
|
||||
|
||||
if(pkt == null) {
|
||||
System.err.println("Recieved invalid '" + pktId + "' packet");
|
||||
@@ -73,6 +75,7 @@ public class WorkerNetworkManager implements INetworkManager {
|
||||
try {
|
||||
pkt.processPacket(theNetHandler);
|
||||
}catch(Throwable t) {
|
||||
System.out.println("[CLIENT]");
|
||||
System.err.println("Could not process minecraft packet 0x" + Integer.toHexString(pkt.getPacketId()) + " class '" + pkt.getClass().getSimpleName() + "' on channel 'NET|" + ipcChannel + "'");
|
||||
t.printStackTrace();
|
||||
}
|
||||
|
||||
@@ -140,7 +140,7 @@ public class GuiMainMenu extends GuiScreen {
|
||||
StringTranslate var2 = StringTranslate.getInstance();
|
||||
int var4 = this.height / 4 + 48;
|
||||
|
||||
if(EaglerAdapter.isIntegratedServerAvailable()) { // EaglerAdapter.isIntegratedServerAvailable()
|
||||
if(false) { // EaglerAdapter.isIntegratedServerAvailable()
|
||||
this.buttonList.add(new GuiButton(1, this.width / 2 - 100, var4, var2.translateKey("menu.singleplayer")));
|
||||
this.buttonList.add(new GuiButton(2, this.width / 2 - 100, var4 + 24 * 1, var2.translateKey("menu.multiplayer")));
|
||||
this.buttonList.add(new GuiButton(3, this.width / 2 - 100, var4 + 24 * 2, var2.translateKey("menu.forkme")));
|
||||
|
||||
@@ -2867,7 +2867,6 @@ public class EaglerAdapterImpl2 {
|
||||
server.terminate();
|
||||
}
|
||||
workerMessageQueue.put("IPC", new LinkedList<PKT>());
|
||||
System.out.println("doing server worker shit");
|
||||
server = new Worker(integratedServerScript);
|
||||
server.onError(new EventListener<ErrorEvent>() {
|
||||
@Override
|
||||
|
||||
Reference in New Issue
Block a user