diff --git a/src/main/java/com/minelittlepony/unicopia/Debug.java b/src/main/java/com/minelittlepony/unicopia/Debug.java index 6773ab2a..ff142889 100644 --- a/src/main/java/com/minelittlepony/unicopia/Debug.java +++ b/src/main/java/com/minelittlepony/unicopia/Debug.java @@ -1,7 +1,7 @@ package com.minelittlepony.unicopia; -import com.minelittlepony.unicopia.entity.AirBalloonEntity; -import com.minelittlepony.unicopia.entity.UEntities; +import com.minelittlepony.unicopia.entity.mob.AirBalloonEntity; +import com.minelittlepony.unicopia.entity.mob.UEntities; import net.minecraft.entity.vehicle.BoatEntity; import net.minecraft.world.World; diff --git a/src/main/java/com/minelittlepony/unicopia/Unicopia.java b/src/main/java/com/minelittlepony/unicopia/Unicopia.java index 661e4f04..899ee06b 100644 --- a/src/main/java/com/minelittlepony/unicopia/Unicopia.java +++ b/src/main/java/com/minelittlepony/unicopia/Unicopia.java @@ -21,9 +21,9 @@ import com.minelittlepony.unicopia.block.state.StateMapLoader; import com.minelittlepony.unicopia.command.Commands; import com.minelittlepony.unicopia.container.SpellbookChapterLoader; import com.minelittlepony.unicopia.container.UScreenHandlers; -import com.minelittlepony.unicopia.entity.UEntities; import com.minelittlepony.unicopia.entity.damage.UDamageTypes; import com.minelittlepony.unicopia.entity.effect.UPotions; +import com.minelittlepony.unicopia.entity.mob.UEntities; import com.minelittlepony.unicopia.entity.player.Pony; import com.minelittlepony.unicopia.item.UItems; import com.minelittlepony.unicopia.item.enchantment.UEnchantments; 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 d1bc68ac..4964656f 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,10 +6,10 @@ 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.entity.CastSpellEntity; import com.minelittlepony.unicopia.entity.EntityReference; import com.minelittlepony.unicopia.entity.EntityReference.EntityValues; -import com.minelittlepony.unicopia.entity.UEntities; +import com.minelittlepony.unicopia.entity.mob.CastSpellEntity; +import com.minelittlepony.unicopia.entity.mob.UEntities; import com.minelittlepony.unicopia.particle.OrientedBillboardParticleEffect; import com.minelittlepony.unicopia.particle.ParticleHandle; import com.minelittlepony.unicopia.particle.UParticles; diff --git a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/ThrowableSpell.java b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/ThrowableSpell.java index 86b4a3d5..49cf0a2e 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/ThrowableSpell.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/ThrowableSpell.java @@ -7,7 +7,7 @@ import java.util.Optional; import com.minelittlepony.unicopia.USounds; import com.minelittlepony.unicopia.ability.magic.Caster; import com.minelittlepony.unicopia.ability.magic.spell.effect.CustomisedSpellType; -import com.minelittlepony.unicopia.entity.UEntities; +import com.minelittlepony.unicopia.entity.mob.UEntities; import com.minelittlepony.unicopia.item.UItems; import com.minelittlepony.unicopia.projectile.MagicProjectileEntity; diff --git a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/AreaProtectionSpell.java b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/AreaProtectionSpell.java index 1b738656..75615785 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/AreaProtectionSpell.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/AreaProtectionSpell.java @@ -5,7 +5,7 @@ import com.minelittlepony.unicopia.ability.magic.spell.AbstractAreaEffectSpell; import com.minelittlepony.unicopia.ability.magic.spell.Situation; import com.minelittlepony.unicopia.ability.magic.spell.trait.SpellTraits; import com.minelittlepony.unicopia.ability.magic.spell.trait.Trait; -import com.minelittlepony.unicopia.entity.UEntities; +import com.minelittlepony.unicopia.entity.mob.UEntities; import com.minelittlepony.unicopia.entity.player.Pony; import com.minelittlepony.unicopia.item.FriendshipBraceletItem; import com.minelittlepony.unicopia.particle.MagicParticleEffect; diff --git a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/BubbleSpell.java b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/BubbleSpell.java index 259bee40..8b962ccb 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/BubbleSpell.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/BubbleSpell.java @@ -9,6 +9,7 @@ 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.entity.*; +import com.minelittlepony.unicopia.entity.mob.UEntityAttributes; import com.minelittlepony.unicopia.entity.player.Pony; import com.minelittlepony.unicopia.particle.ParticleHandle; import com.minelittlepony.unicopia.particle.SphereParticleEffect; diff --git a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/DisplacementSpell.java b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/DisplacementSpell.java index fbc22bed..2d10d70c 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/DisplacementSpell.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/DisplacementSpell.java @@ -4,9 +4,9 @@ import com.minelittlepony.unicopia.USounds; import com.minelittlepony.unicopia.ability.magic.Caster; import com.minelittlepony.unicopia.ability.magic.spell.*; import com.minelittlepony.unicopia.ability.magic.spell.trait.Trait; -import com.minelittlepony.unicopia.entity.CastSpellEntity; import com.minelittlepony.unicopia.entity.EntityReference; import com.minelittlepony.unicopia.entity.damage.UDamageTypes; +import com.minelittlepony.unicopia.entity.mob.CastSpellEntity; import com.minelittlepony.unicopia.particle.ParticleHandle.Attachment; import com.minelittlepony.unicopia.projectile.MagicProjectileEntity; import com.minelittlepony.unicopia.projectile.ProjectileDelegate; diff --git a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/LightSpell.java b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/LightSpell.java index 8fd95e67..d9504055 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/LightSpell.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/LightSpell.java @@ -11,8 +11,8 @@ import com.minelittlepony.unicopia.ability.magic.spell.trait.SpellTraits; import com.minelittlepony.unicopia.ability.magic.spell.trait.Trait; import com.minelittlepony.unicopia.entity.EntityReference; import com.minelittlepony.unicopia.entity.EntityReference.EntityValues; -import com.minelittlepony.unicopia.entity.FairyEntity; -import com.minelittlepony.unicopia.entity.UEntities; +import com.minelittlepony.unicopia.entity.mob.FairyEntity; +import com.minelittlepony.unicopia.entity.mob.UEntities; import com.minelittlepony.unicopia.projectile.MagicProjectileEntity; import com.minelittlepony.unicopia.projectile.ProjectileDelegate; import com.minelittlepony.unicopia.util.VecHelper; 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 2ef4d347..4f7b3e4c 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,8 +8,8 @@ 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.entity.CastSpellEntity; import com.minelittlepony.unicopia.entity.EntityReference; +import com.minelittlepony.unicopia.entity.mob.CastSpellEntity; import com.minelittlepony.unicopia.particle.*; import com.minelittlepony.unicopia.particle.ParticleHandle.Attachment; import com.minelittlepony.unicopia.server.world.Ether; diff --git a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/TransformationSpell.java b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/TransformationSpell.java index b88763c2..e26152f0 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/TransformationSpell.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/TransformationSpell.java @@ -9,7 +9,7 @@ import com.minelittlepony.unicopia.USounds; import com.minelittlepony.unicopia.UTags; import com.minelittlepony.unicopia.ability.magic.Caster; import com.minelittlepony.unicopia.ability.magic.spell.Situation; -import com.minelittlepony.unicopia.entity.UEntities; +import com.minelittlepony.unicopia.entity.mob.UEntities; import com.minelittlepony.unicopia.particle.ParticleUtils; import com.minelittlepony.unicopia.projectile.MagicProjectileEntity; import com.minelittlepony.unicopia.projectile.ProjectileDelegate; diff --git a/src/main/java/com/minelittlepony/unicopia/client/ModifierTooltipRenderer.java b/src/main/java/com/minelittlepony/unicopia/client/ModifierTooltipRenderer.java index a66bf5f5..d67ae8c8 100644 --- a/src/main/java/com/minelittlepony/unicopia/client/ModifierTooltipRenderer.java +++ b/src/main/java/com/minelittlepony/unicopia/client/ModifierTooltipRenderer.java @@ -11,7 +11,7 @@ import org.jetbrains.annotations.Nullable; import com.google.common.collect.Multimap; import com.minelittlepony.unicopia.entity.Equine; -import com.minelittlepony.unicopia.entity.UEntityAttributes; +import com.minelittlepony.unicopia.entity.mob.UEntityAttributes; import com.minelittlepony.unicopia.entity.player.Pony; import com.minelittlepony.unicopia.item.enchantment.AttributedEnchantment; import net.fabricmc.fabric.api.client.item.v1.ItemTooltipCallback; diff --git a/src/main/java/com/minelittlepony/unicopia/client/URenderers.java b/src/main/java/com/minelittlepony/unicopia/client/URenderers.java index acb70971..8e8e523b 100644 --- a/src/main/java/com/minelittlepony/unicopia/client/URenderers.java +++ b/src/main/java/com/minelittlepony/unicopia/client/URenderers.java @@ -16,7 +16,7 @@ import com.minelittlepony.unicopia.client.particle.RunesParticle; import com.minelittlepony.unicopia.client.particle.SphereParticle; import com.minelittlepony.unicopia.client.render.*; import com.minelittlepony.unicopia.client.render.entity.*; -import com.minelittlepony.unicopia.entity.UEntities; +import com.minelittlepony.unicopia.entity.mob.UEntities; import com.minelittlepony.unicopia.item.ChameleonItem; import com.minelittlepony.unicopia.item.EnchantableItem; import com.minelittlepony.unicopia.item.UItems; diff --git a/src/main/java/com/minelittlepony/unicopia/client/render/FloatingArtefactEntityRenderer.java b/src/main/java/com/minelittlepony/unicopia/client/render/FloatingArtefactEntityRenderer.java index 7fc85c60..c825c722 100644 --- a/src/main/java/com/minelittlepony/unicopia/client/render/FloatingArtefactEntityRenderer.java +++ b/src/main/java/com/minelittlepony/unicopia/client/render/FloatingArtefactEntityRenderer.java @@ -1,6 +1,6 @@ package com.minelittlepony.unicopia.client.render; -import com.minelittlepony.unicopia.entity.FloatingArtefactEntity; +import com.minelittlepony.unicopia.entity.mob.FloatingArtefactEntity; import com.minelittlepony.unicopia.item.UItems; import net.minecraft.client.MinecraftClient; import net.minecraft.client.render.OverlayTexture; diff --git a/src/main/java/com/minelittlepony/unicopia/client/render/entity/AirBalloonEntityModel.java b/src/main/java/com/minelittlepony/unicopia/client/render/entity/AirBalloonEntityModel.java index b42bea8e..5934bd8d 100644 --- a/src/main/java/com/minelittlepony/unicopia/client/render/entity/AirBalloonEntityModel.java +++ b/src/main/java/com/minelittlepony/unicopia/client/render/entity/AirBalloonEntityModel.java @@ -2,7 +2,7 @@ package com.minelittlepony.unicopia.client.render.entity; import java.util.List; -import com.minelittlepony.unicopia.entity.AirBalloonEntity; +import com.minelittlepony.unicopia.entity.mob.AirBalloonEntity; import net.minecraft.client.model.*; import net.minecraft.client.render.VertexConsumer; diff --git a/src/main/java/com/minelittlepony/unicopia/client/render/entity/AirBalloonEntityRenderer.java b/src/main/java/com/minelittlepony/unicopia/client/render/entity/AirBalloonEntityRenderer.java index 3b74caaa..5466f5f4 100644 --- a/src/main/java/com/minelittlepony/unicopia/client/render/entity/AirBalloonEntityRenderer.java +++ b/src/main/java/com/minelittlepony/unicopia/client/render/entity/AirBalloonEntityRenderer.java @@ -4,7 +4,7 @@ import java.util.function.Function; import java.util.function.Predicate; import com.minelittlepony.unicopia.Unicopia; -import com.minelittlepony.unicopia.entity.AirBalloonEntity; +import com.minelittlepony.unicopia.entity.mob.AirBalloonEntity; import net.minecraft.client.MinecraftClient; import net.minecraft.client.render.RenderLayer; diff --git a/src/main/java/com/minelittlepony/unicopia/client/render/entity/ButterflyEntityRenderer.java b/src/main/java/com/minelittlepony/unicopia/client/render/entity/ButterflyEntityRenderer.java index 099af689..1313e8c1 100644 --- a/src/main/java/com/minelittlepony/unicopia/client/render/entity/ButterflyEntityRenderer.java +++ b/src/main/java/com/minelittlepony/unicopia/client/render/entity/ButterflyEntityRenderer.java @@ -1,7 +1,7 @@ package com.minelittlepony.unicopia.client.render.entity; import com.minelittlepony.unicopia.client.render.RenderLayers; -import com.minelittlepony.unicopia.entity.ButterflyEntity; +import com.minelittlepony.unicopia.entity.mob.ButterflyEntity; import net.minecraft.client.model.ModelData; import net.minecraft.client.model.ModelPart; diff --git a/src/main/java/com/minelittlepony/unicopia/client/render/entity/CastSpellEntityRenderer.java b/src/main/java/com/minelittlepony/unicopia/client/render/entity/CastSpellEntityRenderer.java index bb0db37f..aa5448ae 100644 --- a/src/main/java/com/minelittlepony/unicopia/client/render/entity/CastSpellEntityRenderer.java +++ b/src/main/java/com/minelittlepony/unicopia/client/render/entity/CastSpellEntityRenderer.java @@ -1,6 +1,6 @@ package com.minelittlepony.unicopia.client.render.entity; -import com.minelittlepony.unicopia.entity.CastSpellEntity; +import com.minelittlepony.unicopia.entity.mob.CastSpellEntity; import net.minecraft.client.render.entity.EntityRenderer; import net.minecraft.client.render.entity.EntityRendererFactory; diff --git a/src/main/java/com/minelittlepony/unicopia/client/render/entity/CrystalShardsEntityModel.java b/src/main/java/com/minelittlepony/unicopia/client/render/entity/CrystalShardsEntityModel.java index 78a19026..48faac72 100644 --- a/src/main/java/com/minelittlepony/unicopia/client/render/entity/CrystalShardsEntityModel.java +++ b/src/main/java/com/minelittlepony/unicopia/client/render/entity/CrystalShardsEntityModel.java @@ -1,6 +1,6 @@ package com.minelittlepony.unicopia.client.render.entity; -import com.minelittlepony.unicopia.entity.CrystalShardsEntity; +import com.minelittlepony.unicopia.entity.mob.CrystalShardsEntity; import net.minecraft.client.model.Dilation; import net.minecraft.client.model.ModelData; diff --git a/src/main/java/com/minelittlepony/unicopia/client/render/entity/CrystalShardsEntityRenderer.java b/src/main/java/com/minelittlepony/unicopia/client/render/entity/CrystalShardsEntityRenderer.java index 8f51da70..3ca4649b 100644 --- a/src/main/java/com/minelittlepony/unicopia/client/render/entity/CrystalShardsEntityRenderer.java +++ b/src/main/java/com/minelittlepony/unicopia/client/render/entity/CrystalShardsEntityRenderer.java @@ -3,7 +3,8 @@ package com.minelittlepony.unicopia.client.render.entity; import java.util.List; import com.minelittlepony.unicopia.Unicopia; -import com.minelittlepony.unicopia.entity.CrystalShardsEntity; +import com.minelittlepony.unicopia.entity.mob.CrystalShardsEntity; + import net.minecraft.client.render.OverlayTexture; import net.minecraft.client.render.VertexConsumerProvider; import net.minecraft.client.render.entity.EntityRenderer; diff --git a/src/main/java/com/minelittlepony/unicopia/client/render/entity/FairyEntityRenderer.java b/src/main/java/com/minelittlepony/unicopia/client/render/entity/FairyEntityRenderer.java index 66857c73..e5b869f6 100644 --- a/src/main/java/com/minelittlepony/unicopia/client/render/entity/FairyEntityRenderer.java +++ b/src/main/java/com/minelittlepony/unicopia/client/render/entity/FairyEntityRenderer.java @@ -2,7 +2,8 @@ package com.minelittlepony.unicopia.client.render.entity; import com.minelittlepony.unicopia.client.render.RenderLayers; import com.minelittlepony.unicopia.client.render.model.SphereModel; -import com.minelittlepony.unicopia.entity.FairyEntity; +import com.minelittlepony.unicopia.entity.mob.FairyEntity; + import net.minecraft.client.render.*; import net.minecraft.client.render.entity.EntityRendererFactory; import net.minecraft.client.render.entity.MobEntityRenderer; diff --git a/src/main/java/com/minelittlepony/unicopia/client/render/entity/SombraEntityModel.java b/src/main/java/com/minelittlepony/unicopia/client/render/entity/SombraEntityModel.java index 35615f98..67e00e85 100644 --- a/src/main/java/com/minelittlepony/unicopia/client/render/entity/SombraEntityModel.java +++ b/src/main/java/com/minelittlepony/unicopia/client/render/entity/SombraEntityModel.java @@ -1,12 +1,13 @@ package com.minelittlepony.unicopia.client.render.entity; -import com.minelittlepony.unicopia.entity.SombraEntity; - import net.minecraft.client.model.ModelData; import net.minecraft.client.model.ModelPart; import net.minecraft.client.model.ModelPartBuilder; import net.minecraft.client.model.ModelPartData; import net.minecraft.client.model.ModelTransform; + +import com.minelittlepony.unicopia.entity.mob.SombraEntity; + import net.minecraft.client.model.Dilation; import net.minecraft.client.model.TexturedModelData; import net.minecraft.client.render.VertexConsumer; diff --git a/src/main/java/com/minelittlepony/unicopia/client/render/entity/SombraEntityRenderer.java b/src/main/java/com/minelittlepony/unicopia/client/render/entity/SombraEntityRenderer.java index f65f92e6..b13fcaf2 100644 --- a/src/main/java/com/minelittlepony/unicopia/client/render/entity/SombraEntityRenderer.java +++ b/src/main/java/com/minelittlepony/unicopia/client/render/entity/SombraEntityRenderer.java @@ -1,7 +1,8 @@ package com.minelittlepony.unicopia.client.render.entity; import com.minelittlepony.unicopia.Unicopia; -import com.minelittlepony.unicopia.entity.SombraEntity; +import com.minelittlepony.unicopia.entity.mob.SombraEntity; + import net.minecraft.client.render.entity.EntityRendererFactory; import net.minecraft.client.render.entity.LivingEntityRenderer; import net.minecraft.util.Identifier; diff --git a/src/main/java/com/minelittlepony/unicopia/client/render/entity/SpellbookEntityRenderer.java b/src/main/java/com/minelittlepony/unicopia/client/render/entity/SpellbookEntityRenderer.java index cb2f955b..f04a5494 100644 --- a/src/main/java/com/minelittlepony/unicopia/client/render/entity/SpellbookEntityRenderer.java +++ b/src/main/java/com/minelittlepony/unicopia/client/render/entity/SpellbookEntityRenderer.java @@ -1,7 +1,7 @@ package com.minelittlepony.unicopia.client.render.entity; import com.minelittlepony.unicopia.Unicopia; -import com.minelittlepony.unicopia.entity.SpellbookEntity; +import com.minelittlepony.unicopia.entity.mob.SpellbookEntity; import net.minecraft.client.render.entity.EntityRendererFactory; import net.minecraft.client.render.entity.LivingEntityRenderer; diff --git a/src/main/java/com/minelittlepony/unicopia/client/render/entity/SpellbookModel.java b/src/main/java/com/minelittlepony/unicopia/client/render/entity/SpellbookModel.java index eb0cfd3d..d24988c5 100644 --- a/src/main/java/com/minelittlepony/unicopia/client/render/entity/SpellbookModel.java +++ b/src/main/java/com/minelittlepony/unicopia/client/render/entity/SpellbookModel.java @@ -1,6 +1,6 @@ package com.minelittlepony.unicopia.client.render.entity; -import com.minelittlepony.unicopia.entity.SpellbookEntity; +import com.minelittlepony.unicopia.entity.mob.SpellbookEntity; import net.minecraft.client.model.ModelPart; import net.minecraft.client.model.TexturedModelData; diff --git a/src/main/java/com/minelittlepony/unicopia/client/render/entity/StormCloudEntityModel.java b/src/main/java/com/minelittlepony/unicopia/client/render/entity/StormCloudEntityModel.java index 8b3b25fe..f42afca6 100644 --- a/src/main/java/com/minelittlepony/unicopia/client/render/entity/StormCloudEntityModel.java +++ b/src/main/java/com/minelittlepony/unicopia/client/render/entity/StormCloudEntityModel.java @@ -4,7 +4,7 @@ import java.util.List; import org.joml.Vector3f; -import com.minelittlepony.unicopia.entity.StormCloudEntity; +import com.minelittlepony.unicopia.entity.mob.StormCloudEntity; import net.minecraft.client.model.Dilation; import net.minecraft.client.model.ModelData; diff --git a/src/main/java/com/minelittlepony/unicopia/client/render/entity/StormCloudEntityRenderer.java b/src/main/java/com/minelittlepony/unicopia/client/render/entity/StormCloudEntityRenderer.java index 467c64ed..c0e6447b 100644 --- a/src/main/java/com/minelittlepony/unicopia/client/render/entity/StormCloudEntityRenderer.java +++ b/src/main/java/com/minelittlepony/unicopia/client/render/entity/StormCloudEntityRenderer.java @@ -1,7 +1,7 @@ package com.minelittlepony.unicopia.client.render.entity; import com.minelittlepony.unicopia.Unicopia; -import com.minelittlepony.unicopia.entity.StormCloudEntity; +import com.minelittlepony.unicopia.entity.mob.StormCloudEntity; import net.minecraft.client.render.Frustum; import net.minecraft.client.render.OverlayTexture; diff --git a/src/main/java/com/minelittlepony/unicopia/entity/Creature.java b/src/main/java/com/minelittlepony/unicopia/entity/Creature.java index 49ecfdde..5252add0 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/Creature.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/Creature.java @@ -17,6 +17,8 @@ import com.minelittlepony.unicopia.entity.ai.BreakHeartGoal; import com.minelittlepony.unicopia.entity.ai.DynamicTargetGoal; import com.minelittlepony.unicopia.entity.ai.EatMuffinGoal; import com.minelittlepony.unicopia.entity.ai.WantItTakeItGoal; +import com.minelittlepony.unicopia.entity.mob.SombraEntity; +import com.minelittlepony.unicopia.entity.mob.UEntityAttributes; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; diff --git a/src/main/java/com/minelittlepony/unicopia/entity/DynamicLightSource.java b/src/main/java/com/minelittlepony/unicopia/entity/DynamicLightSource.java index 7c3e412a..0c5b02ff 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/DynamicLightSource.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/DynamicLightSource.java @@ -18,12 +18,12 @@ public interface DynamicLightSource { private final T entity; - LightEmitter(T entity) { + public LightEmitter(T entity) { this.entity = entity; } @SuppressWarnings("deprecation") - void tick() { + public void tick() { if (entity.isRemoved()) { remove(); return; @@ -50,7 +50,7 @@ public interface DynamicLightSource { } } - void remove() { + public void remove() { LightSources.get(entity.getWorld()).removeLightSource(entity); if (lastPos != null) { try { diff --git a/src/main/java/com/minelittlepony/unicopia/entity/EntityPhysics.java b/src/main/java/com/minelittlepony/unicopia/entity/EntityPhysics.java index 485c3897..3b912b76 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/EntityPhysics.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/EntityPhysics.java @@ -1,5 +1,6 @@ package com.minelittlepony.unicopia.entity; +import com.minelittlepony.unicopia.entity.mob.UEntityAttributes; import com.minelittlepony.unicopia.util.Copyable; import com.minelittlepony.unicopia.util.Tickable; diff --git a/src/main/java/com/minelittlepony/unicopia/entity/Living.java b/src/main/java/com/minelittlepony/unicopia/entity/Living.java index 7ffc5d36..bcfb3ed9 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/Living.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/Living.java @@ -19,6 +19,7 @@ import com.minelittlepony.unicopia.ability.magic.spell.AbstractDisguiseSpell; import com.minelittlepony.unicopia.ability.magic.spell.Situation; import com.minelittlepony.unicopia.advancement.UCriteria; import com.minelittlepony.unicopia.entity.behaviour.EntityAppearance; +import com.minelittlepony.unicopia.entity.collision.MultiBoundingBoxEntity; import com.minelittlepony.unicopia.entity.duck.LivingEntityDuck; import com.minelittlepony.unicopia.entity.effect.UEffects; import com.minelittlepony.unicopia.entity.player.Pony; diff --git a/src/main/java/com/minelittlepony/unicopia/entity/ai/ArenaAttackGoal.java b/src/main/java/com/minelittlepony/unicopia/entity/ai/ArenaAttackGoal.java index 1650ef30..90282704 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/ai/ArenaAttackGoal.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/ai/ArenaAttackGoal.java @@ -1,6 +1,6 @@ package com.minelittlepony.unicopia.entity.ai; -import com.minelittlepony.unicopia.entity.ArenaCombatant; +import com.minelittlepony.unicopia.entity.mob.ArenaCombatant; import net.minecraft.entity.ai.goal.AttackGoal; import net.minecraft.entity.ai.pathing.Path; diff --git a/src/main/java/com/minelittlepony/unicopia/entity/ai/BreakHeartGoal.java b/src/main/java/com/minelittlepony/unicopia/entity/ai/BreakHeartGoal.java index 4bd81fdc..38328a96 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/ai/BreakHeartGoal.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/ai/BreakHeartGoal.java @@ -4,7 +4,7 @@ import java.util.EnumSet; import java.util.Optional; import java.util.function.Supplier; -import com.minelittlepony.unicopia.entity.FloatingArtefactEntity; +import com.minelittlepony.unicopia.entity.mob.FloatingArtefactEntity; import com.minelittlepony.unicopia.item.UItems; import net.minecraft.entity.Entity; diff --git a/src/main/java/com/minelittlepony/unicopia/entity/ai/EatMuffinGoal.java b/src/main/java/com/minelittlepony/unicopia/entity/ai/EatMuffinGoal.java index 255a4c68..de817752 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/ai/EatMuffinGoal.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/ai/EatMuffinGoal.java @@ -1,7 +1,7 @@ package com.minelittlepony.unicopia.entity.ai; -import com.minelittlepony.unicopia.entity.PhysicsBodyProjectileEntity; import com.minelittlepony.unicopia.item.UItems; +import com.minelittlepony.unicopia.projectile.PhysicsBodyProjectileEntity; import net.minecraft.entity.Entity; import net.minecraft.entity.mob.MobEntity; 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 163f52d6..92d92a05 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/behaviour/EntityAppearance.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/behaviour/EntityAppearance.java @@ -15,9 +15,9 @@ import com.minelittlepony.unicopia.InteractionManager; import com.minelittlepony.unicopia.Owned; import com.minelittlepony.unicopia.ability.magic.Caster; import com.minelittlepony.unicopia.compat.pehkui.PehkUtil; -import com.minelittlepony.unicopia.entity.ButterflyEntity; -import com.minelittlepony.unicopia.entity.UEntityAttributes; import com.minelittlepony.unicopia.entity.collision.EntityCollisions; +import com.minelittlepony.unicopia.entity.mob.ButterflyEntity; +import com.minelittlepony.unicopia.entity.mob.UEntityAttributes; import com.minelittlepony.unicopia.entity.player.PlayerDimensions; import com.minelittlepony.unicopia.entity.player.Pony; import com.minelittlepony.unicopia.projectile.ProjectileUtil; diff --git a/src/main/java/com/minelittlepony/unicopia/entity/MultiBoundingBoxEntity.java b/src/main/java/com/minelittlepony/unicopia/entity/collision/MultiBoundingBoxEntity.java similarity index 87% rename from src/main/java/com/minelittlepony/unicopia/entity/MultiBoundingBoxEntity.java rename to src/main/java/com/minelittlepony/unicopia/entity/collision/MultiBoundingBoxEntity.java index 295dc112..82ab40ed 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/MultiBoundingBoxEntity.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/collision/MultiBoundingBoxEntity.java @@ -1,4 +1,4 @@ -package com.minelittlepony.unicopia.entity; +package com.minelittlepony.unicopia.entity.collision; import java.util.List; diff --git a/src/main/java/com/minelittlepony/unicopia/entity/AirBalloonEntity.java b/src/main/java/com/minelittlepony/unicopia/entity/mob/AirBalloonEntity.java similarity index 98% rename from src/main/java/com/minelittlepony/unicopia/entity/AirBalloonEntity.java rename to src/main/java/com/minelittlepony/unicopia/entity/mob/AirBalloonEntity.java index 2c38a7f6..fcb658aa 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/AirBalloonEntity.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/mob/AirBalloonEntity.java @@ -1,4 +1,4 @@ -package com.minelittlepony.unicopia.entity; +package com.minelittlepony.unicopia.entity.mob; import net.minecraft.block.BlockState; import net.minecraft.block.ShapeContext; @@ -39,7 +39,10 @@ import org.jetbrains.annotations.Nullable; import com.minelittlepony.unicopia.USounds; import com.minelittlepony.unicopia.advancement.UCriteria; +import com.minelittlepony.unicopia.entity.Living; +import com.minelittlepony.unicopia.entity.MagicImmune; import com.minelittlepony.unicopia.entity.collision.EntityCollisions; +import com.minelittlepony.unicopia.entity.collision.MultiBoundingBoxEntity; import com.minelittlepony.unicopia.entity.collision.MultiBox; import com.minelittlepony.unicopia.entity.duck.EntityDuck; import com.minelittlepony.unicopia.item.BasketItem; diff --git a/src/main/java/com/minelittlepony/unicopia/entity/ArenaCombatant.java b/src/main/java/com/minelittlepony/unicopia/entity/mob/ArenaCombatant.java similarity index 85% rename from src/main/java/com/minelittlepony/unicopia/entity/ArenaCombatant.java rename to src/main/java/com/minelittlepony/unicopia/entity/mob/ArenaCombatant.java index e8ba6e7e..15576972 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/ArenaCombatant.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/mob/ArenaCombatant.java @@ -1,4 +1,4 @@ -package com.minelittlepony.unicopia.entity; +package com.minelittlepony.unicopia.entity.mob; import java.util.Optional; diff --git a/src/main/java/com/minelittlepony/unicopia/entity/ButterflyEntity.java b/src/main/java/com/minelittlepony/unicopia/entity/mob/ButterflyEntity.java similarity index 99% rename from src/main/java/com/minelittlepony/unicopia/entity/ButterflyEntity.java rename to src/main/java/com/minelittlepony/unicopia/entity/mob/ButterflyEntity.java index 72868273..e16091bf 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/ButterflyEntity.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/mob/ButterflyEntity.java @@ -1,4 +1,4 @@ -package com.minelittlepony.unicopia.entity; +package com.minelittlepony.unicopia.entity.mob; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/minelittlepony/unicopia/entity/CastSpellEntity.java b/src/main/java/com/minelittlepony/unicopia/entity/mob/CastSpellEntity.java similarity index 94% rename from src/main/java/com/minelittlepony/unicopia/entity/CastSpellEntity.java rename to src/main/java/com/minelittlepony/unicopia/entity/mob/CastSpellEntity.java index db88e8b2..dc2c4f2e 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/CastSpellEntity.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/mob/CastSpellEntity.java @@ -1,4 +1,4 @@ -package com.minelittlepony.unicopia.entity; +package com.minelittlepony.unicopia.entity.mob; import com.minelittlepony.unicopia.*; import com.minelittlepony.unicopia.ability.magic.Caster; @@ -7,6 +7,10 @@ import com.minelittlepony.unicopia.ability.magic.SpellContainer; import com.minelittlepony.unicopia.ability.magic.SpellContainer.Operation; import com.minelittlepony.unicopia.ability.magic.spell.Situation; import com.minelittlepony.unicopia.ability.magic.spell.Spell; +import com.minelittlepony.unicopia.entity.EntityPhysics; +import com.minelittlepony.unicopia.entity.EntityReference; +import com.minelittlepony.unicopia.entity.MagicImmune; +import com.minelittlepony.unicopia.entity.Physics; import com.minelittlepony.unicopia.network.datasync.EffectSync; import net.minecraft.entity.Entity; diff --git a/src/main/java/com/minelittlepony/unicopia/entity/CrystalShardsEntity.java b/src/main/java/com/minelittlepony/unicopia/entity/mob/CrystalShardsEntity.java similarity index 98% rename from src/main/java/com/minelittlepony/unicopia/entity/CrystalShardsEntity.java rename to src/main/java/com/minelittlepony/unicopia/entity/mob/CrystalShardsEntity.java index b780c5f7..59b2c069 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/CrystalShardsEntity.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/mob/CrystalShardsEntity.java @@ -1,4 +1,4 @@ -package com.minelittlepony.unicopia.entity; +package com.minelittlepony.unicopia.entity.mob; import java.util.HashSet; import java.util.Objects; @@ -6,6 +6,7 @@ import java.util.Set; import java.util.stream.Collectors; import com.minelittlepony.unicopia.USounds; +import com.minelittlepony.unicopia.entity.MagicImmune; import com.minelittlepony.unicopia.item.UItems; import net.minecraft.block.SideShapeType; diff --git a/src/main/java/com/minelittlepony/unicopia/entity/FairyEntity.java b/src/main/java/com/minelittlepony/unicopia/entity/mob/FairyEntity.java similarity index 98% rename from src/main/java/com/minelittlepony/unicopia/entity/FairyEntity.java rename to src/main/java/com/minelittlepony/unicopia/entity/mob/FairyEntity.java index a4ac1a3d..37714f05 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/FairyEntity.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/mob/FairyEntity.java @@ -1,4 +1,4 @@ -package com.minelittlepony.unicopia.entity; +package com.minelittlepony.unicopia.entity.mob; import java.util.EnumSet; import java.util.Optional; @@ -7,6 +7,9 @@ import org.jetbrains.annotations.Nullable; import com.minelittlepony.unicopia.USounds; import com.minelittlepony.unicopia.WeaklyOwned; +import com.minelittlepony.unicopia.entity.DynamicLightSource; +import com.minelittlepony.unicopia.entity.EntityReference; +import com.minelittlepony.unicopia.entity.MagicImmune; import com.minelittlepony.unicopia.particle.MagicParticleEffect; import com.minelittlepony.unicopia.particle.ParticleUtils; import com.minelittlepony.unicopia.particle.UParticles; diff --git a/src/main/java/com/minelittlepony/unicopia/entity/FloatingArtefactEntity.java b/src/main/java/com/minelittlepony/unicopia/entity/mob/FloatingArtefactEntity.java similarity index 98% rename from src/main/java/com/minelittlepony/unicopia/entity/FloatingArtefactEntity.java rename to src/main/java/com/minelittlepony/unicopia/entity/mob/FloatingArtefactEntity.java index 9c860e09..40aa822b 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/FloatingArtefactEntity.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/mob/FloatingArtefactEntity.java @@ -1,8 +1,9 @@ -package com.minelittlepony.unicopia.entity; +package com.minelittlepony.unicopia.entity.mob; import java.util.Optional; import com.minelittlepony.unicopia.USounds; +import com.minelittlepony.unicopia.entity.MagicImmune; import com.minelittlepony.unicopia.entity.damage.UDamageSources; import com.minelittlepony.unicopia.item.UItems; import com.minelittlepony.unicopia.server.world.Altar; diff --git a/src/main/java/com/minelittlepony/unicopia/entity/LightEmittingEntity.java b/src/main/java/com/minelittlepony/unicopia/entity/mob/LightEmittingEntity.java similarity index 83% rename from src/main/java/com/minelittlepony/unicopia/entity/LightEmittingEntity.java rename to src/main/java/com/minelittlepony/unicopia/entity/mob/LightEmittingEntity.java index 9646f370..d5225117 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/LightEmittingEntity.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/mob/LightEmittingEntity.java @@ -1,4 +1,6 @@ -package com.minelittlepony.unicopia.entity; +package com.minelittlepony.unicopia.entity.mob; + +import com.minelittlepony.unicopia.entity.DynamicLightSource; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; diff --git a/src/main/java/com/minelittlepony/unicopia/entity/SombraEntity.java b/src/main/java/com/minelittlepony/unicopia/entity/mob/SombraEntity.java similarity index 99% rename from src/main/java/com/minelittlepony/unicopia/entity/SombraEntity.java rename to src/main/java/com/minelittlepony/unicopia/entity/mob/SombraEntity.java index 60de943b..f023adc1 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/SombraEntity.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/mob/SombraEntity.java @@ -1,4 +1,4 @@ -package com.minelittlepony.unicopia.entity; +package com.minelittlepony.unicopia.entity.mob; import java.util.Optional; import java.util.function.Predicate; @@ -8,6 +8,8 @@ import org.jetbrains.annotations.Nullable; import com.minelittlepony.unicopia.USounds; import com.minelittlepony.unicopia.advancement.UCriteria; +import com.minelittlepony.unicopia.entity.AmuletSelectors; +import com.minelittlepony.unicopia.entity.EntityReference; import com.minelittlepony.unicopia.entity.ai.ArenaAttackGoal; import com.minelittlepony.unicopia.entity.player.Pony; import com.minelittlepony.unicopia.item.AmuletItem; diff --git a/src/main/java/com/minelittlepony/unicopia/entity/SpellbookEntity.java b/src/main/java/com/minelittlepony/unicopia/entity/mob/SpellbookEntity.java similarity index 99% rename from src/main/java/com/minelittlepony/unicopia/entity/SpellbookEntity.java rename to src/main/java/com/minelittlepony/unicopia/entity/mob/SpellbookEntity.java index 7032448c..e9aa4286 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/SpellbookEntity.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/mob/SpellbookEntity.java @@ -1,4 +1,4 @@ -package com.minelittlepony.unicopia.entity; +package com.minelittlepony.unicopia.entity.mob; import java.util.Optional; @@ -7,6 +7,7 @@ import com.minelittlepony.unicopia.USounds; import com.minelittlepony.unicopia.UTags; import com.minelittlepony.unicopia.container.SpellbookScreenHandler; import com.minelittlepony.unicopia.container.SpellbookState; +import com.minelittlepony.unicopia.entity.MagicImmune; import com.minelittlepony.unicopia.item.UItems; import com.minelittlepony.unicopia.network.Channel; import com.minelittlepony.unicopia.network.MsgSpellbookStateChanged; diff --git a/src/main/java/com/minelittlepony/unicopia/entity/StormCloudEntity.java b/src/main/java/com/minelittlepony/unicopia/entity/mob/StormCloudEntity.java similarity index 99% rename from src/main/java/com/minelittlepony/unicopia/entity/StormCloudEntity.java rename to src/main/java/com/minelittlepony/unicopia/entity/mob/StormCloudEntity.java index 0784629b..f522b812 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/StormCloudEntity.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/mob/StormCloudEntity.java @@ -1,4 +1,4 @@ -package com.minelittlepony.unicopia.entity; +package com.minelittlepony.unicopia.entity.mob; import java.util.HashSet; import java.util.Set; @@ -7,6 +7,7 @@ import java.util.function.Consumer; import org.jetbrains.annotations.Nullable; import com.minelittlepony.unicopia.USounds; +import com.minelittlepony.unicopia.entity.MagicImmune; import com.minelittlepony.unicopia.particle.UParticles; import com.minelittlepony.unicopia.server.world.WeatherConditions; diff --git a/src/main/java/com/minelittlepony/unicopia/entity/UEntities.java b/src/main/java/com/minelittlepony/unicopia/entity/mob/UEntities.java similarity index 98% rename from src/main/java/com/minelittlepony/unicopia/entity/UEntities.java rename to src/main/java/com/minelittlepony/unicopia/entity/mob/UEntities.java index 52bbc635..59a58ea3 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/UEntities.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/mob/UEntities.java @@ -1,10 +1,12 @@ -package com.minelittlepony.unicopia.entity; +package com.minelittlepony.unicopia.entity.mob; import java.util.function.Predicate; import com.minelittlepony.unicopia.Unicopia; import com.minelittlepony.unicopia.entity.behaviour.EntityBehaviour; import com.minelittlepony.unicopia.projectile.MagicProjectileEntity; +import com.minelittlepony.unicopia.projectile.PhysicsBodyProjectileEntity; + import net.fabricmc.fabric.api.biome.v1.BiomeModifications; import net.fabricmc.fabric.api.biome.v1.BiomeSelectionContext; import net.fabricmc.fabric.api.biome.v1.BiomeSelectors; diff --git a/src/main/java/com/minelittlepony/unicopia/entity/UEntityAttributes.java b/src/main/java/com/minelittlepony/unicopia/entity/mob/UEntityAttributes.java similarity index 96% rename from src/main/java/com/minelittlepony/unicopia/entity/UEntityAttributes.java rename to src/main/java/com/minelittlepony/unicopia/entity/mob/UEntityAttributes.java index 591004a5..f622003f 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/UEntityAttributes.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/mob/UEntityAttributes.java @@ -1,4 +1,4 @@ -package com.minelittlepony.unicopia.entity; +package com.minelittlepony.unicopia.entity.mob; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/minelittlepony/unicopia/entity/UTradeOffers.java b/src/main/java/com/minelittlepony/unicopia/entity/mob/UTradeOffers.java similarity index 99% rename from src/main/java/com/minelittlepony/unicopia/entity/UTradeOffers.java rename to src/main/java/com/minelittlepony/unicopia/entity/mob/UTradeOffers.java index 612d0480..cedc1064 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/UTradeOffers.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/mob/UTradeOffers.java @@ -1,4 +1,4 @@ -package com.minelittlepony.unicopia.entity; +package com.minelittlepony.unicopia.entity.mob; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/minelittlepony/unicopia/entity/player/PlayerAttributes.java b/src/main/java/com/minelittlepony/unicopia/entity/player/PlayerAttributes.java index 8884b26d..38fa5f23 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/player/PlayerAttributes.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/player/PlayerAttributes.java @@ -3,7 +3,7 @@ package com.minelittlepony.unicopia.entity.player; import java.util.UUID; import com.minelittlepony.unicopia.Race; -import com.minelittlepony.unicopia.entity.UEntityAttributes; +import com.minelittlepony.unicopia.entity.mob.UEntityAttributes; import com.minelittlepony.unicopia.util.Tickable; import net.minecraft.entity.attribute.EntityAttribute; 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 2251c797..2510770b 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/player/Pony.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/player/Pony.java @@ -21,6 +21,7 @@ import com.minelittlepony.unicopia.entity.behaviour.EntityAppearance; import com.minelittlepony.unicopia.entity.duck.LivingEntityDuck; import com.minelittlepony.unicopia.entity.effect.SunBlindnessStatusEffect; import com.minelittlepony.unicopia.entity.effect.UEffects; +import com.minelittlepony.unicopia.entity.mob.UEntityAttributes; import com.minelittlepony.unicopia.entity.player.MagicReserves.Bar; import com.minelittlepony.unicopia.item.FriendshipBraceletItem; import com.minelittlepony.unicopia.item.UItems; diff --git a/src/main/java/com/minelittlepony/unicopia/item/AlicornAmuletItem.java b/src/main/java/com/minelittlepony/unicopia/item/AlicornAmuletItem.java index 08e32c48..1ba02b4c 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/AlicornAmuletItem.java +++ b/src/main/java/com/minelittlepony/unicopia/item/AlicornAmuletItem.java @@ -10,6 +10,7 @@ import com.minelittlepony.unicopia.USounds; import com.minelittlepony.unicopia.entity.*; import com.minelittlepony.unicopia.entity.damage.UDamageTypes; import com.minelittlepony.unicopia.entity.effect.UEffects; +import com.minelittlepony.unicopia.entity.mob.SombraEntity; import com.minelittlepony.unicopia.entity.player.*; import com.minelittlepony.unicopia.particle.FollowingParticleEffect; import com.minelittlepony.unicopia.particle.ParticleUtils; diff --git a/src/main/java/com/minelittlepony/unicopia/item/BasketItem.java b/src/main/java/com/minelittlepony/unicopia/item/BasketItem.java index d9408802..beb93ee4 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/BasketItem.java +++ b/src/main/java/com/minelittlepony/unicopia/item/BasketItem.java @@ -6,8 +6,8 @@ import java.util.function.Predicate; import org.jetbrains.annotations.Nullable; -import com.minelittlepony.unicopia.entity.AirBalloonEntity; -import com.minelittlepony.unicopia.entity.UEntities; +import com.minelittlepony.unicopia.entity.mob.AirBalloonEntity; +import com.minelittlepony.unicopia.entity.mob.UEntities; import com.minelittlepony.unicopia.util.Dispensable; import net.minecraft.block.DispenserBlock; diff --git a/src/main/java/com/minelittlepony/unicopia/item/CrystalHeartItem.java b/src/main/java/com/minelittlepony/unicopia/item/CrystalHeartItem.java index 55688ac8..d1e4d3b4 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/CrystalHeartItem.java +++ b/src/main/java/com/minelittlepony/unicopia/item/CrystalHeartItem.java @@ -7,9 +7,10 @@ import java.util.function.Supplier; import com.google.common.base.Suppliers; import com.minelittlepony.unicopia.*; import com.minelittlepony.unicopia.advancement.UCriteria; -import com.minelittlepony.unicopia.entity.*; -import com.minelittlepony.unicopia.entity.FloatingArtefactEntity.State; import com.minelittlepony.unicopia.entity.damage.UDamageTypes; +import com.minelittlepony.unicopia.entity.mob.FloatingArtefactEntity; +import com.minelittlepony.unicopia.entity.mob.UEntities; +import com.minelittlepony.unicopia.entity.mob.FloatingArtefactEntity.State; import com.minelittlepony.unicopia.particle.FollowingParticleEffect; import com.minelittlepony.unicopia.particle.ParticleUtils; import com.minelittlepony.unicopia.particle.UParticles; diff --git a/src/main/java/com/minelittlepony/unicopia/item/EnchantedStaffItem.java b/src/main/java/com/minelittlepony/unicopia/item/EnchantedStaffItem.java index e0a3f679..b37d4cab 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/EnchantedStaffItem.java +++ b/src/main/java/com/minelittlepony/unicopia/item/EnchantedStaffItem.java @@ -14,8 +14,8 @@ import com.minelittlepony.unicopia.ability.magic.spell.CastingMethod; import com.minelittlepony.unicopia.ability.magic.spell.Spell; import com.minelittlepony.unicopia.ability.magic.spell.effect.SpellType; import com.minelittlepony.unicopia.client.render.PlayerPoser.Animation; -import com.minelittlepony.unicopia.entity.CastSpellEntity; -import com.minelittlepony.unicopia.entity.UEntities; +import com.minelittlepony.unicopia.entity.mob.CastSpellEntity; +import com.minelittlepony.unicopia.entity.mob.UEntities; import com.minelittlepony.unicopia.entity.player.Pony; import com.minelittlepony.unicopia.item.group.MultiItem; diff --git a/src/main/java/com/minelittlepony/unicopia/item/HeavyProjectileItem.java b/src/main/java/com/minelittlepony/unicopia/item/HeavyProjectileItem.java index d5ffbae9..01d268d6 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/HeavyProjectileItem.java +++ b/src/main/java/com/minelittlepony/unicopia/item/HeavyProjectileItem.java @@ -3,7 +3,8 @@ package com.minelittlepony.unicopia.item; import org.jetbrains.annotations.Nullable; import com.minelittlepony.unicopia.USounds; -import com.minelittlepony.unicopia.entity.PhysicsBodyProjectileEntity; +import com.minelittlepony.unicopia.projectile.PhysicsBodyProjectileEntity; + import net.minecraft.block.DispenserBlock; import net.minecraft.block.dispenser.ProjectileDispenserBehavior; import net.minecraft.entity.player.PlayerEntity; diff --git a/src/main/java/com/minelittlepony/unicopia/item/HotAirBalloonItem.java b/src/main/java/com/minelittlepony/unicopia/item/HotAirBalloonItem.java index dca94801..99a63895 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/HotAirBalloonItem.java +++ b/src/main/java/com/minelittlepony/unicopia/item/HotAirBalloonItem.java @@ -1,6 +1,6 @@ package com.minelittlepony.unicopia.item; -import com.minelittlepony.unicopia.entity.AirBalloonEntity; +import com.minelittlepony.unicopia.entity.mob.AirBalloonEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/minelittlepony/unicopia/item/MuffinItem.java b/src/main/java/com/minelittlepony/unicopia/item/MuffinItem.java index c7557aba..3fb05b3d 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/MuffinItem.java +++ b/src/main/java/com/minelittlepony/unicopia/item/MuffinItem.java @@ -3,7 +3,7 @@ package com.minelittlepony.unicopia.item; import org.jetbrains.annotations.Nullable; import com.minelittlepony.unicopia.advancement.UCriteria; -import com.minelittlepony.unicopia.entity.PhysicsBodyProjectileEntity; +import com.minelittlepony.unicopia.projectile.PhysicsBodyProjectileEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/minelittlepony/unicopia/item/PolearmItem.java b/src/main/java/com/minelittlepony/unicopia/item/PolearmItem.java index b6d81dd9..2658cb01 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/PolearmItem.java +++ b/src/main/java/com/minelittlepony/unicopia/item/PolearmItem.java @@ -6,7 +6,7 @@ import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.Multimap; import com.minelittlepony.unicopia.UTags; import com.minelittlepony.unicopia.entity.Living; -import com.minelittlepony.unicopia.entity.UEntityAttributes; +import com.minelittlepony.unicopia.entity.mob.UEntityAttributes; import net.minecraft.block.*; import net.minecraft.entity.EquipmentSlot; diff --git a/src/main/java/com/minelittlepony/unicopia/item/SpellbookItem.java b/src/main/java/com/minelittlepony/unicopia/item/SpellbookItem.java index 8b72bd38..19a78a66 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/SpellbookItem.java +++ b/src/main/java/com/minelittlepony/unicopia/item/SpellbookItem.java @@ -3,8 +3,8 @@ package com.minelittlepony.unicopia.item; import org.jetbrains.annotations.Nullable; import com.minelittlepony.unicopia.advancement.UCriteria; -import com.minelittlepony.unicopia.entity.SpellbookEntity; -import com.minelittlepony.unicopia.entity.UEntities; +import com.minelittlepony.unicopia.entity.mob.SpellbookEntity; +import com.minelittlepony.unicopia.entity.mob.UEntities; import com.minelittlepony.unicopia.server.world.Altar; import com.minelittlepony.unicopia.util.Dispensable; diff --git a/src/main/java/com/minelittlepony/unicopia/item/StaffItem.java b/src/main/java/com/minelittlepony/unicopia/item/StaffItem.java index 3edfe731..cb567ce1 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/StaffItem.java +++ b/src/main/java/com/minelittlepony/unicopia/item/StaffItem.java @@ -6,7 +6,7 @@ import java.util.UUID; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import com.minelittlepony.unicopia.USounds; -import com.minelittlepony.unicopia.entity.UEntityAttributes; +import com.minelittlepony.unicopia.entity.mob.UEntityAttributes; import net.minecraft.block.Blocks; import net.minecraft.client.item.TooltipContext; diff --git a/src/main/java/com/minelittlepony/unicopia/item/UItems.java b/src/main/java/com/minelittlepony/unicopia/item/UItems.java index 0c72f71c..ecc11d46 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/UItems.java +++ b/src/main/java/com/minelittlepony/unicopia/item/UItems.java @@ -3,8 +3,8 @@ package com.minelittlepony.unicopia.item; import com.minelittlepony.unicopia.*; import com.minelittlepony.unicopia.block.UBlocks; import com.minelittlepony.unicopia.block.UWoodTypes; -import com.minelittlepony.unicopia.entity.AirBalloonEntity; -import com.minelittlepony.unicopia.entity.UEntities; +import com.minelittlepony.unicopia.entity.mob.AirBalloonEntity; +import com.minelittlepony.unicopia.entity.mob.UEntities; import com.minelittlepony.unicopia.item.enchantment.UEnchantments; import com.minelittlepony.unicopia.item.group.ItemGroupRegistry; import com.minelittlepony.unicopia.item.group.UItemGroups; diff --git a/src/main/java/com/minelittlepony/unicopia/item/enchantment/UEnchantments.java b/src/main/java/com/minelittlepony/unicopia/item/enchantment/UEnchantments.java index 7654803f..3414e340 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/enchantment/UEnchantments.java +++ b/src/main/java/com/minelittlepony/unicopia/item/enchantment/UEnchantments.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.UUID; import com.minelittlepony.unicopia.Unicopia; -import com.minelittlepony.unicopia.entity.UEntityAttributes; +import com.minelittlepony.unicopia.entity.mob.UEntityAttributes; import com.minelittlepony.unicopia.item.enchantment.SimpleEnchantment.Options; import net.minecraft.enchantment.Enchantment; diff --git a/src/main/java/com/minelittlepony/unicopia/network/handler/ClientNetworkHandlerImpl.java b/src/main/java/com/minelittlepony/unicopia/network/handler/ClientNetworkHandlerImpl.java index b4e068ae..1f2798cf 100644 --- a/src/main/java/com/minelittlepony/unicopia/network/handler/ClientNetworkHandlerImpl.java +++ b/src/main/java/com/minelittlepony/unicopia/network/handler/ClientNetworkHandlerImpl.java @@ -14,7 +14,7 @@ import com.minelittlepony.unicopia.client.UnicopiaClient; import com.minelittlepony.unicopia.client.gui.TribeSelectionScreen; import com.minelittlepony.unicopia.client.gui.spellbook.ClientChapters; import com.minelittlepony.unicopia.client.gui.spellbook.SpellbookChapterList.Chapter; -import com.minelittlepony.unicopia.entity.UEntities; +import com.minelittlepony.unicopia.entity.mob.UEntities; import com.minelittlepony.unicopia.entity.player.Pony; import com.minelittlepony.unicopia.network.*; import net.minecraft.client.MinecraftClient; diff --git a/src/main/java/com/minelittlepony/unicopia/projectile/MagicProjectileEntity.java b/src/main/java/com/minelittlepony/unicopia/projectile/MagicProjectileEntity.java index 0e40da1e..37f84c9b 100644 --- a/src/main/java/com/minelittlepony/unicopia/projectile/MagicProjectileEntity.java +++ b/src/main/java/com/minelittlepony/unicopia/projectile/MagicProjectileEntity.java @@ -21,7 +21,7 @@ import com.minelittlepony.unicopia.entity.EntityPhysics; import com.minelittlepony.unicopia.entity.EntityReference; import com.minelittlepony.unicopia.entity.MagicImmune; import com.minelittlepony.unicopia.entity.Physics; -import com.minelittlepony.unicopia.entity.UEntities; +import com.minelittlepony.unicopia.entity.mob.UEntities; import com.minelittlepony.unicopia.item.UItems; import com.minelittlepony.unicopia.network.Channel; import com.minelittlepony.unicopia.network.MsgSpawnProjectile; diff --git a/src/main/java/com/minelittlepony/unicopia/entity/PhysicsBodyProjectileEntity.java b/src/main/java/com/minelittlepony/unicopia/projectile/PhysicsBodyProjectileEntity.java similarity index 98% rename from src/main/java/com/minelittlepony/unicopia/entity/PhysicsBodyProjectileEntity.java rename to src/main/java/com/minelittlepony/unicopia/projectile/PhysicsBodyProjectileEntity.java index 647033a0..2ac09472 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/PhysicsBodyProjectileEntity.java +++ b/src/main/java/com/minelittlepony/unicopia/projectile/PhysicsBodyProjectileEntity.java @@ -1,10 +1,11 @@ -package com.minelittlepony.unicopia.entity; +package com.minelittlepony.unicopia.projectile; import org.jetbrains.annotations.Nullable; import com.minelittlepony.unicopia.USounds; import com.minelittlepony.unicopia.UTags; import com.minelittlepony.unicopia.ability.magic.Caster; +import com.minelittlepony.unicopia.entity.mob.UEntities; import net.minecraft.block.BlockState; import net.minecraft.block.ButtonBlock; 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 70325717..857b0a85 100644 --- a/src/main/java/com/minelittlepony/unicopia/server/world/Altar.java +++ b/src/main/java/com/minelittlepony/unicopia/server/world/Altar.java @@ -11,9 +11,9 @@ import java.util.stream.Stream; import org.jetbrains.annotations.Nullable; -import com.minelittlepony.unicopia.entity.FloatingArtefactEntity; -import com.minelittlepony.unicopia.entity.SpellbookEntity; -import com.minelittlepony.unicopia.entity.UEntities; +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.NbtSerialisable; import com.minelittlepony.unicopia.util.PosHelper; diff --git a/src/main/java/com/minelittlepony/unicopia/server/world/WeatherConditions.java b/src/main/java/com/minelittlepony/unicopia/server/world/WeatherConditions.java index a935f474..75e0b392 100644 --- a/src/main/java/com/minelittlepony/unicopia/server/world/WeatherConditions.java +++ b/src/main/java/com/minelittlepony/unicopia/server/world/WeatherConditions.java @@ -6,7 +6,7 @@ import java.util.Map; import java.util.UUID; import com.minelittlepony.unicopia.Unicopia; -import com.minelittlepony.unicopia.entity.StormCloudEntity; +import com.minelittlepony.unicopia.entity.mob.StormCloudEntity; import com.minelittlepony.unicopia.util.MeteorlogicalUtil; import com.minelittlepony.unicopia.util.Tickable;