Actual things that can be committed

Author: CaptainSly

src/main/java/com/spireprod/cje/ConsoleJavaEngine.java

@@ -16,7 +16,7 @@
 import com.googlecode.lanterna.terminal.swing.SwingTerminalFrame;
 import com.spireprod.cje.core.ConsoleRenderer;
 import com.spireprod.cje.core.input.Input;
-import com.spireprod.cje.core.scenes.Scene;
+import com.spireprod.cje.core.scenes.AbstractScene;
 import com.spireprod.cje.core.scenes.SceneManager;
 import com.spireprod.cje.core.ui.TextUI;
 
@@ -57,6 +57,7 @@ public ConsoleJavaEngine(String title, int width, int height) {
 			frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
 			frame.setVisible(true);
 
+			ctx = new TextUI();
 			screen = new TerminalScreen(terminal);
 			termWidth = frame.getTerminalSize().getColumns();
 			termHeight = frame.getTerminalSize().getRows();
@@ -137,6 +138,10 @@ public void run() {
 		gameLoop.start();
 	}
 
+	public void stop() {
+		isRunning = false;
+	}
+
 	private void onGameUpdate(float deltaTime) {
 		sceneManager.sceneUpdate(deltaTime);
 	}
@@ -184,7 +189,7 @@ private void loop() throws IOException, InterruptedException {
 			renderer.clearScreen();
 
 			onGameRender(renderer);
-			
+
 			// CJE-IMGUI Stuff
 			ctx.reset();
 			onGameUIRender(ctx, renderer, input);
@@ -204,7 +209,7 @@ private void loop() throws IOException, InterruptedException {
 		screen.stopScreen();
 	}
 
-	protected void setScene(Scene scene) {
+	public void setScene(AbstractScene scene) {
 		sceneManager.setScene(scene);
 	}
 

…in/java/com/spireprod/cje/util/Pair.java …in/java/com/spireprod/cje/core/Pair.javasrc/main/java/com/spireprod/cje/util/Pair.java renamed to src/main/java/com/spireprod/cje/core/Pair.java src/main/java/com/spireprod/cje/util/Pair.java renamed to src/main/java/com/spireprod/cje/core/Pair.java

@@ -1,4 +1,4 @@
-package com.spireprod.cje.util;
+package com.spireprod.cje.core;
 
 public class Pair<T, U> {
 	public T first;

src/main/java/com/spireprod/cje/core/input/Input.java

@@ -9,63 +9,24 @@
 public class Input {
 
 	private final Set<KeyStroke> currentKeys = new HashSet<>();
-	private final Set<KeyStroke> previousKeys = new HashSet<>();
 
 	public void update(KeyStroke stroke) {
 		if (stroke != null) {
-			currentKeys.add(normalize(stroke));
+			currentKeys.add(stroke);
 		}
 	}
 
 	public void endFrame() {
-		previousKeys.clear();
-		previousKeys.addAll(currentKeys);
 		currentKeys.clear();
 	}
 
-	// Check if key is currently held down
 	public boolean isKeyDown(KeyType type) {
-		return previousKeys.stream().anyMatch(k -> k.getKeyType() == type);
+		return currentKeys.stream().anyMatch(k -> k.getKeyType() == type);
 	}
 
 	public boolean isKeyDown(char c) {
-		return previousKeys.stream().anyMatch(
+		return currentKeys.stream().anyMatch(
 				k -> k.getKeyType() == KeyType.Character && k.getCharacter() != null && k.getCharacter() == c);
 	}
 
-	// Check if key was just pressed this frame
-	public boolean isKeyPressed(KeyType type) {
-		return currentKeys.stream().anyMatch(k -> k.getKeyType() == type)
-				&& previousKeys.stream().noneMatch(k -> k.getKeyType() == type);
-	}
-
-	public boolean isKeyPressed(char c) {
-		return currentKeys.stream()
-				.anyMatch(k -> k.getKeyType() == KeyType.Character && k.getCharacter() != null && k.getCharacter() == c)
-				&& previousKeys.stream().noneMatch(
-						k -> k.getKeyType() == KeyType.Character && k.getCharacter() != null && k.getCharacter() == c);
-	}
-
-	// Check if key was released this frame
-	public boolean isKeyReleased(KeyType type) {
-		return previousKeys.stream().anyMatch(k -> k.getKeyType() == type)
-				&& currentKeys.stream().noneMatch(k -> k.getKeyType() == type);
-	}
-
-	public boolean isKeyReleased(char c) {
-		return previousKeys.stream()
-				.anyMatch(k -> k.getKeyType() == KeyType.Character && k.getCharacter() != null && k.getCharacter() == c)
-				&& currentKeys.stream().noneMatch(
-						k -> k.getKeyType() == KeyType.Character && k.getCharacter() != null && k.getCharacter() == c);
-	}
-
-	// Normalize to avoid issues with Shift+char, etc.
-	private KeyStroke normalize(KeyStroke stroke) {
-		// Only consider key type + char, ignore modifiers for now
-		if (stroke.getKeyType() == KeyType.Character && stroke.getCharacter() != null) {
-			return new KeyStroke(Character.toLowerCase(stroke.getCharacter()), false, false);
-		}
-		return new KeyStroke(stroke.getKeyType());
-	}
-	
 }

src/main/java/com/spireprod/cje/core/scenes/AbstractScene.java

@@ -0,0 +1,13 @@
+package com.spireprod.cje.core.scenes;
+
+import com.spireprod.cje.ConsoleJavaEngine;
+
+public abstract class AbstractScene implements Scene {
+
+	protected ConsoleJavaEngine cje;
+
+	public AbstractScene(ConsoleJavaEngine cje) {
+		this.cje = cje;
+	}
+
+}

src/main/java/com/spireprod/cje/core/scenes/SceneManager.java

@@ -6,7 +6,7 @@
 
 public class SceneManager {
 
-	private Scene currentScene;
+	private AbstractScene currentScene;
 
 	public SceneManager() {
 	}
@@ -31,7 +31,7 @@ public void sceneRender(ConsoleRenderer renderer) {
 			currentScene.onSceneRender(renderer);
 	}
 
-	public void setScene(Scene scene) {
+	public void setScene(AbstractScene scene) {
 		currentScene = scene;
 	}
 

src/main/java/com/spireprod/cje/core/ui/TextUI.java

@@ -1,5 +1,6 @@
 package com.spireprod.cje.core.ui;
 
+import com.googlecode.lanterna.TextColor;
 import com.googlecode.lanterna.input.KeyType;
 import com.spireprod.cje.core.ConsoleRenderer;
 import com.spireprod.cje.core.input.Input;
@@ -12,22 +13,30 @@ public void reset() {
 		totalItems = 0;
 	}
 
-	public boolean selectable(String label, ConsoleRenderer renderer, Input input, int x, int y) {
+	public boolean button(String label, ConsoleRenderer renderer, Input input, int x, int y) {
 		boolean selected = (selectedIndex == totalItems);
-		String display = selected ? "> " + label : "  " + label;
+		String display = selected ? "> " + label : label;
 
-		renderer.writeString(display, x, y);
+		TextColor.ANSI color = selected ? TextColor.ANSI.GREEN : TextColor.ANSI.WHITE;
+
+		renderer.writeString(display, x, y, TextColor.ANSI.BLACK, color);
 
 		totalItems++;
-		return selected && input.isKeyPressed(KeyType.Enter);
+		return selected && input.isKeyDown(KeyType.Enter);
 	}
 
 	public void handleInput(Input input) {
-		if (input.isKeyPressed(KeyType.ArrowUp))
+		if (totalItems == 0) {
+			selectedIndex = -1;
+			return;
+		}
+
+		if (input.isKeyDown(KeyType.ArrowUp))
 			selectedIndex--;
-		if (input.isKeyPressed(KeyType.ArrowDown))
+		if (input.isKeyDown(KeyType.ArrowDown))
 			selectedIndex++;
 
 		selectedIndex = Math.floorMod(selectedIndex, totalItems);
 	}
+
 }