Fix stair json weirdness

This commit is contained in:
Vincent Lee committed 2016-04-13 17:30:26 -05:00
1 parent f219836f81
commit be9fba512b
66 files changed
+1038 -1030

No files matched your search

@@ -18,6 +18,7 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import java.awt.*;
import java.util.UUID;
/**
* An extension of IBossDisplayData. This counts as a botania boss and as a normal
@@ -52,13 +53,18 @@ public interface IBotaniaBoss {
public Rectangle getBossBarHPTextureRect();
/**
* A callback for when this boss's boss bar renders, you can do aditional rendering
* A callback for when this boss's boss bar renders, you can do additional rendering
* here if needed.
*/
@SideOnly(Side.CLIENT)
public void bossBarRenderCallback(ScaledResolution res, int x, int y);
public BossInfo getBossInfo();
/**
* Get the UUID of the {@link BossInfo} instance tracking this boss
* @return The uuid. Note that this is NOT the entity's UUID!
* todo 1.9 is this needed?
*/
public UUID getBossInfoUuid();
public EntityLivingBase getEntity();
}
@@ -134,7 +134,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi
private static boolean isPlayingMusic = false;
private final BossInfoServer bossInfo = (BossInfoServer) (new BossInfoServer(this.getDisplayName(), BossInfo.Color.PINK, BossInfo.Overlay.PROGRESS)).setDarkenSky(true);
private final BossInfoServer bossInfo = (BossInfoServer) (new BossInfoServer(this.getDisplayName(), BossInfo.Color.PINK, BossInfo.Overlay.PROGRESS)).setCreateFog(true);
public EntityDoppleganger(World par1World) {
super(par1World);
@@ -515,6 +515,8 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi
public void onLivingUpdate() {
super.onLivingUpdate();
bossInfo.setPercent(getHealth() / getMaxHealth());
if(!getPassengers().isEmpty())
this.dismountRidingEntity();
@@ -549,7 +551,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi
BlockPos source = getSource();
boolean hard = isHardMode();
float range = RANGE + 3F;
float range;
List<EntityPlayer> players = getPlayersAround();
int playerCount = getPlayerCount();
@@ -898,8 +900,8 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi
}
@Override
public BossInfo getBossInfo() {
return bossInfo;
public UUID getBossInfoUuid() {
return bossInfo.getUniqueId();
}
@Override