From 1d80ac1b5d1ef69ace93f8485a9320a132481fd3 Mon Sep 17 00:00:00 2001
From: Lounode <lounode@gmail.com>
Date: Tue, 17 Sep 2024 04:02:47 +0800
Subject: [PATCH] bug: 'lore' not 'item_lore'

---
 .idea/misc.xml                                            | 2 +-
 .../libraries/datacomponent/nms/v1_20_R4/CodecImpl.java   | 2 +-
 .../libraries/datacomponent/nms/v1_20_R4/Converters.java  | 2 +-
 .../datacomponent/nms/v1_20_R4/DataComponentTypeImpl.java | 8 ++++----
 .../libraries/datacomponent/nms/v1_20_R4/NMSImpl.java     | 2 +-
 .../libraries/datacomponent/nms/v1_21_R1/CodecImpl.java   | 2 +-
 .../libraries/datacomponent/nms/v1_21_R1/Converters.java  | 2 +-
 .../datacomponent/nms/v1_21_R1/DataComponentTypeImpl.java | 8 ++++----
 .../libraries/datacomponent/nms/v1_21_R1/NMSImpl.java     | 2 +-
 9 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index f0c744c..5cd9a10 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="temurin-21" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="21" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/nms/v1_20_R4/src/main/java/kr/toxicity/libraries/datacomponent/nms/v1_20_R4/CodecImpl.java b/nms/v1_20_R4/src/main/java/kr/toxicity/libraries/datacomponent/nms/v1_20_R4/CodecImpl.java
index 3940559..228d017 100644
--- a/nms/v1_20_R4/src/main/java/kr/toxicity/libraries/datacomponent/nms/v1_20_R4/CodecImpl.java
+++ b/nms/v1_20_R4/src/main/java/kr/toxicity/libraries/datacomponent/nms/v1_20_R4/CodecImpl.java
@@ -32,7 +32,7 @@ final class CodecImpl<T> implements kr.toxicity.libraries.datacomponent.api.Code
     private static final RegistryOps<JsonElement> OPS = RegistryAccess.fromRegistryOfRegistries(BuiltInRegistries.REGISTRY).createSerializationContext(JsonOps.INSTANCE);
 
     static final CodecImpl<Component> COMPONENT = of(ComponentSerialization.CODEC, t -> t.stream().count() == 1 && t.getStyle().isEmpty() && t.getContents() instanceof PlainTextContents textContents ? new JsonPrimitive(textContents.text()) : new JsonObject());
-    static final CodecImpl<ItemLore> ITEM_LORE = of(ItemLore.CODEC, t -> new JsonArray());
+    static final CodecImpl<ItemLore> LORE = of(ItemLore.CODEC, t -> new JsonArray());
     static final CodecImpl<Rarity> RARITY = of(Rarity.CODEC, t -> new JsonPrimitive(t.name().toLowerCase()));
     static final CodecImpl<Unit> UNIT = of(Codec.unit(Unit.INSTANCE), t -> new JsonPrimitive(true));
     static final CodecImpl<AdventureModePredicate> ADVENTURE_MODE_PREDICATE = of(AdventureModePredicate.CODEC, t -> new JsonObject());
diff --git a/nms/v1_20_R4/src/main/java/kr/toxicity/libraries/datacomponent/nms/v1_20_R4/Converters.java b/nms/v1_20_R4/src/main/java/kr/toxicity/libraries/datacomponent/nms/v1_20_R4/Converters.java
index 8ca16ca..d9bc38b 100644
--- a/nms/v1_20_R4/src/main/java/kr/toxicity/libraries/datacomponent/nms/v1_20_R4/Converters.java
+++ b/nms/v1_20_R4/src/main/java/kr/toxicity/libraries/datacomponent/nms/v1_20_R4/Converters.java
@@ -348,7 +348,7 @@ public net.minecraft.world.effect.MobEffectInstance asVanilla(@NotNull MobEffect
             )
     );
 
-    static final Converter<ItemLore, net.minecraft.world.item.component.ItemLore> ITEM_LORE = Converter.of(
+    static final Converter<ItemLore, net.minecraft.world.item.component.ItemLore> LORE = Converter.of(
             l -> new net.minecraft.world.item.component.ItemLore(
                     l.lines().stream().map(COMPONENT::asVanilla).toList(),
                     l.styledLines().stream().map(COMPONENT::asVanilla).toList()
diff --git a/nms/v1_20_R4/src/main/java/kr/toxicity/libraries/datacomponent/nms/v1_20_R4/DataComponentTypeImpl.java b/nms/v1_20_R4/src/main/java/kr/toxicity/libraries/datacomponent/nms/v1_20_R4/DataComponentTypeImpl.java
index d9eddb8..3a00700 100644
--- a/nms/v1_20_R4/src/main/java/kr/toxicity/libraries/datacomponent/nms/v1_20_R4/DataComponentTypeImpl.java
+++ b/nms/v1_20_R4/src/main/java/kr/toxicity/libraries/datacomponent/nms/v1_20_R4/DataComponentTypeImpl.java
@@ -74,11 +74,11 @@ final class DataComponentTypeImpl<T, R> implements kr.toxicity.libraries.datacom
             Converters.COMPONENT,
             CodecImpl.COMPONENT
     );
-    static final DataComponentTypeImpl<ItemLore, net.minecraft.world.item.component.ItemLore> ITEM_LORE = register(
-            "item_lore",
+    static final DataComponentTypeImpl<ItemLore, net.minecraft.world.item.component.ItemLore> LORE = register(
+            "lore",
             DataComponents.LORE,
-            Converters.ITEM_LORE,
-            CodecImpl.ITEM_LORE
+            Converters.LORE,
+            CodecImpl.LORE
     );
     static final DataComponentTypeImpl<Rarity, net.minecraft.world.item.Rarity> RARITY = register(
             "rarity",
diff --git a/nms/v1_20_R4/src/main/java/kr/toxicity/libraries/datacomponent/nms/v1_20_R4/NMSImpl.java b/nms/v1_20_R4/src/main/java/kr/toxicity/libraries/datacomponent/nms/v1_20_R4/NMSImpl.java
index 8a3bedc..61067d8 100644
--- a/nms/v1_20_R4/src/main/java/kr/toxicity/libraries/datacomponent/nms/v1_20_R4/NMSImpl.java
+++ b/nms/v1_20_R4/src/main/java/kr/toxicity/libraries/datacomponent/nms/v1_20_R4/NMSImpl.java
@@ -55,7 +55,7 @@ public final class NMSImpl implements NMS {
 
     @Override
     public @NotNull DataComponentType<ItemLore> lore() {
-        return DataComponentTypeImpl.ITEM_LORE;
+        return DataComponentTypeImpl.LORE;
     }
 
     @Override
diff --git a/nms/v1_21_R1/src/main/java/kr/toxicity/libraries/datacomponent/nms/v1_21_R1/CodecImpl.java b/nms/v1_21_R1/src/main/java/kr/toxicity/libraries/datacomponent/nms/v1_21_R1/CodecImpl.java
index f4b36a5..73cce44 100644
--- a/nms/v1_21_R1/src/main/java/kr/toxicity/libraries/datacomponent/nms/v1_21_R1/CodecImpl.java
+++ b/nms/v1_21_R1/src/main/java/kr/toxicity/libraries/datacomponent/nms/v1_21_R1/CodecImpl.java
@@ -32,7 +32,7 @@ final class CodecImpl<T> implements kr.toxicity.libraries.datacomponent.api.Code
     private static final RegistryOps<JsonElement> OPS = RegistryAccess.fromRegistryOfRegistries(BuiltInRegistries.REGISTRY).createSerializationContext(JsonOps.INSTANCE);
 
     static final CodecImpl<Component> COMPONENT = of(ComponentSerialization.CODEC, t -> t.stream().count() == 1 && t.getStyle().isEmpty() && t.getContents() instanceof PlainTextContents textContents ? new JsonPrimitive(textContents.text()) : new JsonObject());
-    static final CodecImpl<ItemLore> ITEM_LORE = of(ItemLore.CODEC, t -> new JsonArray());
+    static final CodecImpl<ItemLore> LORE = of(ItemLore.CODEC, t -> new JsonArray());
     static final CodecImpl<Rarity> RARITY = of(Rarity.CODEC, t -> new JsonPrimitive(t.name().toLowerCase()));
     static final CodecImpl<Unit> UNIT = of(Codec.unit(Unit.INSTANCE), t -> new JsonPrimitive(true));
     static final CodecImpl<AdventureModePredicate> ADVENTURE_MODE_PREDICATE = of(AdventureModePredicate.CODEC, t -> new JsonObject());
diff --git a/nms/v1_21_R1/src/main/java/kr/toxicity/libraries/datacomponent/nms/v1_21_R1/Converters.java b/nms/v1_21_R1/src/main/java/kr/toxicity/libraries/datacomponent/nms/v1_21_R1/Converters.java
index 2563659..b434369 100644
--- a/nms/v1_21_R1/src/main/java/kr/toxicity/libraries/datacomponent/nms/v1_21_R1/Converters.java
+++ b/nms/v1_21_R1/src/main/java/kr/toxicity/libraries/datacomponent/nms/v1_21_R1/Converters.java
@@ -348,7 +348,7 @@ public net.minecraft.world.effect.MobEffectInstance asVanilla(@NotNull MobEffect
             )
     );
 
-    static final Converter<ItemLore, net.minecraft.world.item.component.ItemLore> ITEM_LORE = Converter.of(
+    static final Converter<ItemLore, net.minecraft.world.item.component.ItemLore> LORE = Converter.of(
             l -> new net.minecraft.world.item.component.ItemLore(
                     l.lines().stream().map(COMPONENT::asVanilla).toList(),
                     l.styledLines().stream().map(COMPONENT::asVanilla).toList()
diff --git a/nms/v1_21_R1/src/main/java/kr/toxicity/libraries/datacomponent/nms/v1_21_R1/DataComponentTypeImpl.java b/nms/v1_21_R1/src/main/java/kr/toxicity/libraries/datacomponent/nms/v1_21_R1/DataComponentTypeImpl.java
index cc5c0af..eec5391 100644
--- a/nms/v1_21_R1/src/main/java/kr/toxicity/libraries/datacomponent/nms/v1_21_R1/DataComponentTypeImpl.java
+++ b/nms/v1_21_R1/src/main/java/kr/toxicity/libraries/datacomponent/nms/v1_21_R1/DataComponentTypeImpl.java
@@ -74,11 +74,11 @@ final class DataComponentTypeImpl<T, R> implements kr.toxicity.libraries.datacom
             Converters.COMPONENT,
             CodecImpl.COMPONENT
     );
-    static final DataComponentTypeImpl<ItemLore, net.minecraft.world.item.component.ItemLore> ITEM_LORE = register(
-            "item_lore",
+    static final DataComponentTypeImpl<ItemLore, net.minecraft.world.item.component.ItemLore> LORE = register(
+            "lore",
             DataComponents.LORE,
-            Converters.ITEM_LORE,
-            CodecImpl.ITEM_LORE
+            Converters.LORE,
+            CodecImpl.LORE
     );
     static final DataComponentTypeImpl<Rarity, net.minecraft.world.item.Rarity> RARITY = register(
             "rarity",
diff --git a/nms/v1_21_R1/src/main/java/kr/toxicity/libraries/datacomponent/nms/v1_21_R1/NMSImpl.java b/nms/v1_21_R1/src/main/java/kr/toxicity/libraries/datacomponent/nms/v1_21_R1/NMSImpl.java
index eb7c284..3a634b4 100644
--- a/nms/v1_21_R1/src/main/java/kr/toxicity/libraries/datacomponent/nms/v1_21_R1/NMSImpl.java
+++ b/nms/v1_21_R1/src/main/java/kr/toxicity/libraries/datacomponent/nms/v1_21_R1/NMSImpl.java
@@ -55,7 +55,7 @@ public final class NMSImpl implements NMS {
 
     @Override
     public @NotNull DataComponentType<ItemLore> lore() {
-        return DataComponentTypeImpl.ITEM_LORE;
+        return DataComponentTypeImpl.LORE;
     }
 
     @Override