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

Update to MC 1.14.3

Browse Source
This commit is contained in:
Jonas Herzig
2019-06-24 18:17:51 +02:00
parent 1f547f92ce
commit 214da6ba59
22 changed files with 93 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,7 +31,7 @@ import net.minecraft.network.Packet;
import net.minecraft.util.PacketByteBuf;
import net.minecraft.client.network.packet.LoginSuccessS2CPacket;
import net.minecraft.client.network.packet.*;
import net.minecraft.network.chat.Component;
import net.minecraft.text.Text;
import net.minecraft.world.World;
import net.minecraft.world.chunk.ChunkProvider;
import org.apache.commons.io.FileUtils;
@@ -40,7 +40,7 @@ import org.apache.commons.io.IOUtils;
//#if MC>=11400
import de.johni0702.minecraft.gui.versions.callbacks.PreTickCallback;
import net.minecraft.entity.EntityType;
import net.minecraft.network.chat.TranslatableComponent;
import net.minecraft.text.TranslatableText;
//#else
//$$ import net.minecraft.client.resources.I18n;
//$$ import net.minecraft.entity.Entity;
@@ -462,8 +462,8 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend
mc.openScreen(new NoticeScreen(
//#if MC>=11400
() -> mc.openScreen(null),
new TranslatableComponent("replaymod.error.unknownrestriction1"),
new TranslatableComponent("replaymod.error.unknownrestriction2", unknown)
new TranslatableText("replaymod.error.unknownrestriction1"),
new TranslatableText("replaymod.error.unknownrestriction2", unknown)
//#else
//$$ I18n.format("replaymod.error.unknownrestriction1"),
//$$ I18n.format("replaymod.error.unknownrestriction2", unknown)
@@ -474,7 +474,7 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend
}
}
if (p instanceof DisconnectS2CPacket) {
Component reason = ((DisconnectS2CPacket) p).getReason();
Text reason = ((DisconnectS2CPacket) p).getReason();
String message = reason.getString();
if ("Please update to view this replay.".equals(message)) {
// This version of the mod supports replay restrictions so we are allowed

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

@@ -22,7 +22,7 @@ import net.minecraft.entity.decoration.ItemFrameEntity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.stat.StatHandler;
import net.minecraft.util.Identifier;
import net.minecraft.util.math.BoundingBox;
import net.minecraft.util.math.Box;
//#if MC>=11400
import com.replaymod.core.events.KeyBindingEventCallback;
@@ -234,7 +234,7 @@ public class CameraEntity
float height = getHeight();
//#endif
//#if MC>=10800
setBoundingBox(new BoundingBox(
setBoundingBox(new Box(
//#else
//$$ this.boundingBox.setBB(AxisAlignedBB.getBoundingBox(
//#endif

12
src/main/java/com/replaymod/replay/gui/screen/GuiReplayViewer.java
View File

@@ -5,7 +5,7 @@ import com.google.common.base.Supplier;
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.SettableFuture;
import net.minecraft.ChatFormat;
import net.minecraft.util.Formatting;
import com.replaymod.core.ReplayMod;
import com.replaymod.core.SettingsRegistry;
import com.replaymod.core.gui.GuiReplaySettings;
@@ -57,7 +57,7 @@ import java.util.List;
import static com.replaymod.replay.ReplayModReplay.LOGGER;
//#if MC>=11400
import net.minecraft.network.chat.TranslatableComponent;
import net.minecraft.text.TranslatableText;
//#else
//$$ import net.minecraft.client.resources.I18n;
//#endif
@@ -144,8 +144,8 @@ public class GuiReplayViewer extends GuiScreen {
getMinecraft().openScreen(new NoticeScreen(
//#if MC>=11400
GuiReplayViewer.this::display,
new TranslatableComponent("replaymod.gui.viewer.delete.failed1"),
new TranslatableComponent("replaymod.gui.viewer.delete.failed2")
new TranslatableText("replaymod.gui.viewer.delete.failed1"),
new TranslatableText("replaymod.gui.viewer.delete.failed2")
//#else
//$$ I18n.format("replaymod.gui.viewer.delete.failed1"),
//$$ I18n.format("replaymod.gui.viewer.delete.failed2")
@@ -170,7 +170,7 @@ public class GuiReplayViewer extends GuiScreen {
String name = list.getSelected().name.getText();
GuiYesNoPopup popup = GuiYesNoPopup.open(GuiReplayViewer.this,
new GuiLabel().setI18nText("replaymod.gui.viewer.delete.linea").setColor(Colors.BLACK),
new GuiLabel().setI18nText("replaymod.gui.viewer.delete.lineb", name + ChatFormat.RESET).setColor(Colors.BLACK)
new GuiLabel().setI18nText("replaymod.gui.viewer.delete.lineb", name + Formatting.RESET).setColor(Colors.BLACK)
).setYesI18nLabel("replaymod.gui.delete").setNoI18nLabel("replaymod.gui.cancel");
Futures.addCallback(popup.getFuture(), new FutureCallback<Boolean>() {
@Override
@@ -404,7 +404,7 @@ public class GuiReplayViewer extends GuiScreen {
public GuiReplayEntry(File file, ReplayMetaData metaData, BufferedImage thumbImage) {
this.file = file;
name.setText(ChatFormat.UNDERLINE + Utils.fileNameToReplayName(file.getName()));
name.setText(Formatting.UNDERLINE + Utils.fileNameToReplayName(file.getName()));
if (StringUtils.isEmpty(metaData.getServerName())
|| !ReplayMod.instance.getSettingsRegistry().get(Setting.SHOW_SERVER_IPS)) {
server.setI18nText("replaymod.gui.iphidden").setColor(Colors.DARK_RED);