From ef58e92c169ac94370c8a6dd48146587571cf8d2 Mon Sep 17 00:00:00 2001 From: Lorenz Date: Tue, 23 Aug 2022 22:34:07 +0200 Subject: added rng meter coloring methods --- src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt | 7 ++++--- src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt | 7 +++++++ 2 files changed, 11 insertions(+), 3 deletions(-) (limited to 'src/main/java/at/hannibal2/skyhanni/utils') diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt index c9ddea9a8..24c3d822a 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt @@ -7,6 +7,7 @@ import com.google.gson.JsonObject import net.minecraft.client.Minecraft import net.minecraft.client.gui.inventory.GuiChest import net.minecraft.init.Items +import net.minecraft.inventory.Slot import net.minecraft.item.ItemStack import net.minecraftforge.common.util.Constants import java.util.* @@ -16,8 +17,8 @@ object ItemUtils { fun ItemStack.cleanName() = this.displayName.removeColor() - fun getItemsInOpenChest(): List { - val list = mutableListOf() + fun getItemsInOpenChest(): List { + val list = mutableListOf() val guiChest = Minecraft.getMinecraft().currentScreen as GuiChest val inventorySlots = guiChest.inventorySlots.inventorySlots val skipAt = inventorySlots.size - 9 * 4 @@ -25,7 +26,7 @@ object ItemUtils { for (slot in inventorySlots) { val stack = slot.stack if (stack != null) { - list.add(stack) + list.add(slot) } i++ if (i == skipAt) break diff --git a/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt index 453b220e5..9de886f37 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt @@ -28,6 +28,11 @@ object RenderUtils { } infix fun Slot.highlight(color: Color) { + val lightingState = GL11.glIsEnabled(GL11.GL_LIGHTING) + + GlStateManager.disableLighting() + GlStateManager.color(1f, 1f, 1f, 1f) + GlStateManager.pushMatrix() GlStateManager.translate(0f, 0f, 110 + Minecraft.getMinecraft().renderItem.zLevel) Gui.drawRect( @@ -38,6 +43,8 @@ object RenderUtils { color.rgb ) GlStateManager.popMatrix() + + if (lightingState) GlStateManager.enableLighting() } fun RenderWorldLastEvent.drawColor(location: LorenzVec, color: LorenzColor, beacon: Boolean = false) { -- cgit