From 98029eb6d6d897b325825ab4fabf5e2da0936bc4 Mon Sep 17 00:00:00 2001 From: John Yorke Date: Sun, 20 Aug 2017 16:27:35 -0300 Subject: [PATCH] HUD stuff --- .../java/taintedmagic/api/IHeldItemHUD.java | 10 ++ .../client/handler/HUDHandler.java | 60 ++++++----- .../common/items/ItemFlyteCharm.java | 1 - .../common/items/tools/ItemKatana.java | 101 +++++++----------- .../items/tools/ItemThaumicDisassembler.java | 93 ++++++---------- 5 files changed, 118 insertions(+), 147 deletions(-) create mode 100644 src/main/java/taintedmagic/api/IHeldItemHUD.java diff --git a/src/main/java/taintedmagic/api/IHeldItemHUD.java b/src/main/java/taintedmagic/api/IHeldItemHUD.java new file mode 100644 index 0000000..805bc14 --- /dev/null +++ b/src/main/java/taintedmagic/api/IHeldItemHUD.java @@ -0,0 +1,10 @@ +package taintedmagic.api; + +import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; + +public interface IHeldItemHUD +{ + abstract void renderHUD (ScaledResolution res, EntityPlayer p, ItemStack s, float partialTicks, float fract); +} diff --git a/src/main/java/taintedmagic/client/handler/HUDHandler.java b/src/main/java/taintedmagic/client/handler/HUDHandler.java index 80efbac..935656d 100644 --- a/src/main/java/taintedmagic/client/handler/HUDHandler.java +++ b/src/main/java/taintedmagic/client/handler/HUDHandler.java @@ -1,45 +1,53 @@ package taintedmagic.client.handler; -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.OpenGlHelper; -import net.minecraft.client.shader.ShaderGroup; -import net.minecraft.client.util.JsonException; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.event.RenderGameOverlayEvent; -import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType; -import taintedmagic.common.items.equipment.ItemWarpedGoggles; -import taintedmagic.common.items.tools.ItemKatana; -import taintedmagic.common.items.tools.ItemThaumicDisassembler; -import thaumcraft.client.lib.ClientTickEventsFML; -import thaumcraft.client.lib.RenderEventHandler; import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.TickEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.Minecraft; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraftforge.client.event.RenderGameOverlayEvent; +import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType; +import taintedmagic.api.IHeldItemHUD; +import taintedmagic.common.TaintedMagic; @SideOnly (Side.CLIENT) public class HUDHandler { + float ticksEquipped = 0.0F; + ItemStack s = null; + ItemStack last = null; + @SubscribeEvent public void onDrawScreen (RenderGameOverlayEvent.Post event) { if (event.type == ElementType.ALL) { - Minecraft mc = Minecraft.getMinecraft(); - EntityPlayer p = mc.thePlayer; - ScaledResolution r = event.resolution; - float pT = event.partialTicks; + EntityPlayer p = TaintedMagic.proxy.getClientPlayer(); + float partialTicks = event.partialTicks; + if (s != null && s.getItem() instanceof IHeldItemHUD) last = s.copy(); + s = p.getCurrentEquippedItem(); - if (mc.currentScreen == null) + if (Minecraft.getMinecraft().currentScreen == null) { - ItemKatana.renderHUD(r, p, pT); - ItemThaumicDisassembler.renderHUD(r, p, pT); + boolean b = false; + if (s != null && s.getItem() instanceof IHeldItemHUD) b = true; + else b = false; + + float time = 30F; + if (b) ticksEquipped = Math.min(time, ticksEquipped + partialTicks); + else ticksEquipped = Math.max(0F, ticksEquipped - partialTicks); + + float fract = ticksEquipped / time; + + if (b) + { + ((IHeldItemHUD) s.getItem()).renderHUD(event.resolution, p, s, partialTicks, fract); + } + if (!b && ticksEquipped != 0) + { + ((IHeldItemHUD) last.getItem()).renderHUD(event.resolution, p, last, partialTicks, fract); + } } } } diff --git a/src/main/java/taintedmagic/common/items/ItemFlyteCharm.java b/src/main/java/taintedmagic/common/items/ItemFlyteCharm.java index aed6ab9..c25ea71 100644 --- a/src/main/java/taintedmagic/common/items/ItemFlyteCharm.java +++ b/src/main/java/taintedmagic/common/items/ItemFlyteCharm.java @@ -37,7 +37,6 @@ import thaumcraft.codechicken.lib.vec.Vector3; public class ItemFlyteCharm extends Item implements IWarpingGear, IEquipmentItemRenderer { boolean isFlying = false; - boolean synced = false; static final int maxBurstCooldown = 40; static final AspectList cost = new AspectList().add(Aspect.AIR, 10); diff --git a/src/main/java/taintedmagic/common/items/tools/ItemKatana.java b/src/main/java/taintedmagic/common/items/tools/ItemKatana.java index df92d2d..7fa053b 100644 --- a/src/main/java/taintedmagic/common/items/tools/ItemKatana.java +++ b/src/main/java/taintedmagic/common/items/tools/ItemKatana.java @@ -6,8 +6,6 @@ import java.util.Random; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; @@ -32,23 +30,21 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import net.minecraftforge.client.event.RenderPlayerEvent; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.entity.living.LivingEvent; import taintedmagic.api.IEquipmentItemRenderer; +import taintedmagic.api.IHeldItemHUD; import taintedmagic.client.model.ModelKatana; import taintedmagic.client.model.ModelSaya; import taintedmagic.common.TaintedMagic; import taintedmagic.common.entities.EntityTaintBubble; -import taintedmagic.common.helper.TaintedMagicHelper; import taintedmagic.common.network.PacketHandler; import taintedmagic.common.network.PacketKatanaAttack; import thaumcraft.api.IRepairable; import thaumcraft.api.IWarpingGear; +import thaumcraft.client.lib.UtilsFX; import thaumcraft.common.config.Config; import thaumcraft.common.entities.projectile.EntityExplosiveOrb; -public class ItemKatana extends Item implements IWarpingGear, IRepairable, IEquipmentItemRenderer +public class ItemKatana extends Item implements IWarpingGear, IRepairable, IEquipmentItemRenderer, IHeldItemHUD { public static final int SUBTYPES = 3; @@ -59,9 +55,7 @@ public class ItemKatana extends Item implements IWarpingGear, IRepairable, IEqui public static final ModelKatana katana = new ModelKatana(); public static final ModelSaya saya = new ModelSaya(); - static float ticksEquipped = 0F; int ticksInUse = 0; - boolean synced = false; public ItemKatana () { @@ -286,84 +280,67 @@ public class ItemKatana extends Item implements IWarpingGear, IRepairable, IEqui else return false; } - @SideOnly (Side.CLIENT) - public static void renderHUD (ScaledResolution r, EntityPlayer p, float pT) + @Override + public void renderHUD (ScaledResolution res, EntityPlayer p, ItemStack s, float partialTicks, float fract) { - Minecraft mc = Minecraft.getMinecraft(); - ItemStack s = mc.thePlayer.getCurrentEquippedItem(); Tessellator t = Tessellator.instance; - boolean b = false; + float tickFract = Math.min((float) p.getItemInUseDuration() / 30.0F, 1.0F); - if (s != null && s.getItem() instanceof ItemKatana) b = true; - else b = false; + int x = res.getScaledWidth() / 2 + 725; + int x2 = x + 16; + int y = res.getScaledHeight() / 2 + (p.capabilities.isCreativeMode ? 805 : 755); + int y2 = y + 16; - float time = 30F; - if (b) ticksEquipped = Math.min(time, ticksEquipped + pT); - else ticksEquipped = Math.max(0F, ticksEquipped - pT); + GL11.glPushMatrix(); + GL11.glEnable(GL11.GL_BLEND); + GL11.glEnable(GL12.GL_RESCALE_NORMAL); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - float a = ticksEquipped / time; + float sc = 0.315F; + GL11.glScalef(sc, sc, sc); - if (b || ticksEquipped != 0) + UtilsFX.bindTexture(new ResourceLocation("thaumcraft:textures/misc/script.png")); + + for (int rune = 0; rune < 16; rune++) { - float tickFract = Math.min((float) p.getItemInUseDuration() / 30.0F, 1.0F); + float red = MathHelper.sin( (p.ticksExisted + rune * 5) / 5.0F) * 0.1F + 0.8F; + float green = MathHelper.sin( (p.ticksExisted + rune * 5) / 7.0F) * 0.1F + 0.7F; + float alpha = MathHelper.sin( (p.ticksExisted + rune * 5) / 10.0F) * 0.3F; - int x = r.getScaledWidth() / 2 + 725; - int x2 = x + 16; - int y = r.getScaledHeight() / 2 + (p.capabilities.isCreativeMode ? 805 : 755); - int y2 = y + 16; + float f = 0.0625F * rune; + float f1 = f + 0.0625F; + float f2 = 0.0F; + float f3 = 1.0F; - GL11.glPushMatrix(); - GL11.glEnable(GL11.GL_BLEND); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + t.startDrawingQuads(); - float sc = 0.315F; + t.setBrightness(240); + t.setColorRGBA_F(red, green, 0.4F, (alpha + 0.7F) * fract); + t.addVertexWithUV(x + (rune * 16) - alpha, y2 + alpha, 0, f, f3); + t.addVertexWithUV(x2 + (rune * 16) + alpha, y2 + alpha, 0, f1, f3); + t.addVertexWithUV(x2 + (rune * 16) + alpha, y - alpha, 0, f1, f2); + t.addVertexWithUV(x + (rune * 16) - alpha, y - alpha, 0, f, f2); - GL11.glScalef(sc, sc, sc); + t.draw(); - mc.renderEngine.bindTexture(new ResourceLocation("thaumcraft:textures/misc/script.png")); - - for (int rune = 0; rune < 16; rune++) + if ((int) (16 * tickFract) > rune) { - float red = MathHelper.sin( (p.ticksExisted + rune * 5) / 5.0F) * 0.1F + 0.8F; - float green = MathHelper.sin( (p.ticksExisted + rune * 5) / 7.0F) * 0.1F + 0.7F; - float alpha = MathHelper.sin( (p.ticksExisted + rune * 5) / 10.0F) * 0.3F; - - float f = 0.0625F * rune; - float f1 = f + 0.0625F; - float f2 = 0.0F; - float f3 = 1.0F; - t.startDrawingQuads(); t.setBrightness(240); - t.setColorRGBA_F(red, green, 0.4F, (alpha + 0.7F) * a); + t.setColorRGBA_F(1.0F - (0.0625F * rune), 0.0F + (0.0625F * rune), 0.0F, 0.9F + alpha); t.addVertexWithUV(x + (rune * 16) - alpha, y2 + alpha, 0, f, f3); t.addVertexWithUV(x2 + (rune * 16) + alpha, y2 + alpha, 0, f1, f3); t.addVertexWithUV(x2 + (rune * 16) + alpha, y - alpha, 0, f1, f2); t.addVertexWithUV(x + (rune * 16) - alpha, y - alpha, 0, f, f2); t.draw(); - - if ((int) (16 * tickFract) > rune) - { - t.startDrawingQuads(); - - t.setBrightness(240); - t.setColorRGBA_F(1.0F - (0.0625F * rune), 0.0F + (0.0625F * rune), 0.0F, 0.9F + alpha); - t.addVertexWithUV(x + (rune * 16) - alpha, y2 + alpha, 0, f, f3); - t.addVertexWithUV(x2 + (rune * 16) + alpha, y2 + alpha, 0, f1, f3); - t.addVertexWithUV(x2 + (rune * 16) + alpha, y - alpha, 0, f1, f2); - t.addVertexWithUV(x + (rune * 16) - alpha, y - alpha, 0, f, f2); - - t.draw(); - } } - GL11.glDisable(GL11.GL_BLEND); - GL11.glDisable(GL12.GL_RESCALE_NORMAL); - GL11.glPopMatrix(); } + GL11.glDisable(GL11.GL_BLEND); + GL11.glDisable(GL12.GL_RESCALE_NORMAL); + GL11.glPopMatrix(); } public static boolean hasAnyInscription (ItemStack s) diff --git a/src/main/java/taintedmagic/common/items/tools/ItemThaumicDisassembler.java b/src/main/java/taintedmagic/common/items/tools/ItemThaumicDisassembler.java index 8d0399e..aa1d601 100644 --- a/src/main/java/taintedmagic/common/items/tools/ItemThaumicDisassembler.java +++ b/src/main/java/taintedmagic/common/items/tools/ItemThaumicDisassembler.java @@ -3,6 +3,9 @@ package taintedmagic.common.items.tools; import java.util.ArrayList; import java.util.List; +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; + import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; @@ -18,22 +21,15 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.DamageSource; import net.minecraft.util.StatCollector; import net.minecraft.world.World; - -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - +import taintedmagic.api.IHeldItemHUD; import taintedmagic.common.TaintedMagic; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.common.items.wands.WandManager; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -public class ItemThaumicDisassembler extends Item +public class ItemThaumicDisassembler extends Item implements IHeldItemHUD { public static final String TAG_MODE = "mode"; - - static float ticksEquipped = 0F; public static List data = new ArrayList(); public ItemThaumicDisassembler () @@ -187,60 +183,41 @@ public class ItemThaumicDisassembler extends Item } } - @SideOnly (Side.CLIENT) - public static void renderHUD (ScaledResolution r, EntityPlayer p, float pT) + @Override + public void renderHUD (ScaledResolution res, EntityPlayer p, ItemStack s, float partialTicks, float fract) { - Minecraft mc = Minecraft.getMinecraft(); - ItemStack s = mc.thePlayer.getCurrentEquippedItem(); - FontRenderer f = mc.fontRenderer; - - boolean b = false; - - if (s != null && s.getItem() instanceof ItemThaumicDisassembler) + if (data.isEmpty()) { - if (data.isEmpty()) - { - data.add(getMode(s)); - } - - if (!data.isEmpty() && getMode(s) != data.get(0)) - { - data.clear(); - data.add(getMode(s)); - } - b = true; + data.add(getMode(s)); } - else b = false; - float time = 30F; - if (b) ticksEquipped = Math.min(time, ticksEquipped + pT); - else ticksEquipped = Math.max(0F, ticksEquipped - pT); - - float fract = ticksEquipped / time; - - if (b || ticksEquipped != 0) + if (!data.isEmpty() && getMode(s) != data.get(0)) { - int mode = data.get(0); - String str = "\u00A78" + StatCollector.translateToLocal("text.disassembler.mode") + ": " + getModeName(mode) + (mode == 3 ? "\u00A7c" : "\u00A7a") + " (" + getEfficiency(mode) + ")"; - - GL11.glPushMatrix(); - - GL11.glEnable(GL11.GL_BLEND); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - - GL11.glTranslated(40.0F, -15.0F, 0.0F); - GL11.glTranslatef(-fract * 40.0F, 0.0F, 0.0F); - - GL11.glScalef(0.8F, 0.8F, 0.8F); - - f.drawStringWithShadow(str, r.getScaledWidth() / 2 + 100, r.getScaledHeight() / 2 + (p.capabilities.isCreativeMode ? 230 : 212), 0xFFFFFF); - - GL11.glDisable(GL11.GL_BLEND); - GL11.glDisable(GL12.GL_RESCALE_NORMAL); - - GL11.glPopMatrix(); + data.clear(); + data.add(getMode(s)); } + + int mode = data.get(0); + String str = "\u00A78" + StatCollector.translateToLocal("text.disassembler.mode") + ": " + getModeName(mode) + (mode == 3 ? "\u00A7c" : "\u00A7a") + " (" + getEfficiency(mode) + ")"; + + GL11.glPushMatrix(); + + GL11.glEnable(GL11.GL_BLEND); + GL11.glEnable(GL12.GL_RESCALE_NORMAL); + + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + + GL11.glTranslated(40.0F, -15.0F, 0.0F); + GL11.glTranslatef(-fract * 40.0F, 0.0F, 0.0F); + + GL11.glScalef(0.8F, 0.8F, 0.8F); + + FontRenderer f = Minecraft.getMinecraft().fontRenderer; + f.drawStringWithShadow(str, res.getScaledWidth() / 2 + 100, res.getScaledHeight() / 2 + (p.capabilities.isCreativeMode ? 230 : 212), 0xFFFFFF); + + GL11.glDisable(GL11.GL_BLEND); + GL11.glDisable(GL12.GL_RESCALE_NORMAL); + + GL11.glPopMatrix(); } }