From ffe27326e3f757b05ccd4ac9cca559b995c63c4d Mon Sep 17 00:00:00 2001 From: nossr50 Date: Tue, 4 Jun 2019 19:33:29 -0700 Subject: [PATCH] Move serializers --- src/main/java/com/gmail/nossr50/config/ConfigManager.java | 1 + .../hocon/{ => serializers}/CustomEnumValueSerializer.java | 3 ++- .../CustomEnumValueSerializerPartyFeature.java | 2 +- .../config/hocon/{ => serializers}/CustomXPPerkSerializer.java | 2 +- .../hocon/{ => serializers}/DamagePropertySerializer.java | 2 +- .../{ => serializers}/MinecraftMaterialWrapperSerializer.java | 2 +- .../config/hocon/{ => serializers}/RepairableSerializer.java | 2 +- .../config/hocon/{ => serializers}/SalvageableSerializer.java | 2 +- .../config/hocon/{ => serializers}/SkillCeilingSerializer.java | 2 +- .../hocon/{ => serializers}/SkillRankPropertySerializer.java | 2 +- 10 files changed, 11 insertions(+), 9 deletions(-) rename src/main/java/com/gmail/nossr50/config/hocon/{ => serializers}/CustomEnumValueSerializer.java (94%) rename src/main/java/com/gmail/nossr50/config/hocon/{ => serializers}/CustomEnumValueSerializerPartyFeature.java (96%) rename src/main/java/com/gmail/nossr50/config/hocon/{ => serializers}/CustomXPPerkSerializer.java (98%) rename src/main/java/com/gmail/nossr50/config/hocon/{ => serializers}/DamagePropertySerializer.java (96%) rename src/main/java/com/gmail/nossr50/config/hocon/{ => serializers}/MinecraftMaterialWrapperSerializer.java (96%) rename src/main/java/com/gmail/nossr50/config/hocon/{ => serializers}/RepairableSerializer.java (98%) rename src/main/java/com/gmail/nossr50/config/hocon/{ => serializers}/SalvageableSerializer.java (98%) rename src/main/java/com/gmail/nossr50/config/hocon/{ => serializers}/SkillCeilingSerializer.java (96%) rename src/main/java/com/gmail/nossr50/config/hocon/{ => serializers}/SkillRankPropertySerializer.java (97%) diff --git a/src/main/java/com/gmail/nossr50/config/ConfigManager.java b/src/main/java/com/gmail/nossr50/config/ConfigManager.java index 1686d5241..f9aa52d7a 100644 --- a/src/main/java/com/gmail/nossr50/config/ConfigManager.java +++ b/src/main/java/com/gmail/nossr50/config/ConfigManager.java @@ -21,6 +21,7 @@ import com.gmail.nossr50.config.hocon.party.ConfigParty; import com.gmail.nossr50.config.hocon.party.data.ConfigPartyData; import com.gmail.nossr50.config.hocon.playerleveling.ConfigLeveling; import com.gmail.nossr50.config.hocon.scoreboard.ConfigScoreboard; +import com.gmail.nossr50.config.hocon.serializers.*; import com.gmail.nossr50.config.hocon.skills.acrobatics.ConfigAcrobatics; import com.gmail.nossr50.config.hocon.skills.alchemy.ConfigAlchemy; import com.gmail.nossr50.config.hocon.skills.archery.ConfigArchery; diff --git a/src/main/java/com/gmail/nossr50/config/hocon/CustomEnumValueSerializer.java b/src/main/java/com/gmail/nossr50/config/hocon/serializers/CustomEnumValueSerializer.java similarity index 94% rename from src/main/java/com/gmail/nossr50/config/hocon/CustomEnumValueSerializer.java rename to src/main/java/com/gmail/nossr50/config/hocon/serializers/CustomEnumValueSerializer.java index 60557e423..13c2c1851 100644 --- a/src/main/java/com/gmail/nossr50/config/hocon/CustomEnumValueSerializer.java +++ b/src/main/java/com/gmail/nossr50/config/hocon/serializers/CustomEnumValueSerializer.java @@ -1,5 +1,6 @@ -package com.gmail.nossr50.config.hocon; +package com.gmail.nossr50.config.hocon.serializers; +import com.gmail.nossr50.config.hocon.HOCONUtil; import com.google.common.reflect.TypeToken; import ninja.leaping.configurate.ConfigurationNode; import ninja.leaping.configurate.objectmapping.ObjectMappingException; diff --git a/src/main/java/com/gmail/nossr50/config/hocon/CustomEnumValueSerializerPartyFeature.java b/src/main/java/com/gmail/nossr50/config/hocon/serializers/CustomEnumValueSerializerPartyFeature.java similarity index 96% rename from src/main/java/com/gmail/nossr50/config/hocon/CustomEnumValueSerializerPartyFeature.java rename to src/main/java/com/gmail/nossr50/config/hocon/serializers/CustomEnumValueSerializerPartyFeature.java index 8929edc66..988cf6350 100644 --- a/src/main/java/com/gmail/nossr50/config/hocon/CustomEnumValueSerializerPartyFeature.java +++ b/src/main/java/com/gmail/nossr50/config/hocon/serializers/CustomEnumValueSerializerPartyFeature.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon; +package com.gmail.nossr50.config.hocon.serializers; import com.google.common.reflect.TypeToken; import ninja.leaping.configurate.ConfigurationNode; diff --git a/src/main/java/com/gmail/nossr50/config/hocon/CustomXPPerkSerializer.java b/src/main/java/com/gmail/nossr50/config/hocon/serializers/CustomXPPerkSerializer.java similarity index 98% rename from src/main/java/com/gmail/nossr50/config/hocon/CustomXPPerkSerializer.java rename to src/main/java/com/gmail/nossr50/config/hocon/serializers/CustomXPPerkSerializer.java index b8d152a78..6b3cd8222 100644 --- a/src/main/java/com/gmail/nossr50/config/hocon/CustomXPPerkSerializer.java +++ b/src/main/java/com/gmail/nossr50/config/hocon/serializers/CustomXPPerkSerializer.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon; +package com.gmail.nossr50.config.hocon.serializers; import com.gmail.nossr50.api.exceptions.InvalidSkillException; import com.gmail.nossr50.datatypes.experience.CustomXPPerk; diff --git a/src/main/java/com/gmail/nossr50/config/hocon/DamagePropertySerializer.java b/src/main/java/com/gmail/nossr50/config/hocon/serializers/DamagePropertySerializer.java similarity index 96% rename from src/main/java/com/gmail/nossr50/config/hocon/DamagePropertySerializer.java rename to src/main/java/com/gmail/nossr50/config/hocon/serializers/DamagePropertySerializer.java index 139f5bf9d..c3f837c50 100644 --- a/src/main/java/com/gmail/nossr50/config/hocon/DamagePropertySerializer.java +++ b/src/main/java/com/gmail/nossr50/config/hocon/serializers/DamagePropertySerializer.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon; +package com.gmail.nossr50.config.hocon.serializers; import com.gmail.nossr50.datatypes.skills.properties.AbstractDamageProperty; import com.gmail.nossr50.datatypes.skills.properties.DamageProperty; diff --git a/src/main/java/com/gmail/nossr50/config/hocon/MinecraftMaterialWrapperSerializer.java b/src/main/java/com/gmail/nossr50/config/hocon/serializers/MinecraftMaterialWrapperSerializer.java similarity index 96% rename from src/main/java/com/gmail/nossr50/config/hocon/MinecraftMaterialWrapperSerializer.java rename to src/main/java/com/gmail/nossr50/config/hocon/serializers/MinecraftMaterialWrapperSerializer.java index 75e7563dd..6c6af49e9 100644 --- a/src/main/java/com/gmail/nossr50/config/hocon/MinecraftMaterialWrapperSerializer.java +++ b/src/main/java/com/gmail/nossr50/config/hocon/serializers/MinecraftMaterialWrapperSerializer.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon; +package com.gmail.nossr50.config.hocon.serializers; import com.gmail.nossr50.config.hocon.skills.exampleconfigs.MinecraftMaterialWrapper; import com.google.common.reflect.TypeToken; diff --git a/src/main/java/com/gmail/nossr50/config/hocon/RepairableSerializer.java b/src/main/java/com/gmail/nossr50/config/hocon/serializers/RepairableSerializer.java similarity index 98% rename from src/main/java/com/gmail/nossr50/config/hocon/RepairableSerializer.java rename to src/main/java/com/gmail/nossr50/config/hocon/serializers/RepairableSerializer.java index 68c0988a5..34d6ad731 100644 --- a/src/main/java/com/gmail/nossr50/config/hocon/RepairableSerializer.java +++ b/src/main/java/com/gmail/nossr50/config/hocon/serializers/RepairableSerializer.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon; +package com.gmail.nossr50.config.hocon.serializers; import com.gmail.nossr50.skills.repair.repairables.Repairable; import com.google.common.reflect.TypeToken; diff --git a/src/main/java/com/gmail/nossr50/config/hocon/SalvageableSerializer.java b/src/main/java/com/gmail/nossr50/config/hocon/serializers/SalvageableSerializer.java similarity index 98% rename from src/main/java/com/gmail/nossr50/config/hocon/SalvageableSerializer.java rename to src/main/java/com/gmail/nossr50/config/hocon/serializers/SalvageableSerializer.java index 7808aeb3f..bf4eb237d 100644 --- a/src/main/java/com/gmail/nossr50/config/hocon/SalvageableSerializer.java +++ b/src/main/java/com/gmail/nossr50/config/hocon/serializers/SalvageableSerializer.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon; +package com.gmail.nossr50.config.hocon.serializers; import com.gmail.nossr50.skills.salvage.salvageables.Salvageable; import com.google.common.reflect.TypeToken; diff --git a/src/main/java/com/gmail/nossr50/config/hocon/SkillCeilingSerializer.java b/src/main/java/com/gmail/nossr50/config/hocon/serializers/SkillCeilingSerializer.java similarity index 96% rename from src/main/java/com/gmail/nossr50/config/hocon/SkillCeilingSerializer.java rename to src/main/java/com/gmail/nossr50/config/hocon/serializers/SkillCeilingSerializer.java index 92360440c..1d15dac06 100644 --- a/src/main/java/com/gmail/nossr50/config/hocon/SkillCeilingSerializer.java +++ b/src/main/java/com/gmail/nossr50/config/hocon/serializers/SkillCeilingSerializer.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon; +package com.gmail.nossr50.config.hocon.serializers; import com.gmail.nossr50.datatypes.skills.properties.AbstractSkillCeiling; import com.gmail.nossr50.datatypes.skills.properties.SkillCeiling; diff --git a/src/main/java/com/gmail/nossr50/config/hocon/SkillRankPropertySerializer.java b/src/main/java/com/gmail/nossr50/config/hocon/serializers/SkillRankPropertySerializer.java similarity index 97% rename from src/main/java/com/gmail/nossr50/config/hocon/SkillRankPropertySerializer.java rename to src/main/java/com/gmail/nossr50/config/hocon/serializers/SkillRankPropertySerializer.java index 021e8ad98..911981e90 100644 --- a/src/main/java/com/gmail/nossr50/config/hocon/SkillRankPropertySerializer.java +++ b/src/main/java/com/gmail/nossr50/config/hocon/serializers/SkillRankPropertySerializer.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.config.hocon; +package com.gmail.nossr50.config.hocon.serializers; import com.gmail.nossr50.config.hocon.skills.ranks.SkillRankProperty; import com.gmail.nossr50.mcMMO;