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

Fix keybinding conflicts on 1.14+ (fixes #268)

Browse Source 
This fixes both, replay-exclusive keybindings blocking vanilla ones as well as
vanilla keybindings blocking replay-exclusive ones.

The magic happens in Mixin_ContextualKeyBindings.
This commit is contained in:
Jonas Herzig
2020-07-25 21:34:30 +02:00
parent 063657af4c
commit fd7b6030f9
11 changed files with 105 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/replaymod/replay/ReplayHandler.java
View File

@@ -237,7 +237,7 @@ public class ReplayHandler {
//#endif
overlay.setVisible(false);
ReplayModReplay.instance.replayHandler = null;
ReplayModReplay.instance.forcefullyStopReplay();
mc.openScreen(null);

23
src/main/java/com/replaymod/replay/ReplayModReplay.java
View File

@@ -23,6 +23,7 @@ import com.replaymod.replaystudio.replay.ReplayFile;
import com.replaymod.replaystudio.replay.ZipReplayFile;
import com.replaymod.replaystudio.studio.ReplayStudio;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.options.KeyBinding;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -46,7 +47,7 @@ public class ReplayModReplay implements Module {
public static Logger LOGGER = LogManager.getLogger();
protected ReplayHandler replayHandler;
private ReplayHandler replayHandler;
public ReplayHandler getReplayHandler() {
return replayHandler;
@@ -78,7 +79,7 @@ public class ReplayModReplay implements Module {
}
}
}
});
}, true);
registry.registerKeyBinding("replaymod.input.thumbnail", Keyboard.KEY_N, new Runnable() {
@Override
@@ -113,7 +114,7 @@ public class ReplayModReplay implements Module {
});
}
}
});
}, true);
registry.registerKeyBinding("replaymod.input.playpause", Keyboard.KEY_P, new Runnable() {
@Override
@@ -122,7 +123,7 @@ public class ReplayModReplay implements Module {
replayHandler.getOverlay().playPauseButton.onClick();
}
}
});
}, true);
registry.registerKeyBinding("replaymod.input.quickmode", Keyboard.KEY_Q, () -> {
if (replayHandler != null) {
@@ -133,19 +134,19 @@ public class ReplayModReplay implements Module {
replayHandler.getReplaySender().setAsyncMode(true);
}));
}
});
}, true);
core.getKeyBindingRegistry().registerKeyBinding("replaymod.input.rollclockwise", Keyboard.KEY_L, () -> {
// Noop, actual handling logic in CameraEntity#update
});
}, true);
core.getKeyBindingRegistry().registerKeyBinding("replaymod.input.rollcounterclockwise", Keyboard.KEY_J, () -> {
// Noop, actual handling logic in CameraEntity#update
});
}, true);
core.getKeyBindingRegistry().registerKeyBinding("replaymod.input.resettilt", Keyboard.KEY_K, () -> {
Optional.ofNullable(replayHandler).map(ReplayHandler::getCameraEntity).ifPresent(c -> c.roll = 0);
});
}, true);
}
@Override
@@ -191,10 +192,16 @@ public class ReplayModReplay implements Module {
}
}
replayHandler = new ReplayHandler(replayFile, true);
//#if MC>=11400
KeyBinding.updateKeysByCode(); // see Mixin_ContextualKeyBindings
//#endif
}
public void forcefullyStopReplay() {
replayHandler = null;
//#if MC>=11400
KeyBinding.updateKeysByCode(); // see Mixin_ContextualKeyBindings
//#endif
}
public ReplayMod getCore() {