DIvan2000/ReplayModCinematic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix multiplayer recording on 1.19.3 (fixes #803)

Browse Source
This commit is contained in:
Jonas Herzig
2022-12-09 13:14:56 +01:00
parent 9a5b88fd48
commit 043664ab0c
3 changed files with 37 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/com/replaymod/recording/handler/ConnectionEventHandler.java
View File

@@ -19,6 +19,10 @@ import net.minecraft.client.resource.language.I18n;
import net.minecraft.network.ClientConnection;
import org.apache.logging.log4j.Logger;
//#if MC>=11900
//$$ import com.replaymod.recording.mixin.ClientLoginNetworkHandlerAccessor;
//#endif
//#if MC>=11600
import net.minecraft.world.World;
//#else
@@ -88,6 +92,15 @@ public class ConnectionEventHandler {
}
}
ServerInfo serverInfo;
//#if MC>=11903
//$$ serverInfo = networkManager.getPacketListener() instanceof ClientLoginNetworkHandlerAccessor loginNetworkHandler
//$$ ? loginNetworkHandler.getServerInfo()
//$$ : null;
//#else
serverInfo = mc.getCurrentServerEntry();
//#endif
String worldName;
String serverName = null;
boolean autoStart = core.getSettingsRegistry().get(Setting.AUTO_START_RECORDING);
@@ -98,8 +111,12 @@ public class ConnectionEventHandler {
//$$ worldName = mc.getServer().getLevelName();
//#endif
serverName = worldName;
} else if (mc.getCurrentServerEntry() != null) {
ServerInfo serverInfo = mc.getCurrentServerEntry();
//#if MC>=11100
} else if (mc.isConnectedToRealms()) {
// we can't access the server name without tapping too deep in the Realms Library
worldName = "A Realms Server";
//#endif
} else if (serverInfo != null) {
worldName = serverInfo.address;
if (!I18n.translate("selectServer.defaultName").equals(serverInfo.name)) {
serverName = serverInfo.name;
@@ -109,11 +126,6 @@ public class ConnectionEventHandler {
if (autoStartServer != null) {
autoStart = autoStartServer;
}
//#if MC>=11100
} else if (mc.isConnectedToRealms()) {
// we can't access the server name without tapping too deep in the Realms Library
worldName = "A Realms Server";
//#endif
} else {
logger.info("Recording not started as the world is neither local nor remote (probably a replay).");
return;

17
src/main/java/com/replaymod/recording/mixin/ClientLoginNetworkHandlerAccessor.java Normal file
View File

@@ -0,0 +1,17 @@
package com.replaymod.recording.mixin;
import net.minecraft.client.network.ClientLoginNetworkHandler;
import org.spongepowered.asm.mixin.Mixin;
//#if MC>=11903
//$$ import net.minecraft.client.network.ServerInfo;
//$$ import org.spongepowered.asm.mixin.gen.Accessor;
//#endif
@Mixin(ClientLoginNetworkHandler.class)
public interface ClientLoginNetworkHandlerAccessor {
//#if MC>=11903
//$$ @Accessor
//$$ ServerInfo getServerInfo();
//#endif
}