feat: allow players to reset computers via commands

Signed-off-by: Octol1ttle <[email protected]>
Octol1ttle · Nov 20, 2023 · f02e94d · f02e94d
1 parent 1393cf8
commit f02e94d
Show file tree

Hide file tree

Showing 5 changed files with 70 additions and 1 deletion.
diff --git a/src/main/java/ru/octol1ttle/flightassistant/FlightAssistant.java b/src/main/java/ru/octol1ttle/flightassistant/FlightAssistant.java
@@ -13,6 +13,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import ru.octol1ttle.flightassistant.alerts.ECAMSoundData;
+import ru.octol1ttle.flightassistant.commands.ResetAllComputersCommand;
+import ru.octol1ttle.flightassistant.commands.ResetFaultedComputersCommand;
 import ru.octol1ttle.flightassistant.commands.SetAutoThrustSpeedCommand;
 import ru.octol1ttle.flightassistant.commands.SwitchDisplayModeCommand;
 import ru.octol1ttle.flightassistant.computers.ComputerHost;
@@ -100,6 +102,14 @@ private static void setupCommand() {
                     .then(literal("speed")
                             .then(argument("targetSpeed", IntegerArgumentType.integer(10, 30))
                                     .executes(new SetAutoThrustSpeedCommand())))
+                    .then(literal("reset")
+                            .then(literal("computers")
+                                    .then(literal("all")
+                                            .executes(new ResetAllComputersCommand()))
+                                    .then(literal("faulted")
+                                            .executes(new ResetFaultedComputersCommand()))
+                            )
+                    )
             );
             dispatcher.register(literal("flas").redirect(node));
             dispatcher.register(literal("fhud").redirect(node));

diff --git a/src/main/java/ru/octol1ttle/flightassistant/commands/ResetAllComputersCommand.java b/src/main/java/ru/octol1ttle/flightassistant/commands/ResetAllComputersCommand.java
@@ -0,0 +1,16 @@
+package ru.octol1ttle.flightassistant.commands;
+
+import com.mojang.brigadier.Command;
+import com.mojang.brigadier.context.CommandContext;
+import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
+import ru.octol1ttle.flightassistant.HudRenderer;
+
+public class ResetAllComputersCommand implements Command<FabricClientCommandSource> {
+    @Override
+    public int run(CommandContext<FabricClientCommandSource> context) {
+        if (HudRenderer.getHost() != null) {
+            HudRenderer.getHost().resetAll();
+        }
+        return 0;
+    }
+}
diff --git a/src/main/java/ru/octol1ttle/flightassistant/commands/ResetFaultedComputersCommand.java b/src/main/java/ru/octol1ttle/flightassistant/commands/ResetFaultedComputersCommand.java
@@ -0,0 +1,16 @@
+package ru.octol1ttle.flightassistant.commands;
+
+import com.mojang.brigadier.Command;
+import com.mojang.brigadier.context.CommandContext;
+import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
+import ru.octol1ttle.flightassistant.HudRenderer;
+
+public class ResetFaultedComputersCommand implements Command<FabricClientCommandSource> {
+    @Override
+    public int run(CommandContext<FabricClientCommandSource> context) {
+        if (HudRenderer.getHost() != null) {
+            HudRenderer.getHost().resetFaulted();
+        }
+        return 0;
+    }
+}
diff --git a/src/main/java/ru/octol1ttle/flightassistant/computers/AirDataComputer.java b/src/main/java/ru/octol1ttle/flightassistant/computers/AirDataComputer.java
@@ -182,7 +182,7 @@ public void reset() {
         flightHeading = 0.0f;
         roll = 0.0f;
         altitude = 0.0f;
-        voidLevel = 0;
+        voidLevel = Integer.MIN_VALUE;
         groundLevel = 0;
         distanceFromGround = 0.0f;
         elytraHealth = null;

diff --git a/src/main/java/ru/octol1ttle/flightassistant/computers/ComputerHost.java b/src/main/java/ru/octol1ttle/flightassistant/computers/ComputerHost.java
@@ -99,4 +99,31 @@ public void render() {
             }
         }
     }
+
+    public void resetAll() {
+        for (ITickableComputer tickable : tickables) {
+            tickable.reset();
+        }
+        for (IRenderTickableComputer renderTickable : renderTickables) {
+            renderTickable.reset();
+        }
+        resetFaulted();
+    }
+
+    public void resetFaulted() {
+        for (IComputer computer : faulted) {
+            faulted.remove(computer);
+            computer.reset();
+            if (computer instanceof ITickableComputer tickable) {
+                tickables.add(tickable);
+                return;
+            }
+            if (computer instanceof IRenderTickableComputer renderTickable) {
+                renderTickables.add(renderTickable);
+                return;
+            }
+
+            throw new RuntimeException("Unknown computer type for " + computer);
+        }
+    }
 }