Skip to content

fix: Fix NoSuchMethodError for waterfall ~559 #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TheXorog wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: Fix NoSuchMethodError for waterfall ~559 #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .idea/compiler.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions .idea/encodings.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion .idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

103 changes: 103 additions & 0 deletions AutoReconnect.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id="$MODULE_DIR$/pom.xml" external.system.module.type="SINGLE_MODULE" external.system.module.version="223-2" org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="minecraft" name="Minecraft">
<configuration>
<autoDetectTypes>
<platformType>WATERFALL</platformType>
</autoDetectTypes>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_11">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/target/generated-sources/annotations" isTestSource="false" generated="true" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="PROVIDED" name="Maven: io.github.waterfallmc:waterfall-proxy:1.20-R0.2-SNAPSHOT" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: io.netty:netty-codec-haproxy:4.1.104.Final" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: io.netty:netty-buffer:4.1.104.Final" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: io.netty:netty-transport:4.1.104.Final" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: io.netty:netty-codec:4.1.104.Final" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: io.netty:netty-codec-http:4.1.104.Final" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: io.netty:netty-common:4.1.104.Final" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: io.netty:netty-resolver-dns:4.1.104.Final" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: io.netty:netty-resolver:4.1.104.Final" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: io.netty:netty-codec-dns:4.1.104.Final" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: io.netty:netty-resolver-dns-native-macos:osx-x86_64:4.1.104.Final" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: io.netty:netty-resolver-dns-classes-macos:4.1.104.Final" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: io.netty:netty-handler:4.1.104.Final" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: io.netty:netty-transport-native-unix-common:4.1.104.Final" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: io.netty:netty-transport-native-epoll:linux-x86_64:4.1.104.Final" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: io.netty:netty-transport-classes-epoll:4.1.104.Final" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: io.netty:netty-transport-native-epoll:linux-aarch_64:4.1.104.Final" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: io.github.waterfallmc:waterfall-api:1.20-R0.2-SNAPSHOT" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: io.github.waterfallmc:waterfall-chat:1.20-R0.2-SNAPSHOT" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.10.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: io.github.waterfallmc:waterfall-config:1.20-R0.2-SNAPSHOT" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: io.github.waterfallmc:waterfall-event:1.20-R0.2-SNAPSHOT" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:2.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: io.github.waterfallmc:waterfall-log4j:1.20-R0.2-SNAPSHOT" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.logging.log4j:log4j-core:2.20.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.logging.log4j:log4j-api:2.20.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.logging.log4j:log4j-iostreams:2.20.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.logging.log4j:log4j-jul:2.20.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.logging.log4j:log4j-slf4j-impl:2.20.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.slf4j:slf4j-api:1.7.36" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.lmax:disruptor:3.4.4" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: io.github.waterfallmc:waterfall-native:1.20-R0.2-SNAPSHOT" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: io.github.waterfallmc:waterfall-protocol:1.20-R0.2-SNAPSHOT" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.mojang:brigadier:1.2.9" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: net.sf.trove4j:core:3.1.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: se.llbit:jo-nbt:1.3.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: io.github.waterfallmc:waterfall-query:1.20-R0.2-SNAPSHOT" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: net.sf.jopt-simple:jopt-simple:5.0.4" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.mysql:mysql-connector-j:8.2.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.protobuf:protobuf-java:3.21.9" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven:maven-resolver-provider:3.9.6" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven:maven-model:3.9.6" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven:maven-model-builder:3.9.6" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.codehaus.plexus:plexus-interpolation:1.26" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven:maven-artifact:3.9.6" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.commons:commons-lang3:3.12.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven:maven-builder-support:3.9.6" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.eclipse.sisu:org.eclipse.sisu.inject:0.9.0.M2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven:maven-repository-metadata:3.9.6" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven.resolver:maven-resolver-api:1.9.18" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven.resolver:maven-resolver-spi:1.9.18" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven.resolver:maven-resolver-util:1.9.18" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven.resolver:maven-resolver-impl:1.9.18" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven.resolver:maven-resolver-named-locks:1.9.18" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.codehaus.plexus:plexus-utils:3.5.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: javax.inject:javax.inject:1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven.resolver:maven-resolver-transport-http:1.9.18" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.httpcomponents:httpclient:4.5.14" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.httpcomponents:httpcore:4.4.16" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: commons-codec:commons-codec:1.16.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.slf4j:jcl-over-slf4j:1.7.36" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.slf4j:slf4j-jdk14:1.7.36" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: net.minecrell:terminalconsoleappender:1.3.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.jline:jline-reader:3.20.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.jline:jline-terminal-jansi:3.21.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.fusesource.jansi:jansi:2.4.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.jline:jline-terminal:3.21.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:32.1.2-jre" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.checkerframework:checker-qual:3.33.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.errorprone:error_prone_annotations:2.18.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.j2objc:j2objc-annotations:2.8" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: dev.simplix:protocolize-api:2.3.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: dev.simplix:protocolize-data-bundle:2.3.1" level="project" />
</component>
</module>
16 changes: 8 additions & 8 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>me.aoelite.bungee</groupId>
<artifactId>AutoReconnect</artifactId>
<version>1.6.11</version>
<version>1.6.12</version>
<packaging>jar</packaging>

<name>AutoReconnect</name>
Expand Down Expand Up @@ -99,19 +99,19 @@
<dependency>
<groupId>io.github.waterfallmc</groupId>
<artifactId>waterfall-proxy</artifactId>
<version>1.19-R0.1-SNAPSHOT</version>
<version>1.20-R0.2-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>dev.simplix</groupId>
<artifactId>protocolize-api</artifactId>
<version>2.2.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.bstats</groupId>
<artifactId>bstats-bungeecord</artifactId>
<version>3.0.0</version>
</dependency>
<dependency>
<groupId>dev.simplix</groupId>
<artifactId>protocolize-api</artifactId>
<version>2.3.2</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project>
9 changes: 4 additions & 5 deletions src/main/java/me/aoelite/bungee/autoreconnect/ReconnectHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,21 +139,20 @@ private void reconnect(UserConnection user, ServerConnection server, String kick
newDimension = LimboDimensionType.getLimboCurrentDimension(autoReconnect, version);
}
short previousGamemode = (short) user.getGamemode();
user.unsafe().sendPacket(new Login(user.getClientEntityId(), false, (short) 2,
previousGamemode, new HashSet<String>(Arrays.asList(LimboDimensionType.DIMENSION_NAME)), LimboDimensionType.getLimboLoginRegistry(autoReconnect, version), newDimension,
LimboDimensionType.DIMENSION_NAME, 0L, (short) 0, 0, "", 10, 10, false, false, false, false, DEFAULT_LOCATION));
user.unsafe().sendPacket(new Login(user.getClientEntityId(), false, (short) 2, previousGamemode, new HashSet<String>(Arrays.asList(LimboDimensionType.DIMENSION_NAME)), LimboDimensionType.getLimboLoginRegistry(autoReconnect, version), newDimension,
LimboDimensionType.DIMENSION_NAME, 0L, (short) 0, 0, "", 10, 10, false, false, false, false, false, DEFAULT_LOCATION, 0));
user.setGamemode(2);
user.getServerSentScoreboard().clear();
for (UUID bossbar : user.getSentBossBars()) {
user.unsafe().sendPacket(new BossBar(bossbar, 1));
}
user.getSentBossBars().clear();
user.unsafe().sendPacket(new Respawn(newDimension, LimboDimensionType.DIMENSION_NAME, 0, (short) 0, (short) 2, previousGamemode, "", false, false, false, DEFAULT_LOCATION));
user.unsafe().sendPacket(new Respawn(newDimension, LimboDimensionType.DIMENSION_NAME, 0,(short) 0, (short) 2, previousGamemode, "", false, false, (byte)0, DEFAULT_LOCATION, 0));
} else {
if (autoReconnect.getConfig().isDebugEnabled())
autoReconnect.getLogger().info("Version pre-1.16");
Object newDim = (Integer) user.getDimension() <= 0 ? 1 : 0;
user.unsafe().sendPacket(new Respawn(newDim, "", 0L, (short) 0, (short) 2, (short) 2, "default", false, false, false, DEFAULT_LOCATION));
user.unsafe().sendPacket(new Respawn(newDim, "", 0L, (short) 0, (short) 2, (short) 2, "default", false, false, (byte)0, DEFAULT_LOCATION, 0));
user.setGamemode(2);
user.setDimension(newDim);
user.getServerSentScoreboard().clear();
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/me/aoelite/bungee/autoreconnect/net/ReconnectBridge.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,11 +139,11 @@ public void handle(Kick kick) throws Exception {
// .getFallbackServer()
ServerInfo def = user.updateAndGetNextServer(server.getInfo());
// Call ServerKickEvent
ServerKickEvent event = bungee.getPluginManager().callEvent(new ServerKickEvent(user, server.getInfo(), ComponentSerializer.parse(kick.getMessage()), def, ServerKickEvent.State.CONNECTED, ServerKickEvent.Cause.SERVER));
ServerKickEvent event = bungee.getPluginManager().callEvent(new ServerKickEvent(user, server.getInfo(), kick.getMessage(), def, ServerKickEvent.State.CONNECTED, ServerKickEvent.Cause.SERVER));
if (event.isCancelled() && event.getCancelServer() != null) {
user.connectNow(event.getCancelServer(), ServerConnectEvent.Reason.KICK_REDIRECT);
} else {
String kickMessageColor = BaseComponent.toLegacyText(ComponentSerializer.parse(kick.getMessage()));
String kickMessageColor = BaseComponent.toLegacyText(kick.getMessage());
String kickMessage = ChatColor.stripColor(kickMessageColor); // needs to be parsed like that...
// doReconnect indicates whether the player should be reconnected or not after
// he has been kicked. Only if the kick reason matches the one that has been
Expand Down