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

Formatting!

Browse source
This commit is contained in:
WayofTime 2016-06-23 21:43:27 -04:00
parent d240daf958
commit 8c4eff0d81
30 changed files with 301 additions and 225 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/main/java/WayofTime/bloodmagic/client/hud/HUDElement.java
View file

@ -12,7 +12,8 @@ import net.minecraftforge.client.event.RenderGameOverlayEvent;
@Getter
@Setter
public abstract class HUDElement {
public abstract class HUDElement
{
private int xOffset;
private int yOffset;
@ -20,7 +21,8 @@ public abstract class HUDElement {
private final int yOffsetDefault;
private final RenderGameOverlayEvent.ElementType elementType;
public HUDElement(int xOffset, int yOffset, RenderGameOverlayEvent.ElementType elementType) {
public HUDElement(int xOffset, int yOffset, RenderGameOverlayEvent.ElementType elementType)
{
this.xOffset = xOffset;
this.xOffsetDefault = xOffset;
this.yOffset = yOffset;
@ -34,25 +36,28 @@ public abstract class HUDElement {
public abstract boolean shouldRender(Minecraft minecraft);
public void onPositionChanged() {
public void onPositionChanged()
{
}
public void resetToDefault() {
public void resetToDefault()
{
this.xOffset = xOffsetDefault;
this.yOffset = yOffsetDefault;
}
public void drawTexturedModalRect(int x, int y, int textureX, int textureY, int width, int height) {
public void drawTexturedModalRect(int x, int y, int textureX, int textureY, int width, int height)
{
float f = 0.00390625F;
float f1 = 0.00390625F;
Tessellator tessellator = Tessellator.getInstance();
VertexBuffer vertexbuffer = tessellator.getBuffer();
vertexbuffer.begin(7, DefaultVertexFormats.POSITION_TEX);
vertexbuffer.pos((double)(x + 0), (double)(y + height), 0).tex((double)((float)(textureX + 0) * f), (double)((float)(textureY + height) * f1)).endVertex();
vertexbuffer.pos((double)(x + width), (double)(y + height), 0).tex((double)((float)(textureX + width) * f), (double)((float)(textureY + height) * f1)).endVertex();
vertexbuffer.pos((double)(x + width), (double)(y + 0), 0).tex((double)((float)(textureX + width) * f), (double)((float)(textureY + 0) * f1)).endVertex();
vertexbuffer.pos((double)(x + 0), (double)(y + 0), 0).tex((double)((float)(textureX + 0) * f), (double)((float)(textureY + 0) * f1)).endVertex();
vertexbuffer.pos((double) (x + 0), (double) (y + height), 0).tex((double) ((float) (textureX + 0) * f), (double) ((float) (textureY + height) * f1)).endVertex();
vertexbuffer.pos((double) (x + width), (double) (y + height), 0).tex((double) ((float) (textureX + width) * f), (double) ((float) (textureY + height) * f1)).endVertex();
vertexbuffer.pos((double) (x + width), (double) (y + 0), 0).tex((double) ((float) (textureX + width) * f), (double) ((float) (textureY + 0) * f1)).endVertex();
vertexbuffer.pos((double) (x + 0), (double) (y + 0), 0).tex((double) ((float) (textureX + 0) * f), (double) ((float) (textureY + 0) * f1)).endVertex();
tessellator.draw();
}
}

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

@ -14,14 +14,17 @@ import net.minecraftforge.client.event.RenderGameOverlayEvent;
import javax.annotation.Nullable;
public class HUDElementHolding extends HUDElement {
public class HUDElementHolding extends HUDElement
{
public HUDElementHolding() {
public HUDElementHolding()
{
super(0, 0, RenderGameOverlayEvent.ElementType.HOTBAR);
}
@Override
public void render(Minecraft minecraft, ScaledResolution resolution, float partialTicks) {
public void render(Minecraft minecraft, ScaledResolution resolution, float partialTicks)
{
ItemStack sigilHolding = minecraft.thePlayer.getHeldItemMainhand();
// TODO - Clean this mess
// Check mainhand for Sigil of Holding
@ -59,7 +62,8 @@ public class HUDElementHolding extends HUDElement {
}
@Override
public boolean shouldRender(Minecraft minecraft) {
public boolean shouldRender(Minecraft minecraft)
{
return true;
}

18
src/main/java/WayofTime/bloodmagic/client/render/LayerBloodElytra.java
View file

@ -13,21 +13,26 @@ import net.minecraft.inventory.EntityEquipmentSlot;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
public class LayerBloodElytra implements LayerRenderer<AbstractClientPlayer> {
public class LayerBloodElytra implements LayerRenderer<AbstractClientPlayer>
{
private static final ResourceLocation TEXTURE_BLOOD_ELYTRA = new ResourceLocation("bloodmagic", "textures/entities/bloodElytra.png");
private final RenderPlayer renderPlayer;
private final ModelElytra modelElytra = new ModelElytra();
public LayerBloodElytra(RenderPlayer renderPlayer) {
public LayerBloodElytra(RenderPlayer renderPlayer)
{
this.renderPlayer = renderPlayer;
}
@Override
public void doRenderLayer(AbstractClientPlayer clientPlayer, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale) {
if (LivingArmour.hasFullSet(clientPlayer)) {
public void doRenderLayer(AbstractClientPlayer clientPlayer, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale)
{
if (LivingArmour.hasFullSet(clientPlayer))
{
ItemStack chestStack = clientPlayer.getItemStackFromSlot(EntityEquipmentSlot.CHEST);
if (ItemLivingArmour.hasUpgrade(Constants.Mod.MODID + ".upgrade.elytra", chestStack)) {
if (ItemLivingArmour.hasUpgrade(Constants.Mod.MODID + ".upgrade.elytra", chestStack))
{
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
GlStateManager.enableBlend();
@ -47,7 +52,8 @@ public class LayerBloodElytra implements LayerRenderer<AbstractClientPlayer> {
}
@Override
public boolean shouldCombineTextures() {
public boolean shouldCombineTextures()
{
return false;
}
}

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

@ -153,24 +153,24 @@ public class RenderAltar extends TileEntitySpecialRenderer<TileAltar>
switch (altarComponent.getComponent())
{
case BLOODRUNE:
texture = ClientHandler.blankBloodRune;
break;
case NOTAIR:
texture = ClientHandler.stoneBrick;
break;
case GLOWSTONE:
texture = ClientHandler.glowstone;
break;
case BLOODSTONE:
texture = ClientHandler.bloodStoneBrick;
break;
case BEACON:
texture = ClientHandler.beacon;
break;
case CRYSTAL:
texture = ClientHandler.crystalCluster;
break;
case BLOODRUNE:
texture = ClientHandler.blankBloodRune;
break;
case NOTAIR:
texture = ClientHandler.stoneBrick;
break;
case GLOWSTONE:
texture = ClientHandler.glowstone;
break;
case BLOODSTONE:
texture = ClientHandler.bloodStoneBrick;
break;
case BEACON:
texture = ClientHandler.beacon;
break;
case CRYSTAL:
texture = ClientHandler.crystalCluster;
break;
}
RenderFakeBlocks.drawFakeBlock(texture, minX, minY, minZ, world);