Fix a bunch of entities not spawning properly

This commit is contained in:
Vincent Lee committed 2019-10-11 13:48:57 -05:00
1 parent 7fe136d400
commit b2682fd143
11 files changed
+78 -19

No files matched your search

@@ -15,6 +15,7 @@ import net.minecraft.entity.EntityType;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.network.IPacket;
import net.minecraft.network.datasync.DataParameter;
import net.minecraft.network.datasync.DataSerializers;
import net.minecraft.network.datasync.EntityDataManager;
@@ -28,6 +29,7 @@ import net.minecraft.util.math.RayTraceResult;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.Explosion;
import net.minecraft.world.World;
import net.minecraftforge.fml.network.NetworkHooks;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.client.fx.WispParticleData;
import vazkii.botania.common.core.handler.ModSounds;
@@ -79,6 +81,11 @@ public class EntityBabylonWeapon extends EntityThrowableCopy {
dataManager.register(ROTATION, 0F);
}
@Override
public IPacket<?> createSpawnPacket() {
return NetworkHooks.getEntitySpawningPacket(this);
}
@Override
public boolean isImmuneToExplosions() {
return true;
@@ -19,11 +19,13 @@ import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.EntityType;
import net.minecraft.entity.projectile.ThrowableEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.network.IPacket;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.BlockRayTraceResult;
import net.minecraft.util.math.EntityRayTraceResult;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.world.World;
import net.minecraftforge.fml.network.NetworkHooks;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.lib.LibMisc;
@@ -82,6 +84,12 @@ public class EntityEnderAirBottle extends ThrowableEntity implements IRendersAsI
@Override
protected void registerData() {}
@Nonnull
@Override
public IPacket<?> createSpawnPacket() {
return NetworkHooks.getEntitySpawningPacket(this);
}
@Nonnull
@Override
public ItemStack getItem() {
@@ -16,6 +16,7 @@ import net.minecraft.entity.Entity;
import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.EntityType;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.network.IPacket;
import net.minecraft.util.DamageSource;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
@@ -23,6 +24,7 @@ import net.minecraft.util.math.BlockRayTraceResult;
import net.minecraft.util.math.EntityRayTraceResult;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.world.World;
import net.minecraftforge.fml.network.NetworkHooks;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.client.fx.SparkleParticleData;
import vazkii.botania.common.core.handler.ConfigHandler;
@@ -46,6 +48,11 @@ public class EntityFallingStar extends EntityThrowableCopy {
@Override
protected void registerData() {}
@Override
public IPacket<?> createSpawnPacket() {
return NetworkHooks.getEntitySpawningPacket(this);
}
@Override
public void tick() {
super.tick();
@@ -21,6 +21,7 @@ import net.minecraft.entity.monster.IMob;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.projectile.ThrowableEntity;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.network.IPacket;
import net.minecraft.network.datasync.DataParameter;
import net.minecraft.network.datasync.DataSerializers;
import net.minecraft.network.datasync.EntityDataManager;
@@ -30,6 +31,7 @@ import net.minecraft.util.math.BlockRayTraceResult;
import net.minecraft.util.math.EntityRayTraceResult;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.world.World;
import net.minecraftforge.fml.network.NetworkHooks;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.client.fx.SparkleParticleData;
import vazkii.botania.common.Botania;
@@ -69,6 +71,12 @@ public class EntityMagicMissile extends ThrowableEntity {
dataManager.register(TARGET, 0);
}
@Nonnull
@Override
public IPacket<?> createSpawnPacket() {
return NetworkHooks.getEntitySpawningPacket(this);
}
public void setEvil(boolean evil) {
dataManager.set(EVIL, evil);
}
@@ -20,11 +20,13 @@ import net.minecraft.entity.boss.WitherEntity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.ServerPlayerEntity;
import net.minecraft.entity.player.ServerPlayerEntity;
import net.minecraft.network.IPacket;
import net.minecraft.particles.ParticleTypes;
import net.minecraft.util.Hand;
import net.minecraft.util.Hand;
import net.minecraft.util.math.MathHelper;
import net.minecraft.world.World;
import net.minecraftforge.fml.network.NetworkHooks;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.common.lib.LibMisc;
@@ -105,4 +107,10 @@ public class EntityPinkWither extends WitherEntity {
return this.posZ + (double)f1 * 1.3D;
}
}
@Nonnull
@Override
public IPacket<?> createSpawnPacket() {
return NetworkHooks.getEntitySpawningPacket(this);
}
}
@@ -15,12 +15,14 @@ import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.EntityType;
import net.minecraft.entity.SharedMonsterAttributes;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.network.IPacket;
import net.minecraft.network.datasync.DataParameter;
import net.minecraft.network.datasync.DataSerializers;
import net.minecraft.network.datasync.EntityDataManager;
import net.minecraft.potion.EffectInstance;
import net.minecraft.util.DamageSource;
import net.minecraft.world.World;
import net.minecraftforge.fml.network.NetworkHooks;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.client.fx.SparkleParticleData;
@@ -51,6 +53,12 @@ public class EntityPixie extends FlyingEntity {
dataManager.register(PIXIE_TYPE, 0);
}
@Nonnull
@Override
public IPacket<?> createSpawnPacket() {
return NetworkHooks.getEntitySpawningPacket(this);
}
@Override
protected void registerAttributes() {
super.registerAttributes();
@@ -16,6 +16,7 @@ import net.minecraft.entity.EntityType;
import net.minecraft.entity.item.minecart.AbstractMinecartEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.network.IPacket;
import net.minecraft.network.datasync.DataParameter;
import net.minecraft.network.datasync.DataSerializers;
import net.minecraft.network.datasync.EntityDataManager;
@@ -26,6 +27,7 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.world.World;
import net.minecraftforge.fml.network.NetworkHooks;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.internal.VanillaPacketDispatcher;
import vazkii.botania.api.mana.IManaPool;
@@ -61,6 +63,12 @@ public class EntityPoolMinecart extends AbstractMinecartEntity {
dataManager.register(MANA, 0);
}
@Nonnull
@Override
public IPacket<?> createSpawnPacket() {
return NetworkHooks.getEntitySpawningPacket(this);
}
@Nonnull
@Override
public BlockState getDisplayTile() {
@@ -21,6 +21,7 @@ import net.minecraft.entity.item.ItemEntity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.projectile.ThrowableEntity;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.network.IPacket;
import net.minecraft.potion.EffectInstance;
import net.minecraft.potion.Effects;
import net.minecraft.particles.ParticleTypes;
@@ -35,6 +36,7 @@ import net.minecraft.util.math.EntityRayTraceResult;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.World;
import net.minecraftforge.fml.network.NetworkHooks;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.common.core.helper.Vector3;
import vazkii.botania.common.item.ModItems;
@@ -69,6 +71,12 @@ public class EntityThornChakram extends ThrowableEntity implements IRendersAsIte
dataManager.register(RETURN_TO, -1);
}
@Nonnull
@Override
public IPacket<?> createSpawnPacket() {
return NetworkHooks.getEntitySpawningPacket(this);
}
@Override
public boolean isImmuneToExplosions() {
return true;
@@ -15,6 +15,7 @@ import net.minecraft.entity.EntityType;
import net.minecraft.entity.item.ItemEntity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.block.Blocks;
import net.minecraft.network.IPacket;
import net.minecraft.util.DamageSource;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockRayTraceResult;
@@ -23,6 +24,7 @@ import net.minecraft.util.math.RayTraceContext;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.World;
import net.minecraftforge.fml.network.NetworkHooks;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.common.core.helper.Vector3;
import vazkii.botania.common.lib.LibMisc;
@@ -58,6 +60,12 @@ public class EntityThrownItem extends ItemEntity {
return TYPE;
}
@Nonnull
@Override
public IPacket<?> createSpawnPacket() {
return NetworkHooks.getEntitySpawningPacket(this);
}
@Override
public void tick() {
super.tick();
@@ -18,6 +18,7 @@ import net.minecraft.entity.IRendersAsItem;
import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.EntityType;
import net.minecraft.entity.projectile.ThrowableEntity;
import net.minecraft.network.IPacket;
import net.minecraft.particles.ParticleTypes;
import net.minecraft.item.ItemStack;
import net.minecraft.network.datasync.DataParameter;
@@ -33,6 +34,7 @@ import net.minecraft.util.math.RayTraceResult;
import net.minecraft.world.World;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.fml.network.NetworkHooks;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.item.ModItems;
@@ -67,6 +69,12 @@ public class EntityVineBall extends ThrowableEntity implements IRendersAsItem {
dataManager.register(GRAVITY, 0F);
}
@Nonnull
@Override
public IPacket<?> createSpawnPacket() {
return NetworkHooks.getEntitySpawningPacket(this);
}
@OnlyIn(Dist.CLIENT)
@Override
public void handleStatusUpdate(byte id) {
@@ -25,7 +25,6 @@ public final class ModEntities {
public static void registerEntities(RegistryEvent.Register<EntityType<?>> evt) {
evt.getRegistry().register(EntityType.Builder.<EntityManaBurst>create(
EntityManaBurst::new, EntityClassification.MISC)
.setCustomClientFactory((p, w) -> new EntityManaBurst(w))
.size(0, 0)
.setUpdateInterval(10)
.setTrackingRange(64)
@@ -34,7 +33,6 @@ public final class ModEntities {
.setRegistryName(LibEntityNames.MANA_BURST));
evt.getRegistry().register(EntityType.Builder.<EntitySignalFlare>create(
EntitySignalFlare::new, EntityClassification.MISC)
.setCustomClientFactory((p, w) -> new EntitySignalFlare(w))
.size(0, 0)
.setUpdateInterval(10)
.setTrackingRange(2048)
@@ -42,7 +40,6 @@ public final class ModEntities {
.build("")
.setRegistryName(LibEntityNames.SIGNAL_FLARE));
evt.getRegistry().register(EntityType.Builder.<EntityPixie>create(EntityPixie::new, EntityClassification.MISC)
.setCustomClientFactory((p, w) -> new EntityPixie(w))
.size(1, 1)
.setUpdateInterval(3)
.setTrackingRange(16)
@@ -50,7 +47,6 @@ public final class ModEntities {
.build("")
.setRegistryName(LibEntityNames.PIXIE));
evt.getRegistry().register(EntityType.Builder.<EntityFlameRing>create(EntityFlameRing::new, EntityClassification.MISC)
.setCustomClientFactory((p, w) -> new EntityFlameRing(w))
.size(0, 0)
.setTrackingRange(32)
.setUpdateInterval(40)
@@ -58,14 +54,12 @@ public final class ModEntities {
.build("")
.setRegistryName(LibEntityNames.FLAME_RING));
evt.getRegistry().register(EntityType.Builder.<EntityVineBall>create(EntityVineBall::new, EntityClassification.MISC)
.setCustomClientFactory((p, w) -> new EntityVineBall(w))
.setTrackingRange(64)
.setUpdateInterval(10)
.setShouldReceiveVelocityUpdates(true)
.build("")
.setRegistryName(LibEntityNames.VINE_BALL));
evt.getRegistry().register(EntityType.Builder.<EntityDoppleganger>create(EntityDoppleganger::new, EntityClassification.MONSTER)
.setCustomClientFactory((p, w) -> new EntityDoppleganger(w))
.size(0.6F, 1.8F)
.immuneToFire()
.setTrackingRange(128)
@@ -74,7 +68,6 @@ public final class ModEntities {
.build("")
.setRegistryName(LibEntityNames.DOPPLEGANGER));
evt.getRegistry().register(EntityType.Builder.<EntityMagicLandmine>create(EntityMagicLandmine::new, EntityClassification.MISC)
.setCustomClientFactory((p, w) -> new EntityMagicLandmine(w))
.size(0, 0)
.setTrackingRange(128)
.setUpdateInterval(40)
@@ -82,7 +75,6 @@ public final class ModEntities {
.build("")
.setRegistryName(LibEntityNames.MAGIC_LANDMINE));
evt.getRegistry().register(EntityType.Builder.<EntitySpark>create(EntitySpark::new, EntityClassification.MISC)
.setCustomClientFactory((p, w) -> new EntitySpark(w))
.size(0.1F, 0.5F)
.immuneToFire()
.setTrackingRange(64)
@@ -91,7 +83,6 @@ public final class ModEntities {
.build("")
.setRegistryName(LibEntityNames.SPARK));
evt.getRegistry().register(EntityType.Builder.<EntityThrownItem>create(EntityThrownItem::new, EntityClassification.MISC)
.setCustomClientFactory((p, w) -> new EntityThrownItem(w))
.size(0.25F, 0.25F)
.setTrackingRange(64)
.setUpdateInterval(20)
@@ -99,7 +90,6 @@ public final class ModEntities {
.build("")
.setRegistryName(LibEntityNames.THROWN_ITEM));
evt.getRegistry().register(EntityType.Builder.<EntityMagicMissile>create(EntityMagicMissile::new, EntityClassification.MISC)
.setCustomClientFactory((p, w) -> new EntityMagicMissile(w))
.size(0, 0)
.setTrackingRange(64)
.setUpdateInterval(2)
@@ -107,14 +97,12 @@ public final class ModEntities {
.build("")
.setRegistryName(LibEntityNames.MAGIC_MISSILE));
evt.getRegistry().register(EntityType.Builder.<EntityThornChakram>create(EntityThornChakram::new, EntityClassification.MISC)
.setCustomClientFactory((p, w) -> new EntityThornChakram(EntityThornChakram.TYPE, w))
.setTrackingRange(64)
.setUpdateInterval(10)
.setShouldReceiveVelocityUpdates(true)
.build("")
.setRegistryName(LibEntityNames.THORN_CHAKRAM));
evt.getRegistry().register(EntityType.Builder.<EntityCorporeaSpark>create(EntityCorporeaSpark::new, EntityClassification.MISC)
.setCustomClientFactory((p, w) -> new EntityCorporeaSpark(w))
.size(0.1F, 0.5F)
.immuneToFire()
.setTrackingRange(64)
@@ -123,7 +111,6 @@ public final class ModEntities {
.build("")
.setRegistryName(LibEntityNames.CORPOREA_SPARK));
evt.getRegistry().register(EntityType.Builder.<EntityEnderAirBottle>create(EntityEnderAirBottle::new, EntityClassification.MISC)
.setCustomClientFactory((p, w) -> new EntityEnderAirBottle(EntityEnderAirBottle.TYPE, w))
.size(0.25F, 0.25F)
.setTrackingRange(64)
.setUpdateInterval(10)
@@ -131,7 +118,6 @@ public final class ModEntities {
.build("")
.setRegistryName(LibEntityNames.ENDER_AIR_BOTTLE));
evt.getRegistry().register(EntityType.Builder.<EntityPoolMinecart>create(EntityPoolMinecart::new, EntityClassification.MISC)
.setCustomClientFactory((p, w) -> new EntityPoolMinecart(EntityPoolMinecart.TYPE, w))
.size(0.98F, 0.7F)
.setTrackingRange(80)
.setUpdateInterval(3)
@@ -139,7 +125,6 @@ public final class ModEntities {
.build("")
.setRegistryName(LibEntityNames.POOL_MINECART));
evt.getRegistry().register(EntityType.Builder.<EntityPinkWither>create(EntityPinkWither::new, EntityClassification.MISC)
.setCustomClientFactory((p, w) -> new EntityPinkWither(w))
.size(0.9F, 3.5F)
.setTrackingRange(80)
.setUpdateInterval(3)
@@ -147,7 +132,6 @@ public final class ModEntities {
.build("")
.setRegistryName(LibEntityNames.PINK_WITHER));
evt.getRegistry().register(EntityType.Builder.<EntityPlayerMover>create(EntityPlayerMover::new, EntityClassification.MISC)
.setCustomClientFactory((p, w) -> new EntityPlayerMover(EntityPlayerMover.TYPE, w))
.size(0, 0)
.setTrackingRange(40)
.setUpdateInterval(3)
@@ -155,14 +139,12 @@ public final class ModEntities {
.build("")
.setRegistryName(LibEntityNames.PLAYER_MOVER));
evt.getRegistry().register(EntityType.Builder.<EntityManaStorm>create(EntityManaStorm::new, EntityClassification.MISC)
.setCustomClientFactory((p, w) -> new EntityManaStorm(w))
.setTrackingRange(64)
.setUpdateInterval(10)
.setShouldReceiveVelocityUpdates(false)
.build("")
.setRegistryName(LibEntityNames.MANA_STORM));
evt.getRegistry().register(EntityType.Builder.<EntityBabylonWeapon>create(EntityBabylonWeapon::new, EntityClassification.MISC)
.setCustomClientFactory((p, w) -> new EntityBabylonWeapon(EntityBabylonWeapon.TYPE, w))
.size(0, 0)
.setTrackingRange(64)
.setUpdateInterval(10)
@@ -170,7 +152,6 @@ public final class ModEntities {
.build("")
.setRegistryName(LibEntityNames.BABYLON_WEAPON));
evt.getRegistry().register(EntityType.Builder.<EntityFallingStar>create(EntityFallingStar::new, EntityClassification.MISC)
.setCustomClientFactory((p, w) -> new EntityFallingStar(EntityFallingStar.TYPE, w))
.size(0, 0)
.setTrackingRange(64)
.setUpdateInterval(10)