lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

It runs!

Browse source
This commit is contained in:
Nicholas Ignoffo 2017-01-02 00:10:28 -08:00
parent 51e10eaad2
commit ed27873fbe
42 changed files with 3606 additions and 3648 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/WayofTime/bloodmagic/client/hud/HUDElementDemonWillAura.java
View file

@ -34,7 +34,7 @@ public class HUDElementDemonWillAura extends HUDElement
@Override
public void render(Minecraft minecraft, ScaledResolution resolution, float partialTicks)
{
EntityPlayer player = minecraft.thePlayer;
EntityPlayer player = minecraft.player;
if (!Utils.canPlayerSeeDemonWill(player))
{

13
src/main/java/WayofTime/bloodmagic/client/hud/HUDElementHolding.java
View file

@ -26,16 +26,11 @@ public class HUDElementHolding extends HUDElement
@Override
public void render(Minecraft minecraft, ScaledResolution resolution, float partialTicks)
{
ItemStack sigilHolding = minecraft.thePlayer.getHeldItemMainhand();
// TODO - Clean this mess
ItemStack sigilHolding = minecraft.player.getHeldItemMainhand();
// Check mainhand for Sigil of Holding
if (sigilHolding == null)
return;
if (!(sigilHolding.getItem() == ModItems.SIGIL_HOLDING))
sigilHolding = minecraft.thePlayer.getHeldItemOffhand();
sigilHolding = minecraft.player.getHeldItemOffhand();
// Check offhand for Sigil of Holding
if (sigilHolding == null)
return;
if (!(sigilHolding.getItem() == ModItems.SIGIL_HOLDING))
return;
@ -54,7 +49,7 @@ public class HUDElementHolding extends HUDElement
{
for (ItemStack sigil : holdingInv)
{
renderHotbarItem(resolution.getScaledWidth() / 2 + 103 + xOffset + getXOffset(), resolution.getScaledHeight() - 18 + getYOffset(), partialTicks, minecraft.thePlayer, sigil);
renderHotbarItem(resolution.getScaledWidth() / 2 + 103 + xOffset + getXOffset(), resolution.getScaledHeight() - 18 + getYOffset(), partialTicks, minecraft.player, sigil);
xOffset += 20;
}
}
@ -72,7 +67,7 @@ public class HUDElementHolding extends HUDElement
{
if (stack != null)
{
float animation = (float) stack.animationsToGo - partialTicks;
float animation = (float) stack.getAnimationsToGo() - partialTicks;
if (animation > 0.0F)
{