Port to 1.20.3-rc1

This commit is contained in:
Jonas Herzig
2023-12-03 16:30:00 +01:00
parent 43576efeb3
commit faebeb525a
14 changed files with 136 additions and 21 deletions

View File

@@ -655,7 +655,11 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend
if(p instanceof ResourcePackSendS2CPacket) {
ResourcePackSendS2CPacket packet = (ResourcePackSendS2CPacket) p;
//#if MC>=12003
//$$ String url = packet.url();
//#else
String url = packet.getURL();
//#endif
if (url.startsWith("replay://")) {
//#else
//$$ String url;
@@ -671,7 +675,11 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend
if (!file.exists()) {
IOUtils.copy(replayFile.getResourcePack(hash).get(), new FileOutputStream(file));
}
//#if MC>=12003
//$$ mc.getServerResourcePackProvider().addResourcePack(packet.id(), file.toPath());
//#else
setServerResourcePack(file);
//#endif
}
}
return null;

View File

@@ -42,6 +42,10 @@ import net.minecraft.network.ClientConnection;
import java.io.IOException;
import java.util.*;
//#if MC>=12003
//$$ import net.minecraft.client.resource.server.ServerResourcePackManager;
//#endif
//#if MC>=12002
//$$ import io.netty.channel.ChannelDuplexHandler;
//$$ import io.netty.channel.ChannelPromise;
@@ -355,6 +359,10 @@ public class ReplayHandler {
//#if MC>=11400
((MinecraftAccessor) mc).setConnection(networkManager);
//#endif
//#if MC>=12003
//$$ mc.getServerResourcePackProvider().init(networkManager, ServerResourcePackManager.AcceptanceStatus.ALLOWED);
//#endif
}
public ReplayFile getReplayFile() {