DIvan2000/ReplayModCinematic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed for 1.15.2

Browse Source
This commit is contained in:
LindaJuffermans
2020-07-15 21:07:30 +02:00
parent 2dcfbd6435
commit a94f417822
2 changed files with 48 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/replaymod/extras/HotkeyButtons.java
View File

@@ -74,7 +74,7 @@ public class HotkeyButtons extends EventRegistrations implements Extra {
final KeyBindingRegistry keyBindingRegistry = mod.getKeyBindingRegistry(); final KeyBindingRegistry keyBindingRegistry = mod.getKeyBindingRegistry();
keyBindingRegistry.getKeyBindings().values().stream() keyBindingRegistry.getKeyBindings().values().stream()
.sorted(Comparator.comparing(it -> I18n.translate(it.getTranslationKey()))) .sorted(Comparator.comparing(it -> I18n.translate(it.getId())))
.forEachOrdered(keyBinding -> { .forEachOrdered(keyBinding -> {
GuiButton button = new GuiButton(){ GuiButton button = new GuiButton(){
@Override @Override
@@ -83,10 +83,10 @@ public class HotkeyButtons extends EventRegistrations implements Extra {
String keyName = "???"; String keyName = "???";
try { try {
//#if MC>=11600 //#if MC>=11600
keyName = keyBinding.getBoundKeyLocalizedText().asString(); //$$ keyName = keyBinding.getBoundKeyLocalizedText().asString();
//#else //#else
//#if MC>=11400 //#if MC>=11400
//$$ keyName = keyBinding.getLocalizedName(); keyName = keyBinding.getLocalizedName();
//#else //#else
//$$ keyName = Keyboard.getKeyName(keyBinding.getKeyCode()); //$$ keyName = Keyboard.getKeyName(keyBinding.getKeyCode());
//#endif //#endif
@@ -115,7 +115,7 @@ public class HotkeyButtons extends EventRegistrations implements Extra {
return new Dimension(Math.max(10, button.getMinSize().getWidth()) + 10, 20); return new Dimension(Math.max(10, button.getMinSize().getWidth()) + 10, 20);
} }
}).addElements(null, button), }).addElements(null, button),
new GuiLabel().setI18nText(keyBinding.getTranslationKey()) new GuiLabel().setI18nText(keyBinding.getId())
)); ));
}); });

12
src/main/java/com/replaymod/extras/QuickMode.java
View File

@@ -35,9 +35,11 @@ public class QuickMode extends EventRegistrations implements Extra {
mod.getKeyBindingRegistry().registerKeyBinding("replaymod.input.quickmode", Keyboard.KEY_Q, new Runnable() { mod.getKeyBindingRegistry().registerKeyBinding("replaymod.input.quickmode", Keyboard.KEY_Q, new Runnable() {
@Override @Override
public void run() { public void run() {
active = !active;
ReplayHandler replayHandler = module.getReplayHandler(); ReplayHandler replayHandler = module.getReplayHandler();
if (replayHandler == null) return; if (replayHandler == null) {
return;
}
active = !active;
updateIndicator(replayHandler.getOverlay()); updateIndicator(replayHandler.getOverlay());
replayHandler.getReplaySender().setSyncModeAndWait(); replayHandler.getReplaySender().setSyncModeAndWait();
mod.runLater(() -> mod.runLater(() ->
@@ -52,7 +54,10 @@ public class QuickMode extends EventRegistrations implements Extra {
register(); register();
} }
{ on(ReplayOpenedCallback.EVENT, replayHandler -> updateIndicator(replayHandler.getOverlay())); } {
on(ReplayOpenedCallback.EVENT, replayHandler -> updateIndicator(replayHandler.getOverlay()));
}
private void updateIndicator(GuiReplayOverlay overlay) { private void updateIndicator(GuiReplayOverlay overlay) {
System.out.println("QuickMode::updateIndicator; active=" + (active ? "T" : "F")); System.out.println("QuickMode::updateIndicator; active=" + (active ? "T" : "F"));
if (active) { if (active) {
@@ -61,5 +66,4 @@ public class QuickMode extends EventRegistrations implements Extra {
overlay.statusIndicatorPanel.removeElement(indicator); overlay.statusIndicatorPanel.removeElement(indicator);
} }
} }
} }