refactor(loot): rename serializers

auioc · Apr 4, 2022 · 678e841 · 678e841
1 parent 926dd1a
commit 678e841
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/src/main/java/org/auioc/mods/arnicalib/server/loot/AHLootItemConditions.java b/src/main/java/org/auioc/mods/arnicalib/server/loot/AHLootItemConditions.java
@@ -17,6 +17,6 @@ private static RegistryObject<LootItemConditionType> register(String id, Seriali
         return LOOT_CONDITION_TYPES.register(id, () -> new LootItemConditionType(serializer));
     }
 
-    public static final RegistryObject<LootItemConditionType> MOD_LOADED = register("mod_loaded", new ModLoadedCondition.SerializerX());
+    public static final RegistryObject<LootItemConditionType> MOD_LOADED = register("mod_loaded", new ModLoadedCondition.Serializer());
 
 }
diff --git a/src/main/java/org/auioc/mods/arnicalib/server/loot/AHLootItemFunctions.java b/src/main/java/org/auioc/mods/arnicalib/server/loot/AHLootItemFunctions.java
@@ -18,7 +18,7 @@ private static RegistryObject<LootItemFunctionType> register(String id, Serializ
         return LOOT_FUNCTION_TYPES.register(id, () -> new LootItemFunctionType(serializer));
     }
 
-    public static final RegistryObject<LootItemFunctionType> SET_RANDOM_POTION = register("set_random_potion", new SetRandomPotionFunction.SerializerX());
-    public static final RegistryObject<LootItemFunctionType> SET_CUSTOM_EFFECTS = register("set_custom_effects", new SetCustomEffectsFunction.SerializerX());
+    public static final RegistryObject<LootItemFunctionType> SET_RANDOM_POTION = register("set_random_potion", new SetRandomPotionFunction.Serializer());
+    public static final RegistryObject<LootItemFunctionType> SET_CUSTOM_EFFECTS = register("set_custom_effects", new SetCustomEffectsFunction.Serializer());
 
 }
diff --git a/src/main/java/org/auioc/mods/arnicalib/server/loot/function/SetCustomEffectsFunction.java b/src/main/java/org/auioc/mods/arnicalib/server/loot/function/SetCustomEffectsFunction.java
@@ -39,7 +39,7 @@ protected ItemStack run(ItemStack stack, LootContext ctx) {
     }
 
 
-    public static class SerializerX extends Serializer<SetCustomEffectsFunction> {
+    public static class Serializer extends LootItemConditionalFunction.Serializer<SetCustomEffectsFunction> {
 
         public void serialize(JsonObject json, SetCustomEffectsFunction instance, JsonSerializationContext ctx) {}
 

diff --git a/src/main/java/org/auioc/mods/arnicalib/server/loot/function/SetRandomPotionFunction.java b/src/main/java/org/auioc/mods/arnicalib/server/loot/function/SetRandomPotionFunction.java
@@ -62,7 +62,7 @@ private static Potion getRandomPotion() {
     }
 
 
-    public static class SerializerX extends Serializer<SetRandomPotionFunction> {
+    public static class Serializer extends LootItemConditionalFunction.Serializer<SetRandomPotionFunction> {
 
         public void serialize(JsonObject json, SetRandomPotionFunction instance, JsonSerializationContext ctx) {}
 

diff --git a/src/main/java/org/auioc/mods/arnicalib/server/loot/predicate/ModLoadedCondition.java b/src/main/java/org/auioc/mods/arnicalib/server/loot/predicate/ModLoadedCondition.java
@@ -6,7 +6,6 @@
 import org.auioc.mods.arnicalib.server.loot.AHLootItemConditions;
 import net.minecraft.util.GsonHelper;
 import net.minecraft.world.level.storage.loot.LootContext;
-import net.minecraft.world.level.storage.loot.Serializer;
 import net.minecraft.world.level.storage.loot.predicates.LootItemCondition;
 import net.minecraft.world.level.storage.loot.predicates.LootItemConditionType;
 import net.minecraftforge.fml.ModList;
@@ -30,7 +29,7 @@ public LootItemConditionType getType() {
     }
 
 
-    public static class SerializerX implements Serializer<ModLoadedCondition> {
+    public static class Serializer implements net.minecraft.world.level.storage.loot.Serializer<ModLoadedCondition> {
 
         @Override
         public void serialize(JsonObject json, ModLoadedCondition instance, JsonSerializationContext ctx) {}