Some fixes and stuff

GeyserMC · Jan 19, 2025 · 3fff601 · 3fff601
1 parent 0ae556c
commit 3fff601
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/core/src/main/java/org/geysermc/geyser/registry/mappings/util/MappingsUtil.java b/core/src/main/java/org/geysermc/geyser/registry/mappings/util/MappingsUtil.java
@@ -91,13 +91,6 @@ public static <T> void readIfPresent(JsonElement node, String name, Consumer<T>
         }
     }
 
-    // TODO don't use this method but throw an error in the above reading methods
-    public static void requireObject(JsonNode node, String task, String... context) throws InvalidCustomMappingsFileException {
-        if (node == null || !node.isObject()) {
-            throw new InvalidCustomMappingsFileException(task, "expected an object", context);
-        }
-    }
-
     private static JsonElement getJsonElement(JsonElement element, String name, String... context) throws InvalidCustomMappingsFileException {
         if (!element.isJsonObject()) {
             throw new InvalidCustomMappingsFileException(formatTask(name), OBJECT_ERROR, context);

diff --git a/core/src/main/java/org/geysermc/geyser/registry/mappings/util/NodeReader.java b/core/src/main/java/org/geysermc/geyser/registry/mappings/util/NodeReader.java
@@ -46,8 +46,9 @@
 public interface NodeReader<T> {
 
     NodeReader<Integer> INT = node -> {
-        if (node.getAsNumber() instanceof Integer i) {
-            return i;
+        double i = node.getAsDouble();
+        if (i == (int) i) { // Make sure the number is round
+            return (int) i;
         }
         throw new InvalidCustomMappingsFileException("expected node to be an integer");
     };