This commit is contained in:
John Yorke committed 2020-10-26 20:43:15 -03:00
1 parent cbb61ebcbe
commit 82de9e1aa0
74 files changed
+3485 -3415

No files matched your search

@@ -35,18 +35,18 @@ public class ClientHandler
@SubscribeEvent
public void onPlayerRender (RenderPlayerEvent.Specials.Post event)
{
EntityPlayer p = event.entityPlayer;
if (p.getActivePotionEffect(Potion.invisibility) != null) return;
ItemStack[] inv = p.inventory.mainInventory;
EntityPlayer player = event.entityPlayer;
if (player.getActivePotionEffect(Potion.invisibility) != null) return;
ItemStack[] inv = player.inventory.mainInventory;
List<Item> rendering = new ArrayList<Item>();
for (int i = 0; i < 36; i++)
{
ItemStack s = inv[i];
if (s != null && s.getItem() instanceof IRenderInventoryItem && !rendering.contains(s.getItem()))
ItemStack stack = inv[i];
if (stack != null && stack.getItem() instanceof IRenderInventoryItem && !rendering.contains(stack.getItem()))
{
((IRenderInventoryItem) s.getItem()).render(p, s, event.partialRenderTick);
rendering.add(s.getItem());
((IRenderInventoryItem) stack.getItem()).render(player, stack, event.partialRenderTick);
rendering.add(stack.getItem());
}
if (i == 36) rendering.clear();
}
@@ -12,7 +12,6 @@ import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.gui.ScaledResolution;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.MathHelper;
import net.minecraftforge.client.event.RenderGameOverlayEvent;
import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType;
@@ -22,91 +21,94 @@ import taintedmagic.common.TaintedMagic;
@SideOnly (Side.CLIENT)
public class HUDHandler
{
@SubscribeEvent
public void renderGameOverlayEvent (RenderGameOverlayEvent.Post event)
{
if (event.type == ElementType.ALL)
{
renderHeldItemHUD(event.partialTicks);
renderString();
}
}
@SubscribeEvent
public void renderGameOverlayEvent (RenderGameOverlayEvent.Post event)
{
if (event.type == ElementType.ALL)
{
renderHeldItemHUD(event.partialTicks);
renderString();
}
}
private static float ticksEquipped = 0.0F;
private static ItemStack s = null;
private static ItemStack last = null;
private static float ticksEquipped = 0.0F;
private static ItemStack stack = null;
private static ItemStack last = null;
private void renderHeldItemHUD (float pt)
{
EntityPlayer p = TaintedMagic.proxy.getClientPlayer();
Minecraft mc = Minecraft.getMinecraft();
ScaledResolution res = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight);
private void renderHeldItemHUD (float partialTicks)
{
EntityPlayer player = TaintedMagic.proxy.getClientPlayer();
Minecraft mc = Minecraft.getMinecraft();
ScaledResolution res = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight);
if (s != null && s.getItem() instanceof IHeldItemHUD) last = s.copy();
s = p.getCurrentEquippedItem();
if (stack != null && stack.getItem() instanceof IHeldItemHUD) last = stack.copy();
stack = player.getCurrentEquippedItem();
boolean b = false;
if (s != null && s.getItem() instanceof IHeldItemHUD) b = true;
else b = false;
boolean b = false;
if (stack != null && stack.getItem() instanceof IHeldItemHUD) b = true;
else b = false;
float time = 30.0F;
if (b) ticksEquipped = Math.min(time, ticksEquipped + pt);
else ticksEquipped = Math.max(0F, ticksEquipped - pt);
float time = 30.0F;
if (b) ticksEquipped = Math.min(time, ticksEquipped + partialTicks);
else ticksEquipped = Math.max(0F, ticksEquipped - partialTicks);
float fract = ticksEquipped / time;
float fract = ticksEquipped / time;
if (b) ((IHeldItemHUD) s.getItem()).renderHUD(res, p, s, pt, fract);
else if (!b && ticksEquipped != 0) ((IHeldItemHUD) last.getItem()).renderHUD(res, p, last, pt, fract);
}
if (b) ((IHeldItemHUD) stack.getItem()).renderHUD(res, player, stack, partialTicks, fract);
else if (!b && ticksEquipped != 0) ((IHeldItemHUD) last.getItem()).renderHUD(res, player, last, partialTicks, fract);
}
private static String currentStr;
private static int start;
private static int ticks;
private static boolean gay;
private static String currentStr;
private static int start;
private static int ticks;
private static boolean gay;
public static void displayStringRainbow (String str, int display)
{
}
/**
* Displays text above the health bar for a specified duration.
*
* @param str The string to display.
* @param duration The duration to display it for (in ticks).
* @param rainbow Setting this to true makes things absolutely fabulous.
*/
public static void displayString (String str, int duration, boolean rainbow)
{
currentStr = str;
ticks = start = duration;
gay = rainbow;
}
public static void displayString (String str, int duration, boolean rainbow)
{
currentStr = str;
ticks = start = duration;
gay = rainbow;
}
public static void updateTicks ()
{
if (ticks > 0) ticks--;
}
public static void updateTicks ()
{
if (ticks > 0) ticks--;
}
private void renderString ()
{
if (ticks > 0 && !MathHelper.stringNullOrLengthZero(currentStr))
{
Minecraft mc = Minecraft.getMinecraft();
ScaledResolution res = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight);
int x = res.getScaledWidth();
int y = res.getScaledHeight();
FontRenderer font = mc.fontRenderer;
private void renderString ()
{
if (ticks > 0 && !MathHelper.stringNullOrLengthZero(currentStr))
{
Minecraft mc = Minecraft.getMinecraft();
ScaledResolution res = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight);
int x = res.getScaledWidth();
int y = res.getScaledHeight();
FontRenderer font = mc.fontRenderer;
int startX = (x - font.getStringWidth(currentStr)) / 2;
int startY = y - 72;
int startX = (x - font.getStringWidth(currentStr)) / 2;
int startY = y - 72;
int opacity = ticks > ((float) start * 0.25F) ? 255 : (int) (255F * ((float) ticks / ((float) start * 0.25F)));
if (opacity < 5) opacity = 0;
int opacity = ticks > ((float) start * 0.25F) ? 255 : (int) (255F * ((float) ticks / ((float) start * 0.25F)));
if (opacity < 5) opacity = 0;
int rgb = Color.HSBtoRGB( ((float) (start - ticks) / (float) start), 1.0F, 1.0F);
int rgb = Color.HSBtoRGB( ((float) (start - ticks) / (float) start), 1.0F, 1.0F);
if (opacity > 0)
{
GL11.glPushMatrix();
GL11.glEnable(GL11.GL_BLEND);
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
font.drawStringWithShadow(currentStr, startX, startY, (gay ? rgb : 0xFFFFFF) + (opacity << 24));
GL11.glDisable(GL11.GL_BLEND);
GL11.glPopMatrix();
}
}
}
if (opacity > 0)
{
GL11.glPushMatrix();
GL11.glEnable(GL11.GL_BLEND);
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
font.drawStringWithShadow(currentStr, startX, startY, (gay ? rgb : 0xFFFFFF) + (opacity << 24));
GL11.glDisable(GL11.GL_BLEND);
GL11.glPopMatrix();
}
}
}
}