From e5ee6a3d945aae3ec90a8dfeeb642385b60afb87 Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Mon, 20 May 2019 13:38:38 +0200 Subject: [PATCH] Update to MC 1.14.1 The ReplayStudio update also fixes an issue with reading the PlayerListEntryPacket leading to NPEs during Quick Mode. --- jGui | 2 +- settings.gradle | 4 +- .../java/com/replaymod/core/ReplayMod.java | 36 +++---- .../core/gui/GuiBackgroundProcesses.java | 2 +- .../replaymod/core/gui/GuiReplaySettings.java | 2 +- .../core/handler/MainMenuHandler.java | 8 +- .../core/mixin/GuiMainMenuAccessor.java | 6 +- .../core/mixin/GuiScreenAccessor.java | 2 +- .../core/mixin/MixinGameRenderer.java | 2 +- .../replaymod/core/mixin/MixinMinecraft.java | 4 +- .../core/mixin/MixinModResourcePackUtil.java | 2 +- .../core/mixin/MixinMouseListener.java | 4 +- .../com/replaymod/core/mixin/MixinScreen.java | 2 +- .../java/com/replaymod/core/utils/Utils.java | 2 +- .../core/versions/LangResourcePack.java | 12 +-- .../com/replaymod/core/versions/MCVer.java | 2 +- .../replaymod/editor/handler/GuiHandler.java | 2 +- .../playeroverview/PlayerOverviewGui.java | 2 +- .../replaymod/extras/urischeme/UriScheme.java | 2 +- .../extras/youtube/YoutubeUpload.java | 2 +- .../replaymod/online/gui/GuiReplayCenter.java | 8 +- .../online/gui/GuiReplayDownloading.java | 4 +- .../replaymod/online/handler/GuiHandler.java | 10 +- .../recording/gui/GuiRecordingControls.java | 8 +- .../recording/handler/GuiHandler.java | 10 +- .../handler/RecordingEventHandler.java | 16 ++-- .../mixin/MixinNetHandlerPlayClient.java | 2 +- .../recording/packet/PacketListener.java | 6 +- .../packet/ResourcePackRecorder.java | 8 +- .../com/replaymod/render/RenderSettings.java | 2 +- .../render/blend/BlendMeshBuilder.java | 2 +- .../render/blend/exporters/ChunkExporter.java | 2 +- .../render/blend/exporters/ItemExporter.java | 2 +- .../blend/mixin/ItemRendererAccessor.java | 4 +- .../replaymod/render/gui/GuiRenderQueue.java | 8 +- .../render/gui/GuiRenderSettings.java | 10 +- .../hooks/ChunkLoadingRenderGlobal.java | 8 +- .../render/mixin/MixinRenderGlobal.java | 2 +- .../replaymod/replay/FullReplaySender.java | 18 ++-- .../replaymod/replay/QuickReplaySender.java | 4 +- .../com/replaymod/replay/ReplayHandler.java | 4 +- .../replaymod/replay/camera/CameraEntity.java | 16 ++-- .../replay/gui/screen/GuiReplayViewer.java | 14 +-- .../replaymod/replay/handler/GuiHandler.java | 18 ++-- .../replay/mixin/EntityPlayerAccessor.java | 4 +- .../replay/mixin/MixinViewFrustum.java | 6 +- versions/{1.14 => 1.14.1}/mapping.txt | 96 +++++++++---------- versions/common.gradle | 12 +-- versions/core/mcVersion | 2 +- 49 files changed, 198 insertions(+), 208 deletions(-) rename versions/{1.14 => 1.14.1}/mapping.txt (91%) diff --git a/jGui b/jGui index caea250b..26066998 160000 --- a/jGui +++ b/jGui @@ -1 +1 @@ -Subproject commit caea250b67f0fc71fd5add3791215964c043f3cb +Subproject commit 26066998679b0f443c30c959fe7f25bfcdda2f48 diff --git a/settings.gradle b/settings.gradle index 0fc297e7..a702e191 100644 --- a/settings.gradle +++ b/settings.gradle @@ -14,7 +14,7 @@ jGuiVersions += [ '1.9.4', '1.12', '1.13.2', - '1.14', + '1.14.1', ] replayModVersions += [ '1.7.10', @@ -28,7 +28,7 @@ replayModVersions += [ '1.12.1', '1.12.2', '1.13.2', - '1.14', + '1.14.1', ] include ':jGui' diff --git a/src/main/java/com/replaymod/core/ReplayMod.java b/src/main/java/com/replaymod/core/ReplayMod.java index 68aac5fb..d9de8456 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.text.TextComponent; -import net.minecraft.text.Style; -import net.minecraft.text.StringTextComponent; -import net.minecraft.text.TranslatableTextComponent; -import net.minecraft.text.TextFormat; +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 org.apache.commons.io.FileUtils; //#if MC>=11400 @@ -34,7 +34,7 @@ import com.replaymod.core.versions.LangResourcePack; import net.fabricmc.api.ClientModInitializer; import net.fabricmc.loader.api.FabricLoader; import net.minecraft.SharedConstants; -import net.minecraft.client.options.GameOption; +import net.minecraft.client.options.Option; import net.minecraft.resource.DirectoryResourcePack; import net.minecraft.resource.ResourcePackCreator; import net.minecraft.resource.ResourcePackContainer; @@ -236,9 +236,9 @@ public class ReplayMod implements //#if MC>=11300 DirectoryResourcePack jGuiResourcePack = new DirectoryResourcePack(new File("../jGui/src/main/resources")) { @Override - protected InputStream openFilename(String resourceName) throws IOException { + protected InputStream openFile(String resourceName) throws IOException { try { - return super.openFilename(resourceName); + return super.openFile(resourceName); //#else //$$ List defaultResourcePacks = ((MinecraftAccessor) mc).getDefaultResourcePacks(); //$$ FolderResourcePack jGuiResourcePack = new FolderResourcePack(new File("../jGui/src/main/resources")) { @@ -262,10 +262,10 @@ public class ReplayMod implements } }; //#if MC>=11300 - mc.method_1520().addCreator(new ResourcePackCreator() { + mc.getResourcePackContainerManager().addCreator(new ResourcePackCreator() { @Override public void registerContainer(Map map, ResourcePackContainer.Factory factory) { - map.put("jgui", ResourcePackContainer.of("jgui", true, () -> jGuiResourcePack, factory, ResourcePackContainer.SortingDirection.BOTTOM)); + map.put("jgui", ResourcePackContainer.of("jgui", true, () -> jGuiResourcePack, factory, ResourcePackContainer.InsertionPosition.BOTTOM)); } }); //#else @@ -335,7 +335,7 @@ public class ReplayMod implements //#if MC>=10800 if (!MCVer.hasOptifine()) { //#if MC>=11400 - GameOption.RENDER_DISTANCE.setMax(64f); + Option.RENDER_DISTANCE.setMax(64f); //#else //$$ GameSettings.Options.RENDER_DISTANCE.setValueMax(64f); //#endif @@ -513,13 +513,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(TextFormat.DARK_GRAY); - Style coloredGold = new Style().setColor(TextFormat.GOLD); - TextComponent text = new StringTextComponent("[").setStyle(coloredDarkGray) - .append(new TranslatableTextComponent("replaymod.title").setStyle(coloredGold)) - .append(new StringTextComponent("] ")) - .append(new TranslatableTextComponent(message, args).setStyle(new Style() - .setColor(warning ? TextFormat.RED : TextFormat.DARK_GREEN))); + 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))); //#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/gui/GuiBackgroundProcesses.java b/src/main/java/com/replaymod/core/gui/GuiBackgroundProcesses.java index 38ebed9f..ea4528f8 100644 --- a/src/main/java/com/replaymod/core/gui/GuiBackgroundProcesses.java +++ b/src/main/java/com/replaymod/core/gui/GuiBackgroundProcesses.java @@ -15,7 +15,7 @@ import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension; //#if MC>=11400 import de.johni0702.minecraft.gui.versions.callbacks.InitScreenCallback; -import net.minecraft.client.gui.Screen; +import net.minecraft.client.gui.screen.Screen; //#else //$$ import net.minecraftforge.client.event.GuiScreenEvent; //$$ import net.minecraftforge.common.MinecraftForge; diff --git a/src/main/java/com/replaymod/core/gui/GuiReplaySettings.java b/src/main/java/com/replaymod/core/gui/GuiReplaySettings.java index c277fcbd..0c0cdac8 100644 --- a/src/main/java/com/replaymod/core/gui/GuiReplaySettings.java +++ b/src/main/java/com/replaymod/core/gui/GuiReplaySettings.java @@ -19,7 +19,7 @@ import java.util.List; public class GuiReplaySettings extends AbstractGuiScreen { - public GuiReplaySettings(final net.minecraft.client.gui.Screen parent, final SettingsRegistry settingsRegistry) { + public GuiReplaySettings(final net.minecraft.client.gui.screen.Screen parent, final SettingsRegistry settingsRegistry) { final GuiButton doneButton = new GuiButton(this).setI18nLabel("gui.done").setSize(200, 20).onClick(new Runnable() { @Override public void run() { diff --git a/src/main/java/com/replaymod/core/handler/MainMenuHandler.java b/src/main/java/com/replaymod/core/handler/MainMenuHandler.java index 93adf11a..c70f5d90 100644 --- a/src/main/java/com/replaymod/core/handler/MainMenuHandler.java +++ b/src/main/java/com/replaymod/core/handler/MainMenuHandler.java @@ -3,8 +3,8 @@ package com.replaymod.core.handler; import com.replaymod.core.mixin.GuiMainMenuAccessor; import de.johni0702.minecraft.gui.utils.EventRegistrations; import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.MainMenuScreen; -import net.minecraft.client.gui.Screen; +import net.minecraft.client.gui.screen.TitleScreen; +import net.minecraft.client.gui.screen.Screen; import net.minecraft.realms.RealmsScreenProxy; import org.lwjgl.opengl.GL11; @@ -35,8 +35,8 @@ public class MainMenuHandler extends EventRegistrations { //$$ GuiScreen guiScreen = getGui(event); //$$ List buttonList = getButtonList(event); //#endif - if (guiScreen instanceof MainMenuScreen) { - MainMenuScreen gui = (MainMenuScreen) guiScreen; + if (guiScreen instanceof TitleScreen) { + TitleScreen gui = (TitleScreen) guiScreen; int realmsOffset = 0; //#if MC>=11400 for (AbstractButtonWidget button : buttonList) { diff --git a/src/main/java/com/replaymod/core/mixin/GuiMainMenuAccessor.java b/src/main/java/com/replaymod/core/mixin/GuiMainMenuAccessor.java index 75ed667c..3716e1ab 100644 --- a/src/main/java/com/replaymod/core/mixin/GuiMainMenuAccessor.java +++ b/src/main/java/com/replaymod/core/mixin/GuiMainMenuAccessor.java @@ -1,11 +1,11 @@ package com.replaymod.core.mixin; -import net.minecraft.client.gui.MainMenuScreen; -import net.minecraft.client.gui.Screen; +import net.minecraft.client.gui.screen.TitleScreen; +import net.minecraft.client.gui.screen.Screen; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; -@Mixin(MainMenuScreen.class) +@Mixin(TitleScreen.class) public interface GuiMainMenuAccessor { //#if MC>=10904 @Accessor("realmsNotificationGui") diff --git a/src/main/java/com/replaymod/core/mixin/GuiScreenAccessor.java b/src/main/java/com/replaymod/core/mixin/GuiScreenAccessor.java index c535b5a5..9d16fcc2 100644 --- a/src/main/java/com/replaymod/core/mixin/GuiScreenAccessor.java +++ b/src/main/java/com/replaymod/core/mixin/GuiScreenAccessor.java @@ -1,6 +1,6 @@ package com.replaymod.core.mixin; -import net.minecraft.client.gui.Screen; +import net.minecraft.client.gui.screen.Screen; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; diff --git a/src/main/java/com/replaymod/core/mixin/MixinGameRenderer.java b/src/main/java/com/replaymod/core/mixin/MixinGameRenderer.java index 03a076e5..9c39e663 100644 --- a/src/main/java/com/replaymod/core/mixin/MixinGameRenderer.java +++ b/src/main/java/com/replaymod/core/mixin/MixinGameRenderer.java @@ -30,7 +30,7 @@ public class MixinGameRenderer { method = "render", at = @At( value = "INVOKE", - target = "Lnet/minecraft/client/gui/Screen;render(IIF)V", + target = "Lnet/minecraft/client/gui/screen/Screen;render(IIF)V", shift = At.Shift.AFTER ) ) diff --git a/src/main/java/com/replaymod/core/mixin/MixinMinecraft.java b/src/main/java/com/replaymod/core/mixin/MixinMinecraft.java index d663dc54..1538b398 100644 --- a/src/main/java/com/replaymod/core/mixin/MixinMinecraft.java +++ b/src/main/java/com/replaymod/core/mixin/MixinMinecraft.java @@ -11,7 +11,7 @@ import com.replaymod.core.events.PostRenderCallback; import com.replaymod.core.events.PreRenderCallback; import de.johni0702.minecraft.gui.versions.callbacks.OpenGuiScreenCallback; import de.johni0702.minecraft.gui.versions.callbacks.PreTickCallback; -import net.minecraft.client.gui.Screen; +import net.minecraft.client.gui.screen.Screen; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; //#else @@ -71,7 +71,7 @@ public abstract class MixinMinecraft PreTickCallback.EVENT.invoker().preTick(); } - @Inject(method = "openScreen", at = @At(value = "FIELD", target = "Lnet/minecraft/client/MinecraftClient;currentScreen:Lnet/minecraft/client/gui/Screen;")) + @Inject(method = "openScreen", at = @At(value = "FIELD", target = "Lnet/minecraft/client/MinecraftClient;currentScreen:Lnet/minecraft/client/gui/screen/Screen;")) private void openGuiScreen(Screen newGuiScreen, CallbackInfo ci) { OpenGuiScreenCallback.EVENT.invoker().openGuiScreen(newGuiScreen); } diff --git a/src/main/java/com/replaymod/core/mixin/MixinModResourcePackUtil.java b/src/main/java/com/replaymod/core/mixin/MixinModResourcePackUtil.java index ede1abc2..241f5eac 100644 --- a/src/main/java/com/replaymod/core/mixin/MixinModResourcePackUtil.java +++ b/src/main/java/com/replaymod/core/mixin/MixinModResourcePackUtil.java @@ -20,7 +20,7 @@ import java.util.List; public class MixinModResourcePackUtil { @Inject(method = "appendModResourcePacks", at = @At("RETURN"), remap = false) private static void injectRMLangPack(List packList, ResourceType type, CallbackInfo ci) { - if (type != ResourceType.ASSETS) return; + if (type != ResourceType.CLIENT_RESOURCES) return; for (int i = 0; i < packList.size(); i++) { ResourcePack pack = packList.get(i); diff --git a/src/main/java/com/replaymod/core/mixin/MixinMouseListener.java b/src/main/java/com/replaymod/core/mixin/MixinMouseListener.java index f0535033..c4775683 100644 --- a/src/main/java/com/replaymod/core/mixin/MixinMouseListener.java +++ b/src/main/java/com/replaymod/core/mixin/MixinMouseListener.java @@ -5,7 +5,7 @@ import com.replaymod.core.events.KeyBindingEventCallback; import de.johni0702.minecraft.gui.versions.callbacks.MouseCallback; import net.minecraft.client.Mouse; import net.minecraft.client.gui.Element; -import net.minecraft.client.gui.Screen; +import net.minecraft.client.gui.screen.Screen; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; @@ -47,7 +47,7 @@ public class MixinMouseListener { @Redirect( method = "onMouseScroll", - at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/Screen;mouseScrolled(DDD)Z") + at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/Screen;mouseScrolled(DDD)Z") ) private boolean mouseScroll(Screen element, double x, double y, double scroll) { if (MouseCallback.EVENT.invoker().mouseScroll(x, y, scroll)) { diff --git a/src/main/java/com/replaymod/core/mixin/MixinScreen.java b/src/main/java/com/replaymod/core/mixin/MixinScreen.java index a35e10b3..b0aeb981 100644 --- a/src/main/java/com/replaymod/core/mixin/MixinScreen.java +++ b/src/main/java/com/replaymod/core/mixin/MixinScreen.java @@ -3,7 +3,7 @@ package com.replaymod.core.mixin; import de.johni0702.minecraft.gui.versions.callbacks.InitScreenCallback; import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.Screen; +import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.AbstractButtonWidget; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/com/replaymod/core/utils/Utils.java b/src/main/java/com/replaymod/core/utils/Utils.java index 10e54994..fd969e68 100644 --- a/src/main/java/com/replaymod/core/utils/Utils.java +++ b/src/main/java/com/replaymod/core/utils/Utils.java @@ -21,7 +21,7 @@ import de.johni0702.minecraft.gui.utils.Colors; import de.johni0702.minecraft.gui.utils.lwjgl.Dimension; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension; import de.johni0702.minecraft.gui.versions.MCVer; -import net.minecraft.client.gui.Screen; +import net.minecraft.client.gui.screen.Screen; import net.minecraft.util.crash.CrashReport; import net.minecraft.util.Identifier; import org.apache.commons.io.Charsets; diff --git a/src/main/java/com/replaymod/core/versions/LangResourcePack.java b/src/main/java/com/replaymod/core/versions/LangResourcePack.java index 02beb9a1..0945963b 100644 --- a/src/main/java/com/replaymod/core/versions/LangResourcePack.java +++ b/src/main/java/com/replaymod/core/versions/LangResourcePack.java @@ -3,7 +3,7 @@ package com.replaymod.core.versions; import com.google.gson.Gson; import com.replaymod.core.ReplayMod; -import net.minecraft.resource.AbstractFilenameResourcePack; +import net.minecraft.resource.AbstractFileResourcePack; import net.minecraft.resource.ResourceNotFoundException; import net.minecraft.resource.ResourceType; import net.minecraft.util.Identifier; @@ -39,7 +39,7 @@ import java.util.stream.Collectors; * Resource pack which on-the-fly converts pre-1.13 language files into 1.13 json format. * Also remaps `replaymod.input.*` bindings to `key.replaymod.*` as convention on Fabric. */ -public class LangResourcePack extends AbstractFilenameResourcePack { +public class LangResourcePack extends AbstractFileResourcePack { private static final Gson GSON = new Gson(); private static final String NAME = "replaymod_lang"; private static final Pattern JSON_FILE_PATTERN = Pattern.compile("^assets/" + ReplayMod.MOD_ID + "/lang/([a-z][a-z])_([a-z][a-z]).json$"); @@ -98,7 +98,7 @@ public class LangResourcePack extends AbstractFilenameResourcePack { } @Override - protected InputStream openFilename(String path) throws IOException { + protected InputStream openFile(String path) throws IOException { if ("pack.mcmeta".equals(path)) { return new ByteArrayInputStream("{\"pack\": {\"description\": \"ReplayMod language files\", \"pack_format\": 4}}".getBytes(StandardCharsets.UTF_8)); } @@ -130,7 +130,7 @@ public class LangResourcePack extends AbstractFilenameResourcePack { } @Override - protected boolean containsFilename(String path) { + protected boolean containsFile(String path) { Path langPath = langPath(path); return langPath != null && Files.exists(langPath); } @@ -138,7 +138,7 @@ public class LangResourcePack extends AbstractFilenameResourcePack { @Override public Collection findResources(ResourceType resourcePackType, String path, int maxDepth, Predicate filter) { - if (resourcePackType == ResourceType.ASSETS && "lang".equals(path)) { + if (resourcePackType == ResourceType.CLIENT_RESOURCES && "lang".equals(path)) { Path base = baseLangPath(); //#if MC<11400 //$$ if (base == null) return Collections.emptyList(); @@ -165,7 +165,7 @@ public class LangResourcePack extends AbstractFilenameResourcePack { @Override public Set getNamespaces(ResourceType resourcePackType) { - if (resourcePackType == ResourceType.ASSETS) { + if (resourcePackType == ResourceType.CLIENT_RESOURCES) { return Collections.singleton("replaymod"); } else { return Collections.emptySet(); diff --git a/src/main/java/com/replaymod/core/versions/MCVer.java b/src/main/java/com/replaymod/core/versions/MCVer.java index 44de2a84..040e6e0c 100644 --- a/src/main/java/com/replaymod/core/versions/MCVer.java +++ b/src/main/java/com/replaymod/core/versions/MCVer.java @@ -4,7 +4,7 @@ import com.replaymod.core.mixin.GuiScreenAccessor; import com.replaymod.core.mixin.MinecraftAccessor; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.widget.ButtonWidget; -import net.minecraft.client.gui.Screen; +import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.world.ClientWorld; import net.minecraft.client.render.Tessellator; import net.minecraft.client.render.entity.EntityRenderDispatcher; diff --git a/src/main/java/com/replaymod/editor/handler/GuiHandler.java b/src/main/java/com/replaymod/editor/handler/GuiHandler.java index a33285c3..4390deb9 100644 --- a/src/main/java/com/replaymod/editor/handler/GuiHandler.java +++ b/src/main/java/com/replaymod/editor/handler/GuiHandler.java @@ -12,7 +12,7 @@ import net.minecraft.util.crash.CrashReport; //#if MC>=11400 import de.johni0702.minecraft.gui.versions.callbacks.InitScreenCallback; -import net.minecraft.client.gui.Screen; +import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.AbstractButtonWidget; import java.util.List; //#else diff --git a/src/main/java/com/replaymod/extras/playeroverview/PlayerOverviewGui.java b/src/main/java/com/replaymod/extras/playeroverview/PlayerOverviewGui.java index 43b3750f..15cab41c 100644 --- a/src/main/java/com/replaymod/extras/playeroverview/PlayerOverviewGui.java +++ b/src/main/java/com/replaymod/extras/playeroverview/PlayerOverviewGui.java @@ -102,7 +102,7 @@ public class PlayerOverviewGui extends GuiScreen implements Closeable { renderer.bindTexture(texture); renderer.drawTexturedRect(0, 0, 8, 8, 16, 16, 8, 8, 64, 64); //#if MC>=10809 - if (p.isSkinOverlayVisible(PlayerModelPart.HEAD)) { + if (p.isSkinOverlayVisible(PlayerModelPart.HAT)) { //#else //#if MC>=10800 //$$ if (p.func_175148_a(EnumPlayerModelParts.HAT)) { diff --git a/src/main/java/com/replaymod/extras/urischeme/UriScheme.java b/src/main/java/com/replaymod/extras/urischeme/UriScheme.java index 45587757..fc518aed 100644 --- a/src/main/java/com/replaymod/extras/urischeme/UriScheme.java +++ b/src/main/java/com/replaymod/extras/urischeme/UriScheme.java @@ -71,7 +71,7 @@ public abstract class UriScheme { public static UriScheme create() { switch (SystemUtil.getOperatingSystem()) { - case UNIX: + case LINUX: return new LinuxUriScheme(); case WINDOWS: return new WindowsUriScheme(); diff --git a/src/main/java/com/replaymod/extras/youtube/YoutubeUpload.java b/src/main/java/com/replaymod/extras/youtube/YoutubeUpload.java index 2ae980a8..f5d5c0f5 100644 --- a/src/main/java/com/replaymod/extras/youtube/YoutubeUpload.java +++ b/src/main/java/com/replaymod/extras/youtube/YoutubeUpload.java @@ -9,7 +9,7 @@ import de.johni0702.minecraft.gui.utils.EventRegistrations; //#if MC>=11400 import de.johni0702.minecraft.gui.versions.callbacks.OpenGuiScreenCallback; -import net.minecraft.client.gui.Screen; +import net.minecraft.client.gui.screen.Screen; //#else //$$ import net.minecraftforge.client.event.GuiScreenEvent; //$$ import net.minecraftforge.eventbus.api.SubscribeEvent; diff --git a/src/main/java/com/replaymod/online/gui/GuiReplayCenter.java b/src/main/java/com/replaymod/online/gui/GuiReplayCenter.java index 941544d4..08c6468c 100644 --- a/src/main/java/com/replaymod/online/gui/GuiReplayCenter.java +++ b/src/main/java/com/replaymod/online/gui/GuiReplayCenter.java @@ -39,7 +39,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.text.TextFormat; +import net.minecraft.ChatFormat; import java.awt.image.BufferedImage; import java.io.IOException; @@ -417,9 +417,9 @@ public class GuiReplayCenter extends GuiScreen { this.downloaded = downloaded; ReplayMetaData metaData = fileInfo.getMetadata(); - name.setText(TextFormat.UNDERLINE + Utils.fileNameToReplayName(fileInfo.getName())); + name.setText(ChatFormat.UNDERLINE + Utils.fileNameToReplayName(fileInfo.getName())); author.setI18nText("replaymod.gui.center.author", - "" + TextFormat.GRAY + TextFormat.ITALIC, fileInfo.getOwner()); + "" + ChatFormat.GRAY + ChatFormat.ITALIC, fileInfo.getOwner()); if (StringUtils.isEmpty(metaData.getServerName())) { server.setI18nText("replaymod.gui.iphidden").setColor(Colors.DARK_RED); } else { @@ -443,7 +443,7 @@ public class GuiReplayCenter extends GuiScreen { favorites.setText("⭑" + fileInfo.getFavorites()); likes.setText("⬆" + fileInfo.getRatings().getPositive()); dislikes.setText("⬇" + fileInfo.getRatings().getNegative()); - category.setText(TextFormat.ITALIC + Optional.fromNullable(Category.fromId(fileInfo.getCategory())) + category.setText(ChatFormat.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 b2537a09..53a7d1bb 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.text.TextFormat; +import net.minecraft.ChatFormat; 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/online/handler/GuiHandler.java b/src/main/java/com/replaymod/online/handler/GuiHandler.java index 139be458..2bf7f931 100644 --- a/src/main/java/com/replaymod/online/handler/GuiHandler.java +++ b/src/main/java/com/replaymod/online/handler/GuiHandler.java @@ -10,12 +10,12 @@ import com.replaymod.replay.handler.GuiHandler.InjectedButton; import de.johni0702.minecraft.gui.container.AbstractGuiScreen; import de.johni0702.minecraft.gui.container.GuiScreen; import net.minecraft.client.gui.widget.ButtonWidget; -import net.minecraft.client.gui.MainMenuScreen; +import net.minecraft.client.gui.screen.TitleScreen; import net.minecraft.client.resource.language.I18n; //#if MC>=11400 import de.johni0702.minecraft.gui.versions.callbacks.InitScreenCallback; -import net.minecraft.client.gui.Screen; +import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.AbstractButtonWidget; import java.util.List; //#else @@ -44,7 +44,7 @@ public class GuiHandler extends EventRegistrations { //$$ public void injectIntoMainMenu(GuiScreenEvent.InitGuiEvent event) { //$$ final net.minecraft.client.gui.GuiScreen guiScreen = getGui(event); //#endif - if (!(guiScreen instanceof MainMenuScreen)) { + if (!(guiScreen instanceof TitleScreen)) { return; } @@ -89,7 +89,7 @@ public class GuiHandler extends EventRegistrations { //#if MC>=11300 private void onButton(InjectedButton button) { - net.minecraft.client.gui.Screen guiScreen = button.guiScreen; + net.minecraft.client.gui.screen.Screen guiScreen = button.guiScreen; //#else //$$ @SubscribeEvent //$$ public void onButton(GuiScreenEvent.ActionPerformedEvent.Pre event) { @@ -98,7 +98,7 @@ public class GuiHandler extends EventRegistrations { //#endif if(!button.active) return; - if (guiScreen instanceof MainMenuScreen) { + if (guiScreen instanceof TitleScreen) { if (button.id == BUTTON_REPLAY_CENTER) { GuiReplayCenter replayCenter = new GuiReplayCenter(mod); if (mod.isLoggedIn()) { diff --git a/src/main/java/com/replaymod/recording/gui/GuiRecordingControls.java b/src/main/java/com/replaymod/recording/gui/GuiRecordingControls.java index 6407297b..23337cc7 100644 --- a/src/main/java/com/replaymod/recording/gui/GuiRecordingControls.java +++ b/src/main/java/com/replaymod/recording/gui/GuiRecordingControls.java @@ -11,7 +11,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.menu.PauseMenuScreen; +import net.minecraft.client.gui.screen.PauseScreen; //#if MC>=11400 import de.johni0702.minecraft.gui.versions.callbacks.InitScreenCallback; @@ -68,8 +68,8 @@ public class GuiRecordingControls extends EventRegistrations { //#if MC>=11400 { on(InitScreenCallback.EVENT, (screen, buttons) -> { - if (screen instanceof PauseMenuScreen) { - show((PauseMenuScreen) screen); + if (screen instanceof PauseScreen) { + show((PauseScreen) screen); } }); } //#else @@ -88,7 +88,7 @@ public class GuiRecordingControls extends EventRegistrations { buttonPauseResume.setEnabled(!stopped); } - public void show(PauseMenuScreen gui) { + public void show(PauseScreen gui) { VanillaGuiScreen.setup(gui).setLayout(new CustomLayout() { @Override protected void layout(GuiScreen container, int width, int height) { diff --git a/src/main/java/com/replaymod/recording/handler/GuiHandler.java b/src/main/java/com/replaymod/recording/handler/GuiHandler.java index 9a922dec..36a346d0 100644 --- a/src/main/java/com/replaymod/recording/handler/GuiHandler.java +++ b/src/main/java/com/replaymod/recording/handler/GuiHandler.java @@ -8,12 +8,12 @@ import de.johni0702.minecraft.gui.container.VanillaGuiScreen; import de.johni0702.minecraft.gui.element.GuiCheckbox; import de.johni0702.minecraft.gui.layout.CustomLayout; import de.johni0702.minecraft.gui.utils.EventRegistrations; -import net.minecraft.client.gui.menu.MultiplayerScreen; -import net.minecraft.client.gui.menu.LevelSelectScreen; +import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen; +import net.minecraft.client.gui.screen.world.SelectWorldScreen; //#if MC>=11400 import de.johni0702.minecraft.gui.versions.callbacks.InitScreenCallback; -import net.minecraft.client.gui.Screen; +import net.minecraft.client.gui.screen.Screen; //#else //$$ import net.minecraftforge.client.event.GuiScreenEvent; //$$ import net.minecraftforge.common.MinecraftForge; @@ -38,8 +38,8 @@ public class GuiHandler extends EventRegistrations { //$$ public void onGuiInit(GuiScreenEvent.InitGuiEvent.Post event) { //$$ net.minecraft.client.gui.GuiScreen gui = getGui(event); //#endif - if (gui instanceof LevelSelectScreen || gui instanceof MultiplayerScreen) { - boolean sp = gui instanceof LevelSelectScreen; + if (gui instanceof SelectWorldScreen || gui instanceof MultiplayerScreen) { + boolean sp = gui instanceof SelectWorldScreen; SettingsRegistry settingsRegistry = mod.getSettingsRegistry(); Setting setting = sp ? Setting.RECORD_SINGLEPLAYER : Setting.RECORD_SERVER; diff --git a/src/main/java/com/replaymod/recording/handler/RecordingEventHandler.java b/src/main/java/com/replaymod/recording/handler/RecordingEventHandler.java index e5509f32..8021e800 100755 --- a/src/main/java/com/replaymod/recording/handler/RecordingEventHandler.java +++ b/src/main/java/com/replaymod/recording/handler/RecordingEventHandler.java @@ -219,7 +219,7 @@ public class RecordingEventHandler extends EventRegistrations { packetListener.save(new EntityAnimationS2CPacket( player, //#if MC>=10904 - player.preferredHand == Hand.MAIN ? 0 : 3 + player.preferredHand == Hand.MAIN_HAND ? 0 : 3 //#else //$$ 0 //#endif @@ -248,14 +248,14 @@ public class RecordingEventHandler extends EventRegistrations { //Inventory Handling //#if MC>=10904 - if (playerItems[0] != player.getStackInHand(Hand.MAIN)) { - playerItems[0] = player.getStackInHand(Hand.MAIN); - packetListener.save(new EntityEquipmentUpdateS2CPacket(player.getEntityId(), EquipmentSlot.HAND_MAIN, playerItems[0])); + if (playerItems[0] != player.getStackInHand(Hand.MAIN_HAND)) { + playerItems[0] = player.getStackInHand(Hand.MAIN_HAND); + packetListener.save(new EntityEquipmentUpdateS2CPacket(player.getEntityId(), EquipmentSlot.MAINHAND, playerItems[0])); } - if (playerItems[1] != player.getStackInHand(Hand.OFF)) { - playerItems[1] = player.getStackInHand(Hand.OFF); - packetListener.save(new EntityEquipmentUpdateS2CPacket(player.getEntityId(), EquipmentSlot.HAND_OFF, playerItems[1])); + if (playerItems[1] != player.getStackInHand(Hand.OFF_HAND)) { + playerItems[1] = player.getStackInHand(Hand.OFF_HAND); + packetListener.save(new EntityEquipmentUpdateS2CPacket(player.getEntityId(), EquipmentSlot.OFFHAND, playerItems[1])); } if (playerItems[2] != player.getEquippedStack(EquipmentSlot.FEET)) { @@ -338,7 +338,7 @@ public class RecordingEventHandler extends EventRegistrations { wasHandActive = player.isUsingItem(); lastActiveHand = player.getActiveHand(); DataTracker dataManager = new DataTracker(null); - int state = (wasHandActive ? 1 : 0) | (lastActiveHand == Hand.OFF ? 2 : 0); + int state = (wasHandActive ? 1 : 0) | (lastActiveHand == Hand.OFF_HAND ? 2 : 0); //#if MC>=11300 dataManager.startTracking(EntityLivingBaseAccessor.getLivingFlags(), (byte) state); //#else diff --git a/src/main/java/com/replaymod/recording/mixin/MixinNetHandlerPlayClient.java b/src/main/java/com/replaymod/recording/mixin/MixinNetHandlerPlayClient.java index 121a11b8..6995e134 100644 --- a/src/main/java/com/replaymod/recording/mixin/MixinNetHandlerPlayClient.java +++ b/src/main/java/com/replaymod/recording/mixin/MixinNetHandlerPlayClient.java @@ -53,7 +53,7 @@ public abstract class MixinNetHandlerPlayClient { if (gameController.player == null) return; RecordingEventHandler handler = getRecordingEventHandler(); - if (handler != null && packet.getAction() == PlayerListS2CPacket.Action.ADD) { + if (handler != null && packet.getAction() == PlayerListS2CPacket.Action.ADD_PLAYER) { // We cannot reference SPacketPlayerListItem.AddPlayerData directly for complicated (and yet to be // resolved) reasons (see https://github.com/MinecraftForge/ForgeGradle/issues/472), so we "simply" convert // the back to the MCProtocolLib equivalent and deal with that one. diff --git a/src/main/java/com/replaymod/recording/packet/PacketListener.java b/src/main/java/com/replaymod/recording/packet/PacketListener.java index d04ac0f7..279c696b 100755 --- a/src/main/java/com/replaymod/recording/packet/PacketListener.java +++ b/src/main/java/com/replaymod/recording/packet/PacketListener.java @@ -23,7 +23,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.text.StringTextComponent; +import net.minecraft.network.chat.TextComponent; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -279,7 +279,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 StringTextComponent("Please update to view this replay.")); + packet = new DisconnectS2CPacket(new TextComponent("Please update to view this replay.")); save(packet); } } @@ -339,7 +339,7 @@ public class PacketListener extends ChannelInboundHandlerAdapter { } //#if MC>=10800 - Integer packetId = connectionState.getPacketId(NetworkSide.CLIENT, packet); + Integer packetId = connectionState.getPacketId(NetworkSide.CLIENTBOUND, packet); //#else //$$ Integer packetId = (Integer) connectionState.func_150755_b().inverse().get(packet.getClass()); //#endif diff --git a/src/main/java/com/replaymod/recording/packet/ResourcePackRecorder.java b/src/main/java/com/replaymod/recording/packet/ResourcePackRecorder.java index 7e8e599c..b7619d0c 100644 --- a/src/main/java/com/replaymod/recording/packet/ResourcePackRecorder.java +++ b/src/main/java/com/replaymod/recording/packet/ResourcePackRecorder.java @@ -4,7 +4,7 @@ import com.google.common.hash.Hashing; import com.google.common.io.Files; import com.replaymod.replaystudio.replay.ReplayFile; import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.menu.YesNoScreen; +import net.minecraft.client.gui.screen.ConfirmScreen; import net.minecraft.client.options.ServerEntry; import net.minecraft.client.options.ServerList; import net.minecraft.client.resource.ClientResourcePackCreator; @@ -12,7 +12,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; //#if MC>=11400 -import net.minecraft.text.TranslatableTextComponent; +import net.minecraft.network.chat.TranslatableComponent; //#else //$$ import net.minecraft.client.gui.GuiYesNoCallback; //$$ import net.minecraft.client.resources.I18n; @@ -144,7 +144,7 @@ public class ResourcePackRecorder { } else { // Lambdas MUST NOT be used with methods that need re-obfuscation in FG prior to 2.2 (will result in AbstractMethodError) //#if MC>=11400 - mc.execute(() -> mc.openScreen(new YesNoScreen(result -> { + mc.execute(() -> mc.openScreen(new ConfirmScreen(result -> { //#else //$$ //noinspection Convert2Lambda //$$ mc.addScheduledTask(() -> mc.displayGuiScreen(new GuiYesNo(new GuiYesNoCallback() { @@ -169,7 +169,7 @@ public class ResourcePackRecorder { mc.openScreen(null); } //#if MC>=11400 - , new TranslatableTextComponent("multiplayer.texturePrompt.line1"), new TranslatableTextComponent("multiplayer.texturePrompt.line2")))); + , new TranslatableComponent("multiplayer.texturePrompt.line1"), new TranslatableComponent("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/RenderSettings.java b/src/main/java/com/replaymod/render/RenderSettings.java index 363fcfec..a8498d40 100644 --- a/src/main/java/com/replaymod/render/RenderSettings.java +++ b/src/main/java/com/replaymod/render/RenderSettings.java @@ -212,7 +212,7 @@ public class RenderSettings { } } break; - case UNIX: // Linux users are entrusted to have their PATH configured correctly (most package manager do this) + case LINUX: // Linux users are entrusted to have their PATH configured correctly (most package manager do this) case SOLARIS: // Never heard of anyone running this mod on Solaris having any problems case UNKNOWN: // Unknown OS, just try to use "ffmpeg" } diff --git a/src/main/java/com/replaymod/render/blend/BlendMeshBuilder.java b/src/main/java/com/replaymod/render/blend/BlendMeshBuilder.java index 237a00d8..a4c54b13 100644 --- a/src/main/java/com/replaymod/render/blend/BlendMeshBuilder.java +++ b/src/main/java/com/replaymod/render/blend/BlendMeshBuilder.java @@ -172,7 +172,7 @@ public class BlendMeshBuilder posOffset = offset; break; case COLOR: - if (element.getFormat() != VertexFormatElement.Format.UNSIGNED_BYTE) { + if (element.getFormat() != VertexFormatElement.Format.UBYTE) { throw new UnsupportedOperationException("Only unsigned byte is supported for color elements!"); } colorOffset = offset; diff --git a/src/main/java/com/replaymod/render/blend/exporters/ChunkExporter.java b/src/main/java/com/replaymod/render/blend/exporters/ChunkExporter.java index 825cd0d8..ec7c2e17 100644 --- a/src/main/java/com/replaymod/render/blend/exporters/ChunkExporter.java +++ b/src/main/java/com/replaymod/render/blend/exporters/ChunkExporter.java @@ -71,7 +71,7 @@ public class ChunkExporter implements Exporter { List renderInfos = ((WorldRendererAccessor) mc.worldRenderer).getRenderInfos(); for (ContainerLocalRenderInformationAccessor renderInfo : renderInfos) { ChunkRenderer renderChunk = renderInfo.getRenderChunk(); - ChunkRenderData compiledChunk = renderChunk.getChunkRenderData(); + ChunkRenderData compiledChunk = renderChunk.getData(); if (!compiledChunk.isEmpty()) { addChunkUpdate(renderChunk, null); } 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 edf81816..ae484d97 100644 --- a/src/main/java/com/replaymod/render/blend/exporters/ItemExporter.java +++ b/src/main/java/com/replaymod/render/blend/exporters/ItemExporter.java @@ -119,7 +119,7 @@ public class ItemExporter implements Exporter { for (BakedQuad quad : quads) { int color = stack != null && quad.hasColor() //#if MC>=10904 - ? ((ItemRendererAccessor) renderItem).getItemColors().getRenderColor(stack, quad.getColorIndex()) | 0xff000000 + ? ((ItemRendererAccessor) renderItem).getItemColors().getColorMultiplier(stack, quad.getColorIndex()) | 0xff000000 //#else //$$ ? stack.getItem().getColorFromItemStack(stack, quad.getTintIndex()) | 0xff000000 //#endif diff --git a/src/main/java/com/replaymod/render/blend/mixin/ItemRendererAccessor.java b/src/main/java/com/replaymod/render/blend/mixin/ItemRendererAccessor.java index 1778e389..70fb862e 100644 --- a/src/main/java/com/replaymod/render/blend/mixin/ItemRendererAccessor.java +++ b/src/main/java/com/replaymod/render/blend/mixin/ItemRendererAccessor.java @@ -2,13 +2,13 @@ package com.replaymod.render.blend.mixin; import net.minecraft.client.render.item.ItemRenderer; -import net.minecraft.client.render.item.ItemColorMap; +import net.minecraft.client.color.item.ItemColors; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; @Mixin(ItemRenderer.class) public interface ItemRendererAccessor { @Accessor("colorMap") - ItemColorMap getItemColors(); + ItemColors getItemColors(); } //#endif diff --git a/src/main/java/com/replaymod/render/gui/GuiRenderQueue.java b/src/main/java/com/replaymod/render/gui/GuiRenderQueue.java index 256b5a3f..dc3e726f 100644 --- a/src/main/java/com/replaymod/render/gui/GuiRenderQueue.java +++ b/src/main/java/com/replaymod/render/gui/GuiRenderQueue.java @@ -29,7 +29,7 @@ import de.johni0702.minecraft.gui.popup.GuiYesNoPopup; import de.johni0702.minecraft.gui.utils.Colors; import de.johni0702.minecraft.gui.utils.lwjgl.Dimension; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension; -import net.minecraft.client.gui.menu.NoticeScreen; +import net.minecraft.client.gui.screen.NoticeScreen; import net.minecraft.util.crash.CrashReport; import javax.annotation.Nullable; @@ -38,7 +38,7 @@ import java.util.List; import static com.replaymod.render.ReplayModRender.LOGGER; //#if MC>=11400 -import net.minecraft.text.TranslatableTextComponent; +import net.minecraft.network.chat.TranslatableComponent; //#endif public class GuiRenderQueue extends AbstractGuiPopup { @@ -217,8 +217,8 @@ public class GuiRenderQueue extends AbstractGuiPopup { NoticeScreen errorScreen = new NoticeScreen( //#if MC>=11400 () -> {}, - new TranslatableTextComponent("replaymod.gui.rendering.error.title"), - new TranslatableTextComponent("replaymod.gui.rendering.error.message") + new TranslatableComponent("replaymod.gui.rendering.error.title"), + new TranslatableComponent("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 2201922c..12b465ce 100644 --- a/src/main/java/com/replaymod/render/gui/GuiRenderSettings.java +++ b/src/main/java/com/replaymod/render/gui/GuiRenderSettings.java @@ -32,7 +32,7 @@ import de.johni0702.minecraft.gui.utils.lwjgl.Color; import de.johni0702.minecraft.gui.utils.lwjgl.Dimension; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableColor; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension; -import net.minecraft.client.gui.menu.NoticeScreen; +import net.minecraft.client.gui.screen.NoticeScreen; import net.minecraft.client.resource.language.I18n; import net.minecraft.util.crash.CrashReport; @@ -52,7 +52,7 @@ import static com.replaymod.core.utils.Utils.error; import static com.replaymod.render.ReplayModRender.LOGGER; //#if MC>=11400 -import net.minecraft.text.TranslatableTextComponent; +import net.minecraft.network.chat.TranslatableComponent; //#endif public class GuiRenderSettings extends GuiScreen implements Closeable { @@ -240,8 +240,8 @@ public class GuiRenderSettings extends GuiScreen implements Closeable { NoticeScreen errorScreen = new NoticeScreen( //#if MC>=11400 () -> {}, - new TranslatableTextComponent("replaymod.gui.rendering.error.title"), - new TranslatableTextComponent("replaymod.gui.rendering.error.message") + new TranslatableComponent("replaymod.gui.rendering.error.title"), + new TranslatableComponent("replaymod.gui.rendering.error.message") //#else //$$ I18n.format("replaymod.gui.rendering.error.title"), //$$ I18n.format("replaymod.gui.rendering.error.message") @@ -538,7 +538,7 @@ public class GuiRenderSettings extends GuiScreen implements Closeable { antiAliasingDropdown.getSelectedValue(), exportCommand.getText(), exportArguments.getText(), - net.minecraft.client.gui.Screen.hasControlDown() + net.minecraft.client.gui.screen.Screen.hasControlDown() ); } diff --git a/src/main/java/com/replaymod/render/hooks/ChunkLoadingRenderGlobal.java b/src/main/java/com/replaymod/render/hooks/ChunkLoadingRenderGlobal.java index d4fce49b..36989d57 100644 --- a/src/main/java/com/replaymod/render/hooks/ChunkLoadingRenderGlobal.java +++ b/src/main/java/com/replaymod/render/hooks/ChunkLoadingRenderGlobal.java @@ -93,7 +93,7 @@ public class ChunkLoadingRenderGlobal { // Temporary workaround for dead lock, will be replaced by a new (ShaderMod compatible) mechanism later //noinspection StatementWithEmptyBody - while (renderDispatcher.method_3631(0)) {} + while (renderDispatcher.runTasksSync(0)) {} workerJailingQueue.jail(workerThreads); renderDispatcherAcc.setQueueChunkUpdates(queueChunkUpdates); @@ -111,7 +111,7 @@ public class ChunkLoadingRenderGlobal { } public void updateChunks() { - while (renderDispatcher.method_3631(0)) { + while (renderDispatcher.runTasksSync(0)) { ((WorldRendererAccessor) hooked).setDisplayListEntitiesDirty(true); } @@ -131,10 +131,10 @@ public class ChunkLoadingRenderGlobal { while (iterator.hasNext()) { ChunkRenderer renderchunk = iterator.next(); - renderDispatcher.method_3627(renderchunk); + renderDispatcher.rebuildSync(renderchunk); //#if MC>=10904 - renderchunk.method_3662(); + renderchunk.unscheduleRebuild(); //#else //$$ renderchunk.setNeedsUpdate(false); //#endif diff --git a/src/main/java/com/replaymod/render/mixin/MixinRenderGlobal.java b/src/main/java/com/replaymod/render/mixin/MixinRenderGlobal.java index a99ce33c..0add952a 100644 --- a/src/main/java/com/replaymod/render/mixin/MixinRenderGlobal.java +++ b/src/main/java/com/replaymod/render/mixin/MixinRenderGlobal.java @@ -118,7 +118,7 @@ public abstract class MixinRenderGlobal { // Prior to 1.9.4, MC always uses the same ChunkRenderDispatcher instance //#if MC>=10904 - @Inject(method = "setWorld", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/chunk/ChunkBatcher;method_3619()V")) + @Inject(method = "setWorld", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/chunk/ChunkBatcher;stop()V")) private void stopWorkerThreadsAndChunkLoadingRenderGlobal(CallbackInfo ci) { if (replayModRender_hook != null) { replayModRender_hook.updateRenderDispatcher(null); diff --git a/src/main/java/com/replaymod/replay/FullReplaySender.java b/src/main/java/com/replaymod/replay/FullReplaySender.java index 35fabfb0..ea59516a 100755 --- a/src/main/java/com/replaymod/replay/FullReplaySender.java +++ b/src/main/java/com/replaymod/replay/FullReplaySender.java @@ -21,8 +21,8 @@ import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelPromise; import net.minecraft.client.MinecraftClient; import net.minecraft.client.network.OtherClientPlayerEntity; -import net.minecraft.client.gui.menu.DownloadingTerrainScreen; -import net.minecraft.client.gui.menu.NoticeScreen; +import net.minecraft.client.gui.screen.DownloadingTerrainScreen; +import net.minecraft.client.gui.screen.NoticeScreen; import net.minecraft.client.world.ClientWorld; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.network.NetworkState; @@ -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.text.TextComponent; +import net.minecraft.network.chat.Component; 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.text.TranslatableTextComponent; +import net.minecraft.network.chat.TranslatableComponent; //#else //$$ import net.minecraft.client.resources.I18n; //$$ import net.minecraft.entity.Entity; @@ -343,7 +343,7 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend for (PlayerEntity playerEntity : playerEntities(mc.world)) { if (!playerEntity.field_6016 && playerEntity instanceof OtherClientPlayerEntity) { //#if MC>=11300 - playerEntity.updateState(); + playerEntity.tickMovement(); //#else //$$ playerEntity.onLivingUpdate(); //#endif @@ -436,7 +436,7 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend NetworkState state = loginPhase ? NetworkState.LOGIN : NetworkState.PLAY; //#if MC>=10800 - Packet p = state.getPacketHandler(NetworkSide.CLIENT, i); + Packet p = state.getPacketHandler(NetworkSide.CLIENTBOUND, i); //#else //$$ Packet p = Packet.generatePacket(state.func_150755_b(), i); //#endif @@ -475,8 +475,8 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend mc.openScreen(new NoticeScreen( //#if MC>=11400 () -> {}, - new TranslatableTextComponent("replaymod.error.unknownrestriction1"), - new TranslatableTextComponent("replaymod.error.unknownrestriction2", unknown) + new TranslatableComponent("replaymod.error.unknownrestriction1"), + new TranslatableComponent("replaymod.error.unknownrestriction2", unknown) //#else //$$ I18n.format("replaymod.error.unknownrestriction1"), //$$ I18n.format("replaymod.error.unknownrestriction2", unknown) @@ -487,7 +487,7 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend } } if (p instanceof DisconnectS2CPacket) { - TextComponent reason = ((DisconnectS2CPacket) p).getReason(); + Component 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/QuickReplaySender.java b/src/main/java/com/replaymod/replay/QuickReplaySender.java index 4506aa72..06406cc3 100644 --- a/src/main/java/com/replaymod/replay/QuickReplaySender.java +++ b/src/main/java/com/replaymod/replay/QuickReplaySender.java @@ -676,7 +676,7 @@ public class QuickReplaySender extends ChannelHandlerAdapter implements ReplaySe byteBuf.skipBytes(8); // Skip packet length & timestamp int packetId = packetBuf.readVarInt(); - Packet mcPacket = state.getPacketHandler(NetworkSide.CLIENT, packetId); + Packet mcPacket = state.getPacketHandler(NetworkSide.CLIENTBOUND, packetId); mcPacket.read(packetBuf); return mcPacket; } catch (Exception e) { @@ -710,7 +710,7 @@ public class QuickReplaySender extends ChannelHandlerAdapter implements ReplaySe } int packetId = packetBuf.readVarInt(); - Packet mcPacket = NetworkState.PLAY.getPacketHandler(NetworkSide.CLIENT, packetId); + Packet mcPacket = NetworkState.PLAY.getPacketHandler(NetworkSide.CLIENTBOUND, packetId); mcPacket.read(packetBuf); return mcPacket; } catch (Exception e) { diff --git a/src/main/java/com/replaymod/replay/ReplayHandler.java b/src/main/java/com/replaymod/replay/ReplayHandler.java index 47753a3e..927c5c01 100755 --- a/src/main/java/com/replaymod/replay/ReplayHandler.java +++ b/src/main/java/com/replaymod/replay/ReplayHandler.java @@ -25,7 +25,7 @@ import de.johni0702.minecraft.gui.popup.AbstractGuiPopup; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.embedded.EmbeddedChannel; import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.Screen; +import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.network.ClientLoginNetworkHandler; import net.minecraft.client.resource.language.I18n; import net.minecraft.util.crash.CrashReport; @@ -229,7 +229,7 @@ public class ReplayHandler { //#endif //#if MC>=10800 - ClientConnection networkManager = new ClientConnection(NetworkSide.CLIENT) { + ClientConnection networkManager = new ClientConnection(NetworkSide.CLIENTBOUND) { @Override public void exceptionCaught(ChannelHandlerContext ctx, Throwable t) { t.printStackTrace(); diff --git a/src/main/java/com/replaymod/replay/camera/CameraEntity.java b/src/main/java/com/replaymod/replay/camera/CameraEntity.java index dbd21bd9..dc950001 100755 --- a/src/main/java/com/replaymod/replay/camera/CameraEntity.java +++ b/src/main/java/com/replaymod/replay/camera/CameraEntity.java @@ -284,12 +284,12 @@ public class CameraEntity } @Override - public void method_5823() { + public void afterSpawn() { // Make sure our world is up-to-date in case of world changes if (this.client.world != null) { this.world = this.client.world; } - super.method_5823(); + super.afterSpawn(); } @Override @@ -428,19 +428,19 @@ public class CameraEntity //#if MC>=10904 @Override - public float method_7279() { + public float getAttackCooldownProgressPerTick() { Entity view = this.client.getCameraEntity(); if (view != this && view instanceof PlayerEntity) { - return ((PlayerEntity) view).method_7279(); + return ((PlayerEntity) view).getAttackCooldownProgressPerTick(); } return 1; } @Override - public float method_7261(float adjustTicks) { + public float getAttackCooldownProgress(float adjustTicks) { Entity view = this.client.getCameraEntity(); if (view != this && view instanceof PlayerEntity) { - return ((PlayerEntity) view).method_7261(adjustTicks); + return ((PlayerEntity) view).getAttackCooldownProgress(adjustTicks); } // Default to 1 as to not render the cooldown indicator (renders for < 1) return 1; @@ -707,8 +707,8 @@ public class CameraEntity acc.setPrevEquippedProgressOffHand(1); acc.setEquippedProgressMainHand(1); acc.setEquippedProgressOffHand(1); - acc.setItemStackMainHand(player.getEquippedStack(EquipmentSlot.HAND_MAIN)); - acc.setItemStackOffHand(player.getEquippedStack(EquipmentSlot.HAND_OFF)); + acc.setItemStackMainHand(player.getEquippedStack(EquipmentSlot.MAINHAND)); + acc.setItemStackOffHand(player.getEquippedStack(EquipmentSlot.OFFHAND)); //#else //$$ acc.setPrevEquippedProgress(1); //$$ acc.setEquippedProgress(1); 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 10b31728..14a74bd7 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.text.TextFormat; +import net.minecraft.ChatFormat; import com.replaymod.core.ReplayMod; import com.replaymod.core.SettingsRegistry; import com.replaymod.core.gui.GuiReplaySettings; @@ -36,7 +36,7 @@ import de.johni0702.minecraft.gui.utils.lwjgl.Dimension; import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension; import de.johni0702.minecraft.gui.utils.lwjgl.ReadablePoint; import lombok.Getter; -import net.minecraft.client.gui.menu.NoticeScreen; +import net.minecraft.client.gui.screen.NoticeScreen; import net.minecraft.util.crash.CrashReport; import net.minecraft.util.crash.CrashException; import org.apache.commons.io.FileUtils; @@ -57,7 +57,7 @@ import java.util.List; import static com.replaymod.replay.ReplayModReplay.LOGGER; //#if MC>=11400 -import net.minecraft.text.TranslatableTextComponent; +import net.minecraft.network.chat.TranslatableComponent; //#else //$$ import net.minecraft.client.resources.I18n; //#endif @@ -144,8 +144,8 @@ public class GuiReplayViewer extends GuiScreen { getMinecraft().openScreen(new NoticeScreen( //#if MC>=11400 () -> {}, - new TranslatableTextComponent("replaymod.gui.viewer.delete.failed1"), - new TranslatableTextComponent("replaymod.gui.viewer.delete.failed2") + new TranslatableComponent("replaymod.gui.viewer.delete.failed1"), + new TranslatableComponent("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 + TextFormat.RESET).setColor(Colors.BLACK) + new GuiLabel().setI18nText("replaymod.gui.viewer.delete.lineb", name + ChatFormat.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(TextFormat.UNDERLINE + Utils.fileNameToReplayName(file.getName())); + name.setText(ChatFormat.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/java/com/replaymod/replay/handler/GuiHandler.java b/src/main/java/com/replaymod/replay/handler/GuiHandler.java index 98723cfa..eff5e723 100644 --- a/src/main/java/com/replaymod/replay/handler/GuiHandler.java +++ b/src/main/java/com/replaymod/replay/handler/GuiHandler.java @@ -4,10 +4,10 @@ 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.menu.PauseMenuScreen; -import net.minecraft.client.gui.MainMenuScreen; -import net.minecraft.client.gui.menu.MultiplayerScreen; -import net.minecraft.client.gui.Screen; +import net.minecraft.client.gui.screen.PauseScreen; +import net.minecraft.client.gui.screen.TitleScreen; +import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen; +import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.resource.language.I18n; //#if MC>=11400 @@ -45,7 +45,7 @@ public class GuiHandler extends EventRegistrations { //$$ GuiScreen guiScreen = getGui(event); //$$ List buttonList = getButtonList(event); //#endif - if (!(guiScreen instanceof PauseMenuScreen)) { + if (!(guiScreen instanceof PauseScreen)) { return; } @@ -171,7 +171,7 @@ public class GuiHandler extends EventRegistrations { //$$ public void ensureReplayStopped(GuiScreenEvent.InitGuiEvent event) { //$$ GuiScreen guiScreen = getGui(event); //#endif - if (!(guiScreen instanceof MainMenuScreen || guiScreen instanceof MultiplayerScreen)) { + if (!(guiScreen instanceof TitleScreen || guiScreen instanceof MultiplayerScreen)) { return; } @@ -198,7 +198,7 @@ public class GuiHandler extends EventRegistrations { //$$ public void injectIntoMainMenu(GuiScreenEvent.InitGuiEvent event) { //$$ GuiScreen guiScreen = getGui(event); //#endif - if (!(guiScreen instanceof MainMenuScreen)) { + if (!(guiScreen instanceof TitleScreen)) { return; } ButtonWidget button = new InjectedButton( @@ -225,13 +225,13 @@ public class GuiHandler extends EventRegistrations { //#endif if(!button.active) return; - if (guiScreen instanceof MainMenuScreen) { + if (guiScreen instanceof TitleScreen) { if (button.id == BUTTON_REPLAY_VIEWER) { new GuiReplayViewer(mod).display(); } } - if (guiScreen instanceof PauseMenuScreen && mod.getReplayHandler() != null) { + if (guiScreen instanceof PauseScreen && mod.getReplayHandler() != null) { if (button.id == BUTTON_EXIT_REPLAY) { button.active = false; try { diff --git a/src/main/java/com/replaymod/replay/mixin/EntityPlayerAccessor.java b/src/main/java/com/replaymod/replay/mixin/EntityPlayerAccessor.java index 41ed5604..b70b9ac6 100644 --- a/src/main/java/com/replaymod/replay/mixin/EntityPlayerAccessor.java +++ b/src/main/java/com/replaymod/replay/mixin/EntityPlayerAccessor.java @@ -8,9 +8,9 @@ import org.spongepowered.asm.mixin.gen.Accessor; @Mixin(PlayerEntity.class) public interface EntityPlayerAccessor extends EntityLivingBaseAccessor { //#if MC>=10904 - @Accessor("field_7525") + @Accessor("selectedItem") ItemStack getItemStackMainHand(); - @Accessor("field_7525") + @Accessor("selectedItem") void setItemStackMainHand(ItemStack value); //#else //$$ @Accessor diff --git a/src/main/java/com/replaymod/replay/mixin/MixinViewFrustum.java b/src/main/java/com/replaymod/replay/mixin/MixinViewFrustum.java index ef52f19f..3f9fbe2c 100644 --- a/src/main/java/com/replaymod/replay/mixin/MixinViewFrustum.java +++ b/src/main/java/com/replaymod/replay/mixin/MixinViewFrustum.java @@ -15,7 +15,7 @@ public abstract class MixinViewFrustum { at = @At( value = "INVOKE", //#if MC>=10904 - target = "Lnet/minecraft/client/render/chunk/ChunkRenderer;method_3653(III)V" + target = "Lnet/minecraft/client/render/chunk/ChunkRenderer;setOrigin(III)V" //#else //$$ target = "Lnet/minecraft/client/renderer/chunk/RenderChunk;setPosition(Lnet/minecraft/util/BlockPos;)V" //#endif @@ -34,8 +34,8 @@ public abstract class MixinViewFrustum { //#endif if (!pos.equals(renderChunk.getOrigin())) { //#if MC>=10904 - renderChunk.method_3653(x, y, z); - renderChunk.scheduleRender(false); + renderChunk.setOrigin(x, y, z); + renderChunk.scheduleRebuild(false); //#else //$$ renderChunk.setPosition(pos); //$$ renderChunk.setNeedsUpdate(true); diff --git a/versions/1.14/mapping.txt b/versions/1.14.1/mapping.txt similarity index 91% rename from versions/1.14/mapping.txt rename to versions/1.14.1/mapping.txt index 34936247..6ce18c53 100644 --- a/versions/1.14/mapping.txt +++ b/versions/1.14.1/mapping.txt @@ -6,7 +6,6 @@ net.minecraft.client.particle.Particle cameraY interpPosY net.minecraft.client.particle.Particle cameraZ interpPosZ net.minecraft.client.particle.Particle buildGeometry() renderParticle() net.minecraft.client.render.entity.PlayerModelPart net.minecraft.entity.player.EnumPlayerModelParts -net.minecraft.client.render.entity.PlayerModelPart HEAD HAT net.minecraft.entity.effect.StatusEffects net.minecraft.init.MobEffects net.minecraft.util.math.Direction net.minecraft.util.EnumFacing net.minecraft.client.render.model.BakedQuad net.minecraft.client.renderer.model.BakedQuad @@ -39,9 +38,9 @@ net.minecraft.client.render.chunk.ChunkRenderTask.Mode net.minecraft.client.rend net.minecraft.client.render.chunk.ChunkBatcher net.minecraft.client.renderer.chunk.ChunkRenderDispatcher net.minecraft.client.render.chunk.ChunkBatcher workers listThreadedWorkers net.minecraft.client.render.chunk.ChunkBatcher pendingChunks queueChunkUpdates -net.minecraft.client.render.chunk.ChunkBatcher method_3631() runChunkUploads() -net.minecraft.client.render.chunk.ChunkBatcher method_3627() updateChunkNow() -net.minecraft.client.render.chunk.ChunkBatcher method_3619() stopWorkerThreads() +net.minecraft.client.render.chunk.ChunkBatcher runTasksSync() runChunkUploads() +net.minecraft.client.render.chunk.ChunkBatcher rebuildSync() updateChunkNow() +net.minecraft.client.render.chunk.ChunkBatcher stop() stopWorkerThreads() net.minecraft.client.particle.ParticleManager newParticles queue net.minecraft.client.particle.ParticleManager setWorld() clearEffects() net.minecraft.client.util.Session net.minecraft.util.Session @@ -62,15 +61,15 @@ net.minecraft.entity.passive.AnimalEntity net.minecraft.entity.passive.EntityAni net.minecraft.client.render.item.ItemRenderer net.minecraft.client.renderer.ItemRenderer net.minecraft.client.render.item.ItemRenderer colorMap itemColors net.minecraft.client.render.item.ItemRenderer renderGlint() renderEffect() -net.minecraft.client.render.item.ItemColorMap net.minecraft.client.renderer.color.ItemColors -net.minecraft.client.render.item.ItemColorMap getRenderColor() getColor() +net.minecraft.client.color.item.ItemColors net.minecraft.client.renderer.color.ItemColors +net.minecraft.client.color.item.ItemColors getColorMultiplier() getColor() net.minecraft.client.gui.Element net.minecraft.client.gui.IGuiEventListener -net.minecraft.text.TextComponent net.minecraft.util.text.ITextComponent -net.minecraft.text.TextComponent append() appendSibling() -net.minecraft.text.Style net.minecraft.util.text.Style -net.minecraft.text.StringTextComponent net.minecraft.util.text.TextComponentString -net.minecraft.text.TranslatableTextComponent net.minecraft.util.text.TextComponentTranslation -net.minecraft.text.TextFormat net.minecraft.util.text.TextFormatting +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.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() @@ -90,12 +89,12 @@ com.mojang.blaze3d.platform.GLX net.minecraft.client.renderer.OpenGlHelper com.mojang.blaze3d.platform.GLX isUsingFBOs() isFramebufferEnabled() net.minecraft.entity.data.TrackedData net.minecraft.network.datasync.DataParameter net.minecraft.client.render.chunk.ChunkRenderer net.minecraft.client.renderer.chunk.RenderChunk -net.minecraft.client.render.chunk.ChunkRenderer method_3653() setPosition() +net.minecraft.client.render.chunk.ChunkRenderer setOrigin() setPosition() net.minecraft.client.render.chunk.ChunkRenderer getOrigin() getPosition() -net.minecraft.client.render.chunk.ChunkRenderer getChunkRenderData() getCompiledChunk() +net.minecraft.client.render.chunk.ChunkRenderer getData() getCompiledChunk() net.minecraft.client.render.chunk.ChunkRenderer getGlBuffer() getVertexBufferByLayer() -net.minecraft.client.render.chunk.ChunkRenderer scheduleRender() setNeedsUpdate() -net.minecraft.client.render.chunk.ChunkRenderer method_3662() clearNeedsUpdate() +net.minecraft.client.render.chunk.ChunkRenderer scheduleRebuild() setNeedsUpdate() +net.minecraft.client.render.chunk.ChunkRenderer unscheduleRebuild() clearNeedsUpdate() net.minecraft.client.util.GlAllocationUtils net.minecraft.client.renderer.GLAllocation net.minecraft.client.util.GlAllocationUtils allocateFloatBuffer() createDirectFloatBuffer() net.minecraft.client.util.GlAllocationUtils allocateByteBuffer() createDirectByteBuffer() @@ -120,9 +119,9 @@ 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.menu.PauseMenuScreen net.minecraft.client.gui.GuiIngameMenu -net.minecraft.client.gui.menu.MultiplayerScreen net.minecraft.client.gui.GuiMultiplayer -net.minecraft.client.gui.menu.LevelSelectScreen net.minecraft.client.gui.GuiWorldSelection +net.minecraft.client.gui.screen.PauseScreen 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 net.minecraft.entity.data.DataTracker startTracking() register() net.minecraft.entity.data.DataTracker.Entry net.minecraft.network.datasync.EntityDataManager.DataEntry @@ -132,24 +131,22 @@ net.minecraft.entity.data.DataTracker.Entry get() getValue() # most members are actually on the latter net.minecraft.client.gui.widget.ButtonWidget net.minecraft.client.gui.GuiButton net.minecraft.client.gui.widget.AbstractButtonWidget active net.minecraft.client.gui.GuiButton enabled -net.minecraft.client.gui.MainMenuScreen net.minecraft.client.gui.GuiMainMenu -net.minecraft.client.gui.MainMenuScreen realmsNotificationGui realmsNotification +net.minecraft.client.gui.screen.TitleScreen net.minecraft.client.gui.GuiMainMenu +net.minecraft.client.gui.screen.TitleScreen realmsNotificationGui realmsNotification net.minecraft.realms.RealmsScreenProxy net.minecraft.client.gui.GuiScreenRealmsProxy net.minecraft.resource.ResourceNotFoundException net.minecraft.resources.ResourcePackFileNotFoundException net.minecraft.resource.ResourcePack net.minecraft.resources.IResourcePack net.minecraft.resource.ResourcePack findResources() getAllResourceLocations() net.minecraft.resource.ResourcePack getNamespaces() getResourceNamespaces() net.minecraft.resource.ResourceType net.minecraft.resources.ResourcePackType -net.minecraft.resource.ResourceType ASSETS CLIENT_RESOURCES net.minecraft.network.NetworkSide net.minecraft.network.EnumPacketDirection -net.minecraft.network.NetworkSide CLIENT CLIENTBOUND net.minecraft.network.NetworkState net.minecraft.network.EnumConnectionState net.minecraft.network.NetworkState getPacketHandler() getPacket() net.minecraft.network.Packet read() readPacketData() net.minecraft.network.Packet write() writePacketData() net.minecraft.world.GameMode net.minecraft.world.GameType -net.minecraft.client.gui.menu.DownloadingTerrainScreen net.minecraft.client.gui.GuiDownloadTerrain -net.minecraft.client.gui.menu.NoticeScreen net.minecraft.client.gui.GuiErrorScreen +net.minecraft.client.gui.screen.DownloadingTerrainScreen net.minecraft.client.gui.GuiDownloadTerrain +net.minecraft.client.gui.screen.NoticeScreen net.minecraft.client.gui.GuiErrorScreen net.minecraft.client.network.OtherClientPlayerEntity net.minecraft.client.entity.EntityOtherPlayerMP net.minecraft.world.Difficulty net.minecraft.world.EnumDifficulty net.minecraft.world.chunk.ChunkProvider net.minecraft.world.chunk.IChunkProvider @@ -222,7 +219,7 @@ net.minecraft.client.MinecraftClient joinWorld() loadWorld() net.minecraft.client.MinecraftClient tick() runTick() net.minecraft.client.MinecraftClient render() runGameLoop() net.minecraft.client.MinecraftClient handleInputEvents() processKeyBinds() -net.minecraft.client.MinecraftClient method_1520() getResourcePackList() +net.minecraft.client.MinecraftClient getResourcePackContainerManager() getResourcePackList() net.minecraft.client.options.ServerList net.minecraft.client.multiplayer.ServerList net.minecraft.client.options.ServerList updateServerListEntry() saveSingleServer() net.minecraft.client.options.ServerEntry net.minecraft.client.multiplayer.ServerData @@ -230,7 +227,7 @@ net.minecraft.client.options.ServerEntry getResourcePack() getResourceMode() net.minecraft.client.options.ServerEntry setResourcePackState() setResourceMode() net.minecraft.client.options.ServerEntry address serverIP net.minecraft.client.options.ServerEntry.ResourcePackState net.minecraft.client.multiplayer.ServerData.ServerResourceMode -net.minecraft.client.gui.menu.YesNoScreen net.minecraft.client.gui.GuiYesNo +net.minecraft.client.gui.screen.ConfirmScreen net.minecraft.client.gui.GuiYesNo net.minecraft.client.Mouse getX() getMouseX() net.minecraft.client.Mouse getY() getMouseY() net.minecraft.client.Mouse net.minecraft.client.MouseHelper @@ -249,15 +246,15 @@ net.minecraft.client.font.TextRenderer trimToWidth() trimStringToWidth() net.minecraft.client.font.TextRenderer wrapStringToWidthAsList() listFormattedStringToWidth() net.minecraft.client.gui.DrawableHelper fill() drawRect() net.minecraft.client.gui.DrawableHelper net.minecraft.client.gui.Gui -net.minecraft.client.gui.Screen hasControlDown() isCtrlKeyDown() -net.minecraft.client.gui.Screen hasShiftDown() isShiftKeyDown() -net.minecraft.client.gui.Screen init() setWorldAndResolution() -net.minecraft.client.gui.Screen minecraft mc -net.minecraft.client.gui.Screen net.minecraft.client.gui.GuiScreen -net.minecraft.client.gui.Screen passEvents allowUserInput -net.minecraft.client.gui.Screen removed() onGuiClosed() -net.minecraft.client.gui.Screen renderBackground() drawDefaultBackground() -net.minecraft.client.gui.Screen renderDirtBackground() drawBackground() +net.minecraft.client.gui.screen.Screen hasControlDown() isCtrlKeyDown() +net.minecraft.client.gui.screen.Screen hasShiftDown() isShiftKeyDown() +net.minecraft.client.gui.screen.Screen init() setWorldAndResolution() +net.minecraft.client.gui.screen.Screen minecraft mc +net.minecraft.client.gui.screen.Screen net.minecraft.client.gui.GuiScreen +net.minecraft.client.gui.screen.Screen passEvents allowUserInput +net.minecraft.client.gui.screen.Screen removed() onGuiClosed() +net.minecraft.client.gui.screen.Screen renderBackground() drawDefaultBackground() +net.minecraft.client.gui.screen.Screen renderDirtBackground() drawBackground() net.minecraft.client.gui.hud.ChatHud addMessage() printChatMessage() net.minecraft.client.gui.hud.ChatHud clear() clearChatMessages() net.minecraft.client.gui.hud.ChatHud net.minecraft.client.gui.GuiNewChat @@ -303,7 +300,6 @@ net.minecraft.client.render.VertexFormatElement net.minecraft.client.renderer.ve net.minecraft.client.render.VertexFormatElement getType() getUsage() net.minecraft.client.render.VertexFormatElement getFormat() getType() net.minecraft.client.render.VertexFormatElement.Format net.minecraft.client.renderer.vertex.VertexFormatElement.EnumType -net.minecraft.client.render.VertexFormatElement.Format UNSIGNED_BYTE UBYTE net.minecraft.client.render.VertexFormats net.minecraft.client.renderer.vertex.DefaultVertexFormats net.minecraft.client.render.VertexFormats POSITION_COLOR_UV_LMAP BLOCK net.minecraft.client.render.VertexFormats POSITION_COLOR_UV_NORMAL ITEM @@ -325,13 +321,13 @@ net.minecraft.client.util.Window setFullscreen() update() net.minecraft.client.util.Window method_4493() setupOverlayRendering() net.minecraft.client.util.Window net.minecraft.client.MainWindow net.minecraft.resource.DirectoryResourcePack net.minecraft.resources.FolderPack -net.minecraft.resource.AbstractFilenameResourcePack net.minecraft.resources.AbstractResourcePack -net.minecraft.resource.AbstractFilenameResourcePack openFilename() getInputStream() -net.minecraft.resource.AbstractFilenameResourcePack containsFilename() resourceExists() -net.minecraft.resource.AbstractFilenameResourcePack base file +net.minecraft.resource.AbstractFileResourcePack net.minecraft.resources.AbstractResourcePack +net.minecraft.resource.AbstractFileResourcePack openFile() getInputStream() +net.minecraft.resource.AbstractFileResourcePack containsFile() resourceExists() +net.minecraft.resource.AbstractFileResourcePack base file net.minecraft.resource.ResourcePackContainer net.minecraft.resources.ResourcePackInfo net.minecraft.resource.ResourcePackContainer.Factory net.minecraft.resources.ResourcePackInfo.IFactory -net.minecraft.resource.ResourcePackContainer.SortingDirection net.minecraft.resources.ResourcePackInfo.Priority +net.minecraft.resource.ResourcePackContainer.InsertionPosition net.minecraft.resources.ResourcePackInfo.Priority net.minecraft.resource.ResourcePackContainer of() func_195793_a() net.minecraft.resource.ResourcePackContainerManager net.minecraft.resources.ResourcePackList net.minecraft.resource.ResourcePackContainerManager addCreator() addPackFinder() @@ -368,7 +364,6 @@ 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 UNIX LINUX net.minecraft.util.SystemUtil.OperatingSystem MAC OSX net.minecraft.util.SystemUtil.OperatingSystem open() openFile() net.minecraft.client.util.InputUtil net.minecraft.client.util.InputMappings @@ -403,11 +398,11 @@ net.minecraft.client.util.DefaultSkinHelper net.minecraft.client.resources.Defau net.minecraft.client.util.DefaultSkinHelper getTexture() getDefaultSkin() net.minecraft.entity.decoration.ItemFrameEntity net.minecraft.entity.item.EntityItemFrame net.minecraft.entity.player.PlayerEntity net.minecraft.entity.player.EntityPlayer -net.minecraft.entity.player.PlayerEntity field_7525 itemStackMainHand +net.minecraft.entity.player.PlayerEntity selectedItem itemStackMainHand net.minecraft.entity.player.PlayerEntity isSleeping() isPlayerSleeping() net.minecraft.entity.player.PlayerEntity getEquippedStack() getItemStackFromSlot() -net.minecraft.entity.player.PlayerEntity method_7279() getCooldownPeriod() -net.minecraft.entity.player.PlayerEntity method_7261() getCooledAttackStrength() +net.minecraft.entity.player.PlayerEntity getAttackCooldownProgressPerTick() getCooldownPeriod() +net.minecraft.entity.player.PlayerEntity getAttackCooldownProgress() getCooledAttackStrength() net.minecraft.entity.player.PlayerEntity isSkinOverlayVisible() isWearing() net.minecraft.entity.mob.MobEntity net.minecraft.entity.EntityLiving net.minecraft.entity.LivingEntity net.minecraft.entity.EntityLivingBase @@ -427,8 +422,8 @@ net.minecraft.entity.LivingEntity getHandSwingProgress() getSwingProgress() net.minecraft.entity.LivingEntity isUsingItem() isHandActive() net.minecraft.entity.LivingEntity isSleeping() isPlayerSleeping() net.minecraft.entity.LivingEntity getStatusEffect() getActivePotionEffect() -net.minecraft.entity.LivingEntity updateState() livingTick() -net.minecraft.entity.Entity method_5823() preparePlayerToSpawn() +net.minecraft.entity.LivingEntity tickMovement() livingTick() +net.minecraft.entity.Entity afterSpawn() preparePlayerToSpawn() net.minecraft.entity.Entity getVehicle() getRidingEntity() net.minecraft.entity.Entity isRiding() isPassenger() net.minecraft.entity.Entity getUuid() getUniqueID() @@ -461,13 +456,9 @@ net.minecraft.world.chunk.WorldChunk getEntitySectionArray() getEntityLists() net.minecraft.util.math.BoundingBox net.minecraft.util.math.AxisAlignedBB net.minecraft.world.RayTraceContext net.minecraft.util.math.RayTraceResult net.minecraft.entity.EquipmentSlot net.minecraft.inventory.EntityEquipmentSlot -net.minecraft.entity.EquipmentSlot HAND_MAIN MAINHAND -net.minecraft.entity.EquipmentSlot HAND_OFF OFFHAND net.minecraft.stat.StatHandler net.minecraft.stats.StatisticsManager net.minecraft.client.recipe.book.ClientRecipeBook net.minecraft.client.util.RecipeBookClient net.minecraft.util.Hand net.minecraft.util.EnumHand -net.minecraft.util.Hand MAIN MAIN_HAND -net.minecraft.util.Hand OFF OFF_HAND net.minecraft.client.model.Box net.minecraft.client.renderer.entity.model.ModelBox net.minecraft.client.model.Cuboid net.minecraft.client.renderer.entity.model.ModelRenderer net.minecraft.client.model.Cuboid boxes cubeList @@ -501,7 +492,6 @@ net.minecraft.client.network.packet.PlayerPositionLookS2CPacket net.minecraft.ne net.minecraft.client.network.packet.PlayerPositionLookS2CPacket.Flag net.minecraft.network.play.server.SPacketPlayerPosLook.EnumFlags net.minecraft.client.network.packet.PlayerListS2CPacket net.minecraft.network.play.server.SPacketPlayerListItem net.minecraft.client.network.packet.PlayerListS2CPacket.Action net.minecraft.network.play.server.SPacketPlayerListItem.Action -net.minecraft.client.network.packet.PlayerListS2CPacket.Action ADD ADD_PLAYER net.minecraft.client.network.packet.PlayerListS2CPacket.Entry net.minecraft.network.play.server.SPacketPlayerListItem.AddPlayerData net.minecraft.client.network.packet.PlayerRespawnS2CPacket net.minecraft.network.play.server.SPacketRespawn net.minecraft.client.network.packet.PlayerSpawnS2CPacket net.minecraft.network.play.server.SPacketSpawnPlayer diff --git a/versions/common.gradle b/versions/common.gradle index 1d82f89b..b5b3289b 100644 --- a/versions/common.gradle +++ b/versions/common.gradle @@ -209,16 +209,16 @@ def shadeExclusions = { dependencies { if (FABRIC) { minecraft 'com.mojang:minecraft:' + [ - 11400: '1.14' + 11401: '1.14.1' ][mcVersion] mappings 'net.fabricmc:yarn:' + [ - 11400: '1.14+build.1' + 11401: '1.14.1+build.10' ][mcVersion] modCompile 'net.fabricmc:fabric-loader:' + [ - 11400: '0.4.2+build.132' + 11401: '0.4.7+build.147' ][mcVersion] - modCompile 'net.fabricmc:fabric:' + [ - 11400: '0.2.7+build.127' + modCompile 'net.fabricmc.fabric-api:fabric-api:' + [ + 11401: '0.3.0-pre+build.157' ][mcVersion] } @@ -254,7 +254,7 @@ dependencies { def studioVersion = mcVersionStr if (studioVersion == '1.8.9') studioVersion = '1.8' - shadow "com.github.ReplayMod.ReplayStudio:$studioVersion:6d1ffa9", shadeExclusions + shadow "com.github.ReplayMod.ReplayStudio:$studioVersion:53c6ca4", 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 af5d3ee7..53f4e310 100644 --- a/versions/core/mcVersion +++ b/versions/core/mcVersion @@ -1 +1 @@ -11400 \ No newline at end of file +11401 \ No newline at end of file