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();
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())
));
});

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

@@ -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);
}
}
}