diff --git a/jGui b/jGui index cd7d3dc5..c8ee5f3c 160000 --- a/jGui +++ b/jGui @@ -1 +1 @@ -Subproject commit cd7d3dc55a4d40b63020772d8046b0878f989aad +Subproject commit c8ee5f3c8975fb5e2365b4e69ea0860b43f5334c diff --git a/settings.gradle b/settings.gradle index 5b2f8e05..a94c43ed 100644 --- a/settings.gradle +++ b/settings.gradle @@ -11,7 +11,7 @@ jGuiVersions += [ '1.9.4', '1.12', '1.13.2', - '1.14.2', + '1.14.3', ] replayModVersions += [ 'core', @@ -26,7 +26,7 @@ replayModVersions += [ '1.12.1', '1.12.2', '1.13.2', - '1.14.2', + '1.14.3', ] include ':jGui' diff --git a/src/main/java/com/replaymod/core/ReplayMod.java b/src/main/java/com/replaymod/core/ReplayMod.java index f3a9aedb..b93edc73 100755 --- a/src/main/java/com/replaymod/core/ReplayMod.java +++ b/src/main/java/com/replaymod/core/ReplayMod.java @@ -21,11 +21,11 @@ import de.johni0702.minecraft.gui.container.GuiScreen; import lombok.Getter; import net.minecraft.client.MinecraftClient; import net.minecraft.util.Identifier; -import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.Style; -import net.minecraft.network.chat.TextComponent; -import net.minecraft.network.chat.TranslatableComponent; -import net.minecraft.ChatFormat; +import net.minecraft.text.Text; +import net.minecraft.text.Style; +import net.minecraft.text.LiteralText; +import net.minecraft.text.TranslatableText; +import net.minecraft.util.Formatting; import org.apache.commons.io.FileUtils; //#if MC>=11400 @@ -608,13 +608,13 @@ public class ReplayMod implements if (getSettingsRegistry().get(Setting.NOTIFICATIONS)) { // Some nostalgia: "§8[§6Replay Mod§8]§r Your message goes here" //#if MC>=10904 - Style coloredDarkGray = new Style().setColor(ChatFormat.DARK_GRAY); - Style coloredGold = new Style().setColor(ChatFormat.GOLD); - Component text = new TextComponent("[").setStyle(coloredDarkGray) - .append(new TranslatableComponent("replaymod.title").setStyle(coloredGold)) - .append(new TextComponent("] ")) - .append(new TranslatableComponent(message, args).setStyle(new Style() - .setColor(warning ? ChatFormat.RED : ChatFormat.DARK_GREEN))); + Style coloredDarkGray = new Style().setColor(Formatting.DARK_GRAY); + Style coloredGold = new Style().setColor(Formatting.GOLD); + Text text = new LiteralText("[").setStyle(coloredDarkGray) + .append(new TranslatableText("replaymod.title").setStyle(coloredGold)) + .append(new LiteralText("] ")) + .append(new TranslatableText(message, args).setStyle(new Style() + .setColor(warning ? Formatting.RED : Formatting.DARK_GREEN))); //#else //$$ ChatStyle coloredDarkGray = new ChatStyle().setColor(EnumChatFormatting.DARK_GRAY); //$$ ChatStyle coloredGold = new ChatStyle().setColor(EnumChatFormatting.GOLD); diff --git a/src/main/java/com/replaymod/core/versions/MCVer.java b/src/main/java/com/replaymod/core/versions/MCVer.java index 824e984f..bf020c34 100644 --- a/src/main/java/com/replaymod/core/versions/MCVer.java +++ b/src/main/java/com/replaymod/core/versions/MCVer.java @@ -68,6 +68,7 @@ import net.minecraft.client.render.BufferBuilder; import com.mojang.blaze3d.platform.GlStateManager; import net.minecraft.client.render.VertexFormat; import net.minecraft.client.render.VertexFormatElement; +import net.minecraft.client.render.chunk.ChunkRenderTask; //#else //$$ import com.replaymod.core.mixin.ResourcePackRepositoryAccessor; //$$ import com.google.common.util.concurrent.Futures; @@ -506,6 +507,12 @@ public class MCVer { //#endif } + //#if MC>=10800 + public interface ChunkRenderWorkerAccessor { + void doRunTask(ChunkRenderTask task) throws InterruptedException; + } + //#endif + public static long milliTime() { //#if MC>=11300 return SystemUtil.getMeasuringTimeMs(); diff --git a/src/main/java/com/replaymod/extras/playeroverview/PlayerOverviewGui.java b/src/main/java/com/replaymod/extras/playeroverview/PlayerOverviewGui.java index 15cab41c..e5960944 100644 --- a/src/main/java/com/replaymod/extras/playeroverview/PlayerOverviewGui.java +++ b/src/main/java/com/replaymod/extras/playeroverview/PlayerOverviewGui.java @@ -116,7 +116,7 @@ public class PlayerOverviewGui extends GuiScreen implements Closeable { }.setSize(16, 16), new GuiLabel().setText( //#if MC>=11300 - p.getName().getFormattedText() + p.getName().asFormattedString() //#else //#if MC>=10800 //$$ p.getName() @@ -181,7 +181,7 @@ public class PlayerOverviewGui extends GuiScreen implements Closeable { if (isSpectator(o1) && !isSpectator(o2)) return 1; if (isSpectator(o2) && !isSpectator(o1)) return -1; //#if MC>=11300 - return o1.getName().getFormattedText().compareToIgnoreCase(o2.getName().getFormattedText()); + return o1.getName().asFormattedString().compareToIgnoreCase(o2.getName().asFormattedString()); //#else //#if MC>=10800 //$$ return o1.getName().compareToIgnoreCase(o2.getName()); diff --git a/src/main/java/com/replaymod/online/api/replay/holders/MinecraftVersion.java b/src/main/java/com/replaymod/online/api/replay/holders/MinecraftVersion.java index ce05f2bb..0ee61c64 100644 --- a/src/main/java/com/replaymod/online/api/replay/holders/MinecraftVersion.java +++ b/src/main/java/com/replaymod/online/api/replay/holders/MinecraftVersion.java @@ -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_2("Minecraft 1.14.2", "1.14.2"); + MC_1_14_3("Minecraft 1.14.3", "1.14.3"); private String niceName, apiName; diff --git a/src/main/java/com/replaymod/online/gui/GuiReplayCenter.java b/src/main/java/com/replaymod/online/gui/GuiReplayCenter.java index 27826010..0dd5cfeb 100644 --- a/src/main/java/com/replaymod/online/gui/GuiReplayCenter.java +++ b/src/main/java/com/replaymod/online/gui/GuiReplayCenter.java @@ -40,7 +40,7 @@ import de.johni0702.minecraft.gui.utils.Consumer; import de.johni0702.minecraft.gui.utils.lwjgl.Dimension; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension; import org.apache.commons.lang3.StringUtils; -import net.minecraft.ChatFormat; +import net.minecraft.util.Formatting; import java.awt.image.BufferedImage; import java.io.IOException; @@ -418,9 +418,9 @@ public class GuiReplayCenter extends GuiScreen { this.downloaded = downloaded; ReplayMetaData metaData = fileInfo.getMetadata(); - name.setText(ChatFormat.UNDERLINE + Utils.fileNameToReplayName(fileInfo.getName())); + name.setText(Formatting.UNDERLINE + Utils.fileNameToReplayName(fileInfo.getName())); author.setI18nText("replaymod.gui.center.author", - "" + ChatFormat.GRAY + ChatFormat.ITALIC, fileInfo.getOwner()); + "" + Formatting.GRAY + Formatting.ITALIC, fileInfo.getOwner()); if (StringUtils.isEmpty(metaData.getServerName())) { server.setI18nText("replaymod.gui.iphidden").setColor(Colors.DARK_RED); } else { @@ -444,7 +444,7 @@ public class GuiReplayCenter extends GuiScreen { favorites.setText("⭑" + fileInfo.getFavorites()); likes.setText("⬆" + fileInfo.getRatings().getPositive()); dislikes.setText("⬇" + fileInfo.getRatings().getNegative()); - category.setText(ChatFormat.ITALIC + Optional.fromNullable(Category.fromId(fileInfo.getCategory())) + category.setText(Formatting.ITALIC + Optional.fromNullable(Category.fromId(fileInfo.getCategory())) .or(Category.MISCELLANEOUS).toNiceString()); addElements(null, durationPanel, downloadsPanel); diff --git a/src/main/java/com/replaymod/online/gui/GuiReplayDownloading.java b/src/main/java/com/replaymod/online/gui/GuiReplayDownloading.java index 53a7d1bb..a3295be3 100644 --- a/src/main/java/com/replaymod/online/gui/GuiReplayDownloading.java +++ b/src/main/java/com/replaymod/online/gui/GuiReplayDownloading.java @@ -10,7 +10,7 @@ import de.johni0702.minecraft.gui.element.GuiButton; import de.johni0702.minecraft.gui.element.GuiLabel; import de.johni0702.minecraft.gui.element.advanced.GuiProgressBar; import de.johni0702.minecraft.gui.layout.CustomLayout; -import net.minecraft.ChatFormat; +import net.minecraft.util.Formatting; import java.io.File; import java.io.IOException; @@ -34,7 +34,7 @@ public class GuiReplayDownloading extends AbstractGuiScreen() { @Override protected void layout(GuiReplayDownloading container, int width, int height) { diff --git a/src/main/java/com/replaymod/recording/packet/PacketListener.java b/src/main/java/com/replaymod/recording/packet/PacketListener.java index cf5d9d89..04d34028 100755 --- a/src/main/java/com/replaymod/recording/packet/PacketListener.java +++ b/src/main/java/com/replaymod/recording/packet/PacketListener.java @@ -26,7 +26,7 @@ import net.minecraft.network.NetworkState; import net.minecraft.network.Packet; import net.minecraft.util.PacketByteBuf; import net.minecraft.client.network.packet.*; -import net.minecraft.network.chat.TextComponent; +import net.minecraft.text.LiteralText; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -285,7 +285,7 @@ public class PacketListener extends ChannelInboundHandlerAdapter { if (packet instanceof CustomPayloadS2CPacket) { CustomPayloadS2CPacket p = (CustomPayloadS2CPacket) packet; if (Restrictions.PLUGIN_CHANNEL.equals(p.getChannel())) { - packet = new DisconnectS2CPacket(new TextComponent("Please update to view this replay.")); + packet = new DisconnectS2CPacket(new LiteralText("Please update to view this replay.")); save(packet); } } diff --git a/src/main/java/com/replaymod/recording/packet/ResourcePackRecorder.java b/src/main/java/com/replaymod/recording/packet/ResourcePackRecorder.java index da50c97d..1141aa68 100644 --- a/src/main/java/com/replaymod/recording/packet/ResourcePackRecorder.java +++ b/src/main/java/com/replaymod/recording/packet/ResourcePackRecorder.java @@ -12,7 +12,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; //#if MC>=11400 -import net.minecraft.network.chat.TranslatableComponent; +import net.minecraft.text.TranslatableText; //#else //$$ import net.minecraft.client.gui.GuiYesNoCallback; //$$ import net.minecraft.client.resources.I18n; @@ -165,7 +165,7 @@ public class ResourcePackRecorder { mc.openScreen(null); } //#if MC>=11400 - , new TranslatableComponent("multiplayer.texturePrompt.line1"), new TranslatableComponent("multiplayer.texturePrompt.line2")))); + , new TranslatableText("multiplayer.texturePrompt.line1"), new TranslatableText("multiplayer.texturePrompt.line2")))); //#else //$$ }, I18n.format("multiplayer.texturePrompt.line1"), I18n.format("multiplayer.texturePrompt.line2"), 0))); //#endif diff --git a/src/main/java/com/replaymod/render/blend/exporters/ItemExporter.java b/src/main/java/com/replaymod/render/blend/exporters/ItemExporter.java index ae484d97..7a8ef2aa 100644 --- a/src/main/java/com/replaymod/render/blend/exporters/ItemExporter.java +++ b/src/main/java/com/replaymod/render/blend/exporters/ItemExporter.java @@ -70,7 +70,7 @@ public class ItemExporter implements Exporter { if (object == null) { object = new ItemBasedDObject(renderItem, model, stack); //#if MC>=11300 - object.id.name = stack.getDisplayName().getString(); + object.id.name = stack.getName().getString(); //#else //$$ object.id.name = stack.getDisplayName(); //#endif diff --git a/src/main/java/com/replaymod/render/gui/GuiRenderQueue.java b/src/main/java/com/replaymod/render/gui/GuiRenderQueue.java index e37d47a3..35e69e04 100644 --- a/src/main/java/com/replaymod/render/gui/GuiRenderQueue.java +++ b/src/main/java/com/replaymod/render/gui/GuiRenderQueue.java @@ -38,7 +38,7 @@ import java.util.List; import static com.replaymod.render.ReplayModRender.LOGGER; //#if MC>=11400 -import net.minecraft.network.chat.TranslatableComponent; +import net.minecraft.text.TranslatableText; //#endif public class GuiRenderQueue extends AbstractGuiPopup { @@ -217,8 +217,8 @@ public class GuiRenderQueue extends AbstractGuiPopup { NoticeScreen errorScreen = new NoticeScreen( //#if MC>=11400 container::display, - new TranslatableComponent("replaymod.gui.rendering.error.title"), - new TranslatableComponent("replaymod.gui.rendering.error.message") + new TranslatableText("replaymod.gui.rendering.error.title"), + new TranslatableText("replaymod.gui.rendering.error.message") //#else //$$ I18n.format("replaymod.gui.rendering.error.title"), //$$ I18n.format("replaymod.gui.rendering.error.message") diff --git a/src/main/java/com/replaymod/render/gui/GuiRenderSettings.java b/src/main/java/com/replaymod/render/gui/GuiRenderSettings.java index 3ae9d2a2..d5f81163 100644 --- a/src/main/java/com/replaymod/render/gui/GuiRenderSettings.java +++ b/src/main/java/com/replaymod/render/gui/GuiRenderSettings.java @@ -53,7 +53,7 @@ import static com.replaymod.core.utils.Utils.error; import static com.replaymod.render.ReplayModRender.LOGGER; //#if MC>=11400 -import net.minecraft.network.chat.TranslatableComponent; +import net.minecraft.text.TranslatableText; //#endif public class GuiRenderSettings extends GuiScreen implements Closeable { @@ -241,8 +241,8 @@ public class GuiRenderSettings extends GuiScreen implements Closeable { NoticeScreen errorScreen = new NoticeScreen( //#if MC>=11400 GuiRenderSettings.this::display, - new TranslatableComponent("replaymod.gui.rendering.error.title"), - new TranslatableComponent("replaymod.gui.rendering.error.message") + new TranslatableText("replaymod.gui.rendering.error.title"), + new TranslatableText("replaymod.gui.rendering.error.message") //#else //$$ I18n.format("replaymod.gui.rendering.error.title"), //$$ I18n.format("replaymod.gui.rendering.error.message") diff --git a/src/main/java/com/replaymod/render/hooks/ChunkLoadingRenderGlobal.java b/src/main/java/com/replaymod/render/hooks/ChunkLoadingRenderGlobal.java index 36989d57..fb1457e6 100644 --- a/src/main/java/com/replaymod/render/hooks/ChunkLoadingRenderGlobal.java +++ b/src/main/java/com/replaymod/render/hooks/ChunkLoadingRenderGlobal.java @@ -35,7 +35,7 @@ public class ChunkLoadingRenderGlobal { //#else //$$ private JailingQueue workerJailingQueue; //#endif - private CustomChunkRenderWorker renderWorker; + private ChunkRenderWorkerAccessor renderWorker; private int frame; @SuppressWarnings("unchecked") @@ -63,7 +63,7 @@ public class ChunkLoadingRenderGlobal { private void setup(ChunkBatcher renderDispatcher) { this.renderDispatcher = renderDispatcher; - this.renderWorker = new CustomChunkRenderWorker(renderDispatcher, new BlockLayeredBufferBuilder()); + this.renderWorker = (ChunkRenderWorkerAccessor) new ChunkRenderWorker(renderDispatcher, new BlockLayeredBufferBuilder()); ChunkRenderDispatcherAccessor renderDispatcherAcc = (ChunkRenderDispatcherAccessor) renderDispatcher; int workerThreads = renderDispatcherAcc.getListThreadedWorkers().size(); @@ -123,7 +123,7 @@ public class ChunkLoadingRenderGlobal { queueChunkUpdates = ((ChunkRenderDispatcherAccessor) renderDispatcher).getQueueChunkUpdates(); while (!queueChunkUpdates.isEmpty()) { try { - renderWorker.runTask(queueChunkUpdates.poll()); + renderWorker.doRunTask(queueChunkUpdates.poll()); } catch (InterruptedException ignored) { } } @@ -160,25 +160,5 @@ public class ChunkLoadingRenderGlobal { public int nextFrameId() { return frame++; } - - /** - * Custom ChunkRenderWorker class providing access to the protected processTask method - */ - private static class CustomChunkRenderWorker extends ChunkRenderWorker { - public CustomChunkRenderWorker(ChunkBatcher p_i46202_1_, BlockLayeredBufferBuilder p_i46202_2_) { - super(p_i46202_1_, p_i46202_2_); - } - - @Override - protected void runTask( - //#if MC>=11300 - ChunkRenderTask p_178474_1_ - //#else - //$$ ChunkCompileTaskGenerator p_178474_1_ - //#endif - ) throws InterruptedException { - super.runTask(p_178474_1_); - } - } } //#endif diff --git a/src/main/java/com/replaymod/render/mixin/MixinChunkRenderWorker.java b/src/main/java/com/replaymod/render/mixin/MixinChunkRenderWorker.java new file mode 100644 index 00000000..c901d0d7 --- /dev/null +++ b/src/main/java/com/replaymod/render/mixin/MixinChunkRenderWorker.java @@ -0,0 +1,19 @@ +package com.replaymod.render.mixin; + +//#if MC>=10800 + +import com.replaymod.core.versions.MCVer; +import net.minecraft.client.render.chunk.ChunkRenderTask; +import net.minecraft.client.render.chunk.ChunkRenderWorker; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; + +@Mixin(ChunkRenderWorker.class) +public abstract class MixinChunkRenderWorker implements MCVer.ChunkRenderWorkerAccessor { + @Shadow abstract void runTask(ChunkRenderTask task) throws InterruptedException; + + public void doRunTask(ChunkRenderTask task) throws InterruptedException { + runTask(task); + } +} +//#endif diff --git a/src/main/java/com/replaymod/replay/FullReplaySender.java b/src/main/java/com/replaymod/replay/FullReplaySender.java index 007237d4..e25df337 100755 --- a/src/main/java/com/replaymod/replay/FullReplaySender.java +++ b/src/main/java/com/replaymod/replay/FullReplaySender.java @@ -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 diff --git a/src/main/java/com/replaymod/replay/camera/CameraEntity.java b/src/main/java/com/replaymod/replay/camera/CameraEntity.java index f59d2992..79b68f03 100755 --- a/src/main/java/com/replaymod/replay/camera/CameraEntity.java +++ b/src/main/java/com/replaymod/replay/camera/CameraEntity.java @@ -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 diff --git a/src/main/java/com/replaymod/replay/gui/screen/GuiReplayViewer.java b/src/main/java/com/replaymod/replay/gui/screen/GuiReplayViewer.java index b6d3311c..4b76a03c 100755 --- a/src/main/java/com/replaymod/replay/gui/screen/GuiReplayViewer.java +++ b/src/main/java/com/replaymod/replay/gui/screen/GuiReplayViewer.java @@ -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() { @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); diff --git a/src/main/resources/mixins.render.replaymod.json b/src/main/resources/mixins.render.replaymod.json index 8b95ca80..8be9afe2 100644 --- a/src/main/resources/mixins.render.replaymod.json +++ b/src/main/resources/mixins.render.replaymod.json @@ -6,6 +6,7 @@ "client": [ //#if MC>=10800 "ChunkRenderDispatcherAccessor", + "MixinChunkRenderWorker", //#endif //#if MC>=11400 "MainWindowAccessor", diff --git a/versions/1.14.2/mapping.txt b/versions/1.14.3/mapping.txt similarity index 98% rename from versions/1.14.2/mapping.txt rename to versions/1.14.3/mapping.txt index 4ee17d80..b435368a 100644 --- a/versions/1.14.2/mapping.txt +++ b/versions/1.14.3/mapping.txt @@ -63,13 +63,15 @@ net.minecraft.client.render.item.ItemRenderer colorMap itemColors net.minecraft.client.render.item.ItemRenderer renderGlint() renderEffect() net.minecraft.client.color.item.ItemColors net.minecraft.client.renderer.color.ItemColors net.minecraft.client.color.item.ItemColors getColorMultiplier() getColor() +net.minecraft.item.ItemStack getName() getDisplayName() net.minecraft.client.gui.Element net.minecraft.client.gui.IGuiEventListener -net.minecraft.network.chat.Component net.minecraft.util.text.ITextComponent -net.minecraft.network.chat.Component append() appendSibling() -net.minecraft.network.chat.Style net.minecraft.util.text.Style -net.minecraft.network.chat.TextComponent net.minecraft.util.text.TextComponentString -net.minecraft.network.chat.TranslatableComponent net.minecraft.util.text.TextComponentTranslation -net.minecraft.ChatFormat net.minecraft.util.text.TextFormatting +net.minecraft.text.Text net.minecraft.util.text.ITextComponent +net.minecraft.text.Text append() appendSibling() +net.minecraft.text.Text asFormattedString() getFormattedText() +net.minecraft.text.Style net.minecraft.util.text.Style +net.minecraft.text.LiteralText net.minecraft.util.text.TextComponentString +net.minecraft.text.TranslatableText net.minecraft.util.text.TextComponentTranslation +net.minecraft.util.Formatting net.minecraft.util.text.TextFormatting net.minecraft.client.render.VisibleRegion net.minecraft.client.renderer.culling.ICamera net.minecraft.client.render.entity.LivingEntityRenderer net.minecraft.client.renderer.entity.RenderLivingBase net.minecraft.client.render.entity.LivingEntityRenderer method_4055() canRenderName() @@ -454,7 +456,7 @@ net.minecraft.entity.Entity prevRenderY lastTickPosY net.minecraft.entity.Entity prevRenderZ lastTickPosZ net.minecraft.world.chunk.WorldChunk net.minecraft.world.chunk.Chunk net.minecraft.world.chunk.WorldChunk getEntitySectionArray() getEntityLists() -net.minecraft.util.math.BoundingBox net.minecraft.util.math.AxisAlignedBB +net.minecraft.util.math.Box net.minecraft.util.math.AxisAlignedBB net.minecraft.world.RayTraceContext net.minecraft.util.math.RayTraceResult net.minecraft.entity.EquipmentSlot net.minecraft.inventory.EntityEquipmentSlot net.minecraft.stat.StatHandler net.minecraft.stats.StatisticsManager diff --git a/versions/common.gradle b/versions/common.gradle index b15d61d1..c2586627 100644 --- a/versions/common.gradle +++ b/versions/common.gradle @@ -211,16 +211,16 @@ def shadeExclusions = { dependencies { if (FABRIC) { minecraft 'com.mojang:minecraft:' + [ - 11402: '1.14.2' + 11403: '1.14.3', ][mcVersion] mappings 'net.fabricmc:yarn:' + [ - 11402: '1.14.2+build.2' + 11403: '1.14.3+build.1', ][mcVersion] modCompile 'net.fabricmc:fabric-loader:' + [ - 11402: '0.4.8+build.154' + 11403: '0.4.8+build.155', ][mcVersion] modCompile 'net.fabricmc.fabric-api:fabric-api:' + [ - 11402: '0.3.0+build.170' + 11403: '0.3.0+build.185', ][mcVersion] } @@ -256,7 +256,7 @@ dependencies { def studioVersion = mcVersionStr if (studioVersion == '1.8.9') studioVersion = '1.8' - shadow "com.github.ReplayMod.ReplayStudio:$studioVersion:e6f1a4b", shadeExclusions + shadow "com.github.ReplayMod.ReplayStudio:$studioVersion:8eeb9f5", 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 diff --git a/versions/core/mcVersion b/versions/core/mcVersion index f7dff338..d5ba10a3 100644 --- a/versions/core/mcVersion +++ b/versions/core/mcVersion @@ -1 +1 @@ -11402 \ No newline at end of file +11403 \ No newline at end of file