From df8fc76c48b392fa1afc069c419664403e482017 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 5 Oct 2019 12:40:19 -0500 Subject: [PATCH] Fix #2975, fix #2976 --- .../java/vazkii/botania/api/boss/IBotaniaBoss.java | 2 +- .../botania/common/entity/EntityDoppleganger.java | 8 ++++++++ .../textures/gui/{bossbar.png => boss_bar.png} | Bin 3 files changed, 9 insertions(+), 1 deletion(-) rename src/main/resources/assets/botania/textures/gui/{bossbar.png => boss_bar.png} (100%) diff --git a/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java b/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java index 3850d9941..fac03868d 100644 --- a/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java +++ b/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java @@ -57,7 +57,7 @@ public interface IBotaniaBoss { /** * Get the serverside UUID of the {@link ServerBossInfo} instance tracking this boss * Note that this is NOT the entity's UUID, nor is it the clientside UUID of the BossInfoServer instance! - * You will most likely need to sync this yourself using the datawatcher + * You will most likely need to sync this yourself using IEntityAdditionalSpawnData or similar. * @return The uuid. */ public UUID getBossInfoUuid(); diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 39f42fc73..e25da74fb 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -29,6 +29,7 @@ import net.minecraft.inventory.EquipmentSlotType; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.nbt.CompoundNBT; +import net.minecraft.network.IPacket; import net.minecraft.network.PacketBuffer; import net.minecraft.network.datasync.DataParameter; import net.minecraft.network.datasync.DataSerializers; @@ -63,6 +64,7 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.fml.common.registry.IEntityAdditionalSpawnData; +import net.minecraftforge.fml.network.NetworkHooks; import net.minecraftforge.registries.ObjectHolder; import org.lwjgl.opengl.ARBShaderObjects; import vazkii.botania.api.boss.IBotaniaBoss; @@ -1016,6 +1018,12 @@ public class EntityDoppleganger extends MobEntity implements IBotaniaBoss, IEnti Minecraft.getInstance().getSoundHandler().play(new DopplegangerMusic(this)); } + @Nonnull + @Override + public IPacket createSpawnPacket() { + return NetworkHooks.getEntitySpawningPacket(this); + } + @OnlyIn(Dist.CLIENT) private static class DopplegangerMusic extends TickableSound { private final EntityDoppleganger guardian; diff --git a/src/main/resources/assets/botania/textures/gui/bossbar.png b/src/main/resources/assets/botania/textures/gui/boss_bar.png similarity index 100% rename from src/main/resources/assets/botania/textures/gui/bossbar.png rename to src/main/resources/assets/botania/textures/gui/boss_bar.png