From 6c74dd71b492d62840bb83f8a7dbb46e6fc12b34 Mon Sep 17 00:00:00 2001 From: Bob Date: Thu, 14 Jul 2022 22:38:30 +0200 Subject: [PATCH] better highlighting on stack tooltips, some funky --- .../com/hbm/inventory/gui/GUITurretBase.java | 2 +- .../hbm/inventory/gui/GuiInfoContainer.java | 9 ++++--- .../inventory/recipes/ChemplantRecipes.java | 4 +-- .../com/hbm/main/ModEventHandlerClient.java | 24 ++++++++++++++++++ .../assets/hbm/sounds/turret/maxwellLoop.ogg | Bin 0 -> 10227 bytes 5 files changed, 33 insertions(+), 6 deletions(-) create mode 100644 src/main/resources/assets/hbm/sounds/turret/maxwellLoop.ogg diff --git a/src/main/java/com/hbm/inventory/gui/GUITurretBase.java b/src/main/java/com/hbm/inventory/gui/GUITurretBase.java index 77bc85c74..07dac0c1d 100644 --- a/src/main/java/com/hbm/inventory/gui/GUITurretBase.java +++ b/src/main/java/com/hbm/inventory/gui/GUITurretBase.java @@ -68,7 +68,7 @@ public abstract class GUITurretBase extends GuiInfoContainer { if(this.mc.thePlayer.inventory.getItemStack() == null && this.guiLeft + 79 <= mouseX && guiLeft + 79 + 54 > mouseX && guiTop + 62 < mouseY && guiTop + 62 + 54 >= mouseY) { boolean draw = true; - for(int i = 0; i < 9; i++) { + for(int i = 1; i < 10; i++) { if(this.isMouseOverSlot(this.inventorySlots.getSlot(i), mouseX, mouseY) && this.inventorySlots.getSlot(i).getHasStack()) { draw = false; break; diff --git a/src/main/java/com/hbm/inventory/gui/GuiInfoContainer.java b/src/main/java/com/hbm/inventory/gui/GuiInfoContainer.java index 52f30a72d..bc473af93 100644 --- a/src/main/java/com/hbm/inventory/gui/GuiInfoContainer.java +++ b/src/main/java/com/hbm/inventory/gui/GuiInfoContainer.java @@ -13,13 +13,11 @@ import com.hbm.util.BobMathUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.ResourceLocation; public abstract class GuiInfoContainer extends GuiContainer { @@ -190,8 +188,13 @@ public abstract class GuiInfoContainer extends GuiContainer { } else { ItemStack stack = (ItemStack) o; GL11.glColor3f(1F, 1F, 1F); + + if(stack.stackSize == 0) { + this.drawGradientRect(minX + indent - 1, minY - 1, minX + indent + 17, minY + 17, 0xffff0000, 0xffff0000); + this.drawGradientRect(minX + indent, minY, minX + indent + 16, minY + 16, 0xffb0b0b0, 0xffb0b0b0); + } itemRender.renderItemAndEffectIntoGUI(this.fontRendererObj, this.mc.getTextureManager(), stack, minX + indent, minY); - itemRender.renderItemOverlayIntoGUI(this.fontRendererObj, this.mc.getTextureManager(), stack, minX + indent, minY, stack.stackSize == 0 ? (EnumChatFormatting.RED + "_ _") : null); + itemRender.renderItemOverlayIntoGUI(this.fontRendererObj, this.mc.getTextureManager(), stack, minX + indent, minY, null); RenderHelper.disableStandardItemLighting(); GL11.glDisable(GL11.GL_DEPTH_TEST); indent += 18; diff --git a/src/main/java/com/hbm/inventory/recipes/ChemplantRecipes.java b/src/main/java/com/hbm/inventory/recipes/ChemplantRecipes.java index 2a596c70c..bb3cc2522 100644 --- a/src/main/java/com/hbm/inventory/recipes/ChemplantRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/ChemplantRecipes.java @@ -149,8 +149,8 @@ public class ChemplantRecipes extends SerializableRecipe { new ComparableStack(ModItems.catalyst_clay, 8)) .outputItems( new ItemStack(ModItems.ingot_schrabidium), - new ItemStack(ModItems.powder_desh), - new ItemStack(ModItems.powder_desh_mix)) + new ItemStack(ModItems.powder_desh, 12), + new ItemStack(ModItems.powder_desh_mix, 12)) .outputFluids(new FluidStack(Fluids.WATZ, 50))); recipes.add(new ChemRecipe(51, "DYN_EUPH", 3600) .inputItems( diff --git a/src/main/java/com/hbm/main/ModEventHandlerClient.java b/src/main/java/com/hbm/main/ModEventHandlerClient.java index b9326c13f..9d412ed51 100644 --- a/src/main/java/com/hbm/main/ModEventHandlerClient.java +++ b/src/main/java/com/hbm/main/ModEventHandlerClient.java @@ -118,6 +118,30 @@ public class ModEventHandlerClient { EntityPlayer player = Minecraft.getMinecraft().thePlayer; + /*if(event.type == ElementType.CROSSHAIRS) { + int width = event.resolution.getScaledWidth(); + int height = event.resolution.getScaledHeight(); + Tessellator tess = Tessellator.instance; + GL11.glDisable(GL11.GL_TEXTURE_2D); + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE); + GL11.glAlphaFunc(GL11.GL_GEQUAL, 0.0F); + GL11.glDepthMask(false); + tess.startDrawingQuads(); + float brightness = (int)(System.currentTimeMillis() % 10000) / 10000F; + tess.setColorRGBA_F(1F, 1F, 1F, (1 - brightness) * 0.8F); + tess.addVertex(width, 0, 0); + tess.addVertex(0, 0, 0); + tess.addVertex(0, height, 0); + tess.addVertex(width, height, 0); + tess.draw(); + OpenGlHelper.glBlendFunc(770, 771, 1, 0); + GL11.glEnable(GL11.GL_TEXTURE_2D); + GL11.glAlphaFunc(GL11.GL_GREATER, 0.1F); + GL11.glDepthMask(true); + return; + }*/ + /// HANDLE GUN OVERLAYS /// if(player.getHeldItem() != null && player.getHeldItem().getItem() instanceof IItemHUD) { ((IItemHUD)player.getHeldItem().getItem()).renderHUD(event, event.type, player, player.getHeldItem()); diff --git a/src/main/resources/assets/hbm/sounds/turret/maxwellLoop.ogg b/src/main/resources/assets/hbm/sounds/turret/maxwellLoop.ogg new file mode 100644 index 0000000000000000000000000000000000000000..75a830a88cb02881d52df9ce6e707e704954ae7d GIT binary patch literal 10227 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 WquV}X!LFU