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/gui/GuiAlchemyTable.java
View file

@ -52,7 +52,7 @@ public class GuiAlchemyTable extends GuiContainer
{
Slot slot = this.inventorySlots.getSlot(slotId);
this.drawTexturedModalRect(i + slot.xDisplayPosition, j + slot.yDisplayPosition, 195, 1, 16, 16);
this.drawTexturedModalRect(i + slot.xPos, j + slot.yPos, 195, 1, 16, 16);
}
}
}

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

12
src/main/java/WayofTime/bloodmagic/client/key/KeyBindings.java
View file

@ -27,8 +27,8 @@ public enum KeyBindings
@Override
public void handleKeybind()
{
ItemStack itemStack = ClientHandler.minecraft.thePlayer.getHeldItemMainhand();
if (itemStack != null && itemStack.getItem() instanceof IKeybindable)
ItemStack itemStack = ClientHandler.minecraft.player.getHeldItemMainhand();
if (itemStack.getItem() instanceof IKeybindable)
BloodMagicPacketHandler.INSTANCE.sendToServer(new KeyProcessor(this, false));
}
},
@ -38,8 +38,8 @@ public enum KeyBindings
@Override
public void handleKeybind()
{
EntityPlayerSP player = Minecraft.getMinecraft().thePlayer;
if (player.getHeldItemMainhand() != null && player.getHeldItemMainhand().getItem() instanceof ItemSigilHolding)
EntityPlayerSP player = Minecraft.getMinecraft().player;
if (player.getHeldItemMainhand().getItem() instanceof ItemSigilHolding)
ClientHandler.cycleSigil(player.getHeldItemMainhand(), player, -1);
}
},
@ -49,8 +49,8 @@ public enum KeyBindings
@Override
public void handleKeybind()
{
EntityPlayerSP player = Minecraft.getMinecraft().thePlayer;
if (player.getHeldItemMainhand() != null && player.getHeldItemMainhand().getItem() instanceof ItemSigilHolding)
EntityPlayerSP player = Minecraft.getMinecraft().player;
if (player.getHeldItemMainhand().getItem() instanceof ItemSigilHolding)
ClientHandler.cycleSigil(player.getHeldItemMainhand(), player, 1);
}
},

6
src/main/java/WayofTime/bloodmagic/client/render/block/RenderAltar.java
View file

@ -102,7 +102,7 @@ public class RenderAltar extends TileEntitySpecialRenderer<TileAltar>
{
GlStateManager.translate(0.5, 1, 0.5);
EntityItem entityitem = new EntityItem(world, 0.0D, 0.0D, 0.0D, stack);
entityitem.getEntityItem().stackSize = 1;
entityitem.getEntityItem().setCount(1);
entityitem.hoverStart = 0.0F;
GlStateManager.pushMatrix();
GlStateManager.disableLighting();
@ -124,8 +124,8 @@ public class RenderAltar extends TileEntitySpecialRenderer<TileAltar>
private void renderHologram(TileAltar altar, EnumAltarTier tier, float partialTicks)
{
EntityPlayerSP player = mc.thePlayer;
World world = player.worldObj;
EntityPlayerSP player = mc.player;
World world = player.world;
if (tier == EnumAltarTier.ONE)
return;

2
src/main/java/WayofTime/bloodmagic/client/render/block/RenderDemonCrucible.java
View file

@ -37,7 +37,7 @@ public class RenderDemonCrucible extends TileEntitySpecialRenderer<TileDemonCruc
{
GlStateManager.translate(0.5, 1.5, 0.5);
EntityItem entityitem = new EntityItem(world, 0.0D, 0.0D, 0.0D, stack);
entityitem.getEntityItem().stackSize = 1;
entityitem.getEntityItem().setCount(1);
entityitem.hoverStart = 0.0F;
GlStateManager.pushMatrix();
GlStateManager.disableLighting();

6
src/main/java/WayofTime/bloodmagic/client/render/block/RenderItemRoutingNode.java
View file

@ -28,7 +28,7 @@ public class RenderItemRoutingNode extends TileEntitySpecialRenderer<TileRouting
@Override
public void renderTileEntityAt(TileRoutingNode tileNode, double x, double y, double z, float partialTicks, int destroyStage)
{
if ((mc.thePlayer.getHeldItemMainhand() != null && mc.thePlayer.getHeldItemMainhand().getItem() instanceof INodeRenderer) || ConfigHandler.alwaysRenderRoutingLines)
if (mc.player.getHeldItemMainhand().getItem() instanceof INodeRenderer || ConfigHandler.alwaysRenderRoutingLines)
{
List<BlockPos> connectionList = tileNode.getConnected();
for (BlockPos wantedPos : connectionList)
@ -41,7 +41,7 @@ public class RenderItemRoutingNode extends TileEntitySpecialRenderer<TileRouting
int yd = offsetPos.getY();
int zd = offsetPos.getZ();
double distance = Math.sqrt(xd * xd + yd * yd + zd * zd);
double subLength = MathHelper.sqrt_double(xd * xd + zd * zd);
double subLength = MathHelper.sqrt(xd * xd + zd * zd);
float rotYaw = -((float) (Math.atan2(zd, xd) * 180.0D / Math.PI));
float rotPitch = ((float) (Math.atan2(yd, subLength) * 180.0D / Math.PI));
@ -55,7 +55,7 @@ public class RenderItemRoutingNode extends TileEntitySpecialRenderer<TileRouting
GlStateManager.disableLighting();
GlStateManager.disableCull();
float f2 = 0;
float f3 = -f2 * 0.2F - (float) MathHelper.floor_float(-f2 * 0.1F);
float f3 = -f2 * 0.2F - (float) MathHelper.floor(-f2 * 0.1F);
GlStateManager.enableBlend();
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);

13
src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedZombie.java
View file

@ -22,8 +22,8 @@ public class RenderCorruptedZombie extends RenderBiped<EntityCorruptedZombie>
public RenderCorruptedZombie(RenderManager renderManagerIn)
{
super(renderManagerIn, new ModelZombie(), 0.5F, 1.0F);
LayerRenderer<?> layerrenderer = (LayerRenderer) this.layerRenderers.get(0);
super(renderManagerIn, new ModelZombie(), 0.5F);
LayerRenderer<?> layerrenderer = this.layerRenderers.get(0);
this.zombieVillagerModel = new ModelZombieVillager();
this.addLayer(new LayerHeldItem(this));
LayerBipedArmor layerbipedarmor = new LayerBipedArmor(this)
@ -38,11 +38,11 @@ public class RenderCorruptedZombie extends RenderBiped<EntityCorruptedZombie>
if (layerrenderer instanceof LayerCustomHead)
{
this.removeLayer(layerrenderer);
layerRenderers.remove(layerrenderer);
this.addLayer(new LayerCustomHead(this.zombieVillagerModel.bipedHead));
}
this.removeLayer(layerbipedarmor);
this.layerRenderers.remove(layerbipedarmor);
this.addLayer(new LayerWill<EntityCorruptedZombie>(this, new ModelZombie(1.2f, false)));
}
@ -71,9 +71,4 @@ public class RenderCorruptedZombie extends RenderBiped<EntityCorruptedZombie>
{
return ZOMBIE_TEXTURES;
}
protected void rotateCorpse(EntityCorruptedZombie entityLiving, float p_77043_2_, float p_77043_3_, float partialTicks)
{
super.rotateCorpse(entityLiving, p_77043_2_, p_77043_3_, partialTicks);
}
}