diff --git a/src/main/java/com/minelittlepony/unicopia/InteractionManager.java b/src/main/java/com/minelittlepony/unicopia/InteractionManager.java index ec1d0696..7578967b 100644 --- a/src/main/java/com/minelittlepony/unicopia/InteractionManager.java +++ b/src/main/java/com/minelittlepony/unicopia/InteractionManager.java @@ -7,8 +7,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import com.minelittlepony.unicopia.ability.magic.CasterView; -import com.minelittlepony.unicopia.block.data.Ether; import com.minelittlepony.unicopia.entity.player.dummy.DummyPlayerEntity; +import com.minelittlepony.unicopia.server.world.Ether; import com.mojang.authlib.GameProfile; import net.minecraft.entity.Entity; diff --git a/src/main/java/com/minelittlepony/unicopia/Unicopia.java b/src/main/java/com/minelittlepony/unicopia/Unicopia.java index 6b708b49..5cff6b58 100644 --- a/src/main/java/com/minelittlepony/unicopia/Unicopia.java +++ b/src/main/java/com/minelittlepony/unicopia/Unicopia.java @@ -30,6 +30,10 @@ import com.minelittlepony.unicopia.item.UItems; import com.minelittlepony.unicopia.item.enchantment.UEnchantments; import com.minelittlepony.unicopia.network.Channel; import com.minelittlepony.unicopia.particle.UParticles; +import com.minelittlepony.unicopia.server.world.BlockDestructionManager; +import com.minelittlepony.unicopia.server.world.UGameRules; +import com.minelittlepony.unicopia.server.world.WeatherConditions; +import com.minelittlepony.unicopia.server.world.ZapAppleStageStore; public class Unicopia implements ModInitializer { public static final String DEFAULT_NAMESPACE = "unicopia"; diff --git a/src/main/java/com/minelittlepony/unicopia/ability/EarthPonyKickAbility.java b/src/main/java/com/minelittlepony/unicopia/ability/EarthPonyKickAbility.java index d967d940..58cfcf32 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/EarthPonyKickAbility.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/EarthPonyKickAbility.java @@ -9,13 +9,13 @@ import com.minelittlepony.unicopia.Race; import com.minelittlepony.unicopia.ability.data.Hit; import com.minelittlepony.unicopia.ability.data.Pos; import com.minelittlepony.unicopia.ability.data.tree.TreeType; -import com.minelittlepony.unicopia.block.data.BlockDestructionManager; import com.minelittlepony.unicopia.client.minelittlepony.MineLPDelegate; import com.minelittlepony.unicopia.client.render.PlayerPoser.Animation; import com.minelittlepony.unicopia.entity.Living; import com.minelittlepony.unicopia.entity.player.Pony; import com.minelittlepony.unicopia.particle.ParticleUtils; import com.minelittlepony.unicopia.particle.UParticles; +import com.minelittlepony.unicopia.server.world.BlockDestructionManager; import com.minelittlepony.unicopia.util.*; import net.minecraft.block.BeehiveBlock; diff --git a/src/main/java/com/minelittlepony/unicopia/ability/EarthPonyStompAbility.java b/src/main/java/com/minelittlepony/unicopia/ability/EarthPonyStompAbility.java index 62f28443..3370336a 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/EarthPonyStompAbility.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/EarthPonyStompAbility.java @@ -4,7 +4,6 @@ import org.jetbrains.annotations.Nullable; import com.minelittlepony.unicopia.Race; import com.minelittlepony.unicopia.ability.data.Hit; -import com.minelittlepony.unicopia.block.data.BlockDestructionManager; import com.minelittlepony.unicopia.client.render.PlayerPoser.Animation; import com.minelittlepony.unicopia.entity.Living; import com.minelittlepony.unicopia.entity.player.Pony; @@ -12,6 +11,7 @@ import com.minelittlepony.unicopia.item.UItems; import com.minelittlepony.unicopia.item.enchantment.UEnchantments; import com.minelittlepony.unicopia.particle.ParticleUtils; import com.minelittlepony.unicopia.particle.UParticles; +import com.minelittlepony.unicopia.server.world.BlockDestructionManager; import com.minelittlepony.unicopia.util.MagicalDamageSource; import com.minelittlepony.unicopia.util.PosHelper; diff --git a/src/main/java/com/minelittlepony/unicopia/ability/magic/Caster.java b/src/main/java/com/minelittlepony/unicopia/ability/magic/Caster.java index e3dd13ee..a69ca0d3 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/magic/Caster.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/magic/Caster.java @@ -8,9 +8,9 @@ import org.jetbrains.annotations.Nullable; import com.minelittlepony.unicopia.*; import com.minelittlepony.unicopia.ability.magic.spell.effect.SpellType; -import com.minelittlepony.unicopia.block.data.ModificationType; import com.minelittlepony.unicopia.entity.*; import com.minelittlepony.unicopia.particle.ParticleSource; +import com.minelittlepony.unicopia.server.world.ModificationType; import com.minelittlepony.unicopia.util.SoundEmitter; import com.minelittlepony.unicopia.util.VecHelper; diff --git a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/PlaceableSpell.java b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/PlaceableSpell.java index 5b94fac7..8c68fff7 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/PlaceableSpell.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/PlaceableSpell.java @@ -6,7 +6,6 @@ import org.jetbrains.annotations.Nullable; import com.minelittlepony.unicopia.ability.magic.Caster; import com.minelittlepony.unicopia.ability.magic.spell.effect.CustomisedSpellType; -import com.minelittlepony.unicopia.block.data.Ether; import com.minelittlepony.unicopia.entity.CastSpellEntity; import com.minelittlepony.unicopia.entity.EntityReference; import com.minelittlepony.unicopia.entity.UEntities; @@ -14,6 +13,7 @@ import com.minelittlepony.unicopia.particle.OrientedBillboardParticleEffect; import com.minelittlepony.unicopia.particle.ParticleHandle; import com.minelittlepony.unicopia.particle.UParticles; import com.minelittlepony.unicopia.particle.ParticleHandle.Attachment; +import com.minelittlepony.unicopia.server.world.Ether; import net.minecraft.nbt.*; import net.minecraft.registry.*; diff --git a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/RainboomAbilitySpell.java b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/RainboomAbilitySpell.java index bc291791..2da08cbf 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/RainboomAbilitySpell.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/RainboomAbilitySpell.java @@ -3,10 +3,10 @@ package com.minelittlepony.unicopia.ability.magic.spell; import com.minelittlepony.unicopia.UTags; import com.minelittlepony.unicopia.ability.magic.Caster; import com.minelittlepony.unicopia.ability.magic.spell.effect.*; -import com.minelittlepony.unicopia.block.data.ModificationType; import com.minelittlepony.unicopia.entity.player.Pony; import com.minelittlepony.unicopia.particle.ParticleHandle; import com.minelittlepony.unicopia.particle.ParticleHandle.Attachment; +import com.minelittlepony.unicopia.server.world.ModificationType; import com.minelittlepony.unicopia.particle.UParticles; import com.minelittlepony.unicopia.util.MagicalDamageSource; import com.minelittlepony.unicopia.util.shape.Shape; diff --git a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/PortalSpell.java b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/PortalSpell.java index 1e407dac..5ba08dfb 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/PortalSpell.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/PortalSpell.java @@ -8,11 +8,11 @@ import com.minelittlepony.unicopia.ability.magic.Caster; import com.minelittlepony.unicopia.ability.magic.spell.*; import com.minelittlepony.unicopia.ability.magic.spell.trait.SpellTraits; import com.minelittlepony.unicopia.ability.magic.spell.trait.Trait; -import com.minelittlepony.unicopia.block.data.Ether; import com.minelittlepony.unicopia.entity.CastSpellEntity; import com.minelittlepony.unicopia.entity.EntityReference; import com.minelittlepony.unicopia.particle.*; import com.minelittlepony.unicopia.particle.ParticleHandle.Attachment; +import com.minelittlepony.unicopia.server.world.Ether; import com.minelittlepony.unicopia.util.shape.*; import net.minecraft.block.Block; diff --git a/src/main/java/com/minelittlepony/unicopia/block/WeatherVaneBlock.java b/src/main/java/com/minelittlepony/unicopia/block/WeatherVaneBlock.java index 068fb951..00e85be6 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/WeatherVaneBlock.java +++ b/src/main/java/com/minelittlepony/unicopia/block/WeatherVaneBlock.java @@ -3,7 +3,7 @@ package com.minelittlepony.unicopia.block; import org.jetbrains.annotations.Nullable; import com.minelittlepony.unicopia.USounds; -import com.minelittlepony.unicopia.block.data.WeatherConditions; +import com.minelittlepony.unicopia.server.world.WeatherConditions; import net.minecraft.block.*; import net.minecraft.block.entity.*; diff --git a/src/main/java/com/minelittlepony/unicopia/block/ZapAppleLeavesBlock.java b/src/main/java/com/minelittlepony/unicopia/block/ZapAppleLeavesBlock.java index aa4a0732..fb53b47d 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/ZapAppleLeavesBlock.java +++ b/src/main/java/com/minelittlepony/unicopia/block/ZapAppleLeavesBlock.java @@ -2,8 +2,9 @@ package com.minelittlepony.unicopia.block; import org.jetbrains.annotations.Nullable; -import com.minelittlepony.unicopia.block.data.ZapAppleStageStore; import com.minelittlepony.unicopia.entity.player.Pony; +import com.minelittlepony.unicopia.server.world.ZapAppleStageStore; + import net.minecraft.block.*; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.fluid.Fluid; diff --git a/src/main/java/com/minelittlepony/unicopia/client/ClientBlockDestructionManager.java b/src/main/java/com/minelittlepony/unicopia/client/ClientBlockDestructionManager.java index 0a23d123..07fd40f8 100644 --- a/src/main/java/com/minelittlepony/unicopia/client/ClientBlockDestructionManager.java +++ b/src/main/java/com/minelittlepony/unicopia/client/ClientBlockDestructionManager.java @@ -2,7 +2,7 @@ package com.minelittlepony.unicopia.client; import java.util.SortedSet; import com.google.common.collect.Sets; -import com.minelittlepony.unicopia.block.data.BlockDestructionManager; +import com.minelittlepony.unicopia.server.world.BlockDestructionManager; import it.unimi.dsi.fastutil.longs.Long2ObjectMap; import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap; diff --git a/src/main/java/com/minelittlepony/unicopia/client/ClientInteractionManager.java b/src/main/java/com/minelittlepony/unicopia/client/ClientInteractionManager.java index 1c635855..760c4d1d 100644 --- a/src/main/java/com/minelittlepony/unicopia/client/ClientInteractionManager.java +++ b/src/main/java/com/minelittlepony/unicopia/client/ClientInteractionManager.java @@ -11,13 +11,13 @@ import com.minelittlepony.unicopia.FlightType; import com.minelittlepony.unicopia.InteractionManager; import com.minelittlepony.unicopia.USounds; import com.minelittlepony.unicopia.ability.magic.CasterView; -import com.minelittlepony.unicopia.block.data.Ether; import com.minelittlepony.unicopia.client.gui.DismissSpellScreen; import com.minelittlepony.unicopia.client.gui.spellbook.ClientChapters; import com.minelittlepony.unicopia.client.sound.*; import com.minelittlepony.unicopia.entity.player.PlayerPhysics; import com.minelittlepony.unicopia.entity.player.Pony; import com.minelittlepony.unicopia.entity.player.dummy.DummyClientPlayerEntity; +import com.minelittlepony.unicopia.server.world.Ether; import com.mojang.authlib.GameProfile; import net.minecraft.client.MinecraftClient; diff --git a/src/main/java/com/minelittlepony/unicopia/client/gui/SettingsScreen.java b/src/main/java/com/minelittlepony/unicopia/client/gui/SettingsScreen.java index 8a0ccd25..39c6775b 100644 --- a/src/main/java/com/minelittlepony/unicopia/client/gui/SettingsScreen.java +++ b/src/main/java/com/minelittlepony/unicopia/client/gui/SettingsScreen.java @@ -8,6 +8,7 @@ import com.minelittlepony.common.client.gui.element.*; import com.minelittlepony.common.client.gui.style.Style; import com.minelittlepony.unicopia.*; import com.minelittlepony.unicopia.client.minelittlepony.MineLPDelegate; +import com.minelittlepony.unicopia.server.world.WorldTribeManager; import com.minelittlepony.unicopia.util.RegistryIndexer; import net.fabricmc.loader.api.FabricLoader; diff --git a/src/main/java/com/minelittlepony/unicopia/command/WorldTribeCommand.java b/src/main/java/com/minelittlepony/unicopia/command/WorldTribeCommand.java index c6ab172f..b166abd2 100644 --- a/src/main/java/com/minelittlepony/unicopia/command/WorldTribeCommand.java +++ b/src/main/java/com/minelittlepony/unicopia/command/WorldTribeCommand.java @@ -1,7 +1,7 @@ package com.minelittlepony.unicopia.command; import com.minelittlepony.unicopia.Race; -import com.minelittlepony.unicopia.WorldTribeManager; +import com.minelittlepony.unicopia.server.world.WorldTribeManager; import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.builder.LiteralArgumentBuilder; import com.mojang.brigadier.exceptions.CommandSyntaxException; diff --git a/src/main/java/com/minelittlepony/unicopia/entity/Living.java b/src/main/java/com/minelittlepony/unicopia/entity/Living.java index 15a3404a..bb69a035 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/Living.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/Living.java @@ -16,7 +16,6 @@ import com.minelittlepony.unicopia.ability.magic.SpellPredicate; import com.minelittlepony.unicopia.ability.magic.SpellContainer.Operation; import com.minelittlepony.unicopia.ability.magic.spell.Situation; import com.minelittlepony.unicopia.advancement.UCriteria; -import com.minelittlepony.unicopia.block.data.DragonBreathStore; import com.minelittlepony.unicopia.entity.duck.LivingEntityDuck; import com.minelittlepony.unicopia.entity.effect.UEffects; import com.minelittlepony.unicopia.entity.player.Pony; @@ -28,6 +27,7 @@ import com.minelittlepony.unicopia.network.datasync.EffectSync; import com.minelittlepony.unicopia.network.datasync.Transmittable; import com.minelittlepony.unicopia.particle.ParticleUtils; import com.minelittlepony.unicopia.projectile.ProjectileImpactListener; +import com.minelittlepony.unicopia.server.world.DragonBreathStore; import com.minelittlepony.unicopia.trinkets.TrinketsDelegate; import com.minelittlepony.unicopia.util.*; 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 9a642bf9..1da42ea1 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/player/PlayerPhysics.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/player/PlayerPhysics.java @@ -4,8 +4,6 @@ import com.minelittlepony.unicopia.*; import com.minelittlepony.unicopia.ability.magic.SpellPredicate; import com.minelittlepony.unicopia.ability.magic.spell.effect.SpellType; import com.minelittlepony.unicopia.advancement.UCriteria; -import com.minelittlepony.unicopia.block.data.ModificationType; -import com.minelittlepony.unicopia.block.data.WeatherConditions; import com.minelittlepony.unicopia.client.minelittlepony.MineLPDelegate; import com.minelittlepony.unicopia.client.render.PlayerPoser.Animation; import com.minelittlepony.unicopia.entity.*; @@ -18,6 +16,9 @@ import com.minelittlepony.unicopia.item.UItems; import com.minelittlepony.unicopia.item.enchantment.UEnchantments; import com.minelittlepony.unicopia.particle.*; import com.minelittlepony.unicopia.projectile.ProjectileUtil; +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 net.minecraft.block.*; diff --git a/src/main/java/com/minelittlepony/unicopia/entity/player/Pony.java b/src/main/java/com/minelittlepony/unicopia/entity/player/Pony.java index 939492bb..9a3c9d7f 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/player/Pony.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/player/Pony.java @@ -24,6 +24,7 @@ import com.minelittlepony.unicopia.item.UItems; import com.minelittlepony.unicopia.util.*; import com.minelittlepony.unicopia.network.*; import com.minelittlepony.unicopia.network.datasync.EffectSync.UpdateCallback; +import com.minelittlepony.unicopia.server.world.UGameRules; import com.minelittlepony.unicopia.trinkets.TrinketsDelegate; import com.minelittlepony.common.util.animation.LinearInterpolator; import com.google.common.collect.Streams; diff --git a/src/main/java/com/minelittlepony/unicopia/item/DragonBreathScrollItem.java b/src/main/java/com/minelittlepony/unicopia/item/DragonBreathScrollItem.java index 545fdc06..36f5c11b 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/DragonBreathScrollItem.java +++ b/src/main/java/com/minelittlepony/unicopia/item/DragonBreathScrollItem.java @@ -4,7 +4,7 @@ import java.util.UUID; import com.minelittlepony.unicopia.USounds; import com.minelittlepony.unicopia.advancement.UCriteria; -import com.minelittlepony.unicopia.block.data.DragonBreathStore; +import com.minelittlepony.unicopia.server.world.DragonBreathStore; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; diff --git a/src/main/java/com/minelittlepony/unicopia/mixin/MixinServerWorld.java b/src/main/java/com/minelittlepony/unicopia/mixin/MixinServerWorld.java index 49edc53c..456c8c25 100644 --- a/src/main/java/com/minelittlepony/unicopia/mixin/MixinServerWorld.java +++ b/src/main/java/com/minelittlepony/unicopia/mixin/MixinServerWorld.java @@ -5,7 +5,7 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import com.minelittlepony.unicopia.block.data.BlockDestructionManager; +import com.minelittlepony.unicopia.server.world.BlockDestructionManager; import net.minecraft.block.BlockState; import net.minecraft.server.world.ServerWorld; diff --git a/src/main/java/com/minelittlepony/unicopia/mixin/MixinStateManager.java b/src/main/java/com/minelittlepony/unicopia/mixin/MixinStateManager.java index b72467ba..c31f2822 100644 --- a/src/main/java/com/minelittlepony/unicopia/mixin/MixinStateManager.java +++ b/src/main/java/com/minelittlepony/unicopia/mixin/MixinStateManager.java @@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import com.minelittlepony.unicopia.block.data.WaterLoggingManager; +import com.minelittlepony.unicopia.server.world.WaterLoggingManager; import net.minecraft.block.*; import net.minecraft.fluid.FluidState; diff --git a/src/main/java/com/minelittlepony/unicopia/mixin/MixinWorld.java b/src/main/java/com/minelittlepony/unicopia/mixin/MixinWorld.java index f5c7bb6f..8708fe0e 100644 --- a/src/main/java/com/minelittlepony/unicopia/mixin/MixinWorld.java +++ b/src/main/java/com/minelittlepony/unicopia/mixin/MixinWorld.java @@ -13,9 +13,9 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.ModifyVariable; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import com.minelittlepony.unicopia.block.data.BlockDestructionManager; import com.minelittlepony.unicopia.entity.collision.EntityCollisions; import com.minelittlepony.unicopia.entity.duck.RotatedView; +import com.minelittlepony.unicopia.server.world.BlockDestructionManager; import net.minecraft.block.BlockState; import net.minecraft.entity.Entity; diff --git a/src/main/java/com/minelittlepony/unicopia/network/Channel.java b/src/main/java/com/minelittlepony/unicopia/network/Channel.java index 3340b0bf..ecec7f6a 100644 --- a/src/main/java/com/minelittlepony/unicopia/network/Channel.java +++ b/src/main/java/com/minelittlepony/unicopia/network/Channel.java @@ -2,6 +2,7 @@ package com.minelittlepony.unicopia.network; import com.minelittlepony.unicopia.*; import com.minelittlepony.unicopia.entity.player.Pony; +import com.minelittlepony.unicopia.server.world.WorldTribeManager; import com.sollace.fabwork.api.packets.*; import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents; diff --git a/src/main/java/com/minelittlepony/unicopia/network/MsgRequestSpeciesChange.java b/src/main/java/com/minelittlepony/unicopia/network/MsgRequestSpeciesChange.java index 239503b0..d5e702fa 100644 --- a/src/main/java/com/minelittlepony/unicopia/network/MsgRequestSpeciesChange.java +++ b/src/main/java/com/minelittlepony/unicopia/network/MsgRequestSpeciesChange.java @@ -2,6 +2,8 @@ package com.minelittlepony.unicopia.network; import com.minelittlepony.unicopia.*; import com.minelittlepony.unicopia.entity.player.Pony; +import com.minelittlepony.unicopia.server.world.UGameRules; +import com.minelittlepony.unicopia.server.world.WorldTribeManager; import com.sollace.fabwork.api.packets.HandledPacket; import net.minecraft.network.PacketByteBuf; diff --git a/src/main/java/com/minelittlepony/unicopia/block/data/BlockDestructionManager.java b/src/main/java/com/minelittlepony/unicopia/server/world/BlockDestructionManager.java similarity index 98% rename from src/main/java/com/minelittlepony/unicopia/block/data/BlockDestructionManager.java rename to src/main/java/com/minelittlepony/unicopia/server/world/BlockDestructionManager.java index 665ab81c..974abaef 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/data/BlockDestructionManager.java +++ b/src/main/java/com/minelittlepony/unicopia/server/world/BlockDestructionManager.java @@ -1,4 +1,4 @@ -package com.minelittlepony.unicopia.block.data; +package com.minelittlepony.unicopia.server.world; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/com/minelittlepony/unicopia/block/data/DragonBreathStore.java b/src/main/java/com/minelittlepony/unicopia/server/world/DragonBreathStore.java similarity index 98% rename from src/main/java/com/minelittlepony/unicopia/block/data/DragonBreathStore.java rename to src/main/java/com/minelittlepony/unicopia/server/world/DragonBreathStore.java index 2e0f8e0b..0ea7eb60 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/data/DragonBreathStore.java +++ b/src/main/java/com/minelittlepony/unicopia/server/world/DragonBreathStore.java @@ -1,4 +1,4 @@ -package com.minelittlepony.unicopia.block.data; +package com.minelittlepony.unicopia.server.world; import java.util.*; diff --git a/src/main/java/com/minelittlepony/unicopia/block/data/Ether.java b/src/main/java/com/minelittlepony/unicopia/server/world/Ether.java similarity index 99% rename from src/main/java/com/minelittlepony/unicopia/block/data/Ether.java rename to src/main/java/com/minelittlepony/unicopia/server/world/Ether.java index 8df42fe1..82a8d802 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/data/Ether.java +++ b/src/main/java/com/minelittlepony/unicopia/server/world/Ether.java @@ -1,4 +1,4 @@ -package com.minelittlepony.unicopia.block.data; +package com.minelittlepony.unicopia.server.world; import java.util.*; diff --git a/src/main/java/com/minelittlepony/unicopia/block/data/ModificationType.java b/src/main/java/com/minelittlepony/unicopia/server/world/ModificationType.java similarity index 83% rename from src/main/java/com/minelittlepony/unicopia/block/data/ModificationType.java rename to src/main/java/com/minelittlepony/unicopia/server/world/ModificationType.java index a19a962a..09833311 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/data/ModificationType.java +++ b/src/main/java/com/minelittlepony/unicopia/server/world/ModificationType.java @@ -1,4 +1,4 @@ -package com.minelittlepony.unicopia.block.data; +package com.minelittlepony.unicopia.server.world; public enum ModificationType { MAGICAL, diff --git a/src/main/java/com/minelittlepony/unicopia/UGameRules.java b/src/main/java/com/minelittlepony/unicopia/server/world/UGameRules.java similarity index 94% rename from src/main/java/com/minelittlepony/unicopia/UGameRules.java rename to src/main/java/com/minelittlepony/unicopia/server/world/UGameRules.java index 8b6cea3f..561f35a3 100644 --- a/src/main/java/com/minelittlepony/unicopia/UGameRules.java +++ b/src/main/java/com/minelittlepony/unicopia/server/world/UGameRules.java @@ -1,4 +1,4 @@ -package com.minelittlepony.unicopia; +package com.minelittlepony.unicopia.server.world; import net.minecraft.world.GameRules; import net.minecraft.world.GameRules.BooleanRule; diff --git a/src/main/java/com/minelittlepony/unicopia/block/data/WaterLoggingManager.java b/src/main/java/com/minelittlepony/unicopia/server/world/WaterLoggingManager.java similarity index 98% rename from src/main/java/com/minelittlepony/unicopia/block/data/WaterLoggingManager.java rename to src/main/java/com/minelittlepony/unicopia/server/world/WaterLoggingManager.java index c9196aba..2372a3bb 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/data/WaterLoggingManager.java +++ b/src/main/java/com/minelittlepony/unicopia/server/world/WaterLoggingManager.java @@ -1,4 +1,4 @@ -package com.minelittlepony.unicopia.block.data; +package com.minelittlepony.unicopia.server.world; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; diff --git a/src/main/java/com/minelittlepony/unicopia/block/data/WeatherConditions.java b/src/main/java/com/minelittlepony/unicopia/server/world/WeatherConditions.java similarity index 99% rename from src/main/java/com/minelittlepony/unicopia/block/data/WeatherConditions.java rename to src/main/java/com/minelittlepony/unicopia/server/world/WeatherConditions.java index 3e7501c0..a58cff3e 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/data/WeatherConditions.java +++ b/src/main/java/com/minelittlepony/unicopia/server/world/WeatherConditions.java @@ -1,4 +1,4 @@ -package com.minelittlepony.unicopia.block.data; +package com.minelittlepony.unicopia.server.world; import com.minelittlepony.unicopia.Unicopia; import com.minelittlepony.unicopia.util.Tickable; diff --git a/src/main/java/com/minelittlepony/unicopia/block/data/WorldOverlay.java b/src/main/java/com/minelittlepony/unicopia/server/world/WorldOverlay.java similarity index 99% rename from src/main/java/com/minelittlepony/unicopia/block/data/WorldOverlay.java rename to src/main/java/com/minelittlepony/unicopia/server/world/WorldOverlay.java index 7b34aed9..3051c754 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/data/WorldOverlay.java +++ b/src/main/java/com/minelittlepony/unicopia/server/world/WorldOverlay.java @@ -1,4 +1,4 @@ -package com.minelittlepony.unicopia.block.data; +package com.minelittlepony.unicopia.server.world; import java.util.List; import java.util.function.*; diff --git a/src/main/java/com/minelittlepony/unicopia/WorldTribeManager.java b/src/main/java/com/minelittlepony/unicopia/server/world/WorldTribeManager.java similarity index 91% rename from src/main/java/com/minelittlepony/unicopia/WorldTribeManager.java rename to src/main/java/com/minelittlepony/unicopia/server/world/WorldTribeManager.java index cb9e8f23..220a6500 100644 --- a/src/main/java/com/minelittlepony/unicopia/WorldTribeManager.java +++ b/src/main/java/com/minelittlepony/unicopia/server/world/WorldTribeManager.java @@ -1,4 +1,6 @@ -package com.minelittlepony.unicopia; +package com.minelittlepony.unicopia.server.world; + +import com.minelittlepony.unicopia.Race; import net.minecraft.nbt.NbtCompound; import net.minecraft.server.world.ServerWorld; diff --git a/src/main/java/com/minelittlepony/unicopia/block/data/ZapAppleStageStore.java b/src/main/java/com/minelittlepony/unicopia/server/world/ZapAppleStageStore.java similarity index 99% rename from src/main/java/com/minelittlepony/unicopia/block/data/ZapAppleStageStore.java rename to src/main/java/com/minelittlepony/unicopia/server/world/ZapAppleStageStore.java index dd857110..74e6aa70 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/data/ZapAppleStageStore.java +++ b/src/main/java/com/minelittlepony/unicopia/server/world/ZapAppleStageStore.java @@ -1,4 +1,4 @@ -package com.minelittlepony.unicopia.block.data; +package com.minelittlepony.unicopia.server.world; import java.util.Locale; import java.util.stream.StreamSupport;