Add enchantment_glint_override component reader

Author: eclipseisoffline

core/src/main/java/org/geysermc/geyser/registry/mappings/components/DataComponentReaders.java

@@ -32,6 +32,7 @@
 import org.geysermc.geyser.api.item.custom.v2.component.DataComponent;
 import org.geysermc.geyser.api.util.Identifier;
 import org.geysermc.geyser.item.exception.InvalidCustomMappingsFileException;
+import org.geysermc.geyser.registry.mappings.components.readers.BooleanComponentReader;
 import org.geysermc.geyser.registry.mappings.components.readers.ConsumableReader;
 import org.geysermc.geyser.registry.mappings.components.readers.EnchantableReader;
 import org.geysermc.geyser.registry.mappings.components.readers.EquippableReader;
@@ -72,5 +73,6 @@ public static void readDataComponent(CustomItemDefinition.Builder builder, Strin
         READERS.put(MinecraftKey.key("enchantable"), new EnchantableReader());
         READERS.put(MinecraftKey.key("tool"), new ToolPropertiesReader());
         READERS.put(MinecraftKey.key("repairable"), new RepairableReader());
+        READERS.put(MinecraftKey.key("enchantment_glint_override"), new BooleanComponentReader(DataComponent.ENCHANTMENT_GLINT_OVERRIDE));
     }
 }

core/src/main/java/org/geysermc/geyser/registry/mappings/components/readers/BooleanComponentReader.java

@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2025 GeyserMC. http://geysermc.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @author GeyserMC
+ * @link https://github.com/GeyserMC/Geyser
+ */
+
+package org.geysermc.geyser.registry.mappings.components.readers;
+
+import com.google.gson.JsonPrimitive;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.geysermc.geyser.api.item.custom.v2.component.DataComponent;
+import org.geysermc.geyser.item.exception.InvalidCustomMappingsFileException;
+import org.geysermc.geyser.registry.mappings.util.NodeReader;
+
+public class BooleanComponentReader extends PrimitiveComponentReader<Boolean> {
+
+    public BooleanComponentReader(DataComponent<Boolean> type) {
+        super(type);
+    }
+
+    @Override
+    protected Boolean readValue(@NonNull JsonPrimitive primitive, String... context) throws InvalidCustomMappingsFileException {
+        return NodeReader.BOOLEAN.read(primitive, "reading component", context);
+    }
+}

core/src/main/java/org/geysermc/geyser/registry/mappings/components/readers/IntComponentReader.java

@@ -25,15 +25,13 @@
 
 package org.geysermc.geyser.registry.mappings.components.readers;
 
-import com.google.gson.JsonElement;
 import com.google.gson.JsonPrimitive;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.geysermc.geyser.api.item.custom.v2.component.DataComponent;
 import org.geysermc.geyser.item.exception.InvalidCustomMappingsFileException;
-import org.geysermc.geyser.registry.mappings.components.DataComponentReader;
 import org.geysermc.geyser.registry.mappings.util.NodeReader;
 
-public class IntComponentReader extends DataComponentReader<Integer> {
+public class IntComponentReader extends PrimitiveComponentReader<Integer> {
     private final int minimum;
     private final int maximum;
 
@@ -48,10 +46,7 @@ public IntComponentReader(DataComponent<Integer> type, int minimum) {
     }
 
     @Override
-    protected Integer readDataComponent(@NonNull JsonElement element, String... context) throws InvalidCustomMappingsFileException {
-        if (!element.isJsonPrimitive()) {
-            throw new InvalidCustomMappingsFileException("reading component", "value must be a primitive", context);
-        }
-        return NodeReader.boundedInt(minimum, maximum).read((JsonPrimitive) element, "reading component", context);
+    protected Integer readValue(@NonNull JsonPrimitive primitive, String... context) throws InvalidCustomMappingsFileException {
+        return NodeReader.boundedInt(minimum, maximum).read(primitive, "reading component", context);
     }
 }

core/src/main/java/org/geysermc/geyser/registry/mappings/components/readers/PrimitiveComponentReader.java

@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2025 GeyserMC. http://geysermc.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @author GeyserMC
+ * @link https://github.com/GeyserMC/Geyser
+ */
+
+package org.geysermc.geyser.registry.mappings.components.readers;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonPrimitive;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.geysermc.geyser.api.item.custom.v2.component.DataComponent;
+import org.geysermc.geyser.item.exception.InvalidCustomMappingsFileException;
+import org.geysermc.geyser.registry.mappings.components.DataComponentReader;
+
+public abstract class PrimitiveComponentReader<V> extends DataComponentReader<V> {
+
+    protected PrimitiveComponentReader(DataComponent<V> type) {
+        super(type);
+    }
+
+    protected abstract V readValue(@NonNull JsonPrimitive primitive, String... context) throws InvalidCustomMappingsFileException;
+
+    @Override
+    protected V readDataComponent(@NonNull JsonElement element, String... context) throws InvalidCustomMappingsFileException {
+        if (!element.isJsonPrimitive()) {
+            throw new InvalidCustomMappingsFileException("reading component", "value must be a primitive", context);
+        }
+        return readValue((JsonPrimitive) element, context);
+    }
+}