From 2025a1cc2ca9cb35b32d8695d61561b30785abc2 Mon Sep 17 00:00:00 2001 From: MineGame159 Date: Fri, 6 Dec 2024 21:51:16 +0100 Subject: [PATCH] Fix background container rendering in Better Tooltips --- .../systems/modules/render/BetterTooltips.java | 2 +- .../java/meteordevelopment/meteorclient/utils/Utils.java | 5 ++++- .../utils/tooltip/ContainerTooltipComponent.java | 9 +++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/meteordevelopment/meteorclient/systems/modules/render/BetterTooltips.java b/src/main/java/meteordevelopment/meteorclient/systems/modules/render/BetterTooltips.java index 0c0376d224..9d2a260b5e 100644 --- a/src/main/java/meteordevelopment/meteorclient/systems/modules/render/BetterTooltips.java +++ b/src/main/java/meteordevelopment/meteorclient/systems/modules/render/BetterTooltips.java @@ -103,7 +103,7 @@ public class BetterTooltips extends Module { .build() ); - public final Setting echest = sgPreviews.add(new BoolSetting.Builder() + private final Setting echest = sgPreviews.add(new BoolSetting.Builder() .name("echests") .description("Shows a preview of your echest when hovering over it in an inventory.") .defaultValue(true) diff --git a/src/main/java/meteordevelopment/meteorclient/utils/Utils.java b/src/main/java/meteordevelopment/meteorclient/utils/Utils.java index 41ed0574d0..413c0f9107 100644 --- a/src/main/java/meteordevelopment/meteorclient/utils/Utils.java +++ b/src/main/java/meteordevelopment/meteorclient/utils/Utils.java @@ -272,13 +272,16 @@ public static Color getShulkerColor(ItemStack shulkerItem) { if (shulkerItem.getItem() instanceof BlockItem blockItem) { Block block = blockItem.getBlock(); if (block == Blocks.ENDER_CHEST) return BetterTooltips.ECHEST_COLOR; + if (block instanceof ShulkerBoxBlock shulkerBlock) { DyeColor dye = shulkerBlock.getColor(); if (dye == null) return WHITE; + final int color = dye.getEntityColor(); - return new Color((color >> 16) & 0xFF, (color >> 8) & 0xFF, color & 0xFF, 1f); + return new Color((color >> 16) & 0xFF, (color >> 8) & 0xFF, color & 0xFF, 255); } } + return WHITE; } diff --git a/src/main/java/meteordevelopment/meteorclient/utils/tooltip/ContainerTooltipComponent.java b/src/main/java/meteordevelopment/meteorclient/utils/tooltip/ContainerTooltipComponent.java index dd2ff9f93b..1515fb7d94 100644 --- a/src/main/java/meteordevelopment/meteorclient/utils/tooltip/ContainerTooltipComponent.java +++ b/src/main/java/meteordevelopment/meteorclient/utils/tooltip/ContainerTooltipComponent.java @@ -5,7 +5,6 @@ package meteordevelopment.meteorclient.utils.tooltip; -import com.mojang.blaze3d.systems.RenderSystem; import meteordevelopment.meteorclient.MeteorClient; import meteordevelopment.meteorclient.utils.render.RenderUtils; import meteordevelopment.meteorclient.utils.render.color.Color; @@ -44,15 +43,13 @@ public int getWidth(TextRenderer textRenderer) { @Override public void drawItems(TextRenderer textRenderer, int x, int y, int width, int height, DrawContext context) { - // Background - RenderSystem.setShaderColor(color.r / 255f, color.g / 255f, color.b / 255f, color.a / 255f); - context.drawTexture(RenderLayer::getGuiTextured, TEXTURE_CONTAINER_BACKGROUND, x, y, 0, 0, 0, 176, 67, 176, 67); - RenderSystem.setShaderColor(1, 1, 1, 1); + context.drawTexture(RenderLayer::getGuiTextured, TEXTURE_CONTAINER_BACKGROUND, x, y, 0, 0, 176, 67, 176, 67, color.getPacked()); - //Contents + // Contents int row = 0; int i = 0; + for (ItemStack itemStack : items) { RenderUtils.drawItem(context, itemStack, x + 8 + i * 18, y + 7 + row * 18, 1, true);