Update to MC 1.14.3
This commit is contained in:
2
jGui
2
jGui
Submodule jGui updated: cd7d3dc55a...c8ee5f3c89
@@ -11,7 +11,7 @@ jGuiVersions += [
|
|||||||
'1.9.4',
|
'1.9.4',
|
||||||
'1.12',
|
'1.12',
|
||||||
'1.13.2',
|
'1.13.2',
|
||||||
'1.14.2',
|
'1.14.3',
|
||||||
]
|
]
|
||||||
replayModVersions += [
|
replayModVersions += [
|
||||||
'core',
|
'core',
|
||||||
@@ -26,7 +26,7 @@ replayModVersions += [
|
|||||||
'1.12.1',
|
'1.12.1',
|
||||||
'1.12.2',
|
'1.12.2',
|
||||||
'1.13.2',
|
'1.13.2',
|
||||||
'1.14.2',
|
'1.14.3',
|
||||||
]
|
]
|
||||||
|
|
||||||
include ':jGui'
|
include ':jGui'
|
||||||
|
|||||||
@@ -21,11 +21,11 @@ import de.johni0702.minecraft.gui.container.GuiScreen;
|
|||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
import net.minecraft.client.MinecraftClient;
|
import net.minecraft.client.MinecraftClient;
|
||||||
import net.minecraft.util.Identifier;
|
import net.minecraft.util.Identifier;
|
||||||
import net.minecraft.network.chat.Component;
|
import net.minecraft.text.Text;
|
||||||
import net.minecraft.network.chat.Style;
|
import net.minecraft.text.Style;
|
||||||
import net.minecraft.network.chat.TextComponent;
|
import net.minecraft.text.LiteralText;
|
||||||
import net.minecraft.network.chat.TranslatableComponent;
|
import net.minecraft.text.TranslatableText;
|
||||||
import net.minecraft.ChatFormat;
|
import net.minecraft.util.Formatting;
|
||||||
import org.apache.commons.io.FileUtils;
|
import org.apache.commons.io.FileUtils;
|
||||||
|
|
||||||
//#if MC>=11400
|
//#if MC>=11400
|
||||||
@@ -608,13 +608,13 @@ public class ReplayMod implements
|
|||||||
if (getSettingsRegistry().get(Setting.NOTIFICATIONS)) {
|
if (getSettingsRegistry().get(Setting.NOTIFICATIONS)) {
|
||||||
// Some nostalgia: "§8[§6Replay Mod§8]§r Your message goes here"
|
// Some nostalgia: "§8[§6Replay Mod§8]§r Your message goes here"
|
||||||
//#if MC>=10904
|
//#if MC>=10904
|
||||||
Style coloredDarkGray = new Style().setColor(ChatFormat.DARK_GRAY);
|
Style coloredDarkGray = new Style().setColor(Formatting.DARK_GRAY);
|
||||||
Style coloredGold = new Style().setColor(ChatFormat.GOLD);
|
Style coloredGold = new Style().setColor(Formatting.GOLD);
|
||||||
Component text = new TextComponent("[").setStyle(coloredDarkGray)
|
Text text = new LiteralText("[").setStyle(coloredDarkGray)
|
||||||
.append(new TranslatableComponent("replaymod.title").setStyle(coloredGold))
|
.append(new TranslatableText("replaymod.title").setStyle(coloredGold))
|
||||||
.append(new TextComponent("] "))
|
.append(new LiteralText("] "))
|
||||||
.append(new TranslatableComponent(message, args).setStyle(new Style()
|
.append(new TranslatableText(message, args).setStyle(new Style()
|
||||||
.setColor(warning ? ChatFormat.RED : ChatFormat.DARK_GREEN)));
|
.setColor(warning ? Formatting.RED : Formatting.DARK_GREEN)));
|
||||||
//#else
|
//#else
|
||||||
//$$ ChatStyle coloredDarkGray = new ChatStyle().setColor(EnumChatFormatting.DARK_GRAY);
|
//$$ ChatStyle coloredDarkGray = new ChatStyle().setColor(EnumChatFormatting.DARK_GRAY);
|
||||||
//$$ ChatStyle coloredGold = new ChatStyle().setColor(EnumChatFormatting.GOLD);
|
//$$ ChatStyle coloredGold = new ChatStyle().setColor(EnumChatFormatting.GOLD);
|
||||||
|
|||||||
@@ -68,6 +68,7 @@ import net.minecraft.client.render.BufferBuilder;
|
|||||||
import com.mojang.blaze3d.platform.GlStateManager;
|
import com.mojang.blaze3d.platform.GlStateManager;
|
||||||
import net.minecraft.client.render.VertexFormat;
|
import net.minecraft.client.render.VertexFormat;
|
||||||
import net.minecraft.client.render.VertexFormatElement;
|
import net.minecraft.client.render.VertexFormatElement;
|
||||||
|
import net.minecraft.client.render.chunk.ChunkRenderTask;
|
||||||
//#else
|
//#else
|
||||||
//$$ import com.replaymod.core.mixin.ResourcePackRepositoryAccessor;
|
//$$ import com.replaymod.core.mixin.ResourcePackRepositoryAccessor;
|
||||||
//$$ import com.google.common.util.concurrent.Futures;
|
//$$ import com.google.common.util.concurrent.Futures;
|
||||||
@@ -506,6 +507,12 @@ public class MCVer {
|
|||||||
//#endif
|
//#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//#if MC>=10800
|
||||||
|
public interface ChunkRenderWorkerAccessor {
|
||||||
|
void doRunTask(ChunkRenderTask task) throws InterruptedException;
|
||||||
|
}
|
||||||
|
//#endif
|
||||||
|
|
||||||
public static long milliTime() {
|
public static long milliTime() {
|
||||||
//#if MC>=11300
|
//#if MC>=11300
|
||||||
return SystemUtil.getMeasuringTimeMs();
|
return SystemUtil.getMeasuringTimeMs();
|
||||||
|
|||||||
@@ -116,7 +116,7 @@ public class PlayerOverviewGui extends GuiScreen implements Closeable {
|
|||||||
}.setSize(16, 16),
|
}.setSize(16, 16),
|
||||||
new GuiLabel().setText(
|
new GuiLabel().setText(
|
||||||
//#if MC>=11300
|
//#if MC>=11300
|
||||||
p.getName().getFormattedText()
|
p.getName().asFormattedString()
|
||||||
//#else
|
//#else
|
||||||
//#if MC>=10800
|
//#if MC>=10800
|
||||||
//$$ p.getName()
|
//$$ p.getName()
|
||||||
@@ -181,7 +181,7 @@ public class PlayerOverviewGui extends GuiScreen implements Closeable {
|
|||||||
if (isSpectator(o1) && !isSpectator(o2)) return 1;
|
if (isSpectator(o1) && !isSpectator(o2)) return 1;
|
||||||
if (isSpectator(o2) && !isSpectator(o1)) return -1;
|
if (isSpectator(o2) && !isSpectator(o1)) return -1;
|
||||||
//#if MC>=11300
|
//#if MC>=11300
|
||||||
return o1.getName().getFormattedText().compareToIgnoreCase(o2.getName().getFormattedText());
|
return o1.getName().asFormattedString().compareToIgnoreCase(o2.getName().asFormattedString());
|
||||||
//#else
|
//#else
|
||||||
//#if MC>=10800
|
//#if MC>=10800
|
||||||
//$$ return o1.getName().compareToIgnoreCase(o2.getName());
|
//$$ return o1.getName().compareToIgnoreCase(o2.getName());
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ public enum MinecraftVersion {
|
|||||||
MC_1_12_1("Minecraft 1.12.1", "1.12.1"),
|
MC_1_12_1("Minecraft 1.12.1", "1.12.1"),
|
||||||
MC_1_12_2("Minecraft 1.12.2", "1.12.2"),
|
MC_1_12_2("Minecraft 1.12.2", "1.12.2"),
|
||||||
MC_1_13_2("Minecraft 1.13.2", "1.13.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;
|
private String niceName, apiName;
|
||||||
|
|
||||||
|
|||||||
@@ -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.Dimension;
|
||||||
import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension;
|
import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension;
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import net.minecraft.ChatFormat;
|
import net.minecraft.util.Formatting;
|
||||||
|
|
||||||
import java.awt.image.BufferedImage;
|
import java.awt.image.BufferedImage;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
@@ -418,9 +418,9 @@ public class GuiReplayCenter extends GuiScreen {
|
|||||||
this.downloaded = downloaded;
|
this.downloaded = downloaded;
|
||||||
ReplayMetaData metaData = fileInfo.getMetadata();
|
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",
|
author.setI18nText("replaymod.gui.center.author",
|
||||||
"" + ChatFormat.GRAY + ChatFormat.ITALIC, fileInfo.getOwner());
|
"" + Formatting.GRAY + Formatting.ITALIC, fileInfo.getOwner());
|
||||||
if (StringUtils.isEmpty(metaData.getServerName())) {
|
if (StringUtils.isEmpty(metaData.getServerName())) {
|
||||||
server.setI18nText("replaymod.gui.iphidden").setColor(Colors.DARK_RED);
|
server.setI18nText("replaymod.gui.iphidden").setColor(Colors.DARK_RED);
|
||||||
} else {
|
} else {
|
||||||
@@ -444,7 +444,7 @@ public class GuiReplayCenter extends GuiScreen {
|
|||||||
favorites.setText("⭑" + fileInfo.getFavorites());
|
favorites.setText("⭑" + fileInfo.getFavorites());
|
||||||
likes.setText("⬆" + fileInfo.getRatings().getPositive());
|
likes.setText("⬆" + fileInfo.getRatings().getPositive());
|
||||||
dislikes.setText("⬇" + fileInfo.getRatings().getNegative());
|
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());
|
.or(Category.MISCELLANEOUS).toNiceString());
|
||||||
addElements(null, durationPanel, downloadsPanel);
|
addElements(null, durationPanel, downloadsPanel);
|
||||||
|
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ import de.johni0702.minecraft.gui.element.GuiButton;
|
|||||||
import de.johni0702.minecraft.gui.element.GuiLabel;
|
import de.johni0702.minecraft.gui.element.GuiLabel;
|
||||||
import de.johni0702.minecraft.gui.element.advanced.GuiProgressBar;
|
import de.johni0702.minecraft.gui.element.advanced.GuiProgressBar;
|
||||||
import de.johni0702.minecraft.gui.layout.CustomLayout;
|
import de.johni0702.minecraft.gui.layout.CustomLayout;
|
||||||
import net.minecraft.ChatFormat;
|
import net.minecraft.util.Formatting;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
@@ -34,7 +34,7 @@ public class GuiReplayDownloading extends AbstractGuiScreen<GuiReplayDownloading
|
|||||||
this.apiClient = mod.getApiClient();
|
this.apiClient = mod.getApiClient();
|
||||||
setTitle(new GuiLabel().setI18nText("replaymod.gui.viewer.download.title"));
|
setTitle(new GuiLabel().setI18nText("replaymod.gui.viewer.download.title"));
|
||||||
final GuiLabel subTitle = new GuiLabel(this).setI18nText("replaymod.gui.viewer.download.message",
|
final GuiLabel subTitle = new GuiLabel(this).setI18nText("replaymod.gui.viewer.download.message",
|
||||||
ChatFormat.UNDERLINE + name + ChatFormat.RESET);
|
Formatting.UNDERLINE + name + Formatting.RESET);
|
||||||
setLayout(new CustomLayout<GuiReplayDownloading>() {
|
setLayout(new CustomLayout<GuiReplayDownloading>() {
|
||||||
@Override
|
@Override
|
||||||
protected void layout(GuiReplayDownloading container, int width, int height) {
|
protected void layout(GuiReplayDownloading container, int width, int height) {
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ import net.minecraft.network.NetworkState;
|
|||||||
import net.minecraft.network.Packet;
|
import net.minecraft.network.Packet;
|
||||||
import net.minecraft.util.PacketByteBuf;
|
import net.minecraft.util.PacketByteBuf;
|
||||||
import net.minecraft.client.network.packet.*;
|
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.LogManager;
|
||||||
import org.apache.logging.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
|
|
||||||
@@ -285,7 +285,7 @@ public class PacketListener extends ChannelInboundHandlerAdapter {
|
|||||||
if (packet instanceof CustomPayloadS2CPacket) {
|
if (packet instanceof CustomPayloadS2CPacket) {
|
||||||
CustomPayloadS2CPacket p = (CustomPayloadS2CPacket) packet;
|
CustomPayloadS2CPacket p = (CustomPayloadS2CPacket) packet;
|
||||||
if (Restrictions.PLUGIN_CHANNEL.equals(p.getChannel())) {
|
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);
|
save(packet);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ import org.apache.logging.log4j.LogManager;
|
|||||||
import org.apache.logging.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
|
|
||||||
//#if MC>=11400
|
//#if MC>=11400
|
||||||
import net.minecraft.network.chat.TranslatableComponent;
|
import net.minecraft.text.TranslatableText;
|
||||||
//#else
|
//#else
|
||||||
//$$ import net.minecraft.client.gui.GuiYesNoCallback;
|
//$$ import net.minecraft.client.gui.GuiYesNoCallback;
|
||||||
//$$ import net.minecraft.client.resources.I18n;
|
//$$ import net.minecraft.client.resources.I18n;
|
||||||
@@ -165,7 +165,7 @@ public class ResourcePackRecorder {
|
|||||||
mc.openScreen(null);
|
mc.openScreen(null);
|
||||||
}
|
}
|
||||||
//#if MC>=11400
|
//#if MC>=11400
|
||||||
, new TranslatableComponent("multiplayer.texturePrompt.line1"), new TranslatableComponent("multiplayer.texturePrompt.line2"))));
|
, new TranslatableText("multiplayer.texturePrompt.line1"), new TranslatableText("multiplayer.texturePrompt.line2"))));
|
||||||
//#else
|
//#else
|
||||||
//$$ }, I18n.format("multiplayer.texturePrompt.line1"), I18n.format("multiplayer.texturePrompt.line2"), 0)));
|
//$$ }, I18n.format("multiplayer.texturePrompt.line1"), I18n.format("multiplayer.texturePrompt.line2"), 0)));
|
||||||
//#endif
|
//#endif
|
||||||
|
|||||||
@@ -70,7 +70,7 @@ public class ItemExporter implements Exporter {
|
|||||||
if (object == null) {
|
if (object == null) {
|
||||||
object = new ItemBasedDObject(renderItem, model, stack);
|
object = new ItemBasedDObject(renderItem, model, stack);
|
||||||
//#if MC>=11300
|
//#if MC>=11300
|
||||||
object.id.name = stack.getDisplayName().getString();
|
object.id.name = stack.getName().getString();
|
||||||
//#else
|
//#else
|
||||||
//$$ object.id.name = stack.getDisplayName();
|
//$$ object.id.name = stack.getDisplayName();
|
||||||
//#endif
|
//#endif
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ import java.util.List;
|
|||||||
import static com.replaymod.render.ReplayModRender.LOGGER;
|
import static com.replaymod.render.ReplayModRender.LOGGER;
|
||||||
|
|
||||||
//#if MC>=11400
|
//#if MC>=11400
|
||||||
import net.minecraft.network.chat.TranslatableComponent;
|
import net.minecraft.text.TranslatableText;
|
||||||
//#endif
|
//#endif
|
||||||
|
|
||||||
public class GuiRenderQueue extends AbstractGuiPopup<GuiRenderQueue> {
|
public class GuiRenderQueue extends AbstractGuiPopup<GuiRenderQueue> {
|
||||||
@@ -217,8 +217,8 @@ public class GuiRenderQueue extends AbstractGuiPopup<GuiRenderQueue> {
|
|||||||
NoticeScreen errorScreen = new NoticeScreen(
|
NoticeScreen errorScreen = new NoticeScreen(
|
||||||
//#if MC>=11400
|
//#if MC>=11400
|
||||||
container::display,
|
container::display,
|
||||||
new TranslatableComponent("replaymod.gui.rendering.error.title"),
|
new TranslatableText("replaymod.gui.rendering.error.title"),
|
||||||
new TranslatableComponent("replaymod.gui.rendering.error.message")
|
new TranslatableText("replaymod.gui.rendering.error.message")
|
||||||
//#else
|
//#else
|
||||||
//$$ I18n.format("replaymod.gui.rendering.error.title"),
|
//$$ I18n.format("replaymod.gui.rendering.error.title"),
|
||||||
//$$ I18n.format("replaymod.gui.rendering.error.message")
|
//$$ I18n.format("replaymod.gui.rendering.error.message")
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ import static com.replaymod.core.utils.Utils.error;
|
|||||||
import static com.replaymod.render.ReplayModRender.LOGGER;
|
import static com.replaymod.render.ReplayModRender.LOGGER;
|
||||||
|
|
||||||
//#if MC>=11400
|
//#if MC>=11400
|
||||||
import net.minecraft.network.chat.TranslatableComponent;
|
import net.minecraft.text.TranslatableText;
|
||||||
//#endif
|
//#endif
|
||||||
|
|
||||||
public class GuiRenderSettings extends GuiScreen implements Closeable {
|
public class GuiRenderSettings extends GuiScreen implements Closeable {
|
||||||
@@ -241,8 +241,8 @@ public class GuiRenderSettings extends GuiScreen implements Closeable {
|
|||||||
NoticeScreen errorScreen = new NoticeScreen(
|
NoticeScreen errorScreen = new NoticeScreen(
|
||||||
//#if MC>=11400
|
//#if MC>=11400
|
||||||
GuiRenderSettings.this::display,
|
GuiRenderSettings.this::display,
|
||||||
new TranslatableComponent("replaymod.gui.rendering.error.title"),
|
new TranslatableText("replaymod.gui.rendering.error.title"),
|
||||||
new TranslatableComponent("replaymod.gui.rendering.error.message")
|
new TranslatableText("replaymod.gui.rendering.error.message")
|
||||||
//#else
|
//#else
|
||||||
//$$ I18n.format("replaymod.gui.rendering.error.title"),
|
//$$ I18n.format("replaymod.gui.rendering.error.title"),
|
||||||
//$$ I18n.format("replaymod.gui.rendering.error.message")
|
//$$ I18n.format("replaymod.gui.rendering.error.message")
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ public class ChunkLoadingRenderGlobal {
|
|||||||
//#else
|
//#else
|
||||||
//$$ private JailingQueue<ChunkCompileTaskGenerator> workerJailingQueue;
|
//$$ private JailingQueue<ChunkCompileTaskGenerator> workerJailingQueue;
|
||||||
//#endif
|
//#endif
|
||||||
private CustomChunkRenderWorker renderWorker;
|
private ChunkRenderWorkerAccessor renderWorker;
|
||||||
private int frame;
|
private int frame;
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
@@ -63,7 +63,7 @@ public class ChunkLoadingRenderGlobal {
|
|||||||
|
|
||||||
private void setup(ChunkBatcher renderDispatcher) {
|
private void setup(ChunkBatcher renderDispatcher) {
|
||||||
this.renderDispatcher = renderDispatcher;
|
this.renderDispatcher = renderDispatcher;
|
||||||
this.renderWorker = new CustomChunkRenderWorker(renderDispatcher, new BlockLayeredBufferBuilder());
|
this.renderWorker = (ChunkRenderWorkerAccessor) new ChunkRenderWorker(renderDispatcher, new BlockLayeredBufferBuilder());
|
||||||
ChunkRenderDispatcherAccessor renderDispatcherAcc = (ChunkRenderDispatcherAccessor) renderDispatcher;
|
ChunkRenderDispatcherAccessor renderDispatcherAcc = (ChunkRenderDispatcherAccessor) renderDispatcher;
|
||||||
|
|
||||||
int workerThreads = renderDispatcherAcc.getListThreadedWorkers().size();
|
int workerThreads = renderDispatcherAcc.getListThreadedWorkers().size();
|
||||||
@@ -123,7 +123,7 @@ public class ChunkLoadingRenderGlobal {
|
|||||||
queueChunkUpdates = ((ChunkRenderDispatcherAccessor) renderDispatcher).getQueueChunkUpdates();
|
queueChunkUpdates = ((ChunkRenderDispatcherAccessor) renderDispatcher).getQueueChunkUpdates();
|
||||||
while (!queueChunkUpdates.isEmpty()) {
|
while (!queueChunkUpdates.isEmpty()) {
|
||||||
try {
|
try {
|
||||||
renderWorker.runTask(queueChunkUpdates.poll());
|
renderWorker.doRunTask(queueChunkUpdates.poll());
|
||||||
} catch (InterruptedException ignored) { }
|
} catch (InterruptedException ignored) { }
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -160,25 +160,5 @@ public class ChunkLoadingRenderGlobal {
|
|||||||
public int nextFrameId() {
|
public int nextFrameId() {
|
||||||
return frame++;
|
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
|
//#endif
|
||||||
|
|||||||
@@ -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
|
||||||
@@ -31,7 +31,7 @@ import net.minecraft.network.Packet;
|
|||||||
import net.minecraft.util.PacketByteBuf;
|
import net.minecraft.util.PacketByteBuf;
|
||||||
import net.minecraft.client.network.packet.LoginSuccessS2CPacket;
|
import net.minecraft.client.network.packet.LoginSuccessS2CPacket;
|
||||||
import net.minecraft.client.network.packet.*;
|
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.World;
|
||||||
import net.minecraft.world.chunk.ChunkProvider;
|
import net.minecraft.world.chunk.ChunkProvider;
|
||||||
import org.apache.commons.io.FileUtils;
|
import org.apache.commons.io.FileUtils;
|
||||||
@@ -40,7 +40,7 @@ import org.apache.commons.io.IOUtils;
|
|||||||
//#if MC>=11400
|
//#if MC>=11400
|
||||||
import de.johni0702.minecraft.gui.versions.callbacks.PreTickCallback;
|
import de.johni0702.minecraft.gui.versions.callbacks.PreTickCallback;
|
||||||
import net.minecraft.entity.EntityType;
|
import net.minecraft.entity.EntityType;
|
||||||
import net.minecraft.network.chat.TranslatableComponent;
|
import net.minecraft.text.TranslatableText;
|
||||||
//#else
|
//#else
|
||||||
//$$ import net.minecraft.client.resources.I18n;
|
//$$ import net.minecraft.client.resources.I18n;
|
||||||
//$$ import net.minecraft.entity.Entity;
|
//$$ import net.minecraft.entity.Entity;
|
||||||
@@ -462,8 +462,8 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend
|
|||||||
mc.openScreen(new NoticeScreen(
|
mc.openScreen(new NoticeScreen(
|
||||||
//#if MC>=11400
|
//#if MC>=11400
|
||||||
() -> mc.openScreen(null),
|
() -> mc.openScreen(null),
|
||||||
new TranslatableComponent("replaymod.error.unknownrestriction1"),
|
new TranslatableText("replaymod.error.unknownrestriction1"),
|
||||||
new TranslatableComponent("replaymod.error.unknownrestriction2", unknown)
|
new TranslatableText("replaymod.error.unknownrestriction2", unknown)
|
||||||
//#else
|
//#else
|
||||||
//$$ I18n.format("replaymod.error.unknownrestriction1"),
|
//$$ I18n.format("replaymod.error.unknownrestriction1"),
|
||||||
//$$ I18n.format("replaymod.error.unknownrestriction2", unknown)
|
//$$ I18n.format("replaymod.error.unknownrestriction2", unknown)
|
||||||
@@ -474,7 +474,7 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (p instanceof DisconnectS2CPacket) {
|
if (p instanceof DisconnectS2CPacket) {
|
||||||
Component reason = ((DisconnectS2CPacket) p).getReason();
|
Text reason = ((DisconnectS2CPacket) p).getReason();
|
||||||
String message = reason.getString();
|
String message = reason.getString();
|
||||||
if ("Please update to view this replay.".equals(message)) {
|
if ("Please update to view this replay.".equals(message)) {
|
||||||
// This version of the mod supports replay restrictions so we are allowed
|
// This version of the mod supports replay restrictions so we are allowed
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ import net.minecraft.entity.decoration.ItemFrameEntity;
|
|||||||
import net.minecraft.entity.player.PlayerEntity;
|
import net.minecraft.entity.player.PlayerEntity;
|
||||||
import net.minecraft.stat.StatHandler;
|
import net.minecraft.stat.StatHandler;
|
||||||
import net.minecraft.util.Identifier;
|
import net.minecraft.util.Identifier;
|
||||||
import net.minecraft.util.math.BoundingBox;
|
import net.minecraft.util.math.Box;
|
||||||
|
|
||||||
//#if MC>=11400
|
//#if MC>=11400
|
||||||
import com.replaymod.core.events.KeyBindingEventCallback;
|
import com.replaymod.core.events.KeyBindingEventCallback;
|
||||||
@@ -234,7 +234,7 @@ public class CameraEntity
|
|||||||
float height = getHeight();
|
float height = getHeight();
|
||||||
//#endif
|
//#endif
|
||||||
//#if MC>=10800
|
//#if MC>=10800
|
||||||
setBoundingBox(new BoundingBox(
|
setBoundingBox(new Box(
|
||||||
//#else
|
//#else
|
||||||
//$$ this.boundingBox.setBB(AxisAlignedBB.getBoundingBox(
|
//$$ this.boundingBox.setBB(AxisAlignedBB.getBoundingBox(
|
||||||
//#endif
|
//#endif
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import com.google.common.base.Supplier;
|
|||||||
import com.google.common.util.concurrent.FutureCallback;
|
import com.google.common.util.concurrent.FutureCallback;
|
||||||
import com.google.common.util.concurrent.Futures;
|
import com.google.common.util.concurrent.Futures;
|
||||||
import com.google.common.util.concurrent.SettableFuture;
|
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.ReplayMod;
|
||||||
import com.replaymod.core.SettingsRegistry;
|
import com.replaymod.core.SettingsRegistry;
|
||||||
import com.replaymod.core.gui.GuiReplaySettings;
|
import com.replaymod.core.gui.GuiReplaySettings;
|
||||||
@@ -57,7 +57,7 @@ import java.util.List;
|
|||||||
import static com.replaymod.replay.ReplayModReplay.LOGGER;
|
import static com.replaymod.replay.ReplayModReplay.LOGGER;
|
||||||
|
|
||||||
//#if MC>=11400
|
//#if MC>=11400
|
||||||
import net.minecraft.network.chat.TranslatableComponent;
|
import net.minecraft.text.TranslatableText;
|
||||||
//#else
|
//#else
|
||||||
//$$ import net.minecraft.client.resources.I18n;
|
//$$ import net.minecraft.client.resources.I18n;
|
||||||
//#endif
|
//#endif
|
||||||
@@ -144,8 +144,8 @@ public class GuiReplayViewer extends GuiScreen {
|
|||||||
getMinecraft().openScreen(new NoticeScreen(
|
getMinecraft().openScreen(new NoticeScreen(
|
||||||
//#if MC>=11400
|
//#if MC>=11400
|
||||||
GuiReplayViewer.this::display,
|
GuiReplayViewer.this::display,
|
||||||
new TranslatableComponent("replaymod.gui.viewer.delete.failed1"),
|
new TranslatableText("replaymod.gui.viewer.delete.failed1"),
|
||||||
new TranslatableComponent("replaymod.gui.viewer.delete.failed2")
|
new TranslatableText("replaymod.gui.viewer.delete.failed2")
|
||||||
//#else
|
//#else
|
||||||
//$$ I18n.format("replaymod.gui.viewer.delete.failed1"),
|
//$$ I18n.format("replaymod.gui.viewer.delete.failed1"),
|
||||||
//$$ I18n.format("replaymod.gui.viewer.delete.failed2")
|
//$$ I18n.format("replaymod.gui.viewer.delete.failed2")
|
||||||
@@ -170,7 +170,7 @@ public class GuiReplayViewer extends GuiScreen {
|
|||||||
String name = list.getSelected().name.getText();
|
String name = list.getSelected().name.getText();
|
||||||
GuiYesNoPopup popup = GuiYesNoPopup.open(GuiReplayViewer.this,
|
GuiYesNoPopup popup = GuiYesNoPopup.open(GuiReplayViewer.this,
|
||||||
new GuiLabel().setI18nText("replaymod.gui.viewer.delete.linea").setColor(Colors.BLACK),
|
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");
|
).setYesI18nLabel("replaymod.gui.delete").setNoI18nLabel("replaymod.gui.cancel");
|
||||||
Futures.addCallback(popup.getFuture(), new FutureCallback<Boolean>() {
|
Futures.addCallback(popup.getFuture(), new FutureCallback<Boolean>() {
|
||||||
@Override
|
@Override
|
||||||
@@ -404,7 +404,7 @@ public class GuiReplayViewer extends GuiScreen {
|
|||||||
public GuiReplayEntry(File file, ReplayMetaData metaData, BufferedImage thumbImage) {
|
public GuiReplayEntry(File file, ReplayMetaData metaData, BufferedImage thumbImage) {
|
||||||
this.file = file;
|
this.file = file;
|
||||||
|
|
||||||
name.setText(ChatFormat.UNDERLINE + Utils.fileNameToReplayName(file.getName()));
|
name.setText(Formatting.UNDERLINE + Utils.fileNameToReplayName(file.getName()));
|
||||||
if (StringUtils.isEmpty(metaData.getServerName())
|
if (StringUtils.isEmpty(metaData.getServerName())
|
||||||
|| !ReplayMod.instance.getSettingsRegistry().get(Setting.SHOW_SERVER_IPS)) {
|
|| !ReplayMod.instance.getSettingsRegistry().get(Setting.SHOW_SERVER_IPS)) {
|
||||||
server.setI18nText("replaymod.gui.iphidden").setColor(Colors.DARK_RED);
|
server.setI18nText("replaymod.gui.iphidden").setColor(Colors.DARK_RED);
|
||||||
|
|||||||
@@ -6,6 +6,7 @@
|
|||||||
"client": [
|
"client": [
|
||||||
//#if MC>=10800
|
//#if MC>=10800
|
||||||
"ChunkRenderDispatcherAccessor",
|
"ChunkRenderDispatcherAccessor",
|
||||||
|
"MixinChunkRenderWorker",
|
||||||
//#endif
|
//#endif
|
||||||
//#if MC>=11400
|
//#if MC>=11400
|
||||||
"MainWindowAccessor",
|
"MainWindowAccessor",
|
||||||
|
|||||||
@@ -63,13 +63,15 @@ net.minecraft.client.render.item.ItemRenderer colorMap itemColors
|
|||||||
net.minecraft.client.render.item.ItemRenderer renderGlint() renderEffect()
|
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 net.minecraft.client.renderer.color.ItemColors
|
||||||
net.minecraft.client.color.item.ItemColors getColorMultiplier() getColor()
|
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.client.gui.Element net.minecraft.client.gui.IGuiEventListener
|
||||||
net.minecraft.network.chat.Component net.minecraft.util.text.ITextComponent
|
net.minecraft.text.Text net.minecraft.util.text.ITextComponent
|
||||||
net.minecraft.network.chat.Component append() appendSibling()
|
net.minecraft.text.Text append() appendSibling()
|
||||||
net.minecraft.network.chat.Style net.minecraft.util.text.Style
|
net.minecraft.text.Text asFormattedString() getFormattedText()
|
||||||
net.minecraft.network.chat.TextComponent net.minecraft.util.text.TextComponentString
|
net.minecraft.text.Style net.minecraft.util.text.Style
|
||||||
net.minecraft.network.chat.TranslatableComponent net.minecraft.util.text.TextComponentTranslation
|
net.minecraft.text.LiteralText net.minecraft.util.text.TextComponentString
|
||||||
net.minecraft.ChatFormat net.minecraft.util.text.TextFormatting
|
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.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 net.minecraft.client.renderer.entity.RenderLivingBase
|
||||||
net.minecraft.client.render.entity.LivingEntityRenderer method_4055() canRenderName()
|
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.entity.Entity prevRenderZ lastTickPosZ
|
||||||
net.minecraft.world.chunk.WorldChunk net.minecraft.world.chunk.Chunk
|
net.minecraft.world.chunk.WorldChunk net.minecraft.world.chunk.Chunk
|
||||||
net.minecraft.world.chunk.WorldChunk getEntitySectionArray() getEntityLists()
|
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.world.RayTraceContext net.minecraft.util.math.RayTraceResult
|
||||||
net.minecraft.entity.EquipmentSlot net.minecraft.inventory.EntityEquipmentSlot
|
net.minecraft.entity.EquipmentSlot net.minecraft.inventory.EntityEquipmentSlot
|
||||||
net.minecraft.stat.StatHandler net.minecraft.stats.StatisticsManager
|
net.minecraft.stat.StatHandler net.minecraft.stats.StatisticsManager
|
||||||
@@ -211,16 +211,16 @@ def shadeExclusions = {
|
|||||||
dependencies {
|
dependencies {
|
||||||
if (FABRIC) {
|
if (FABRIC) {
|
||||||
minecraft 'com.mojang:minecraft:' + [
|
minecraft 'com.mojang:minecraft:' + [
|
||||||
11402: '1.14.2'
|
11403: '1.14.3',
|
||||||
][mcVersion]
|
][mcVersion]
|
||||||
mappings 'net.fabricmc:yarn:' + [
|
mappings 'net.fabricmc:yarn:' + [
|
||||||
11402: '1.14.2+build.2'
|
11403: '1.14.3+build.1',
|
||||||
][mcVersion]
|
][mcVersion]
|
||||||
modCompile 'net.fabricmc:fabric-loader:' + [
|
modCompile 'net.fabricmc:fabric-loader:' + [
|
||||||
11402: '0.4.8+build.154'
|
11403: '0.4.8+build.155',
|
||||||
][mcVersion]
|
][mcVersion]
|
||||||
modCompile 'net.fabricmc.fabric-api:fabric-api:' + [
|
modCompile 'net.fabricmc.fabric-api:fabric-api:' + [
|
||||||
11402: '0.3.0+build.170'
|
11403: '0.3.0+build.185',
|
||||||
][mcVersion]
|
][mcVersion]
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -256,7 +256,7 @@ dependencies {
|
|||||||
|
|
||||||
def studioVersion = mcVersionStr
|
def studioVersion = mcVersionStr
|
||||||
if (studioVersion == '1.8.9') studioVersion = '1.8'
|
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")){
|
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
|
transitive = false // FG 1.2 puts all MC deps into the compile configuration and we don't want to shade those
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
11402
|
11403
|
||||||
Reference in New Issue
Block a user