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

2
jGui

Submodule jGui updated: 1daefddfb8...48c89f8a72

4
settings.gradle
View File

@@ -11,7 +11,7 @@ jGuiVersions += [
'1.9.4',
'1.12',
'1.13.2',
'1.14.3',
'1.14.4',
]
replayModVersions += [
'core',
@@ -26,7 +26,7 @@ replayModVersions += [
'1.12.1',
'1.12.2',
'1.13.2',
'1.14.3',
'1.14.4',
]
include ':jGui'

4
src/main/java/com/replaymod/extras/urischeme/UriScheme.java
View File

@@ -73,9 +73,9 @@ public abstract class UriScheme {
switch (SystemUtil.getOperatingSystem()) {
case LINUX:
return new LinuxUriScheme();
case WINDOWS:
case field_1133:
return new WindowsUriScheme();
case MAC:
case field_1137:
return new OSXUriScheme();
case SOLARIS:
case UNKNOWN:

2
src/main/java/com/replaymod/online/api/replay/holders/MinecraftVersion.java
View File

@@ -11,7 +11,7 @@ public enum MinecraftVersion {
MC_1_12_1("Minecraft 1.12.1", "1.12.1"),
MC_1_12_2("Minecraft 1.12.2", "1.12.2"),
MC_1_13_2("Minecraft 1.13.2", "1.13.2"),
MC_1_14_3("Minecraft 1.14.3", "1.14.3");
MC_1_14_4("Minecraft 1.14.4", "1.14.4");
private String niceName, apiName;

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();

4
src/main/java/com/replaymod/render/RenderSettings.java
View File

@@ -174,7 +174,7 @@ public class RenderSettings {
private static String findFFmpeg() {
switch (SystemUtil.getOperatingSystem()) {
case WINDOWS:
case field_1133:
// Allow windows users to unpack the ffmpeg archive into a sub-folder of their .minecraft folder
File inDotMinecraft = new File(MCVer.getMinecraft().runDirectory, "ffmpeg/bin/ffmpeg.exe");
if (inDotMinecraft.exists()) {
@@ -182,7 +182,7 @@ public class RenderSettings {
return inDotMinecraft.getAbsolutePath();
}
break;
case MAC:
case field_1137:
// The PATH doesn't seem to be set as expected on OSX, therefore we check some common locations ourselves
for (String path : new String[]{"/usr/local/bin/ffmpeg", "/usr/bin/ffmpeg"}) {
File file = new File(path);

8
src/main/java/com/replaymod/replay/FullReplaySender.java
View File

@@ -39,6 +39,7 @@ import org.apache.commons.io.IOUtils;
//#if MC>=11400
import de.johni0702.minecraft.gui.versions.callbacks.PreTickCallback;
import net.minecraft.class_4463;
import net.minecraft.entity.EntityType;
import net.minecraft.text.TranslatableText;
//#else
@@ -96,6 +97,9 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend
* These packets are ignored completely during replay.
*/
private static final List<Class> BAD_PACKETS = Arrays.<Class>asList(
//#if MC>=11404
class_4463.class, // PlayerActionAckPacket
//#endif
//#if MC>=11400
OpenWrittenBookS2CPacket.class,
OpenContainerPacket.class,
@@ -333,7 +337,7 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend
// to any chunk yet.
if (mc.world != null) {
for (PlayerEntity playerEntity : playerEntities(mc.world)) {
if (!playerEntity.field_6016 && playerEntity instanceof OtherClientPlayerEntity) {
if (!playerEntity.updateNeeded && playerEntity instanceof OtherClientPlayerEntity) {
playerEntity.tickMovement();
}
}
@@ -422,7 +426,7 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend
int i = pb.readVarInt();
NetworkState state = loginPhase ? NetworkState.LOGIN : NetworkState.PLAY;
NetworkState state = loginPhase ? NetworkState.field_11688 : NetworkState.field_11690;
//#if MC>=10800
Packet p = state.getPacketHandler(NetworkSide.CLIENTBOUND, i);
//#else

4
src/main/java/com/replaymod/replay/QuickReplaySender.java
View File

@@ -659,7 +659,7 @@ public class QuickReplaySender extends ChannelHandlerAdapter implements ReplaySe
private static final Deflater deflater = new Deflater();
private static Packet<?> toMC(com.github.steveice10.packetlib.packet.Packet packet) {
return toMC(packet, NetworkState.PLAY);
return toMC(packet, NetworkState.field_11690);
}
private static Packet<?> toMC(com.github.steveice10.packetlib.packet.Packet packet, NetworkState state) {
@@ -710,7 +710,7 @@ public class QuickReplaySender extends ChannelHandlerAdapter implements ReplaySe
}
int packetId = packetBuf.readVarInt();
Packet<?> mcPacket = NetworkState.PLAY.getPacketHandler(NetworkSide.CLIENTBOUND, packetId);
Packet<?> mcPacket = NetworkState.field_11690.getPacketHandler(NetworkSide.CLIENTBOUND, packetId);
mcPacket.read(packetBuf);
return mcPacket;
} catch (Exception e) {

2
src/main/java/com/replaymod/replay/ReplayHandler.java
View File

@@ -665,7 +665,7 @@ public class ReplayHandler {
//$$ }
//#endif
mc.getNetworkHandler().getClientConnection()
mc.getNetworkHandler().getConnection()
//#if MC>=11300
.tick();
//#else

4
src/main/java/com/replaymod/replay/camera/CameraEntity.java
View File

@@ -310,8 +310,8 @@ public class CameraEntity
//#if MC>=11400
@Override
public boolean isInFluid(Tag<Fluid> fluid, boolean loadedChunksOnly) {
return falseUnlessSpectating(entity -> entity.isInFluid(fluid, loadedChunksOnly));
public boolean isInFluid(Tag<Fluid> fluid) {
return falseUnlessSpectating(entity -> entity.isInFluid(fluid));
}
//#else
//#if MC>=10800

6
src/main/java/com/replaymod/replay/handler/GuiHandler.java
View File

@@ -4,7 +4,7 @@ import de.johni0702.minecraft.gui.utils.EventRegistrations;
import com.replaymod.replay.ReplayModReplay;
import com.replaymod.replay.gui.screen.GuiReplayViewer;
import net.minecraft.client.gui.widget.ButtonWidget;
import net.minecraft.client.gui.screen.PauseScreen;
import net.minecraft.client.gui.screen.GameMenuScreen;
import net.minecraft.client.gui.screen.TitleScreen;
import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen;
import net.minecraft.client.gui.screen.Screen;
@@ -45,7 +45,7 @@ public class GuiHandler extends EventRegistrations {
//$$ GuiScreen guiScreen = getGui(event);
//$$ List<GuiButton> buttonList = getButtonList(event);
//#endif
if (!(guiScreen instanceof PauseScreen)) {
if (!(guiScreen instanceof GameMenuScreen)) {
return;
}
@@ -231,7 +231,7 @@ public class GuiHandler extends EventRegistrations {
}
}
if (guiScreen instanceof PauseScreen && mod.getReplayHandler() != null) {
if (guiScreen instanceof GameMenuScreen && mod.getReplayHandler() != null) {
if (button.id == BUTTON_EXIT_REPLAY) {
button.active = false;
try {

11
versions/1.14.3/mapping.txt → versions/1.14.4/mapping.txt
View File

@@ -122,7 +122,7 @@ net.minecraft.client.gl.GlFramebuffer endWrite() unbindFramebuffer()
net.minecraft.client.gl.GlFramebuffer draw() framebufferRender()
net.minecraft.client.gl.GlFramebuffer resize() createBindFramebuffer()
net.minecraft.client.gl.GlFramebuffer initFbo() createFramebuffer()
net.minecraft.client.gui.screen.PauseScreen net.minecraft.client.gui.GuiIngameMenu
net.minecraft.client.gui.screen.GameMenuScreen net.minecraft.client.gui.GuiIngameMenu
net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen net.minecraft.client.gui.GuiMultiplayer
net.minecraft.client.gui.screen.world.SelectWorldScreen net.minecraft.client.gui.GuiWorldSelection
net.minecraft.entity.data.DataTracker net.minecraft.network.datasync.EntityDataManager
@@ -144,6 +144,8 @@ net.minecraft.resource.ResourcePack getNamespaces() getResourceNamespaces()
net.minecraft.resource.ResourceType net.minecraft.resources.ResourcePackType
net.minecraft.network.NetworkSide net.minecraft.network.EnumPacketDirection
net.minecraft.network.NetworkState net.minecraft.network.EnumConnectionState
net.minecraft.network.NetworkState field_11688 LOGIN
net.minecraft.network.NetworkState field_11690 PLAY
net.minecraft.network.NetworkState getPacketHandler() getPacket()
net.minecraft.network.Packet read() readPacketData()
net.minecraft.network.Packet write() writePacketData()
@@ -367,7 +369,8 @@ net.minecraft.util.SystemUtil net.minecraft.util.Util
net.minecraft.util.SystemUtil getMeasuringTimeMs() milliTime()
net.minecraft.util.SystemUtil getOperatingSystem() getOSType()
net.minecraft.util.SystemUtil.OperatingSystem net.minecraft.util.Util.EnumOS
net.minecraft.util.SystemUtil.OperatingSystem MAC OSX
net.minecraft.util.SystemUtil.OperatingSystem field_1133 WINDOWS
net.minecraft.util.SystemUtil.OperatingSystem field_1137 OSX
net.minecraft.util.SystemUtil.OperatingSystem open() openFile()
net.minecraft.client.util.InputUtil net.minecraft.client.util.InputMappings
net.minecraft.client.util.InputUtil isKeyPressed() isKeyDown()
@@ -389,7 +392,7 @@ net.minecraft.client.network.ClientLoginNetworkHandler connection networkManager
net.minecraft.client.network.ClientLoginNetworkHandler onQueryRequest() func_209521_a()
net.minecraft.client.network.ClientLoginNetworkHandler onLoginSuccess() handleLoginSuccess()
net.minecraft.client.network.ClientPlayNetworkHandler net.minecraft.client.network.NetHandlerPlayClient
net.minecraft.client.network.ClientPlayNetworkHandler getClientConnection() getNetworkManager()
net.minecraft.client.network.ClientPlayNetworkHandler getConnection() getNetworkManager()
net.minecraft.client.network.ClientPlayNetworkHandler playerListEntries playerInfoMap
net.minecraft.client.network.ClientPlayNetworkHandler onPlayerList() handlePlayerListItem()
net.minecraft.client.network.ClientPlayNetworkHandler onPlayerRespawn() handleRespawn()
@@ -437,7 +440,7 @@ net.minecraft.entity.Entity collides() canBeCollidedWith()
net.minecraft.entity.Entity spawnSprintingParticles() createRunningParticles()
net.minecraft.entity.Entity canSeePlayer() isInvisibleToPlayer()
net.minecraft.entity.Entity getStandingEyeHeight() getEyeHeight()
net.minecraft.entity.Entity field_6016 addedToChunk
net.minecraft.entity.Entity updateNeeded addedToChunk
net.minecraft.entity.Entity chunkX chunkCoordX
net.minecraft.entity.Entity chunkY chunkCoordY
net.minecraft.entity.Entity chunkZ chunkCoordZ

10
versions/common.gradle
View File

@@ -211,16 +211,16 @@ def shadeExclusions = {
dependencies {
if (FABRIC) {
minecraft 'com.mojang:minecraft:' + [
11403: '1.14.3',
11404: '1.14.4',
][mcVersion]
mappings 'net.fabricmc:yarn:' + [
11403: '1.14.3+build.1',
11404: '1.14.4+build.1',
][mcVersion]
modCompile 'net.fabricmc:fabric-loader:' + [
11403: '0.4.8+build.155',
11404: '0.4.8+build.155',
][mcVersion]
modCompile 'net.fabricmc.fabric-api:fabric-api:' + [
11403: '0.3.0+build.185',
11404: '0.3.0+build.200',
][mcVersion]
}
@@ -256,7 +256,7 @@ dependencies {
def studioVersion = mcVersionStr
if (studioVersion == '1.8.9') studioVersion = '1.8'
shadow "com.github.ReplayMod.ReplayStudio:$studioVersion:c80d030", shadeExclusions
shadow "com.github.ReplayMod.ReplayStudio:$studioVersion:ec45c55", shadeExclusions
shadowReobf(project(":jGui:$jGuiVersion")){
transitive = false // FG 1.2 puts all MC deps into the compile configuration and we don't want to shade those

2
versions/core/mcVersion
View File

@@ -1 +1 @@
11403
11404