catfoolyou
/
Project164
mirror of https://github.com/catfoolyou/Project164.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Its a bungee problem

This commit is contained in:
catfoolyou 2025-02-24 17:01:46 -05:00
parent c40c57299f
commit afda45a8e2
11 changed files with 9 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/misc.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" /> <component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="corretto-18" project-jdk-type="JavaSDK" /> <component name="ProjectRootManager" version="2" languageLevel="JDK_18" default="true" project-jdk-name="corretto-18" project-jdk-type="JavaSDK" />
</project> </project>

31
eaglerbungee/nb-configuration.xml
View File

@ -1,31 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project-shared-configuration>
<!--
This file contains additional configuration written by modules in the NetBeans IDE.
The configuration is intended to be shared among all the users of project and
therefore it is assumed to be part of version control checkout.
Without this configuration present, some functionality in the IDE may be limited or fail altogether.
-->
<properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
<!--
Properties that influence various parts of the IDE, especially code formatting and the like.
You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
That way multiple projects can share the same settings (useful for formatting rules for example).
Any value defined here will override the pom.xml file value but is only applicable to the current project.
-->
<org-netbeans-modules-editor-indent.CodeStyle.usedProfile>project</org-netbeans-modules-editor-indent.CodeStyle.usedProfile>
<org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.classDeclBracePlacement>NEW_LINE</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.classDeclBracePlacement>
<org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.otherBracePlacement>NEW_LINE</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.otherBracePlacement>
<org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.methodDeclBracePlacement>NEW_LINE</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.methodDeclBracePlacement>
<org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinMethodCallParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinMethodCallParens>
<org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinSwitchParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinSwitchParens>
<org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinCatchParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinCatchParens>
<org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinTryParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinTryParens>
<org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinSynchronizedParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinSynchronizedParens>
<org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinArrayInitBrackets>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinArrayInitBrackets>
<org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinParens>
<org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinWhileParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinWhileParens>
<org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinIfParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinIfParens>
<org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinForParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinForParens>
</properties>
</project-shared-configuration>

114
eaglerbungee/pom.xml
View File

@ -1,114 +0,0 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.sonatype.oss</groupId>
<artifactId>oss-parent</artifactId>
<version>7</version>
</parent>
<groupId>net.md-5</groupId>
<artifactId>bungeecord-parent</artifactId>
<version>1.6.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>BungeeCord</name>
<description>Parent project for all BungeeCord modules.</description>
<url>https://github.com/SpigotMC/BungeeCord</url>
<inceptionYear>2012</inceptionYear>
<organization>
<name>Elastic Portal Suite</name>
<url>https://github.com/SpigotMC</url>
</organization>
<licenses>
<license>
<name>The BSD 3-Clause License</name>
<url>http://opensource.org/licenses/BSD-3-Clause</url>
<distribution>repo</distribution>
</license>
</licenses>
<developers>
<developer>
<id>md_5</id>
</developer>
</developers>
<modules>
<module>api</module>
<module>bootstrap</module>
<module>config</module>
<module>event</module>
<module>protocol</module>
<module>proxy</module>
<module>query</module>
</modules>
<scm>
<connection>scm:git:git@github.com:SpigotMC/BungeeCord.git</connection>
<developerConnection>scm:git:git@github.com:SpigotMC/BungeeCord.git</developerConnection>
<url>git@github.com:SpigotMC/BungeeCord.git</url>
</scm>
<issueManagement>
<system>GitHub</system>
<url>https://github.com/SpigotMC/BungeeCord/issues</url>
</issueManagement>
<ciManagement>
<system>jenkins</system>
<url>http://ci.md-5.net/job/BungeeCord</url>
</ciManagement>
<properties>
<build.number>unknown</build.number>
<netty.version>4.0.9.Final</netty.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.12.2</version>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>com.lukegb.mojo</groupId>
<artifactId>gitdescribe-maven-plugin</artifactId>
<version>1.3</version>
<configuration>
<outputPrefix>git-${project.name}-${project.version}-</outputPrefix>
<outputPostfix>-${build.number}</outputPostfix>
</configuration>
<executions>
<execution>
<phase>compile</phase>
<goals>
<goal>gitdescribe</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.5.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
</plugins>
</build>
</project>

2
eaglerbungee/src/main/java/net/md_5/bungee/connection/InitialHandler.java
View File

@ -84,6 +84,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection {
@Override @Override
public void handle(final PacketFEPing ping) throws Exception { public void handle(final PacketFEPing ping) throws Exception {
System.out.println("[InitialHandler - Server pinged]");
ServerPing response = new ServerPing(this.bungee.getProtocolVersion(), this.bungee.getGameVersion(), this.listener.getMotd(), this.bungee.getOnlineCount(), this.listener.getMaxPlayers()); ServerPing response = new ServerPing(this.bungee.getProtocolVersion(), this.bungee.getGameVersion(), this.listener.getMotd(), this.bungee.getOnlineCount(), this.listener.getMaxPlayers());
response = this.bungee.getPluginManager().callEvent(new ProxyPingEvent(this, response)).getResponse(); response = this.bungee.getPluginManager().callEvent(new ProxyPingEvent(this, response)).getResponse();
final String kickMessage = ChatColor.DARK_BLUE + "\u0000" + response.getProtocolVersion() + "\u0000" + response.getGameVersion() + "\u0000" + response.getMotd() + "\u0000" + response.getCurrentPlayers() + "\u0000" final String kickMessage = ChatColor.DARK_BLUE + "\u0000" + response.getProtocolVersion() + "\u0000" + response.getGameVersion() + "\u0000" + response.getMotd() + "\u0000" + response.getCurrentPlayers() + "\u0000"
@ -93,6 +94,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection {
@Override @Override
public void handle(final Packet1Login login) throws Exception { public void handle(final Packet1Login login) throws Exception {
System.out.println("Login");
Preconditions.checkState(this.thisState == State.LOGIN, (Object) "Not expecting FORGE LOGIN"); Preconditions.checkState(this.thisState == State.LOGIN, (Object) "Not expecting FORGE LOGIN");
Preconditions.checkState(this.forgeLogin == null, (Object) "Already received FORGE LOGIN"); Preconditions.checkState(this.forgeLogin == null, (Object) "Already received FORGE LOGIN");
this.forgeLogin = login; this.forgeLogin = login;

1
eaglerbungee/src/main/java/net/md_5/bungee/eaglercraft/WebSocketProxy.java
View File

@ -61,6 +61,7 @@ public class WebSocketProxy extends SimpleChannelInboundHandler<ByteBuf> {
} }
public boolean connect() { public boolean connect() {
System.out.println("[WebsocketProxy] - connecting (?)");
try { try {
if(tcpChannel == null) { if(tcpChannel == null) {
Bootstrap clientBootstrap = new Bootstrap(); Bootstrap clientBootstrap = new Bootstrap();

BIN
lwjgl-rundir/_eagstorage.g.dat
View File

Binary file not shown.

BIN
lwjgl-rundir/eaglercraft.jar
View File

Binary file not shown.

4
src/lwjgl/java/net/lax1dude/eaglercraft/adapter/EaglerAdapterImpl2.java
View File

@ -1136,6 +1136,7 @@ public class EaglerAdapterImpl2 {
public static final boolean connectionOpen() { public static final boolean connectionOpen() {
return clientSocket != null && clientSocket.isOpen(); return clientSocket != null && clientSocket.isOpen();
} }
public static final void writePacket(byte[] packet) { public static final void writePacket(byte[] packet) {
if(clientSocket != null && clientSocket.isOpen()) { if(clientSocket != null && clientSocket.isOpen()) {
System.out.println("[EaglerAdapterImpl2] - Writing packet"); System.out.println("[EaglerAdapterImpl2] - Writing packet");
@ -1147,6 +1148,9 @@ public class EaglerAdapterImpl2 {
if(!readPackets.isEmpty()) { if(!readPackets.isEmpty()) {
return readPackets.remove(0); return readPackets.remove(0);
} }
else {
System.err.println("[EaglerAdapterImpl2] - Cannot read packet!");
}
} }
return null; return null;
} }

1
src/main/java/net/lax1dude/eaglercraft/WebsocketNetworkManager.java
View File

@ -68,7 +68,6 @@ public class WebsocketNetworkManager implements INetworkManager {
private LinkedList<ByteBuffer> readChunks = new LinkedList<>(); private LinkedList<ByteBuffer> readChunks = new LinkedList<>();
public void processReadPackets() { public void processReadPackets() {
System.out.println("[WebsocketNetworkManager] - processReadPackets called");
readChunks.clear(); readChunks.clear();
if(oldChunkBuffer != null) { if(oldChunkBuffer != null) {

3
src/main/java/net/minecraft/src/GuiConnecting.java
View File

@ -75,7 +75,7 @@ public class GuiConnecting extends GuiScreen {
} }
this.clientHandler = new NetClientHandler(this.mc, uri, 0); this.clientHandler = new NetClientHandler(this.mc, uri, 0);
System.out.println("Sending packets"); System.out.println("[GuiConnecting] - Sending packets");
this.clientHandler.addToSendQueue(new Packet2ClientProtocol(78, EaglerProfile.username, uria, port)); this.clientHandler.addToSendQueue(new Packet2ClientProtocol(78, EaglerProfile.username, uria, port));
this.clientHandler.addToSendQueue(new Packet250CustomPayload("EAG|MySkin", EaglerProfile.getSkinPacket())); this.clientHandler.addToSendQueue(new Packet250CustomPayload("EAG|MySkin", EaglerProfile.getSkinPacket()));
this.clientHandler.addToSendQueue(new Packet250CustomPayload("EAG|MyCape", EaglerProfile.getCapePacket())); this.clientHandler.addToSendQueue(new Packet250CustomPayload("EAG|MyCape", EaglerProfile.getCapePacket()));
@ -89,7 +89,6 @@ public class GuiConnecting extends GuiScreen {
} }
} }
if(this.clientHandler != null) { if(this.clientHandler != null) {
System.out.println("[GuiConnecting] - Processing packets");
this.clientHandler.processReadPackets(); this.clientHandler.processReadPackets();
} }
else { else {

3
src/main/java/net/minecraft/src/NetClientHandler.java
View File

@ -93,9 +93,6 @@ public class NetClientHandler extends NetHandler {
if (this.netManager != null) { if (this.netManager != null) {
this.netManager.processReadPackets(); this.netManager.processReadPackets();
} }
else {
System.err.println("[NetClientHandler] - netManager is null!");
}
if(!EaglerAdapter.connectionOpen()) { if(!EaglerAdapter.connectionOpen()) {
if(!this.disconnected) { if(!this.disconnected) {