PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2025-02-01 03:26:44 +01:00
Code Issues Projects Releases Packages Wiki Activity

Move mob entities to a separate package

Browse source
This commit is contained in:
Sollace 2023-09-02 18:34:57 +01:00
parent d3c54c1e2b
commit 820856fdc4
No known key found for this signature in database
GPG key ID: E52FACE7B5C773DB
68 changed files with 110 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/com/minelittlepony/unicopia/Debug.java
View file

@ -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;

2
src/main/java/com/minelittlepony/unicopia/Unicopia.java
View file

@ -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;

4
src/main/java/com/minelittlepony/unicopia/ability/magic/spell/PlaceableSpell.java
View file

@ -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;

2
src/main/java/com/minelittlepony/unicopia/ability/magic/spell/ThrowableSpell.java
View file

@ -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;

2
src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/AreaProtectionSpell.java
View file

@ -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;

1
src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/BubbleSpell.java
View file

@ -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;

2
src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/DisplacementSpell.java
View file

@ -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;

4
src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/LightSpell.java
View file

@ -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;

2
src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/PortalSpell.java
View file

@ -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;

2
src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/TransformationSpell.java
View file

@ -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;

2
src/main/java/com/minelittlepony/unicopia/client/ModifierTooltipRenderer.java
View file

@ -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;

2
src/main/java/com/minelittlepony/unicopia/client/URenderers.java
View file

@ -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;

2
src/main/java/com/minelittlepony/unicopia/client/render/FloatingArtefactEntityRenderer.java
View file

@ -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;

2
src/main/java/com/minelittlepony/unicopia/client/render/entity/AirBalloonEntityModel.java
View file

@ -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;

2
src/main/java/com/minelittlepony/unicopia/client/render/entity/AirBalloonEntityRenderer.java
View file

@ -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;

2
src/main/java/com/minelittlepony/unicopia/client/render/entity/ButterflyEntityRenderer.java
View file

@ -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;

2
src/main/java/com/minelittlepony/unicopia/client/render/entity/CastSpellEntityRenderer.java
View file

@ -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;

2
src/main/java/com/minelittlepony/unicopia/client/render/entity/CrystalShardsEntityModel.java
View file

@ -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;

3
src/main/java/com/minelittlepony/unicopia/client/render/entity/CrystalShardsEntityRenderer.java
View file

@ -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;

3
src/main/java/com/minelittlepony/unicopia/client/render/entity/FairyEntityRenderer.java
View file

@ -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;

5
src/main/java/com/minelittlepony/unicopia/client/render/entity/SombraEntityModel.java
View file

@ -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;

3
src/main/java/com/minelittlepony/unicopia/client/render/entity/SombraEntityRenderer.java
View file

@ -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;

2
src/main/java/com/minelittlepony/unicopia/client/render/entity/SpellbookEntityRenderer.java
View file

@ -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;

2
src/main/java/com/minelittlepony/unicopia/client/render/entity/SpellbookModel.java
View file

@ -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;

2
src/main/java/com/minelittlepony/unicopia/client/render/entity/StormCloudEntityModel.java
View file

@ -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;

2
src/main/java/com/minelittlepony/unicopia/client/render/entity/StormCloudEntityRenderer.java
View file

@ -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;

2
src/main/java/com/minelittlepony/unicopia/entity/Creature.java
View file

@ -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;

6
src/main/java/com/minelittlepony/unicopia/entity/DynamicLightSource.java
View file

@ -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 {

1
src/main/java/com/minelittlepony/unicopia/entity/EntityPhysics.java
View file

@ -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;

1
src/main/java/com/minelittlepony/unicopia/entity/Living.java
View file

@ -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;

2
src/main/java/com/minelittlepony/unicopia/entity/ai/ArenaAttackGoal.java
View file

@ -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;

2
src/main/java/com/minelittlepony/unicopia/entity/ai/BreakHeartGoal.java
View file

@ -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;

2
src/main/java/com/minelittlepony/unicopia/entity/ai/EatMuffinGoal.java
View file

@ -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;

4
src/main/java/com/minelittlepony/unicopia/entity/behaviour/EntityAppearance.java
View file

@ -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;

2
src/main/java/com/minelittlepony/unicopia/entity/MultiBoundingBoxEntity.java → src/main/java/com/minelittlepony/unicopia/entity/collision/MultiBoundingBoxEntity.java
View file

@ -1,4 +1,4 @@
package com.minelittlepony.unicopia.entity;
package com.minelittlepony.unicopia.entity.collision;
import java.util.List;

5
src/main/java/com/minelittlepony/unicopia/entity/AirBalloonEntity.java → src/main/java/com/minelittlepony/unicopia/entity/mob/AirBalloonEntity.java
View file

@ -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;

2
src/main/java/com/minelittlepony/unicopia/entity/ArenaCombatant.java → src/main/java/com/minelittlepony/unicopia/entity/mob/ArenaCombatant.java
View file

@ -1,4 +1,4 @@
package com.minelittlepony.unicopia.entity;
package com.minelittlepony.unicopia.entity.mob;
import java.util.Optional;

2
src/main/java/com/minelittlepony/unicopia/entity/ButterflyEntity.java → src/main/java/com/minelittlepony/unicopia/entity/mob/ButterflyEntity.java
View file

@ -1,4 +1,4 @@
package com.minelittlepony.unicopia.entity;
package com.minelittlepony.unicopia.entity.mob;
import java.util.HashMap;
import java.util.Map;

6
src/main/java/com/minelittlepony/unicopia/entity/CastSpellEntity.java → src/main/java/com/minelittlepony/unicopia/entity/mob/CastSpellEntity.java
View file

@ -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;

3
src/main/java/com/minelittlepony/unicopia/entity/CrystalShardsEntity.java → src/main/java/com/minelittlepony/unicopia/entity/mob/CrystalShardsEntity.java
View file

@ -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;

5
src/main/java/com/minelittlepony/unicopia/entity/FairyEntity.java → src/main/java/com/minelittlepony/unicopia/entity/mob/FairyEntity.java
View file

@ -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;

3
src/main/java/com/minelittlepony/unicopia/entity/FloatingArtefactEntity.java → src/main/java/com/minelittlepony/unicopia/entity/mob/FloatingArtefactEntity.java
View file

@ -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;

4
src/main/java/com/minelittlepony/unicopia/entity/LightEmittingEntity.java → src/main/java/com/minelittlepony/unicopia/entity/mob/LightEmittingEntity.java
View file

@ -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;

4
src/main/java/com/minelittlepony/unicopia/entity/SombraEntity.java → src/main/java/com/minelittlepony/unicopia/entity/mob/SombraEntity.java
View file

@ -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;

3
src/main/java/com/minelittlepony/unicopia/entity/SpellbookEntity.java → src/main/java/com/minelittlepony/unicopia/entity/mob/SpellbookEntity.java
View file

@ -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;

3
src/main/java/com/minelittlepony/unicopia/entity/StormCloudEntity.java → src/main/java/com/minelittlepony/unicopia/entity/mob/StormCloudEntity.java
View file

@ -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;

4
src/main/java/com/minelittlepony/unicopia/entity/UEntities.java → src/main/java/com/minelittlepony/unicopia/entity/mob/UEntities.java
View file

@ -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;

2
src/main/java/com/minelittlepony/unicopia/entity/UEntityAttributes.java → src/main/java/com/minelittlepony/unicopia/entity/mob/UEntityAttributes.java
View file

@ -1,4 +1,4 @@
package com.minelittlepony.unicopia.entity;
package com.minelittlepony.unicopia.entity.mob;
import java.util.ArrayList;
import java.util.List;

2
src/main/java/com/minelittlepony/unicopia/entity/UTradeOffers.java → src/main/java/com/minelittlepony/unicopia/entity/mob/UTradeOffers.java
View file

@ -1,4 +1,4 @@
package com.minelittlepony.unicopia.entity;
package com.minelittlepony.unicopia.entity.mob;
import org.jetbrains.annotations.Nullable;

2
src/main/java/com/minelittlepony/unicopia/entity/player/PlayerAttributes.java
View file

@ -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;

1
src/main/java/com/minelittlepony/unicopia/entity/player/Pony.java
View file

@ -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;

1
src/main/java/com/minelittlepony/unicopia/item/AlicornAmuletItem.java
View file

@ -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;

4
src/main/java/com/minelittlepony/unicopia/item/BasketItem.java
View file

@ -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;

5
src/main/java/com/minelittlepony/unicopia/item/CrystalHeartItem.java
View file

@ -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;

4
src/main/java/com/minelittlepony/unicopia/item/EnchantedStaffItem.java
View file

@ -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;

3
src/main/java/com/minelittlepony/unicopia/item/HeavyProjectileItem.java
View file

@ -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;

2
src/main/java/com/minelittlepony/unicopia/item/HotAirBalloonItem.java
View file

@ -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;

2
src/main/java/com/minelittlepony/unicopia/item/MuffinItem.java
View file

@ -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;

2
src/main/java/com/minelittlepony/unicopia/item/PolearmItem.java
View file

@ -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;

4
src/main/java/com/minelittlepony/unicopia/item/SpellbookItem.java
View file

@ -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;

2
src/main/java/com/minelittlepony/unicopia/item/StaffItem.java
View file

@ -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;

4
src/main/java/com/minelittlepony/unicopia/item/UItems.java
View file

@ -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;

2
src/main/java/com/minelittlepony/unicopia/item/enchantment/UEnchantments.java
View file

@ -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;

2
src/main/java/com/minelittlepony/unicopia/network/handler/ClientNetworkHandlerImpl.java
View file

@ -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;

2
src/main/java/com/minelittlepony/unicopia/projectile/MagicProjectileEntity.java
View file

@ -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;

3
src/main/java/com/minelittlepony/unicopia/entity/PhysicsBodyProjectileEntity.java → src/main/java/com/minelittlepony/unicopia/projectile/PhysicsBodyProjectileEntity.java
View file

@ -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;

6
src/main/java/com/minelittlepony/unicopia/server/world/Altar.java
View file

@ -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;

2
src/main/java/com/minelittlepony/unicopia/server/world/WeatherConditions.java
View file

@ -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;