Port to 1.17-pre1

src/main/java/com/replaymod/recording/gui/GuiRecordingControls.java

@@ -19,6 +19,7 @@ import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.widget.AbstractButtonWidget;
 //#endif
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Function;
@@ -78,9 +79,9 @@ public class GuiRecordingControls extends EventRegistrations {
     { on(InitScreenCallback.EVENT, this::injectIntoIngameMenu); }
     private void injectIntoIngameMenu(Screen guiScreen,
                                       //#if MC>=11400
-                                      List<AbstractButtonWidget> buttonList
+                                      Collection<AbstractButtonWidget> buttonList
                                       //#else
-                                      //$$ List<net.minecraft.client.gui.GuiButton> buttonList
+                                      //$$ Collection<net.minecraft.client.gui.GuiButton> buttonList
                                       //#endif
     ) {
         if (!(guiScreen instanceof GameMenuScreen)) {

src/main/java/com/replaymod/recording/gui/GuiRecordingOverlay.java

@@ -38,14 +38,12 @@ public class GuiRecordingOverlay extends EventRegistrations {
         if (settingsRegistry.get(Setting.INDICATOR)) {
             TextRenderer fontRenderer = mc.textRenderer;
             String text = guiControls.isPaused() ? I18n.translate("replaymod.gui.paused") : I18n.translate("replaymod.gui.recording");
-            fontRenderer.draw(
-                    //#if MC>=11600
-                    stack,
-                    //#endif
-                    text.toUpperCase(), 30, 18 - (fontRenderer.fontHeight / 2), 0xffffffff);
-            mc.getTextureManager().bindTexture(TEXTURE);
+            MinecraftGuiRenderer renderer = new MinecraftGuiRenderer(stack);
+            renderer.drawString(30, 18 - (fontRenderer.fontHeight / 2), 0xffffffff, text.toUpperCase());
+            renderer.bindTexture(TEXTURE);
+            //#if MC<11700
             enableAlphaTest();
-            GuiRenderer renderer = new MinecraftGuiRenderer(stack);
+            //#endif
             renderer.drawTexturedRect(10, 10, 58, 20, 16, 16, 16, 16, TEXTURE_SIZE, TEXTURE_SIZE);
         }
     }

src/main/java/com/replaymod/recording/packet/ResourcePackRecorder.java

@@ -172,7 +172,12 @@ public class ResourcePackRecorder {
             }
         }
 
-        return new ResourcePackSendS2CPacket("replay://" + requestId, "");
+        return new ResourcePackSendS2CPacket(
+                "replay://" + requestId, ""
+                //#if MC>=11700
+                //$$ , packet.isRequired(), packet.getPrompt()
+                //#endif
+        );
     }
 
     private void downloadResourcePackFuture(int requestId, String url, final String hash) {
@@ -190,7 +195,11 @@ public class ResourcePackRecorder {
     downloadResourcePack(final int requestId, String url, String hash) {
         ClientBuiltinResourcePackProvider packFinder = mc.getResourcePackDownloader();
         ((IDownloadingPackFinder) packFinder).setRequestCallback(file -> recordResourcePack(file, requestId));
+        //#if MC>=11700
+        //$$ return packFinder.download(url, hash, true);
+        //#else
         return packFinder.download(url, hash);
+        //#endif
     }
 
     public interface IDownloadingPackFinder {