From b72be6e4034f3e6dc85fe28dcd4357c20f3aa123 Mon Sep 17 00:00:00 2001 From: Sollace Date: Thu, 3 Oct 2024 15:35:28 +0100 Subject: [PATCH] Move serialisation-related utils to the serialization package --- .../minelittlepony/unicopia/ability/AbilityDispatcher.java | 2 +- .../unicopia/ability/data/tree/TreeTypeLoader.java | 2 +- .../minelittlepony/unicopia/ability/magic/MultiSpellSlot.java | 2 +- .../unicopia/ability/magic/SingleSpellSlot.java | 3 ++- .../com/minelittlepony/unicopia/ability/magic/SpellSlots.java | 2 +- .../unicopia/ability/magic/spell/PlacementControlSpell.java | 2 +- .../minelittlepony/unicopia/ability/magic/spell/Spell.java | 2 +- .../unicopia/ability/magic/spell/SpellReference.java | 2 +- .../unicopia/ability/magic/spell/TimedSpell.java | 2 +- .../ability/magic/spell/crafting/IngredientWithSpell.java | 2 +- .../ability/magic/spell/crafting/SpellCraftingRecipe.java | 2 +- .../unicopia/ability/magic/spell/effect/HydrophobicSpell.java | 4 ++-- .../unicopia/ability/magic/spell/effect/MindSwapSpell.java | 2 +- .../unicopia/ability/magic/spell/trait/TraitDiscovery.java | 2 +- .../unicopia/advancement/CustomEventCriterion.java | 2 +- .../minelittlepony/unicopia/advancement/RacePredicate.java | 2 +- .../advancement/SendViaDragonBreathScrollCriterion.java | 2 +- .../com/minelittlepony/unicopia/block/FruitBearingBlock.java | 2 +- .../minelittlepony/unicopia/block/GoldenOakLeavesBlock.java | 2 +- .../java/com/minelittlepony/unicopia/block/GrowableBlock.java | 2 +- .../java/com/minelittlepony/unicopia/block/HiveBlock.java | 4 ++-- src/main/java/com/minelittlepony/unicopia/block/PieBlock.java | 2 +- .../com/minelittlepony/unicopia/block/SegmentedCropBlock.java | 2 +- .../java/com/minelittlepony/unicopia/block/SproutBlock.java | 2 +- .../java/com/minelittlepony/unicopia/block/ThornBlock.java | 2 +- .../minelittlepony/unicopia/block/cloud/CloudSlabBlock.java | 2 +- .../unicopia/block/cloud/NaturalCloudBlock.java | 2 +- .../unicopia/block/cloud/PoreousCloudBlock.java | 2 +- .../unicopia/block/cloud/PoreousCloudStairsBlock.java | 2 +- .../minelittlepony/unicopia/block/cloud/SoggyCloudBlock.java | 2 +- .../unicopia/block/cloud/SoggyCloudSlabBlock.java | 2 +- .../unicopia/block/cloud/SoggyCloudStairsBlock.java | 2 +- .../unicopia/block/cloud/WaterloggableCloudBlock.java | 2 +- .../unicopia/block/jar/FluidOnlyJarContents.java | 2 +- .../minelittlepony/unicopia/block/jar/ItemsJarContents.java | 2 +- .../com/minelittlepony/unicopia/entity/EntityReference.java | 3 ++- src/main/java/com/minelittlepony/unicopia/entity/Equine.java | 2 +- .../java/com/minelittlepony/unicopia/entity/ItemTracker.java | 1 + src/main/java/com/minelittlepony/unicopia/entity/Physics.java | 2 +- .../unicopia/entity/behaviour/EntityAppearance.java | 2 +- .../minelittlepony/unicopia/entity/behaviour/Inventory.java | 2 +- .../minelittlepony/unicopia/entity/mob/ButterflyEntity.java | 2 +- .../unicopia/entity/mob/FloatingArtefactEntity.java | 2 +- .../minelittlepony/unicopia/entity/mob/SpellbookEntity.java | 3 ++- .../com/minelittlepony/unicopia/entity/player/Acrobatics.java | 3 ++- .../minelittlepony/unicopia/entity/player/ManaContainer.java | 3 ++- .../unicopia/entity/player/PlayerCharmTracker.java | 2 +- .../minelittlepony/unicopia/entity/player/PlayerPhysics.java | 1 + .../minelittlepony/unicopia/item/component/Appearance.java | 2 +- .../unicopia/particle/LightningBoltParticleEffect.java | 2 +- .../unicopia/particle/SphereParticleEffect.java | 2 +- .../java/com/minelittlepony/unicopia/particle/WeakTarget.java | 2 +- .../java/com/minelittlepony/unicopia/server/world/Altar.java | 2 +- .../java/com/minelittlepony/unicopia/server/world/Ether.java | 2 +- .../unicopia/server/world/UnicopiaWorldProperties.java | 4 ++-- .../minelittlepony/unicopia/server/world/WorldOverlay.java | 2 +- .../unicopia/util/{ => serialization}/CodecUtils.java | 2 +- .../minelittlepony/unicopia/util/serialization/NbtMap.java | 1 - .../unicopia/util/{ => serialization}/NbtSerialisable.java | 2 +- 59 files changed, 66 insertions(+), 60 deletions(-) rename src/main/java/com/minelittlepony/unicopia/util/{ => serialization}/CodecUtils.java (98%) rename src/main/java/com/minelittlepony/unicopia/util/{ => serialization}/NbtSerialisable.java (99%) diff --git a/src/main/java/com/minelittlepony/unicopia/ability/AbilityDispatcher.java b/src/main/java/com/minelittlepony/unicopia/ability/AbilityDispatcher.java index e2b95348..b0efd262 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/AbilityDispatcher.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/AbilityDispatcher.java @@ -13,8 +13,8 @@ import com.minelittlepony.unicopia.ability.data.Hit; import com.minelittlepony.unicopia.entity.player.Pony; import com.minelittlepony.unicopia.network.MsgPlayerAbility; import com.minelittlepony.unicopia.network.Channel; -import com.minelittlepony.unicopia.util.NbtSerialisable; import com.minelittlepony.unicopia.util.Tickable; +import com.minelittlepony.unicopia.util.serialization.NbtSerialisable; import net.minecraft.nbt.NbtCompound; import net.minecraft.registry.RegistryWrapper.WrapperLookup; diff --git a/src/main/java/com/minelittlepony/unicopia/ability/data/tree/TreeTypeLoader.java b/src/main/java/com/minelittlepony/unicopia/ability/data/tree/TreeTypeLoader.java index b1561b2d..d5b9e588 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/data/tree/TreeTypeLoader.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/data/tree/TreeTypeLoader.java @@ -4,9 +4,9 @@ import java.util.*; import java.util.function.Supplier; import com.google.gson.JsonElement; import com.minelittlepony.unicopia.Unicopia; -import com.minelittlepony.unicopia.util.CodecUtils; import com.minelittlepony.unicopia.util.Resources; import com.minelittlepony.unicopia.util.Weighted; +import com.minelittlepony.unicopia.util.serialization.CodecUtils; import com.mojang.serialization.Codec; import com.mojang.serialization.JsonOps; import com.mojang.serialization.codecs.RecordCodecBuilder; diff --git a/src/main/java/com/minelittlepony/unicopia/ability/magic/MultiSpellSlot.java b/src/main/java/com/minelittlepony/unicopia/ability/magic/MultiSpellSlot.java index 7c1b5c83..a01432bd 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/magic/MultiSpellSlot.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/magic/MultiSpellSlot.java @@ -15,7 +15,7 @@ import com.minelittlepony.unicopia.network.track.ObjectTracker; import com.minelittlepony.unicopia.network.track.Trackable; import com.minelittlepony.unicopia.network.track.TrackableObject; import com.minelittlepony.unicopia.network.track.MsgTrackedValues.TrackerEntries; -import com.minelittlepony.unicopia.util.NbtSerialisable; +import com.minelittlepony.unicopia.util.serialization.NbtSerialisable; import io.netty.buffer.Unpooled; import net.minecraft.nbt.NbtCompound; diff --git a/src/main/java/com/minelittlepony/unicopia/ability/magic/SingleSpellSlot.java b/src/main/java/com/minelittlepony/unicopia/ability/magic/SingleSpellSlot.java index 02c0124c..8d5023dd 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/magic/SingleSpellSlot.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/magic/SingleSpellSlot.java @@ -7,7 +7,8 @@ import org.jetbrains.annotations.Nullable; import com.minelittlepony.unicopia.ability.magic.spell.Spell; import com.minelittlepony.unicopia.network.track.Trackable; -import com.minelittlepony.unicopia.util.NbtSerialisable; +import com.minelittlepony.unicopia.util.serialization.NbtSerialisable; + import net.minecraft.nbt.NbtCompound; import net.minecraft.registry.RegistryWrapper.WrapperLookup; diff --git a/src/main/java/com/minelittlepony/unicopia/ability/magic/SpellSlots.java b/src/main/java/com/minelittlepony/unicopia/ability/magic/SpellSlots.java index 32a70f87..7f61e141 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/magic/SpellSlots.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/magic/SpellSlots.java @@ -8,7 +8,7 @@ import org.jetbrains.annotations.Nullable; import com.minelittlepony.unicopia.ability.magic.spell.Spell; import com.minelittlepony.unicopia.util.Copyable; -import com.minelittlepony.unicopia.util.NbtSerialisable; +import com.minelittlepony.unicopia.util.serialization.NbtSerialisable; public interface SpellSlots extends NbtSerialisable, Copyable { static SpellInventory ofUnbounded(Caster caster) { diff --git a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/PlacementControlSpell.java b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/PlacementControlSpell.java index e0507901..faf26441 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/PlacementControlSpell.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/PlacementControlSpell.java @@ -12,7 +12,7 @@ import com.minelittlepony.unicopia.entity.mob.CastSpellEntity; import com.minelittlepony.unicopia.network.track.DataTracker; import com.minelittlepony.unicopia.network.track.TrackableDataType; import com.minelittlepony.unicopia.server.world.Ether; -import com.minelittlepony.unicopia.util.NbtSerialisable; +import com.minelittlepony.unicopia.util.serialization.NbtSerialisable; import net.minecraft.nbt.NbtCompound; import net.minecraft.nbt.NbtElement; diff --git a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/Spell.java b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/Spell.java index 76278fd1..34ea7dac 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/Spell.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/Spell.java @@ -15,7 +15,7 @@ import com.minelittlepony.unicopia.ability.magic.spell.effect.CustomisedSpellTyp import com.minelittlepony.unicopia.ability.magic.spell.effect.SpellType; import com.minelittlepony.unicopia.network.track.DataTracker; import com.minelittlepony.unicopia.server.world.Ether; -import com.minelittlepony.unicopia.util.NbtSerialisable; +import com.minelittlepony.unicopia.util.serialization.NbtSerialisable; import net.minecraft.nbt.NbtCompound; import net.minecraft.registry.RegistryWrapper.WrapperLookup; diff --git a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/SpellReference.java b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/SpellReference.java index 39255734..d9308384 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/SpellReference.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/SpellReference.java @@ -8,7 +8,7 @@ import org.jetbrains.annotations.Nullable; import com.minelittlepony.unicopia.ability.magic.Caster; import com.minelittlepony.unicopia.ability.magic.SpellPredicate; -import com.minelittlepony.unicopia.util.NbtSerialisable; +import com.minelittlepony.unicopia.util.serialization.NbtSerialisable; import net.minecraft.nbt.NbtCompound; import net.minecraft.registry.RegistryWrapper.WrapperLookup; diff --git a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/TimedSpell.java b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/TimedSpell.java index 78695f74..d1c9dcc2 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/TimedSpell.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/TimedSpell.java @@ -4,8 +4,8 @@ import com.minelittlepony.unicopia.ability.magic.spell.attribute.AttributeFormat import com.minelittlepony.unicopia.ability.magic.spell.attribute.SpellAttribute; import com.minelittlepony.unicopia.ability.magic.spell.attribute.SpellAttributeType; import com.minelittlepony.unicopia.ability.magic.spell.trait.Trait; -import com.minelittlepony.unicopia.util.NbtSerialisable; import com.minelittlepony.unicopia.util.Tickable; +import com.minelittlepony.unicopia.util.serialization.NbtSerialisable; import net.minecraft.nbt.NbtCompound; import net.minecraft.registry.RegistryWrapper.WrapperLookup; diff --git a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/crafting/IngredientWithSpell.java b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/crafting/IngredientWithSpell.java index f866d317..6bda1ecb 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/crafting/IngredientWithSpell.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/crafting/IngredientWithSpell.java @@ -9,7 +9,7 @@ import java.util.function.Supplier; import com.google.common.base.Suppliers; import com.minelittlepony.unicopia.ability.magic.spell.effect.SpellType; import com.minelittlepony.unicopia.item.EnchantableItem; -import com.minelittlepony.unicopia.util.CodecUtils; +import com.minelittlepony.unicopia.util.serialization.CodecUtils; import com.mojang.datafixers.util.Pair; import com.mojang.serialization.Codec; diff --git a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/crafting/SpellCraftingRecipe.java b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/crafting/SpellCraftingRecipe.java index 76d1ef1a..ba58462c 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/crafting/SpellCraftingRecipe.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/crafting/SpellCraftingRecipe.java @@ -10,8 +10,8 @@ import com.minelittlepony.unicopia.ability.magic.spell.trait.SpellTraits; import com.minelittlepony.unicopia.container.inventory.SpellbookInventory; import com.minelittlepony.unicopia.item.EnchantableItem; import com.minelittlepony.unicopia.recipe.URecipes; -import com.minelittlepony.unicopia.util.CodecUtils; import com.minelittlepony.unicopia.util.InventoryUtil; +import com.minelittlepony.unicopia.util.serialization.CodecUtils; import com.mojang.datafixers.util.Pair; import com.mojang.serialization.Codec; import com.mojang.serialization.MapCodec; diff --git a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/HydrophobicSpell.java b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/HydrophobicSpell.java index 1c98db3b..3c0660b4 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/HydrophobicSpell.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/HydrophobicSpell.java @@ -17,8 +17,8 @@ import com.minelittlepony.unicopia.entity.player.Pony; import com.minelittlepony.unicopia.particle.UParticles; import com.minelittlepony.unicopia.projectile.MagicProjectileEntity; import com.minelittlepony.unicopia.server.world.Ether; -import com.minelittlepony.unicopia.util.CodecUtils; -import com.minelittlepony.unicopia.util.NbtSerialisable; +import com.minelittlepony.unicopia.util.serialization.CodecUtils; +import com.minelittlepony.unicopia.util.serialization.NbtSerialisable; import com.minelittlepony.unicopia.util.shape.*; import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; diff --git a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/MindSwapSpell.java b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/MindSwapSpell.java index 14d6a960..2aace703 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/MindSwapSpell.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/MindSwapSpell.java @@ -19,7 +19,7 @@ import com.minelittlepony.unicopia.item.AlicornAmuletItem; import com.minelittlepony.unicopia.item.UItems; import com.minelittlepony.unicopia.projectile.MagicProjectileEntity; import com.minelittlepony.unicopia.projectile.ProjectileDelegate; -import com.minelittlepony.unicopia.util.NbtSerialisable; +import com.minelittlepony.unicopia.util.serialization.NbtSerialisable; import net.fabricmc.fabric.api.entity.FakePlayer; import net.minecraft.entity.Entity; diff --git a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/trait/TraitDiscovery.java b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/trait/TraitDiscovery.java index 37392c61..b901b986 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/trait/TraitDiscovery.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/trait/TraitDiscovery.java @@ -15,7 +15,7 @@ import com.minelittlepony.unicopia.network.Channel; import com.minelittlepony.unicopia.network.MsgMarkTraitRead; import com.minelittlepony.unicopia.network.MsgUnlockTraits; import com.minelittlepony.unicopia.util.Copyable; -import com.minelittlepony.unicopia.util.NbtSerialisable; +import com.minelittlepony.unicopia.util.serialization.NbtSerialisable; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; diff --git a/src/main/java/com/minelittlepony/unicopia/advancement/CustomEventCriterion.java b/src/main/java/com/minelittlepony/unicopia/advancement/CustomEventCriterion.java index f32109cb..e26564af 100644 --- a/src/main/java/com/minelittlepony/unicopia/advancement/CustomEventCriterion.java +++ b/src/main/java/com/minelittlepony/unicopia/advancement/CustomEventCriterion.java @@ -5,7 +5,7 @@ import java.util.Optional; import org.jetbrains.annotations.Nullable; import com.minelittlepony.unicopia.entity.player.Pony; -import com.minelittlepony.unicopia.util.CodecUtils; +import com.minelittlepony.unicopia.util.serialization.CodecUtils; import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; diff --git a/src/main/java/com/minelittlepony/unicopia/advancement/RacePredicate.java b/src/main/java/com/minelittlepony/unicopia/advancement/RacePredicate.java index ad7f9c44..8c396722 100644 --- a/src/main/java/com/minelittlepony/unicopia/advancement/RacePredicate.java +++ b/src/main/java/com/minelittlepony/unicopia/advancement/RacePredicate.java @@ -5,7 +5,7 @@ import java.util.Set; import java.util.function.Predicate; import com.minelittlepony.unicopia.Race; import com.minelittlepony.unicopia.entity.player.Pony; -import com.minelittlepony.unicopia.util.CodecUtils; +import com.minelittlepony.unicopia.util.serialization.CodecUtils; import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; diff --git a/src/main/java/com/minelittlepony/unicopia/advancement/SendViaDragonBreathScrollCriterion.java b/src/main/java/com/minelittlepony/unicopia/advancement/SendViaDragonBreathScrollCriterion.java index 43a10e4f..027481ee 100644 --- a/src/main/java/com/minelittlepony/unicopia/advancement/SendViaDragonBreathScrollCriterion.java +++ b/src/main/java/com/minelittlepony/unicopia/advancement/SendViaDragonBreathScrollCriterion.java @@ -4,7 +4,7 @@ import java.util.Optional; import java.util.function.BiConsumer; import com.minelittlepony.unicopia.entity.player.Pony; -import com.minelittlepony.unicopia.util.CodecUtils; +import com.minelittlepony.unicopia.util.serialization.CodecUtils; import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; diff --git a/src/main/java/com/minelittlepony/unicopia/block/FruitBearingBlock.java b/src/main/java/com/minelittlepony/unicopia/block/FruitBearingBlock.java index 8ffa16c3..14ac1ffe 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/FruitBearingBlock.java +++ b/src/main/java/com/minelittlepony/unicopia/block/FruitBearingBlock.java @@ -8,7 +8,7 @@ import org.jetbrains.annotations.Nullable; import com.minelittlepony.unicopia.USounds; import com.minelittlepony.unicopia.ability.EarthPonyKickAbility.Buckable; import com.minelittlepony.unicopia.compat.seasons.FertilizableUtil; -import com.minelittlepony.unicopia.util.CodecUtils; +import com.minelittlepony.unicopia.util.serialization.CodecUtils; import com.mojang.serialization.Codec; import com.mojang.serialization.MapCodec; import com.mojang.serialization.codecs.RecordCodecBuilder; diff --git a/src/main/java/com/minelittlepony/unicopia/block/GoldenOakLeavesBlock.java b/src/main/java/com/minelittlepony/unicopia/block/GoldenOakLeavesBlock.java index db41ab45..fc3e6be3 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/GoldenOakLeavesBlock.java +++ b/src/main/java/com/minelittlepony/unicopia/block/GoldenOakLeavesBlock.java @@ -2,7 +2,7 @@ package com.minelittlepony.unicopia.block; import java.util.function.Supplier; -import com.minelittlepony.unicopia.util.CodecUtils; +import com.minelittlepony.unicopia.util.serialization.CodecUtils; import com.mojang.serialization.Codec; import com.mojang.serialization.MapCodec; import com.mojang.serialization.codecs.RecordCodecBuilder; diff --git a/src/main/java/com/minelittlepony/unicopia/block/GrowableBlock.java b/src/main/java/com/minelittlepony/unicopia/block/GrowableBlock.java index f4b002cd..8064dcad 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/GrowableBlock.java +++ b/src/main/java/com/minelittlepony/unicopia/block/GrowableBlock.java @@ -3,7 +3,7 @@ package com.minelittlepony.unicopia.block; import java.util.function.Supplier; import com.minelittlepony.unicopia.USounds; -import com.minelittlepony.unicopia.util.CodecUtils; +import com.minelittlepony.unicopia.util.serialization.CodecUtils; import com.mojang.serialization.MapCodec; import com.mojang.serialization.codecs.RecordCodecBuilder; diff --git a/src/main/java/com/minelittlepony/unicopia/block/HiveBlock.java b/src/main/java/com/minelittlepony/unicopia/block/HiveBlock.java index ce8b6db0..cc10b670 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/HiveBlock.java +++ b/src/main/java/com/minelittlepony/unicopia/block/HiveBlock.java @@ -17,9 +17,9 @@ import com.minelittlepony.unicopia.USounds; import com.minelittlepony.unicopia.entity.player.Pony; import com.minelittlepony.unicopia.particle.ParticleUtils; import com.mojang.serialization.MapCodec; -import com.minelittlepony.unicopia.util.NbtSerialisable; -import com.minelittlepony.unicopia.util.NbtSerialisable.Serializer; import com.minelittlepony.unicopia.util.PosHelper; +import com.minelittlepony.unicopia.util.serialization.NbtSerialisable; +import com.minelittlepony.unicopia.util.serialization.NbtSerialisable.Serializer; import net.minecraft.block.Block; import net.minecraft.block.BlockEntityProvider; diff --git a/src/main/java/com/minelittlepony/unicopia/block/PieBlock.java b/src/main/java/com/minelittlepony/unicopia/block/PieBlock.java index 69b5bee4..401d1f8f 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/PieBlock.java +++ b/src/main/java/com/minelittlepony/unicopia/block/PieBlock.java @@ -2,8 +2,8 @@ package com.minelittlepony.unicopia.block; import com.minelittlepony.unicopia.*; import com.minelittlepony.unicopia.item.UItems; -import com.minelittlepony.unicopia.util.CodecUtils; import com.minelittlepony.unicopia.util.SoundEmitter; +import com.minelittlepony.unicopia.util.serialization.CodecUtils; import com.mojang.serialization.MapCodec; import com.mojang.serialization.codecs.RecordCodecBuilder; diff --git a/src/main/java/com/minelittlepony/unicopia/block/SegmentedCropBlock.java b/src/main/java/com/minelittlepony/unicopia/block/SegmentedCropBlock.java index 15dca1e7..d1d98d72 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/SegmentedCropBlock.java +++ b/src/main/java/com/minelittlepony/unicopia/block/SegmentedCropBlock.java @@ -5,7 +5,7 @@ import java.util.function.Supplier; import org.jetbrains.annotations.Nullable; import com.minelittlepony.unicopia.compat.seasons.FertilizableUtil; -import com.minelittlepony.unicopia.util.CodecUtils; +import com.minelittlepony.unicopia.util.serialization.CodecUtils; import com.mojang.serialization.Codec; import com.mojang.serialization.MapCodec; import com.mojang.serialization.codecs.RecordCodecBuilder; diff --git a/src/main/java/com/minelittlepony/unicopia/block/SproutBlock.java b/src/main/java/com/minelittlepony/unicopia/block/SproutBlock.java index 4b6a1659..20168e29 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/SproutBlock.java +++ b/src/main/java/com/minelittlepony/unicopia/block/SproutBlock.java @@ -4,7 +4,7 @@ import java.util.function.Supplier; import org.jetbrains.annotations.Nullable; -import com.minelittlepony.unicopia.util.CodecUtils; +import com.minelittlepony.unicopia.util.serialization.CodecUtils; import com.mojang.serialization.Codec; import com.mojang.serialization.MapCodec; import com.mojang.serialization.codecs.RecordCodecBuilder; diff --git a/src/main/java/com/minelittlepony/unicopia/block/ThornBlock.java b/src/main/java/com/minelittlepony/unicopia/block/ThornBlock.java index 64bb34df..f6fd0395 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/ThornBlock.java +++ b/src/main/java/com/minelittlepony/unicopia/block/ThornBlock.java @@ -4,8 +4,8 @@ import java.util.Collection; import java.util.function.Supplier; import com.minelittlepony.unicopia.ability.EarthPonyGrowAbility; import com.minelittlepony.unicopia.entity.mob.UEntities; -import com.minelittlepony.unicopia.util.CodecUtils; import com.minelittlepony.unicopia.util.VecHelper; +import com.minelittlepony.unicopia.util.serialization.CodecUtils; import com.mojang.serialization.MapCodec; import com.mojang.serialization.codecs.RecordCodecBuilder; diff --git a/src/main/java/com/minelittlepony/unicopia/block/cloud/CloudSlabBlock.java b/src/main/java/com/minelittlepony/unicopia/block/cloud/CloudSlabBlock.java index c445809b..e29282f5 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/cloud/CloudSlabBlock.java +++ b/src/main/java/com/minelittlepony/unicopia/block/cloud/CloudSlabBlock.java @@ -5,7 +5,7 @@ import java.util.function.Supplier; import org.jetbrains.annotations.Nullable; import com.minelittlepony.unicopia.EquineContext; -import com.minelittlepony.unicopia.util.CodecUtils; +import com.minelittlepony.unicopia.util.serialization.CodecUtils; import com.mojang.serialization.Codec; import com.mojang.serialization.MapCodec; import com.mojang.serialization.codecs.RecordCodecBuilder; diff --git a/src/main/java/com/minelittlepony/unicopia/block/cloud/NaturalCloudBlock.java b/src/main/java/com/minelittlepony/unicopia/block/cloud/NaturalCloudBlock.java index 3abc0533..fe00ca9b 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/cloud/NaturalCloudBlock.java +++ b/src/main/java/com/minelittlepony/unicopia/block/cloud/NaturalCloudBlock.java @@ -4,7 +4,7 @@ import java.util.function.Supplier; import org.jetbrains.annotations.Nullable; -import com.minelittlepony.unicopia.util.CodecUtils; +import com.minelittlepony.unicopia.util.serialization.CodecUtils; import com.mojang.serialization.Codec; import com.mojang.serialization.MapCodec; import com.mojang.serialization.codecs.RecordCodecBuilder; diff --git a/src/main/java/com/minelittlepony/unicopia/block/cloud/PoreousCloudBlock.java b/src/main/java/com/minelittlepony/unicopia/block/cloud/PoreousCloudBlock.java index fdc1aaa6..04a21112 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/cloud/PoreousCloudBlock.java +++ b/src/main/java/com/minelittlepony/unicopia/block/cloud/PoreousCloudBlock.java @@ -5,7 +5,7 @@ import java.util.function.Supplier; import org.jetbrains.annotations.Nullable; import com.minelittlepony.unicopia.block.state.StateUtil; -import com.minelittlepony.unicopia.util.CodecUtils; +import com.minelittlepony.unicopia.util.serialization.CodecUtils; import com.mojang.serialization.Codec; import com.mojang.serialization.MapCodec; import com.mojang.serialization.codecs.RecordCodecBuilder; diff --git a/src/main/java/com/minelittlepony/unicopia/block/cloud/PoreousCloudStairsBlock.java b/src/main/java/com/minelittlepony/unicopia/block/cloud/PoreousCloudStairsBlock.java index 1ff03471..63434c5e 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/cloud/PoreousCloudStairsBlock.java +++ b/src/main/java/com/minelittlepony/unicopia/block/cloud/PoreousCloudStairsBlock.java @@ -5,7 +5,7 @@ import java.util.function.Supplier; import org.jetbrains.annotations.Nullable; import com.minelittlepony.unicopia.block.state.StateUtil; -import com.minelittlepony.unicopia.util.CodecUtils; +import com.minelittlepony.unicopia.util.serialization.CodecUtils; import com.mojang.serialization.MapCodec; import com.mojang.serialization.codecs.RecordCodecBuilder; diff --git a/src/main/java/com/minelittlepony/unicopia/block/cloud/SoggyCloudBlock.java b/src/main/java/com/minelittlepony/unicopia/block/cloud/SoggyCloudBlock.java index b21aafad..2cc6fcfe 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/cloud/SoggyCloudBlock.java +++ b/src/main/java/com/minelittlepony/unicopia/block/cloud/SoggyCloudBlock.java @@ -5,7 +5,7 @@ import java.util.function.Supplier; import org.jetbrains.annotations.Nullable; import com.minelittlepony.unicopia.block.state.StateUtil; -import com.minelittlepony.unicopia.util.CodecUtils; +import com.minelittlepony.unicopia.util.serialization.CodecUtils; import com.mojang.serialization.MapCodec; import com.mojang.serialization.codecs.RecordCodecBuilder; diff --git a/src/main/java/com/minelittlepony/unicopia/block/cloud/SoggyCloudSlabBlock.java b/src/main/java/com/minelittlepony/unicopia/block/cloud/SoggyCloudSlabBlock.java index 53d83307..4983effe 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/cloud/SoggyCloudSlabBlock.java +++ b/src/main/java/com/minelittlepony/unicopia/block/cloud/SoggyCloudSlabBlock.java @@ -5,7 +5,7 @@ import java.util.function.Supplier; import org.jetbrains.annotations.Nullable; import com.minelittlepony.unicopia.block.state.StateUtil; -import com.minelittlepony.unicopia.util.CodecUtils; +import com.minelittlepony.unicopia.util.serialization.CodecUtils; import com.mojang.serialization.MapCodec; import com.mojang.serialization.codecs.RecordCodecBuilder; diff --git a/src/main/java/com/minelittlepony/unicopia/block/cloud/SoggyCloudStairsBlock.java b/src/main/java/com/minelittlepony/unicopia/block/cloud/SoggyCloudStairsBlock.java index fe3da5ea..23ce0b8d 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/cloud/SoggyCloudStairsBlock.java +++ b/src/main/java/com/minelittlepony/unicopia/block/cloud/SoggyCloudStairsBlock.java @@ -5,7 +5,7 @@ import java.util.function.Supplier; import org.jetbrains.annotations.Nullable; import com.minelittlepony.unicopia.block.state.StateUtil; -import com.minelittlepony.unicopia.util.CodecUtils; +import com.minelittlepony.unicopia.util.serialization.CodecUtils; import com.mojang.serialization.MapCodec; import com.mojang.serialization.codecs.RecordCodecBuilder; diff --git a/src/main/java/com/minelittlepony/unicopia/block/cloud/WaterloggableCloudBlock.java b/src/main/java/com/minelittlepony/unicopia/block/cloud/WaterloggableCloudBlock.java index 898cf13c..d35aeed0 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/cloud/WaterloggableCloudBlock.java +++ b/src/main/java/com/minelittlepony/unicopia/block/cloud/WaterloggableCloudBlock.java @@ -5,7 +5,7 @@ import java.util.function.Supplier; import org.jetbrains.annotations.Nullable; import com.minelittlepony.unicopia.EquineContext; -import com.minelittlepony.unicopia.util.CodecUtils; +import com.minelittlepony.unicopia.util.serialization.CodecUtils; import com.mojang.serialization.Codec; import com.mojang.serialization.MapCodec; import com.mojang.serialization.codecs.RecordCodecBuilder; diff --git a/src/main/java/com/minelittlepony/unicopia/block/jar/FluidOnlyJarContents.java b/src/main/java/com/minelittlepony/unicopia/block/jar/FluidOnlyJarContents.java index 353450d9..4ab39cf8 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/jar/FluidOnlyJarContents.java +++ b/src/main/java/com/minelittlepony/unicopia/block/jar/FluidOnlyJarContents.java @@ -4,7 +4,7 @@ import com.minelittlepony.unicopia.block.ItemJarBlock.FluidJarContents; import com.minelittlepony.unicopia.block.ItemJarBlock.JarContents; import com.minelittlepony.unicopia.block.ItemJarBlock.TileData; import com.minelittlepony.unicopia.util.FluidHelper; -import com.minelittlepony.unicopia.util.NbtSerialisable; +import com.minelittlepony.unicopia.util.serialization.NbtSerialisable; import net.fabricmc.fabric.api.transfer.v1.fluid.FluidConstants; import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant; diff --git a/src/main/java/com/minelittlepony/unicopia/block/jar/ItemsJarContents.java b/src/main/java/com/minelittlepony/unicopia/block/jar/ItemsJarContents.java index 80d7fc79..5bcb929a 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/jar/ItemsJarContents.java +++ b/src/main/java/com/minelittlepony/unicopia/block/jar/ItemsJarContents.java @@ -10,7 +10,7 @@ import com.minelittlepony.unicopia.block.ItemJarBlock.TileData; import com.minelittlepony.unicopia.item.UItems; import com.minelittlepony.unicopia.mixin.MixinEntityBucketItem; import com.minelittlepony.unicopia.util.FluidHelper; -import com.minelittlepony.unicopia.util.NbtSerialisable; +import com.minelittlepony.unicopia.util.serialization.NbtSerialisable; import com.mojang.serialization.Codec; import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant; diff --git a/src/main/java/com/minelittlepony/unicopia/entity/EntityReference.java b/src/main/java/com/minelittlepony/unicopia/entity/EntityReference.java index 48f05e87..f6e0b5c2 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/EntityReference.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/EntityReference.java @@ -11,7 +11,8 @@ import org.jetbrains.annotations.Nullable; import com.minelittlepony.unicopia.ability.magic.Caster; import com.minelittlepony.unicopia.ability.magic.Levelled; import com.minelittlepony.unicopia.network.track.TrackableObject; -import com.minelittlepony.unicopia.util.NbtSerialisable; +import com.minelittlepony.unicopia.util.serialization.NbtSerialisable; + import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.nbt.NbtCompound; diff --git a/src/main/java/com/minelittlepony/unicopia/entity/Equine.java b/src/main/java/com/minelittlepony/unicopia/entity/Equine.java index a9cf3707..34174181 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/Equine.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/Equine.java @@ -9,8 +9,8 @@ import com.minelittlepony.unicopia.EntityConvertable; import com.minelittlepony.unicopia.EquineContext; import com.minelittlepony.unicopia.Race; import com.minelittlepony.unicopia.projectile.ProjectileImpactListener; -import com.minelittlepony.unicopia.util.NbtSerialisable; import com.minelittlepony.unicopia.util.Tickable; +import com.minelittlepony.unicopia.util.serialization.NbtSerialisable; import net.minecraft.entity.Entity; diff --git a/src/main/java/com/minelittlepony/unicopia/entity/ItemTracker.java b/src/main/java/com/minelittlepony/unicopia/entity/ItemTracker.java index fba69d2c..6877771f 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/ItemTracker.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/ItemTracker.java @@ -9,6 +9,7 @@ import org.jetbrains.annotations.Nullable; import com.minelittlepony.unicopia.compat.trinkets.TrinketsDelegate; import com.minelittlepony.unicopia.entity.player.Pony; import com.minelittlepony.unicopia.util.*; +import com.minelittlepony.unicopia.util.serialization.NbtSerialisable; import net.minecraft.entity.LivingEntity; import net.minecraft.item.ItemConvertible; diff --git a/src/main/java/com/minelittlepony/unicopia/entity/Physics.java b/src/main/java/com/minelittlepony/unicopia/entity/Physics.java index bbc2d1ce..c1bccc04 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/Physics.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/Physics.java @@ -1,6 +1,6 @@ package com.minelittlepony.unicopia.entity; -import com.minelittlepony.unicopia.util.NbtSerialisable; +import com.minelittlepony.unicopia.util.serialization.NbtSerialisable; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; diff --git a/src/main/java/com/minelittlepony/unicopia/entity/behaviour/EntityAppearance.java b/src/main/java/com/minelittlepony/unicopia/entity/behaviour/EntityAppearance.java index ee3d3883..4a335591 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/behaviour/EntityAppearance.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/behaviour/EntityAppearance.java @@ -23,7 +23,7 @@ import com.minelittlepony.unicopia.entity.player.PlayerDimensions; import com.minelittlepony.unicopia.entity.player.Pony; import com.minelittlepony.unicopia.network.track.TrackableObject; import com.minelittlepony.unicopia.projectile.ProjectileUtil; -import com.minelittlepony.unicopia.util.NbtSerialisable; +import com.minelittlepony.unicopia.util.serialization.NbtSerialisable; import com.mojang.authlib.GameProfile; import net.minecraft.block.ShapeContext; diff --git a/src/main/java/com/minelittlepony/unicopia/entity/behaviour/Inventory.java b/src/main/java/com/minelittlepony/unicopia/entity/behaviour/Inventory.java index 911a555e..27f846bf 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/behaviour/Inventory.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/behaviour/Inventory.java @@ -3,7 +3,7 @@ package com.minelittlepony.unicopia.entity.behaviour; import java.util.*; import java.util.function.Consumer; -import com.minelittlepony.unicopia.util.CodecUtils; +import com.minelittlepony.unicopia.util.serialization.CodecUtils; import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; diff --git a/src/main/java/com/minelittlepony/unicopia/entity/mob/ButterflyEntity.java b/src/main/java/com/minelittlepony/unicopia/entity/mob/ButterflyEntity.java index 74eedfe1..b3380d5f 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/mob/ButterflyEntity.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/mob/ButterflyEntity.java @@ -9,7 +9,7 @@ import org.jetbrains.annotations.Nullable; import com.minelittlepony.unicopia.USounds; import com.minelittlepony.unicopia.Unicopia; import com.minelittlepony.unicopia.item.component.BufferflyVariantComponent; -import com.minelittlepony.unicopia.util.NbtSerialisable; +import com.minelittlepony.unicopia.util.serialization.NbtSerialisable; import io.netty.buffer.ByteBuf; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/minelittlepony/unicopia/entity/mob/FloatingArtefactEntity.java b/src/main/java/com/minelittlepony/unicopia/entity/mob/FloatingArtefactEntity.java index 673df0bd..7f937af7 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/mob/FloatingArtefactEntity.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/mob/FloatingArtefactEntity.java @@ -5,7 +5,7 @@ import java.util.Optional; import com.minelittlepony.unicopia.USounds; import com.minelittlepony.unicopia.item.UItems; import com.minelittlepony.unicopia.server.world.Altar; -import com.minelittlepony.unicopia.util.NbtSerialisable; +import com.minelittlepony.unicopia.util.serialization.NbtSerialisable; import net.minecraft.entity.EntityType; import net.minecraft.entity.damage.DamageSource; diff --git a/src/main/java/com/minelittlepony/unicopia/entity/mob/SpellbookEntity.java b/src/main/java/com/minelittlepony/unicopia/entity/mob/SpellbookEntity.java index 6405cdde..2d783a08 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/mob/SpellbookEntity.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/mob/SpellbookEntity.java @@ -17,7 +17,8 @@ import com.minelittlepony.unicopia.network.Channel; import com.minelittlepony.unicopia.network.MsgSpellbookStateChanged; import com.minelittlepony.unicopia.server.world.Altar; import com.minelittlepony.unicopia.util.MeteorlogicalUtil; -import com.minelittlepony.unicopia.util.NbtSerialisable; +import com.minelittlepony.unicopia.util.serialization.NbtSerialisable; + import net.fabricmc.fabric.api.screenhandler.v1.ExtendedScreenHandlerFactory; import net.fabricmc.fabric.api.util.TriState; import net.minecraft.block.Blocks; diff --git a/src/main/java/com/minelittlepony/unicopia/entity/player/Acrobatics.java b/src/main/java/com/minelittlepony/unicopia/entity/player/Acrobatics.java index 2c045abc..e25492dd 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/player/Acrobatics.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/player/Acrobatics.java @@ -9,9 +9,10 @@ import com.minelittlepony.unicopia.client.render.PlayerPoser.Animation.Recipient import com.minelittlepony.unicopia.entity.duck.LivingEntityDuck; import com.minelittlepony.unicopia.network.track.DataTracker; import com.minelittlepony.unicopia.network.track.TrackableDataType; -import com.minelittlepony.unicopia.util.NbtSerialisable; import com.minelittlepony.unicopia.util.PosHelper; import com.minelittlepony.unicopia.util.Tickable; +import com.minelittlepony.unicopia.util.serialization.NbtSerialisable; + import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.block.SideShapeType; diff --git a/src/main/java/com/minelittlepony/unicopia/entity/player/ManaContainer.java b/src/main/java/com/minelittlepony/unicopia/entity/player/ManaContainer.java index 32e1be87..9c984025 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/player/ManaContainer.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/player/ManaContainer.java @@ -6,8 +6,9 @@ import java.util.Map; import com.minelittlepony.unicopia.network.track.DataTracker; import com.minelittlepony.unicopia.network.track.TrackableDataType; import com.minelittlepony.unicopia.util.Copyable; -import com.minelittlepony.unicopia.util.NbtSerialisable; import com.minelittlepony.unicopia.util.Tickable; +import com.minelittlepony.unicopia.util.serialization.NbtSerialisable; + import net.minecraft.nbt.NbtCompound; import net.minecraft.registry.RegistryWrapper.WrapperLookup; import net.minecraft.util.math.MathHelper; diff --git a/src/main/java/com/minelittlepony/unicopia/entity/player/PlayerCharmTracker.java b/src/main/java/com/minelittlepony/unicopia/entity/player/PlayerCharmTracker.java index c613012d..30e38a66 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/player/PlayerCharmTracker.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/player/PlayerCharmTracker.java @@ -8,7 +8,7 @@ import com.minelittlepony.unicopia.ability.magic.spell.effect.CustomisedSpellTyp import com.minelittlepony.unicopia.ability.magic.spell.effect.SpellType; import com.minelittlepony.unicopia.item.EnchantableItem; import com.minelittlepony.unicopia.util.Copyable; -import com.minelittlepony.unicopia.util.NbtSerialisable; +import com.minelittlepony.unicopia.util.serialization.NbtSerialisable; import net.minecraft.nbt.NbtCompound; import net.minecraft.nbt.NbtElement; diff --git a/src/main/java/com/minelittlepony/unicopia/entity/player/PlayerPhysics.java b/src/main/java/com/minelittlepony/unicopia/entity/player/PlayerPhysics.java index 27fd3289..38dc3dbf 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/player/PlayerPhysics.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/player/PlayerPhysics.java @@ -35,6 +35,7 @@ import com.minelittlepony.unicopia.server.world.ModificationType; import com.minelittlepony.unicopia.server.world.UGameRules; import com.minelittlepony.unicopia.server.world.WeatherConditions; import com.minelittlepony.unicopia.util.*; +import com.minelittlepony.unicopia.util.serialization.NbtSerialisable; import net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags; import net.minecraft.block.*; diff --git a/src/main/java/com/minelittlepony/unicopia/item/component/Appearance.java b/src/main/java/com/minelittlepony/unicopia/item/component/Appearance.java index e002891e..48901bb8 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/component/Appearance.java +++ b/src/main/java/com/minelittlepony/unicopia/item/component/Appearance.java @@ -1,6 +1,6 @@ package com.minelittlepony.unicopia.item.component; -import com.minelittlepony.unicopia.util.CodecUtils; +import com.minelittlepony.unicopia.util.serialization.CodecUtils; import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; diff --git a/src/main/java/com/minelittlepony/unicopia/particle/LightningBoltParticleEffect.java b/src/main/java/com/minelittlepony/unicopia/particle/LightningBoltParticleEffect.java index e6cbfe4d..2a7d6ee8 100644 --- a/src/main/java/com/minelittlepony/unicopia/particle/LightningBoltParticleEffect.java +++ b/src/main/java/com/minelittlepony/unicopia/particle/LightningBoltParticleEffect.java @@ -2,7 +2,7 @@ package com.minelittlepony.unicopia.particle; import java.util.Optional; -import com.minelittlepony.unicopia.util.CodecUtils; +import com.minelittlepony.unicopia.util.serialization.CodecUtils; import com.minelittlepony.unicopia.util.serialization.PacketCodecUtils; import com.mojang.serialization.Codec; import com.mojang.serialization.MapCodec; diff --git a/src/main/java/com/minelittlepony/unicopia/particle/SphereParticleEffect.java b/src/main/java/com/minelittlepony/unicopia/particle/SphereParticleEffect.java index 35b0bd1b..2affbc64 100644 --- a/src/main/java/com/minelittlepony/unicopia/particle/SphereParticleEffect.java +++ b/src/main/java/com/minelittlepony/unicopia/particle/SphereParticleEffect.java @@ -3,7 +3,7 @@ package com.minelittlepony.unicopia.particle; import org.joml.Vector3f; import com.minelittlepony.common.util.Color; -import com.minelittlepony.unicopia.util.CodecUtils; +import com.minelittlepony.unicopia.util.serialization.CodecUtils; import com.minelittlepony.unicopia.util.serialization.PacketCodecUtils; import com.mojang.serialization.Codec; import com.mojang.serialization.MapCodec; diff --git a/src/main/java/com/minelittlepony/unicopia/particle/WeakTarget.java b/src/main/java/com/minelittlepony/unicopia/particle/WeakTarget.java index e0b8f512..92c0bf56 100644 --- a/src/main/java/com/minelittlepony/unicopia/particle/WeakTarget.java +++ b/src/main/java/com/minelittlepony/unicopia/particle/WeakTarget.java @@ -2,7 +2,7 @@ package com.minelittlepony.unicopia.particle; import org.jetbrains.annotations.Nullable; -import com.minelittlepony.unicopia.util.CodecUtils; +import com.minelittlepony.unicopia.util.serialization.CodecUtils; import com.minelittlepony.unicopia.util.serialization.PacketCodecUtils; import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; diff --git a/src/main/java/com/minelittlepony/unicopia/server/world/Altar.java b/src/main/java/com/minelittlepony/unicopia/server/world/Altar.java index ac2980c0..e516e15c 100644 --- a/src/main/java/com/minelittlepony/unicopia/server/world/Altar.java +++ b/src/main/java/com/minelittlepony/unicopia/server/world/Altar.java @@ -12,8 +12,8 @@ import com.minelittlepony.unicopia.entity.mob.FloatingArtefactEntity; import com.minelittlepony.unicopia.entity.mob.SpellbookEntity; import com.minelittlepony.unicopia.entity.mob.UEntities; import com.minelittlepony.unicopia.item.UItems; -import com.minelittlepony.unicopia.util.CodecUtils; import com.minelittlepony.unicopia.util.PosHelper; +import com.minelittlepony.unicopia.util.serialization.CodecUtils; import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; diff --git a/src/main/java/com/minelittlepony/unicopia/server/world/Ether.java b/src/main/java/com/minelittlepony/unicopia/server/world/Ether.java index 6ea008b5..9caaf6cd 100644 --- a/src/main/java/com/minelittlepony/unicopia/server/world/Ether.java +++ b/src/main/java/com/minelittlepony/unicopia/server/world/Ether.java @@ -14,8 +14,8 @@ import com.minelittlepony.unicopia.ability.magic.spell.Spell; import com.minelittlepony.unicopia.ability.magic.spell.effect.SpellType; import com.minelittlepony.unicopia.entity.EntityReference; import com.minelittlepony.unicopia.server.world.chunk.PositionalDataMap; -import com.minelittlepony.unicopia.util.NbtSerialisable; import com.minelittlepony.unicopia.util.Tickable; +import com.minelittlepony.unicopia.util.serialization.NbtSerialisable; import net.minecraft.nbt.*; import net.minecraft.registry.RegistryWrapper.WrapperLookup; diff --git a/src/main/java/com/minelittlepony/unicopia/server/world/UnicopiaWorldProperties.java b/src/main/java/com/minelittlepony/unicopia/server/world/UnicopiaWorldProperties.java index 1014538f..2ee40d96 100644 --- a/src/main/java/com/minelittlepony/unicopia/server/world/UnicopiaWorldProperties.java +++ b/src/main/java/com/minelittlepony/unicopia/server/world/UnicopiaWorldProperties.java @@ -6,8 +6,8 @@ import java.util.Set; import com.minelittlepony.unicopia.Race; import com.minelittlepony.unicopia.network.Channel; import com.minelittlepony.unicopia.network.MsgSkyAngle; -import com.minelittlepony.unicopia.util.CodecUtils; -import com.minelittlepony.unicopia.util.NbtSerialisable; +import com.minelittlepony.unicopia.util.serialization.CodecUtils; +import com.minelittlepony.unicopia.util.serialization.NbtSerialisable; import com.mojang.serialization.Codec; import net.minecraft.datafixer.DataFixTypes; diff --git a/src/main/java/com/minelittlepony/unicopia/server/world/WorldOverlay.java b/src/main/java/com/minelittlepony/unicopia/server/world/WorldOverlay.java index 28533115..5e5be7e0 100644 --- a/src/main/java/com/minelittlepony/unicopia/server/world/WorldOverlay.java +++ b/src/main/java/com/minelittlepony/unicopia/server/world/WorldOverlay.java @@ -8,8 +8,8 @@ import java.util.function.*; import org.jetbrains.annotations.Nullable; -import com.minelittlepony.unicopia.util.NbtSerialisable; import com.minelittlepony.unicopia.util.Tickable; +import com.minelittlepony.unicopia.util.serialization.NbtSerialisable; import it.unimi.dsi.fastutil.longs.Long2ObjectMap; import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap; diff --git a/src/main/java/com/minelittlepony/unicopia/util/CodecUtils.java b/src/main/java/com/minelittlepony/unicopia/util/serialization/CodecUtils.java similarity index 98% rename from src/main/java/com/minelittlepony/unicopia/util/CodecUtils.java rename to src/main/java/com/minelittlepony/unicopia/util/serialization/CodecUtils.java index 62a3df7c..5633cf81 100644 --- a/src/main/java/com/minelittlepony/unicopia/util/CodecUtils.java +++ b/src/main/java/com/minelittlepony/unicopia/util/serialization/CodecUtils.java @@ -1,4 +1,4 @@ -package com.minelittlepony.unicopia.util; +package com.minelittlepony.unicopia.util.serialization; import java.util.ArrayList; import java.util.Optional; diff --git a/src/main/java/com/minelittlepony/unicopia/util/serialization/NbtMap.java b/src/main/java/com/minelittlepony/unicopia/util/serialization/NbtMap.java index c8cf57ca..84127d58 100644 --- a/src/main/java/com/minelittlepony/unicopia/util/serialization/NbtMap.java +++ b/src/main/java/com/minelittlepony/unicopia/util/serialization/NbtMap.java @@ -8,7 +8,6 @@ import java.util.function.Supplier; import org.jetbrains.annotations.Nullable; -import com.minelittlepony.unicopia.util.NbtSerialisable; import com.mojang.serialization.Codec; import net.minecraft.nbt.NbtCompound; diff --git a/src/main/java/com/minelittlepony/unicopia/util/NbtSerialisable.java b/src/main/java/com/minelittlepony/unicopia/util/serialization/NbtSerialisable.java similarity index 99% rename from src/main/java/com/minelittlepony/unicopia/util/NbtSerialisable.java rename to src/main/java/com/minelittlepony/unicopia/util/serialization/NbtSerialisable.java index 1eb18fdc..a48674e0 100644 --- a/src/main/java/com/minelittlepony/unicopia/util/NbtSerialisable.java +++ b/src/main/java/com/minelittlepony/unicopia/util/serialization/NbtSerialisable.java @@ -1,4 +1,4 @@ -package com.minelittlepony.unicopia.util; +package com.minelittlepony.unicopia.util.serialization; import java.util.*; import java.util.function.*;