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

Update to MC 1.14.4

Browse Source
This commit is contained in:
Jonas Herzig
2019-07-19 13:54:22 +02:00
parent c4c4b75022
commit 67d7af2dc3
16 changed files with 42 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/replaymod/recording/gui/GuiRecordingControls.java
View File

@@ -13,7 +13,7 @@ import de.johni0702.minecraft.gui.element.GuiButton;
import de.johni0702.minecraft.gui.layout.CustomLayout;
import de.johni0702.minecraft.gui.layout.HorizontalLayout;
import de.johni0702.minecraft.gui.utils.EventRegistrations;
import net.minecraft.client.gui.screen.PauseScreen;
import net.minecraft.client.gui.screen.GameMenuScreen;
//#if MC>=11400
import de.johni0702.minecraft.gui.versions.callbacks.InitScreenCallback;
@@ -72,8 +72,8 @@ public class GuiRecordingControls extends EventRegistrations {
//#if MC>=11400
{ on(InitScreenCallback.EVENT, (screen, buttons) -> {
if (screen instanceof PauseScreen) {
show((PauseScreen) screen);
if (screen instanceof GameMenuScreen) {
show((GameMenuScreen) screen);
}
}); }
//#else
@@ -92,7 +92,7 @@ public class GuiRecordingControls extends EventRegistrations {
buttonPauseResume.setEnabled(!stopped);
}
public void show(PauseScreen gui) {
public void show(GameMenuScreen gui) {
int modMenuOffset = MCVer.isModLoaded("modmenu") ? 12 : 0;
VanillaGuiScreen.setup(gui).setLayout(new CustomLayout<GuiScreen>() {
@Override

4
src/main/java/com/replaymod/recording/packet/PacketListener.java
View File

@@ -87,7 +87,7 @@ public class PacketListener extends ChannelInboundHandlerAdapter {
private long timePassedWhilePaused;
private volatile boolean serverWasPaused;
//#if MC>=11300
private NetworkState connectionState = NetworkState.LOGIN;
private NetworkState connectionState = NetworkState.field_11688;
//#else
//$$ private EnumConnectionState connectionState = EnumConnectionState.PLAY;
//#endif
@@ -180,7 +180,7 @@ public class PacketListener extends ChannelInboundHandlerAdapter {
//#if MC>=11300
if (packet instanceof LoginSuccessS2CPacket) {
connectionState = NetworkState.PLAY;
connectionState = NetworkState.field_11690;
}
//#endif
} catch(Exception e) {

2
src/main/java/com/replaymod/recording/packet/ResourcePackRecorder.java
View File

@@ -114,7 +114,7 @@ public class ResourcePackRecorder {
public synchronized ResourcePackSendS2CPacket handleResourcePack(ResourcePackSendS2CPacket packet) {
final int requestId = nextRequestId++;
final ClientPlayNetworkHandler netHandler = mc.getNetworkHandler();
final ClientConnection netManager = netHandler.getClientConnection();
final ClientConnection netManager = netHandler.getConnection();
final String url = packet.getURL();
final String hash = packet.getSHA1();