[VirtualInput] Switched to new VirtualInput

- Removed getters in VirtualInput and replaced them with public final variables for better readybility - Removed InputContainerView - Added isKeyDown() and willKeyBeDown() to VirtualInput
MinecraftTAS · Jan 26, 2024 · 75406a8 · 75406a8
1 parent f5686e9
commit 75406a8
Show file tree

Hide file tree

Showing 16 changed files with 150 additions and 343 deletions.
diff --git a/src/main/java/com/minecrafttas/tasmod/TASmodClient.java b/src/main/java/com/minecrafttas/tasmod/TASmodClient.java
@@ -1,5 +1,15 @@
 package com.minecrafttas.tasmod;
 
+import static com.minecrafttas.tasmod.TASmod.LOGGER;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.logging.log4j.Level;
+import org.lwjgl.input.Keyboard;
+
 import com.minecrafttas.mctcommon.Configuration;
 import com.minecrafttas.mctcommon.Configuration.ConfigOptions;
 import com.minecrafttas.mctcommon.KeybindManager;
@@ -12,7 +22,6 @@
 import com.minecrafttas.mctcommon.server.Client;
 import com.minecrafttas.mctcommon.server.PacketHandlerRegistry;
 import com.minecrafttas.mctcommon.server.Server;
-import com.minecrafttas.tasmod.externalGui.InputContainerView;
 import com.minecrafttas.tasmod.gui.InfoHud;
 import com.minecrafttas.tasmod.handlers.InterpolationHandler;
 import com.minecrafttas.tasmod.handlers.LoadingScreenHandler;
@@ -27,9 +36,9 @@
 import com.minecrafttas.tasmod.util.LoggerMarkers;
 import com.minecrafttas.tasmod.util.Scheduler;
 import com.minecrafttas.tasmod.util.ShieldDownloader;
-import com.minecrafttas.tasmod.virtual.VirtualInput;
 import com.minecrafttas.tasmod.virtual.VirtualInput2;
 import com.minecrafttas.tasmod.virtual.VirtualKeybindings;
+
 import net.fabricmc.api.ClientModInitializer;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.EntityPlayerSP;
@@ -39,20 +48,11 @@
 import net.minecraft.client.multiplayer.ServerData;
 import net.minecraft.client.settings.KeyBinding;
 import net.minecraft.server.MinecraftServer;
-import org.apache.logging.log4j.Level;
-import org.lwjgl.input.Keyboard;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import static com.minecrafttas.tasmod.TASmod.LOGGER;
 
 public class TASmodClient implements ClientModInitializer, EventClientInit, EventPlayerJoinedClientSide, EventOpenGui{
 
 
-	public static VirtualInput virtual;
+	public static VirtualInput2 virtual;
 
 	public static TickSyncClient ticksyncClient;
 
@@ -126,7 +126,7 @@ public void onInitializeClient() {
 		} else {
 			config.reset(ConfigOptions.FileToOpen);
 		}
-		virtual=new VirtualInput(fileOnStart);
+//		virtual=new VirtualInput2(fileOnStart); TODO Move fileOnStart to PlaybackController
 
 		// Initialize InfoHud
 		hud = new InfoHud();
@@ -147,7 +147,7 @@ protected boolean isKeyDown(KeyBinding i) {
 
 		// Register event listeners
 		EventListenerRegistry.register(this);
-		EventListenerRegistry.register(virtual);
+//		EventListenerRegistry.register(virtual); TODO Remove if unnecessary
 		EventListenerRegistry.register(hud);
 		EventListenerRegistry.register(shieldDownloader);
 		EventListenerRegistry.register(loadingScreenHandler);
@@ -199,7 +199,6 @@ public void onClientInit(Minecraft mc) {
 			}
 		})));
 		blockedKeybindings.add(keybindManager.registerKeybind(new Keybind("Open InfoGui Editor", "TASmod", Keyboard.KEY_F6, () -> Minecraft.getMinecraft().displayGuiScreen(TASmodClient.hud))));
-		blockedKeybindings.add(keybindManager.registerKeybind(new Keybind("Buffer View", "TASmod", Keyboard.KEY_NUMPAD0, () -> InputContainerView.startBufferView())));
 		blockedKeybindings.add(keybindManager.registerKeybind(new Keybind("Various Testing", "TASmod", Keyboard.KEY_F12, () -> {
 			TASmodClient.client.disconnect();
 		})));

diff --git a/src/main/java/com/minecrafttas/tasmod/externalGui/InputContainerView.java b/src/main/java/com/minecrafttas/tasmod/externalGui/InputContainerView.java
diff --git a/src/main/java/com/minecrafttas/tasmod/gui/InfoHud.java b/src/main/java/com/minecrafttas/tasmod/gui/InfoHud.java
@@ -343,13 +343,13 @@ public boolean checkInit() {
 				}
 			}));
 
-			title = "cursor";
-			y += 14;
-			if (configuration.getProperty(title + "_x", "err").equals("err")) setDefaults(title, y);
-			lists.add(new InfoLabel(title, Integer.parseInt(configuration.getProperty(title + "_x")), Integer.parseInt(configuration.getProperty(title + "_y")), Boolean.parseBoolean(configuration.getProperty(title + "_visible")), Boolean.parseBoolean(configuration.getProperty(title + "_rect")), () -> {
-				if (Minecraft.getMinecraft().currentScreen == this) return "Mouse Position";
-				return String.format("Mouse Cursor: " + TASmodClient.virtual.getNextMouse().getPath().get(0).cursorX + " " + TASmodClient.virtual.getNextMouse().getPath().get(0).cursorY);
-			}));
+//			title = "cursor";
+//			y += 14;
+//			if (configuration.getProperty(title + "_x", "err").equals("err")) setDefaults(title, y);
+//			lists.add(new InfoLabel(title, Integer.parseInt(configuration.getProperty(title + "_x")), Integer.parseInt(configuration.getProperty(title + "_y")), Boolean.parseBoolean(configuration.getProperty(title + "_visible")), Boolean.parseBoolean(configuration.getProperty(title + "_rect")), () -> {
+//				if (Minecraft.getMinecraft().currentScreen == this) return "Mouse Position";
+//				return String.format("Mouse Cursor: " + TASmodClient.virtual.getNextMouse().getPath().get(0).cursorX + " " + TASmodClient.virtual.getNextMouse().getPath().get(0).cursorY);
+//			})); TODO Remove?
 
 			title = "trajectories";
 			y += 14;
@@ -490,26 +490,26 @@ private void drawRectWithText(String text, int x, int y, boolean rect) {
 	}
 
 	private String keystrokes() {
-		if (Display.isActive()) {
-			String out1 = ""+ChatFormatting.WHITE;
-			for (String mouse : TASmodClient.virtual.getCurrentMousePresses()) {
-				out1 = out1.concat(mouse + " ");
-			}
-			out1=out1.concat(""+ChatFormatting.GREEN);
-			for (String mouse : TASmodClient.virtual.getNextMousePresses()) {
-				out1 = out1.concat(mouse + " ");
-			}
-
-			String out2 = ""+ChatFormatting.WHITE;
-			for (String key : TASmodClient.virtual.getCurrentKeyboardPresses()) {
-				out2 = out2.concat(key + " ");
-			}
-			out2=out2.concat(""+ChatFormatting.GREEN);
-			for (String key : TASmodClient.virtual.getNextKeyboardPresses()) {
-				out2 = out2.concat(key + " ");
-			}
-			return out1+out2;
-		}
+//		if (Display.isActive()) { //TODO Update
+//			String out1 = ""+ChatFormatting.WHITE;
+//			for (String mouse : TASmodClient.virtual.getCurrentMousePresses()) {
+//				out1 = out1.concat(mouse + " ");
+//			}
+//			out1=out1.concat(""+ChatFormatting.GREEN);
+//			for (String mouse : TASmodClient.virtual.getNextMousePresses()) {
+//				out1 = out1.concat(mouse + " ");
+//			}
+//			
+//			String out2 = ""+ChatFormatting.WHITE;
+//			for (String key : TASmodClient.virtual.getCurrentKeyboardPresses()) {
+//				out2 = out2.concat(key + " ");
+//			}
+//			out2=out2.concat(""+ChatFormatting.GREEN);
+//			for (String key : TASmodClient.virtual.getNextKeyboardPresses()) {
+//				out2 = out2.concat(key + " ");
+//			}
+//			return out1+out2;
+//		}
 		return "";
 	}
 

diff --git a/src/main/java/com/minecrafttas/tasmod/mixin/MixinEntityRenderer.java b/src/main/java/com/minecrafttas/tasmod/mixin/MixinEntityRenderer.java
@@ -116,9 +116,9 @@ public void runSubtick(float partialTicks) {
 				smoothCamPitch = 0.0F;
 				mc.player.turn(f2, f3 * (float) i);
 			}
-			TASmodClient.virtual.updateSubtick(mc.player.rotationPitch, mc.player.rotationYaw);
-			mc.player.rotationPitch = TASmodClient.virtual.getSubtickPitch();
-			mc.player.rotationYaw = TASmodClient.virtual.getSubtickYaw();
+			TASmodClient.virtual.CAMERA_ANGLE.updateCameraAngle(mc.player.rotationPitch, mc.player.rotationYaw);
+			mc.player.rotationPitch = TASmodClient.virtual.CAMERA_ANGLE.getPitch();
+			mc.player.rotationYaw = TASmodClient.virtual.CAMERA_ANGLE.getYaw();
 			InterpolationHandler.rotationPitch = mc.player.rotationPitch;
 			InterpolationHandler.rotationYaw = 180f + mc.player.rotationYaw;
 		}