From a94f4178223f46fd1dec9d28e9d06637536cc791 Mon Sep 17 00:00:00 2001
From: LindaJuffermans <github.com@juffermans.net>
Date: Wed, 15 Jul 2020 21:07:30 +0200
Subject: [PATCH] Fixed for 1.15.2

---
 .../com/replaymod/extras/HotkeyButtons.java   |  8 +-
 .../java/com/replaymod/extras/QuickMode.java  | 84 ++++++++++---------
 2 files changed, 48 insertions(+), 44 deletions(-)

diff --git a/src/main/java/com/replaymod/extras/HotkeyButtons.java b/src/main/java/com/replaymod/extras/HotkeyButtons.java
index 08d37b19..69b0b709 100644
--- a/src/main/java/com/replaymod/extras/HotkeyButtons.java
+++ b/src/main/java/com/replaymod/extras/HotkeyButtons.java
@@ -74,7 +74,7 @@ public class HotkeyButtons extends EventRegistrations implements Extra {
 
             final KeyBindingRegistry keyBindingRegistry = mod.getKeyBindingRegistry();
             keyBindingRegistry.getKeyBindings().values().stream()
-                    .sorted(Comparator.comparing(it -> I18n.translate(it.getTranslationKey())))
+                    .sorted(Comparator.comparing(it -> I18n.translate(it.getId())))
                     .forEachOrdered(keyBinding -> {
                 GuiButton button = new GuiButton(){
                     @Override
@@ -83,10 +83,10 @@ public class HotkeyButtons extends EventRegistrations implements Extra {
                         String keyName = "???";
                         try {
                             //#if MC>=11600
-                            keyName = keyBinding.getBoundKeyLocalizedText().asString();
+                            //$$ keyName = keyBinding.getBoundKeyLocalizedText().asString();
                             //#else
                             //#if MC>=11400
-                            //$$ keyName = keyBinding.getLocalizedName();
+                            keyName = keyBinding.getLocalizedName();
                             //#else
                             //$$ keyName = Keyboard.getKeyName(keyBinding.getKeyCode());
                             //#endif
@@ -115,7 +115,7 @@ public class HotkeyButtons extends EventRegistrations implements Extra {
                                         return new Dimension(Math.max(10, button.getMinSize().getWidth()) + 10, 20);
                                     }
                                 }).addElements(null, button),
-                                new GuiLabel().setI18nText(keyBinding.getTranslationKey())
+                                new GuiLabel().setI18nText(keyBinding.getId())
                         ));
             });
 
diff --git a/src/main/java/com/replaymod/extras/QuickMode.java b/src/main/java/com/replaymod/extras/QuickMode.java
index 33295a5a..d697bce2 100644
--- a/src/main/java/com/replaymod/extras/QuickMode.java
+++ b/src/main/java/com/replaymod/extras/QuickMode.java
@@ -15,51 +15,55 @@ import de.johni0702.minecraft.gui.utils.EventRegistrations;
 import net.minecraft.client.MinecraftClient;
 
 public class QuickMode extends EventRegistrations implements Extra {
-  private ReplayModReplay module;
+    private ReplayModReplay module;
 
-  private final IGuiImage indicator = new GuiImage().setTexture(ReplayMod.TEXTURE, 40, 100, 16, 16).setSize(16, 16);
+    private final IGuiImage indicator = new GuiImage().setTexture(ReplayMod.TEXTURE, 40, 100, 16, 16).setSize(16, 16);
 
-  private MinecraftClient mc;
-  private boolean active;
-  //#if MC>=11400
-  private double originalGamma;
-  //#else
-  //$$ private float originalGamma;
-  //#endif
+    private MinecraftClient mc;
+    private boolean active;
+    //#if MC>=11400
+    private double originalGamma;
+    //#else
+    //$$ private float originalGamma;
+    //#endif
 
-  @Override
-  public void register(final ReplayMod mod) throws Exception {
-    this.module = ReplayModReplay.instance;
-    this.mc = mod.getMinecraft();
+    @Override
+    public void register(final ReplayMod mod) throws Exception {
+        this.module = ReplayModReplay.instance;
+        this.mc = mod.getMinecraft();
 
-    mod.getKeyBindingRegistry().registerKeyBinding("replaymod.input.quickmode", Keyboard.KEY_Q, new Runnable() {
-      @Override
-      public void run() {
-        active = !active;
-        ReplayHandler replayHandler = module.getReplayHandler();
-        if (replayHandler == null) return;
-        updateIndicator(replayHandler.getOverlay());
-        replayHandler.getReplaySender().setSyncModeAndWait();
-        mod.runLater(() ->
-          replayHandler.ensureQuickModeInitialized(() -> {
-            replayHandler.setQuickMode(active);
-            replayHandler.getReplaySender().setAsyncMode(true);
-          })
-        );
-      }
-    });
+        mod.getKeyBindingRegistry().registerKeyBinding("replaymod.input.quickmode", Keyboard.KEY_Q, new Runnable() {
+            @Override
+            public void run() {
+                ReplayHandler replayHandler = module.getReplayHandler();
+                if (replayHandler == null) {
+                    return;
+                }
+                active = !active;
+                updateIndicator(replayHandler.getOverlay());
+                replayHandler.getReplaySender().setSyncModeAndWait();
+                mod.runLater(() ->
+                        replayHandler.ensureQuickModeInitialized(() -> {
+                            replayHandler.setQuickMode(active);
+                            replayHandler.getReplaySender().setAsyncMode(true);
+                        })
+                );
+            }
+        });
 
-    register();
-  }
-
-  { on(ReplayOpenedCallback.EVENT, replayHandler -> updateIndicator(replayHandler.getOverlay())); }
-  private void updateIndicator(GuiReplayOverlay overlay) {
-    System.out.println("QuickMode::updateIndicator; active=" + (active ? "T" : "F"));
-    if (active) {
-      overlay.statusIndicatorPanel.addElements(new HorizontalLayout.Data(2), indicator);
-    } else {
-      overlay.statusIndicatorPanel.removeElement(indicator);
+        register();
     }
-  }
 
+    {
+        on(ReplayOpenedCallback.EVENT, replayHandler -> updateIndicator(replayHandler.getOverlay()));
+    }
+
+    private void updateIndicator(GuiReplayOverlay overlay) {
+        System.out.println("QuickMode::updateIndicator; active=" + (active ? "T" : "F"));
+        if (active) {
+            overlay.statusIndicatorPanel.addElements(new HorizontalLayout.Data(2), indicator);
+        } else {
+            overlay.statusIndicatorPanel.removeElement(indicator);
+        }
+    }
 }