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

Get rid of all the ATs in favor of Mixins

Browse Source
This commit is contained in:
Jonas Herzig
2019-05-06 16:53:39 +02:00
parent 2094c518a0
commit bd91d0d3bd
41 changed files with 302 additions and 778 deletions
Download Patch File Download Diff File Expand all files Collapse all files

212
src/main/java/com/replaymod/replay/InputReplayTimer.java
View File

@@ -1,6 +1,7 @@
package com.replaymod.replay;
import com.replaymod.core.utils.WrappedTimer;
import com.replaymod.core.versions.MCVer;
import com.replaymod.replay.camera.CameraController;
import com.replaymod.replay.camera.CameraEntity;
import net.minecraft.client.Minecraft;
@@ -10,15 +11,8 @@ import net.minecraft.util.Timer;
import com.replaymod.core.versions.MCVer;
import org.lwjgl.glfw.GLFW;
//#else
//$$ import com.replaymod.replay.events.ReplayDispatchKeypressesEvent;
//$$ import net.minecraft.client.gui.GuiScreen;
//$$ import net.minecraft.client.settings.GameSettings;
//$$ import net.minecraft.client.settings.KeyBinding;
//$$ import net.minecraft.crash.CrashReport;
//$$ import net.minecraft.util.ReportedException;
//$$ import net.minecraftforge.client.ForgeHooksClient;
//$$ import net.minecraftforge.common.MinecraftForge;
//$$ import org.lwjgl.input.Keyboard;
//$$ import org.lwjgl.input.Mouse;
//$$ import net.minecraftforge.fml.common.FMLCommonHandler;
//#if MC>=10800
@@ -31,6 +25,11 @@ import org.lwjgl.glfw.GLFW;
//#endif
//#endif
//#if MC>=10904
//#else
//$$ import net.minecraft.client.multiplayer.WorldClient;
//#endif
public class InputReplayTimer extends WrappedTimer {
private final ReplayModReplay mod;
private final Minecraft mc;
@@ -70,14 +69,10 @@ public class InputReplayTimer extends WrappedTimer {
}
mc.keyboardListener.tick();
//#else
//#if MC>=10904
//$$ if (mc.currentScreen == null || mc.currentScreen.allowUserInput) {
//$$ while (Mouse.next()) {
//$$ handleMouseEvent();
//$$ }
//$$
//$$ while (Keyboard.next()) {
//$$ handleKeyEvent();
//$$ }
//$$ ((MCVer.MinecraftMethodAccessor) mc).replayModRunTickMouse();
//$$ ((MCVer.MinecraftMethodAccessor) mc).replayModRunTickKeyboard();
//$$ } else {
//#if MC<11300
//#if MC>=10800
@@ -91,6 +86,21 @@ public class InputReplayTimer extends WrappedTimer {
//#endif
//#endif
//$$ }
//#else
//$$ // 1.8.9 and below has one giant tick function, so we try to only do keyboard & mouse as far as possible
//$$ WorldClient world = mc.theWorld;
//$$ mc.theWorld = null;
//#if MC>=10800
//$$ try {
//$$ mc.runTick();
//$$ } catch (IOException e) { // *SIGH*
//$$ e.printStackTrace();
//$$ }
//#else
//$$ mc.runTick();
//#endif
//$$ mc.theWorld = world;
//#endif
//#endif
}
}
@@ -115,180 +125,6 @@ public class InputReplayTimer extends WrappedTimer {
}
}
//#if MC<11300
//$$ protected void handleMouseEvent() {
//$$ if (ForgeHooksClient.postMouseEvent()) return;
//$$
//$$ int button = Mouse.getEventButton() - 100;
//$$ boolean pressed = Mouse.getEventButtonState();
//$$
//$$ // Update key binding states
//$$ KeyBinding.setKeyBindState(button, pressed);
//$$ if (pressed) {
//$$ KeyBinding.onTick(button);
//$$ }
//$$
//$$ int wheel = Mouse.getEventDWheel();
//$$ handleScroll(wheel);
//$$
//$$ if (mc.currentScreen == null) {
//$$ if (!mc.inGameHasFocus && Mouse.getEventButtonState()) {
//$$ // Regrab mouse if the user clicks into the window
//$$ mc.setIngameFocus();
//$$ }
//$$ } else {
//#if MC>=10800
//$$ try {
//$$ mc.currentScreen.handleMouseInput();
//$$ } catch (IOException e) { // WHO IS RESPONSIBLE FOR THIS MESS?!?
//$$ e.printStackTrace();
//$$ }
//#else
//$$ mc.currentScreen.handleMouseInput();
//#endif
//$$ }
//$$
//$$ FMLCommonHandler.instance().fireMouseInput();
//$$ }
//$$
//$$ protected void handleKeyEvent() {
//$$ // TODO 1.7.10: This might be missing some 1.7.10-only key bindings or implement some of them incorrectly
//$$ int key = Keyboard.getEventKey() == 0 ? Keyboard.getEventCharacter() + 256 : Keyboard.getEventKey();
//$$ boolean pressed = Keyboard.getEventKeyState();
//$$
//$$ KeyBinding.setKeyBindState(key, pressed);
//$$ if (pressed) {
//$$ KeyBinding.onTick(key);
//$$ }
//$$
//$$ // Still want to be able to create debug crashes ]:D
//$$ if (mc.debugCrashKeyPressTime > 0) {
//$$ if (Minecraft.getSystemTime() - mc.debugCrashKeyPressTime >= 6000L) {
//$$ throw new ReportedException(new CrashReport("Manually triggered debug crash", new Throwable()));
//$$ }
//$$
//$$ if (!Keyboard.isKeyDown(Keyboard.KEY_F3) || !Keyboard.isKeyDown(Keyboard.KEY_C)) {
//$$ mc.debugCrashKeyPressTime = -1;
//$$ }
//$$ } else if (Keyboard.isKeyDown(Keyboard.KEY_F3) && Keyboard.isKeyDown(Keyboard.KEY_C)) {
//$$ mc.debugCrashKeyPressTime = Minecraft.getSystemTime();
//$$ }
//$$
//$$ // Twitch, screenshot, fullscreen, etc. (stuff that works everywhere)
//$$ if (!MinecraftForge.EVENT_BUS.post(new ReplayDispatchKeypressesEvent.Pre())) {
//$$ mc.dispatchKeypresses();
//$$ }
//$$
//$$ if (pressed) {
//$$ // This might be subject to change as vanilla shaders are still kinda unused in 1.8
//$$ if (key == Keyboard.KEY_F4 && mc.entityRenderer != null) {
//#if MC>=10800
//$$ mc.entityRenderer.switchUseShader();
//#else
//$$ mc.entityRenderer.activateNextShader();
//#endif
//$$ }
//$$
//$$ if (mc.currentScreen != null) {
//#if MC>=10800
//$$ try {
//$$ mc.currentScreen.handleKeyboardInput();
//$$ } catch (IOException e) { // AND WHO THOUGHT THIS WAS A GREAT IDEA?
//$$ e.printStackTrace();
//$$ }
//#else
//$$ mc.currentScreen.handleKeyboardInput();
//#endif
//$$ } else {
//$$ if (key == Keyboard.KEY_ESCAPE) {
//$$ mc.displayInGameMenu();
//$$ }
//$$
//$$ // Following are a ton of vanilla keyboard shortcuts, some are removed as they're useless in the
//$$ // replay viewer as of now
//$$ // TODO Update maybe add new key bindings
//$$ // TODO: Translate magic values to Keyboard.KEY_ constants
//$$
//$$ if (key == 32 && Keyboard.isKeyDown(61) && mc.ingameGUI != null) {
//#if MC>=11100
//$$ mc.ingameGUI.getChatGUI().clearChatMessages(false);
//#else
//$$ mc.ingameGUI.getChatGUI().clearChatMessages();
//#endif
//$$ }
//$$
//$$ if (key == 31 && Keyboard.isKeyDown(61)) {
//$$ mc.refreshResources();
//$$ }
//$$
//$$ if (key == 20 && Keyboard.isKeyDown(61)) {
//$$ mc.refreshResources();
//$$ }
//$$
//$$ if (key == 33 && Keyboard.isKeyDown(61)) {
//$$ boolean flag1 = Keyboard.isKeyDown(42) | Keyboard.isKeyDown(54);
//$$ mc.gameSettings.setOptionValue(GameSettings.Options.RENDER_DISTANCE, flag1 ? -1 : 1);
//$$ }
//$$
//$$ if (key == 30 && Keyboard.isKeyDown(61)) {
//$$ mc.renderGlobal.loadRenderers();
//$$ }
//$$
//$$ if (key == 48 && Keyboard.isKeyDown(61)) {
//#if MC>=10800
//$$ mc.getRenderManager().setDebugBoundingBox(!mc.getRenderManager().isDebugBoundingBox());
//#else
//$$ RenderManager.debugBoundingBox = !RenderManager.debugBoundingBox;
//#endif
//$$ }
//$$
//$$ if (key == 25 && Keyboard.isKeyDown(61)) {
//$$ mc.gameSettings.pauseOnLostFocus = !mc.gameSettings.pauseOnLostFocus;
//$$ mc.gameSettings.saveOptions();
//$$ }
//$$
//$$ if (key == 59) {
//$$ mc.gameSettings.hideGUI = !mc.gameSettings.hideGUI;
//$$ }
//$$
//$$ if (key == 61) {
//$$ mc.gameSettings.showDebugInfo = !mc.gameSettings.showDebugInfo;
//$$ mc.gameSettings.showDebugProfilerChart = GuiScreen.isShiftKeyDown();
//$$ }
//$$
//$$ if (mc.gameSettings.keyBindTogglePerspective.isPressed()) {
//$$ mc.gameSettings.thirdPersonView = (mc.gameSettings.thirdPersonView + 1) % 3;
//$$
//#if MC>=10800
//$$ if (mc.entityRenderer != null) { // Extra check, not in vanilla code
//$$ if (mc.gameSettings.thirdPersonView == 0) {
//$$ mc.entityRenderer.loadEntityShader(mc.getRenderViewEntity());
//$$ } else if (mc.gameSettings.thirdPersonView == 1) {
//$$ mc.entityRenderer.loadEntityShader(null);
//$$ }
//$$ }
//#endif
//$$ }
//$$ }
//$$
//$$ // Navigation in the debug chart
//$$ if (mc.gameSettings.showDebugInfo && mc.gameSettings.showDebugProfilerChart) {
//$$ if (key == Keyboard.KEY_0) {
//$$ mc.updateDebugProfilerName(0);
//$$ }
//$$
//$$ for (int i = 0; i < 9; ++i) {
//$$ if (key == 2 + i) {
//$$ mc.updateDebugProfilerName(i + 1);
//$$ }
//$$ }
//$$ }
//$$ }
//$$
//$$ FMLCommonHandler.instance().fireKeyInput();
//$$ }
//#endif
//#if MC<=10710
//$$ public static class RunScheduledTasks extends Event {}
//#endif