misc

Author: ZZZank

src/main/java/zzzank/probejs/GameEvents.java

@@ -96,9 +96,8 @@ public static void playerJoined(ClientPlayerNetworkEvent.LoggedInEvent event) {
     @SubscribeEvent
     public static void registerCommand(RegisterCommandsEvent event) {
         val dispatcher = event.getDispatcher();
-        BiConsumer<CommandContext<CommandSourceStack>, Component> sendMsg = (context, text) -> {
-            context.getSource().sendSuccess(text, true);
-        };
+        BiConsumer<CommandContext<CommandSourceStack>, Component> sendMsg =
+            (context, text) -> context.getSource().sendSuccess(text, true);
         dispatcher.register(
             Commands.literal("probejs")
                 .then(Commands.literal("dump")
@@ -109,8 +108,7 @@ public static void registerCommand(RegisterCommandsEvent event) {
                             return Command.SINGLE_SUCCESS;
                         }
                         KubeJS.PROXY.reloadClientInternal();
-                        ProbeDumpingThread.create(msg -> sendMsg.accept(context, TextWrapper.of(msg).component()))
-                            .start();
+                        ProbeDumpingThread.create(msg -> sendMsg.accept(context, msg)).start();
                         return Command.SINGLE_SUCCESS;
                     })
                 )

src/main/java/zzzank/probejs/features/interop/EvaluateCommand.java

@@ -30,7 +30,7 @@ public JsonElement handle(JsonObject payload) {
             default -> throw new RuntimeException("Unable to get script manager.");
         };
 
-        //well, there's one and only one ScriptPack in so-called `scriptManager.packs`
+        //well, there's one and only one ScriptPack in so-called scriptManager.pack`s`
         val pack = scriptManager.packs.values().stream().findAny().get();
         Object result = pack.context.evaluateString(pack.scope, content, "probejsEvaluator", 1, null);
         if (result instanceof NativeJavaObject nativeJavaObject) {

src/main/java/zzzank/probejs/features/interop/LintCommand.java

@@ -19,16 +19,12 @@ public String identifier() {
     @Override
     public JsonElement handle(JsonObject payload) {
         String scriptType = payload.get("script_type").getAsString();
-        Linter linter;
-        if (scriptType.equals("client")) {
-            linter = Linter.CLIENT_SCRIPT.get();
-        } else if (scriptType.equals("server")) {
-            linter = Linter.SERVER_SCRIPT.get();
-        } else if (scriptType.equals("startup")) {
-            linter = Linter.STARTUP_SCRIPT.get();
-        } else {
-            throw new RuntimeException(String.format("Unknown script type %s",scriptType));
-        }
+        Linter linter = switch (scriptType) {
+            case "client" -> Linter.CLIENT_SCRIPT.get();
+            case "server" -> Linter.SERVER_SCRIPT.get();
+            case "startup" -> Linter.STARTUP_SCRIPT.get();
+            default -> throw new RuntimeException(String.format("Unknown script type %s", scriptType));
+        };
 
         try {
             var warnings = linter.lint();

src/main/java/zzzank/probejs/mixins/MixinConsole.java

@@ -38,8 +38,11 @@ public void reportError(String message, Throwable error, Pattern exitPattern, Ca
             if (path == null) {
                 return;
             }
-            LintingWarning warning = new LintingWarning(path, LintingWarning.Level.ERROR,
-                rhinoException.lineNumber(), rhinoException.columnNumber(),
+            LintingWarning warning = new LintingWarning(
+                path,
+                LintingWarning.Level.ERROR,
+                rhinoException.lineNumber(),
+                rhinoException.columnNumber(),
                 rhinoException.details()
             );
             GlobalStates.SERVER.broadcast("accept_error", warning.asPayload());

src/main/java/zzzank/probejs/utils/JsonUtils.java

@@ -84,9 +84,10 @@ public static JsonElement parseObject(Object obj) {
 
     public static Object deserializeObject(JsonElement jsonElement) {
         if (jsonElement instanceof JsonPrimitive primitive) {
-            if (primitive.isBoolean()) return primitive.getAsBoolean();
-            if (primitive.isString()) return primitive.getAsString();
-            if (primitive.isNumber()) return primitive.getAsNumber();
+            return primitive.isBoolean() ? primitive.getAsBoolean()
+                : primitive.isString() ? primitive.getAsString()
+                    : primitive.isNumber() ? primitive.getAsNumber()
+                        : null;
         } else if (jsonElement instanceof JsonArray array) {
             List<Object> deserialized = new ArrayList<>();
             for (JsonElement element : array) {