From 7689bdbb42ad10b2ad99e2bae55ddaceac15bca7 Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 3 Jun 2019 21:39:36 +0800 Subject: Dark Mode --- src/main/java/me/shedaniel/rei/gui/widget/TabWidget.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/main/java/me/shedaniel/rei/gui/widget/TabWidget.java') diff --git a/src/main/java/me/shedaniel/rei/gui/widget/TabWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/TabWidget.java index c4ac02342..1376b325e 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/TabWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/TabWidget.java @@ -6,6 +6,7 @@ package me.shedaniel.rei.gui.widget; import com.mojang.blaze3d.platform.GlStateManager; +import me.shedaniel.rei.RoughlyEnoughItemsCore; import me.shedaniel.rei.api.ClientHelper; import me.shedaniel.rei.api.RecipeCategory; import me.shedaniel.rei.api.Renderer; @@ -21,6 +22,7 @@ import java.util.List; public class TabWidget extends HighlightableWidget { public static final Identifier CHEST_GUI_TEXTURE = new Identifier("roughlyenoughitems", "textures/gui/recipecontainer.png"); + public static final Identifier CHEST_GUI_TEXTURE_DARK = new Identifier("roughlyenoughitems", "textures/gui/recipecontainer_dark.png"); public boolean shown = false, selected = false; public Renderer renderer; @@ -73,7 +75,7 @@ public class TabWidget extends HighlightableWidget { if (shown) { GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F); GuiLighting.disable(); - minecraft.getTextureManager().bindTexture(CHEST_GUI_TEXTURE); + minecraft.getTextureManager().bindTexture(RoughlyEnoughItemsCore.getConfigManager().getConfig().darkTheme ? CHEST_GUI_TEXTURE_DARK : CHEST_GUI_TEXTURE); this.blit(bounds.x, bounds.y + 2, selected ? 28 : 0, 192, 28, (selected ? 30 : 27)); renderer.setBlitOffset(100); renderer.render((int) bounds.getCenterX(), (int) bounds.getCenterY(), mouseX, mouseY, delta); -- cgit From 94e6085d2d49e7fe38871c9548774c4e50a2f422 Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 6 Jun 2019 16:09:48 +0800 Subject: this is still not working --- .../me/shedaniel/rei/gui/widget/TabWidget.java | 102 ++++++++++++++++++++- 1 file changed, 99 insertions(+), 3 deletions(-) (limited to 'src/main/java/me/shedaniel/rei/gui/widget/TabWidget.java') diff --git a/src/main/java/me/shedaniel/rei/gui/widget/TabWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/TabWidget.java index 1376b325e..f0df09ef5 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/TabWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/TabWidget.java @@ -5,6 +5,7 @@ package me.shedaniel.rei.gui.widget; +import com.google.common.collect.Lists; import com.mojang.blaze3d.platform.GlStateManager; import me.shedaniel.rei.RoughlyEnoughItemsCore; import me.shedaniel.rei.api.ClientHelper; @@ -12,18 +13,27 @@ import me.shedaniel.rei.api.RecipeCategory; import me.shedaniel.rei.api.Renderer; import me.shedaniel.rei.client.ScreenHelper; import net.minecraft.ChatFormat; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.font.TextRenderer; import net.minecraft.client.render.GuiLighting; +import net.minecraft.client.render.item.ItemRenderer; +import net.minecraft.item.ItemStack; import net.minecraft.util.Identifier; +import net.minecraft.util.Pair; +import net.minecraft.util.math.MathHelper; import java.awt.*; import java.util.Collections; import java.util.List; +import java.util.function.Consumer; public class TabWidget extends HighlightableWidget { public static final Identifier CHEST_GUI_TEXTURE = new Identifier("roughlyenoughitems", "textures/gui/recipecontainer.png"); public static final Identifier CHEST_GUI_TEXTURE_DARK = new Identifier("roughlyenoughitems", "textures/gui/recipecontainer_dark.png"); + private final Consumer tooltipRenderer; + private final List slots; public boolean shown = false, selected = false; public Renderer renderer; public int id; @@ -34,15 +44,99 @@ public class TabWidget extends HighlightableWidget { public TabWidget(int id, Rectangle bounds) { this.id = id; this.bounds = bounds; + this.slots = Lists.newArrayList(); + this.tooltipRenderer = tooltip -> { + MinecraftClient client = MinecraftClient.getInstance(); + int specWidth = MathHelper.clamp(slots.size(), 1, 9) * 18 + 10; + int specHeight = Math.max(1, MathHelper.ceil(slots.size() / 9)) * 18 + 10; + List lines = tooltip.getText(); + TextRenderer font = client.textRenderer; + int width = Math.max(lines.stream().map(font::getStringWidth).max(Integer::compareTo).get(), specWidth); + int tooltipHeight = lines.size() <= 1 ? 8 : lines.size() * 10; + int height = (lines.isEmpty() ? 0 : (tooltipHeight + 10)) + specHeight; + ScreenHelper.drawHoveringWidget(tooltip.getX(), tooltip.getY(), (x, y, aFloat) -> { + int currentY = y; + if (!lines.isEmpty()) { + GlStateManager.disableRescaleNormal(); + GuiLighting.disable(); + GlStateManager.disableLighting(); + this.blitOffset = 1000; + this.fillGradient(x - 3, y - 4, x + width + 3, y - 3, -267386864, -267386864); + this.fillGradient(x - 3, y + tooltipHeight + 3, x + width + 3, y + tooltipHeight + 4, -267386864, -267386864); + this.fillGradient(x - 3, y - 3, x + width + 3, y + tooltipHeight + 3, -267386864, -267386864); + this.fillGradient(x - 4, y - 3, x - 3, y + tooltipHeight + 3, -267386864, -267386864); + this.fillGradient(x + width + 3, y - 3, x + width + 4, y + tooltipHeight + 3, -267386864, -267386864); + this.fillGradient(x - 3, y - 3 + 1, x - 3 + 1, y + tooltipHeight + 3 - 1, 1347420415, 1344798847); + this.fillGradient(x + width + 2, y - 3 + 1, x + width + 3, y + tooltipHeight + 3 - 1, 1347420415, 1344798847); + this.fillGradient(x - 3, y - 3, x + width + 3, y - 3 + 1, 1347420415, 1347420415); + this.fillGradient(x - 3, y + tooltipHeight + 2, x + width + 3, y + tooltipHeight + 3, 1344798847, 1344798847); + for(int lineIndex = 0; lineIndex < lines.size(); lineIndex++) { + GlStateManager.disableDepthTest(); + font.drawWithShadow(lines.get(lineIndex), x, currentY, -1); + GlStateManager.enableDepthTest(); + currentY += lineIndex == 0 ? 12 : 10; + } + this.blitOffset = 0; + GlStateManager.enableLighting(); + GuiLighting.enable(); + GlStateManager.enableRescaleNormal(); + currentY += 6; + } + List> pairs = Lists.newArrayList(); + GlStateManager.pushMatrix(); + GlStateManager.translatef(x, currentY, 1000f); + new CategoryBaseWidget(new Rectangle(specWidth, specHeight)).render(); + GlStateManager.popMatrix(); + GlStateManager.pushMatrix(); + GlStateManager.translatef(x, currentY, 0f); + int currentX = 5; + int currentYY = 5; + int i = 0; + this.blitOffset = 1000; + for(ItemStack itemStack : slots) { + i++; + minecraft.getTextureManager().bindTexture(RoughlyEnoughItemsCore.getConfigManager().getConfig().darkTheme ? SlotWidget.RECIPE_GUI_DARK : SlotWidget.RECIPE_GUI); + blit(currentX, currentYY, 0, 222, 18, 18); + pairs.add(new Pair<>(new Point(x + currentX + 1, currentY + currentYY + 1), itemStack)); + currentX += 18; + if (i > 9) { + i = 1; + currentX = 5; + currentYY += 18; + } + } + this.blitOffset = 0; + GlStateManager.popMatrix(); + ItemRenderer itemRenderer = MinecraftClient.getInstance().getItemRenderer(); + pairs.forEach(pair -> { + ItemStack stack = pair.getRight(); + itemRenderer.zOffset = 1300; + GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F); + GuiLighting.enableForItems(); + int x1 = pair.getLeft().x; + int y1 = pair.getLeft().y; + blitOffset = 1300; + GlStateManager.disableDepthTest(); + fillGradient(x1, y1, x1 + 16, y1 + 16, 0xFFFFFFFF, 0xFFFFFFFF); + GlStateManager.enableDepthTest(); + blitOffset = 0; + itemRenderer.renderGuiItem(stack, x1, y1); + itemRenderer.renderGuiItemOverlay(font, stack, x1, y1); + itemRenderer.zOffset = 0; + }); + }, width, height, 0); + }; } public void setRenderer(RecipeCategory category, Renderer renderable, String categoryName, boolean selected) { + slots.clear(); if (renderable == null) { shown = false; this.renderer = null; } else { shown = true; this.renderer = renderable; + this.slots.addAll(RoughlyEnoughItemsCore.getRecipeHelper().getWorkingStations(category.getIdentifier())); } this.category = category; this.selected = selected; @@ -79,16 +173,18 @@ public class TabWidget extends HighlightableWidget { this.blit(bounds.x, bounds.y + 2, selected ? 28 : 0, 192, 28, (selected ? 30 : 27)); renderer.setBlitOffset(100); renderer.render((int) bounds.getCenterX(), (int) bounds.getCenterY(), mouseX, mouseY, delta); - if (isHighlighted(mouseX, mouseY)) + if (isHighlighted(mouseX, mouseY)) { drawTooltip(); + } } } + @SuppressWarnings("deprecation") private void drawTooltip() { if (this.minecraft.options.advancedItemTooltips) - ScreenHelper.getLastOverlay().addTooltip(QueuedTooltip.create(categoryName, ChatFormat.DARK_GRAY.toString() + category.getIdentifier().toString(), ClientHelper.getInstance().getFormattedModFromIdentifier(category.getIdentifier()))); + ScreenHelper.getLastOverlay().addTooltip(QueuedTooltip.create(categoryName, ChatFormat.DARK_GRAY.toString() + category.getIdentifier().toString(), ClientHelper.getInstance().getFormattedModFromIdentifier(category.getIdentifier())).setSpecialRenderer(tooltipRenderer)); else - ScreenHelper.getLastOverlay().addTooltip(QueuedTooltip.create(categoryName, ClientHelper.getInstance().getFormattedModFromIdentifier(category.getIdentifier()))); + ScreenHelper.getLastOverlay().addTooltip(QueuedTooltip.create(categoryName, ClientHelper.getInstance().getFormattedModFromIdentifier(category.getIdentifier())).setSpecialRenderer(tooltipRenderer)); } @Override -- cgit From 36609262e4014e976523130bf26879eac2e90e19 Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 6 Jun 2019 17:56:11 +0800 Subject: giving up on that --- .../me/shedaniel/rei/gui/widget/TabWidget.java | 178 ++++++++++----------- 1 file changed, 88 insertions(+), 90 deletions(-) (limited to 'src/main/java/me/shedaniel/rei/gui/widget/TabWidget.java') diff --git a/src/main/java/me/shedaniel/rei/gui/widget/TabWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/TabWidget.java index f0df09ef5..e6efdf3d8 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/TabWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/TabWidget.java @@ -13,26 +13,20 @@ import me.shedaniel.rei.api.RecipeCategory; import me.shedaniel.rei.api.Renderer; import me.shedaniel.rei.client.ScreenHelper; import net.minecraft.ChatFormat; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.font.TextRenderer; import net.minecraft.client.render.GuiLighting; -import net.minecraft.client.render.item.ItemRenderer; import net.minecraft.item.ItemStack; import net.minecraft.util.Identifier; -import net.minecraft.util.Pair; -import net.minecraft.util.math.MathHelper; import java.awt.*; import java.util.Collections; import java.util.List; -import java.util.function.Consumer; public class TabWidget extends HighlightableWidget { public static final Identifier CHEST_GUI_TEXTURE = new Identifier("roughlyenoughitems", "textures/gui/recipecontainer.png"); public static final Identifier CHEST_GUI_TEXTURE_DARK = new Identifier("roughlyenoughitems", "textures/gui/recipecontainer_dark.png"); - private final Consumer tooltipRenderer; + // private final Consumer tooltipRenderer; private final List slots; public boolean shown = false, selected = false; public Renderer renderer; @@ -45,87 +39,91 @@ public class TabWidget extends HighlightableWidget { this.id = id; this.bounds = bounds; this.slots = Lists.newArrayList(); - this.tooltipRenderer = tooltip -> { - MinecraftClient client = MinecraftClient.getInstance(); - int specWidth = MathHelper.clamp(slots.size(), 1, 9) * 18 + 10; - int specHeight = Math.max(1, MathHelper.ceil(slots.size() / 9)) * 18 + 10; - List lines = tooltip.getText(); - TextRenderer font = client.textRenderer; - int width = Math.max(lines.stream().map(font::getStringWidth).max(Integer::compareTo).get(), specWidth); - int tooltipHeight = lines.size() <= 1 ? 8 : lines.size() * 10; - int height = (lines.isEmpty() ? 0 : (tooltipHeight + 10)) + specHeight; - ScreenHelper.drawHoveringWidget(tooltip.getX(), tooltip.getY(), (x, y, aFloat) -> { - int currentY = y; - if (!lines.isEmpty()) { - GlStateManager.disableRescaleNormal(); - GuiLighting.disable(); - GlStateManager.disableLighting(); - this.blitOffset = 1000; - this.fillGradient(x - 3, y - 4, x + width + 3, y - 3, -267386864, -267386864); - this.fillGradient(x - 3, y + tooltipHeight + 3, x + width + 3, y + tooltipHeight + 4, -267386864, -267386864); - this.fillGradient(x - 3, y - 3, x + width + 3, y + tooltipHeight + 3, -267386864, -267386864); - this.fillGradient(x - 4, y - 3, x - 3, y + tooltipHeight + 3, -267386864, -267386864); - this.fillGradient(x + width + 3, y - 3, x + width + 4, y + tooltipHeight + 3, -267386864, -267386864); - this.fillGradient(x - 3, y - 3 + 1, x - 3 + 1, y + tooltipHeight + 3 - 1, 1347420415, 1344798847); - this.fillGradient(x + width + 2, y - 3 + 1, x + width + 3, y + tooltipHeight + 3 - 1, 1347420415, 1344798847); - this.fillGradient(x - 3, y - 3, x + width + 3, y - 3 + 1, 1347420415, 1347420415); - this.fillGradient(x - 3, y + tooltipHeight + 2, x + width + 3, y + tooltipHeight + 3, 1344798847, 1344798847); - for(int lineIndex = 0; lineIndex < lines.size(); lineIndex++) { - GlStateManager.disableDepthTest(); - font.drawWithShadow(lines.get(lineIndex), x, currentY, -1); - GlStateManager.enableDepthTest(); - currentY += lineIndex == 0 ? 12 : 10; - } - this.blitOffset = 0; - GlStateManager.enableLighting(); - GuiLighting.enable(); - GlStateManager.enableRescaleNormal(); - currentY += 6; - } - List> pairs = Lists.newArrayList(); - GlStateManager.pushMatrix(); - GlStateManager.translatef(x, currentY, 1000f); - new CategoryBaseWidget(new Rectangle(specWidth, specHeight)).render(); - GlStateManager.popMatrix(); - GlStateManager.pushMatrix(); - GlStateManager.translatef(x, currentY, 0f); - int currentX = 5; - int currentYY = 5; - int i = 0; - this.blitOffset = 1000; - for(ItemStack itemStack : slots) { - i++; - minecraft.getTextureManager().bindTexture(RoughlyEnoughItemsCore.getConfigManager().getConfig().darkTheme ? SlotWidget.RECIPE_GUI_DARK : SlotWidget.RECIPE_GUI); - blit(currentX, currentYY, 0, 222, 18, 18); - pairs.add(new Pair<>(new Point(x + currentX + 1, currentY + currentYY + 1), itemStack)); - currentX += 18; - if (i > 9) { - i = 1; - currentX = 5; - currentYY += 18; - } - } - this.blitOffset = 0; - GlStateManager.popMatrix(); - ItemRenderer itemRenderer = MinecraftClient.getInstance().getItemRenderer(); - pairs.forEach(pair -> { - ItemStack stack = pair.getRight(); - itemRenderer.zOffset = 1300; - GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F); - GuiLighting.enableForItems(); - int x1 = pair.getLeft().x; - int y1 = pair.getLeft().y; - blitOffset = 1300; - GlStateManager.disableDepthTest(); - fillGradient(x1, y1, x1 + 16, y1 + 16, 0xFFFFFFFF, 0xFFFFFFFF); - GlStateManager.enableDepthTest(); - blitOffset = 0; - itemRenderer.renderGuiItem(stack, x1, y1); - itemRenderer.renderGuiItemOverlay(font, stack, x1, y1); - itemRenderer.zOffset = 0; - }); - }, width, height, 0); - }; + // this.tooltipRenderer = tooltip -> { + // MinecraftClient client = MinecraftClient.getInstance(); + // int specWidth = MathHelper.clamp(slots.size(), 1, 9) * 18 + 10; + // int specHeight = Math.max(1, MathHelper.ceil(slots.size() / 9)) * 18 + 10; + // List lines = tooltip.getText(); + // TextRenderer font = client.textRenderer; + // int width = Math.max(lines.stream().map(font::getStringWidth).max(Integer::compareTo).get(), specWidth); + // int tooltipHeight = lines.size() <= 1 ? 8 : lines.size() * 10; + // int height = (lines.isEmpty() ? 0 : (tooltipHeight + 10)) + specHeight; + // ScreenHelper.drawHoveringWidget(tooltip.getX(), tooltip.getY(), (x, y, aFloat) -> { + // int currentY = y; + // if (!lines.isEmpty()) { + // GlStateManager.disableRescaleNormal(); + // GuiLighting.disable(); + // GlStateManager.disableLighting(); + // this.blitOffset = 1000; + // this.fillGradient(x - 3, y - 4, x + width + 3, y - 3, -267386864, -267386864); + // this.fillGradient(x - 3, y + tooltipHeight + 3, x + width + 3, y + tooltipHeight + 4, -267386864, -267386864); + // this.fillGradient(x - 3, y - 3, x + width + 3, y + tooltipHeight + 3, -267386864, -267386864); + // this.fillGradient(x - 4, y - 3, x - 3, y + tooltipHeight + 3, -267386864, -267386864); + // this.fillGradient(x + width + 3, y - 3, x + width + 4, y + tooltipHeight + 3, -267386864, -267386864); + // this.fillGradient(x - 3, y - 3 + 1, x - 3 + 1, y + tooltipHeight + 3 - 1, 1347420415, 1344798847); + // this.fillGradient(x + width + 2, y - 3 + 1, x + width + 3, y + tooltipHeight + 3 - 1, 1347420415, 1344798847); + // this.fillGradient(x - 3, y - 3, x + width + 3, y - 3 + 1, 1347420415, 1347420415); + // this.fillGradient(x - 3, y + tooltipHeight + 2, x + width + 3, y + tooltipHeight + 3, 1344798847, 1344798847); + // for(int lineIndex = 0; lineIndex < lines.size(); lineIndex++) { + // GlStateManager.disableDepthTest(); + // font.drawWithShadow(lines.get(lineIndex), x, currentY, -1); + // GlStateManager.enableDepthTest(); + // currentY += lineIndex == 0 ? 12 : 10; + // } + // this.blitOffset = 0; + // GlStateManager.enableLighting(); + // GuiLighting.enable(); + // GlStateManager.enableRescaleNormal(); + // currentY += 6; + // } + // List> pairs = Lists.newArrayList(); + // GlStateManager.pushMatrix(); + // GlStateManager.translatef(x, currentY, 1000f); + // // new CategoryBaseWidget(new Rectangle(specWidth, specHeight)).render(); + // GlStateManager.popMatrix(); + // ItemRenderer itemRenderer = MinecraftClient.getInstance().getItemRenderer(); + // int currentX = 5; + // int currentYY = 5; + // int i = 0; + // for(ItemStack stack : slots) { + // i++; + // // minecraft.getTextureManager().bindTexture(RoughlyEnoughItemsCore.getConfigManager().getConfig().darkTheme ? SlotWidget.RECIPE_GUI_DARK : SlotWidget.RECIPE_GUI); + // // blit(x + currentX, currentY + currentYY, 0, 222, 18, 18); + // SlotWidget slotWidget = new SlotWidget(x + currentX + 1, currentY + currentYY + 1, stack, true, false) { + // @Override + // public void render(int mouseX, int mouseY, float delta) { + // Renderer renderer = getCurrentRenderer(); + // boolean darkTheme = RoughlyEnoughItemsCore.getConfigManager().getConfig().darkTheme; + // blitOffset = 1000; + // minecraft.getTextureManager().bindTexture(darkTheme ? RECIPE_GUI_DARK : RECIPE_GUI); + //// blit(this.x - 1, this.y - 1, 0, 222, 18, 18); + // GlStateManager.pushMatrix(); + // GlStateManager.translatef(0, 0, 1000f); + // renderer.setBlitOffset(205); + // renderer.render(x + 8, y + 6, mouseX, mouseY, delta); + // GlStateManager.enableDepthTest(); + // GlStateManager.popMatrix(); + // } + // }; + // GuiLighting.disable(); + // slotWidget.render(-1, -1, client.getLastFrameDuration()); + // // GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F); + // // GuiLighting.enableForItems(); + // // itemRenderer.zOffset = blitOffset + 50; + // // itemRenderer.renderGuiItem(stack, x + currentX + 1, currentY + currentYY + 1); + // // itemRenderer.renderGuiItemOverlay(font, stack, x + currentX + 1, currentY + currentYY + 1); + // // itemRenderer.zOffset = 0; + // // GlStateManager.enableDepthTest(); + // currentX += 18; + // if (i > 9) { + // i = 1; + // currentX = 5; + // currentYY += 18; + // } + // } + // this.blitOffset = 0; + // }, width, height, 0); + // }; } public void setRenderer(RecipeCategory category, Renderer renderable, String categoryName, boolean selected) { @@ -182,9 +180,9 @@ public class TabWidget extends HighlightableWidget { @SuppressWarnings("deprecation") private void drawTooltip() { if (this.minecraft.options.advancedItemTooltips) - ScreenHelper.getLastOverlay().addTooltip(QueuedTooltip.create(categoryName, ChatFormat.DARK_GRAY.toString() + category.getIdentifier().toString(), ClientHelper.getInstance().getFormattedModFromIdentifier(category.getIdentifier())).setSpecialRenderer(tooltipRenderer)); + ScreenHelper.getLastOverlay().addTooltip(QueuedTooltip.create(categoryName, ChatFormat.DARK_GRAY.toString() + category.getIdentifier().toString(), ClientHelper.getInstance().getFormattedModFromIdentifier(category.getIdentifier()))); else - ScreenHelper.getLastOverlay().addTooltip(QueuedTooltip.create(categoryName, ClientHelper.getInstance().getFormattedModFromIdentifier(category.getIdentifier())).setSpecialRenderer(tooltipRenderer)); + ScreenHelper.getLastOverlay().addTooltip(QueuedTooltip.create(categoryName, ClientHelper.getInstance().getFormattedModFromIdentifier(category.getIdentifier()))); } @Override -- cgit From 98c2c0f1af8b264cfce5c005f4694318cce001b2 Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 6 Jun 2019 18:36:51 +0800 Subject: alterative solution to the working stations --- .../me/shedaniel/rei/gui/widget/TabWidget.java | 92 ---------------------- 1 file changed, 92 deletions(-) (limited to 'src/main/java/me/shedaniel/rei/gui/widget/TabWidget.java') diff --git a/src/main/java/me/shedaniel/rei/gui/widget/TabWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/TabWidget.java index e6efdf3d8..0ca0849d9 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/TabWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/TabWidget.java @@ -5,7 +5,6 @@ package me.shedaniel.rei.gui.widget; -import com.google.common.collect.Lists; import com.mojang.blaze3d.platform.GlStateManager; import me.shedaniel.rei.RoughlyEnoughItemsCore; import me.shedaniel.rei.api.ClientHelper; @@ -14,7 +13,6 @@ import me.shedaniel.rei.api.Renderer; import me.shedaniel.rei.client.ScreenHelper; import net.minecraft.ChatFormat; import net.minecraft.client.render.GuiLighting; -import net.minecraft.item.ItemStack; import net.minecraft.util.Identifier; import java.awt.*; @@ -26,8 +24,6 @@ public class TabWidget extends HighlightableWidget { public static final Identifier CHEST_GUI_TEXTURE = new Identifier("roughlyenoughitems", "textures/gui/recipecontainer.png"); public static final Identifier CHEST_GUI_TEXTURE_DARK = new Identifier("roughlyenoughitems", "textures/gui/recipecontainer_dark.png"); - // private final Consumer tooltipRenderer; - private final List slots; public boolean shown = false, selected = false; public Renderer renderer; public int id; @@ -38,103 +34,15 @@ public class TabWidget extends HighlightableWidget { public TabWidget(int id, Rectangle bounds) { this.id = id; this.bounds = bounds; - this.slots = Lists.newArrayList(); - // this.tooltipRenderer = tooltip -> { - // MinecraftClient client = MinecraftClient.getInstance(); - // int specWidth = MathHelper.clamp(slots.size(), 1, 9) * 18 + 10; - // int specHeight = Math.max(1, MathHelper.ceil(slots.size() / 9)) * 18 + 10; - // List lines = tooltip.getText(); - // TextRenderer font = client.textRenderer; - // int width = Math.max(lines.stream().map(font::getStringWidth).max(Integer::compareTo).get(), specWidth); - // int tooltipHeight = lines.size() <= 1 ? 8 : lines.size() * 10; - // int height = (lines.isEmpty() ? 0 : (tooltipHeight + 10)) + specHeight; - // ScreenHelper.drawHoveringWidget(tooltip.getX(), tooltip.getY(), (x, y, aFloat) -> { - // int currentY = y; - // if (!lines.isEmpty()) { - // GlStateManager.disableRescaleNormal(); - // GuiLighting.disable(); - // GlStateManager.disableLighting(); - // this.blitOffset = 1000; - // this.fillGradient(x - 3, y - 4, x + width + 3, y - 3, -267386864, -267386864); - // this.fillGradient(x - 3, y + tooltipHeight + 3, x + width + 3, y + tooltipHeight + 4, -267386864, -267386864); - // this.fillGradient(x - 3, y - 3, x + width + 3, y + tooltipHeight + 3, -267386864, -267386864); - // this.fillGradient(x - 4, y - 3, x - 3, y + tooltipHeight + 3, -267386864, -267386864); - // this.fillGradient(x + width + 3, y - 3, x + width + 4, y + tooltipHeight + 3, -267386864, -267386864); - // this.fillGradient(x - 3, y - 3 + 1, x - 3 + 1, y + tooltipHeight + 3 - 1, 1347420415, 1344798847); - // this.fillGradient(x + width + 2, y - 3 + 1, x + width + 3, y + tooltipHeight + 3 - 1, 1347420415, 1344798847); - // this.fillGradient(x - 3, y - 3, x + width + 3, y - 3 + 1, 1347420415, 1347420415); - // this.fillGradient(x - 3, y + tooltipHeight + 2, x + width + 3, y + tooltipHeight + 3, 1344798847, 1344798847); - // for(int lineIndex = 0; lineIndex < lines.size(); lineIndex++) { - // GlStateManager.disableDepthTest(); - // font.drawWithShadow(lines.get(lineIndex), x, currentY, -1); - // GlStateManager.enableDepthTest(); - // currentY += lineIndex == 0 ? 12 : 10; - // } - // this.blitOffset = 0; - // GlStateManager.enableLighting(); - // GuiLighting.enable(); - // GlStateManager.enableRescaleNormal(); - // currentY += 6; - // } - // List> pairs = Lists.newArrayList(); - // GlStateManager.pushMatrix(); - // GlStateManager.translatef(x, currentY, 1000f); - // // new CategoryBaseWidget(new Rectangle(specWidth, specHeight)).render(); - // GlStateManager.popMatrix(); - // ItemRenderer itemRenderer = MinecraftClient.getInstance().getItemRenderer(); - // int currentX = 5; - // int currentYY = 5; - // int i = 0; - // for(ItemStack stack : slots) { - // i++; - // // minecraft.getTextureManager().bindTexture(RoughlyEnoughItemsCore.getConfigManager().getConfig().darkTheme ? SlotWidget.RECIPE_GUI_DARK : SlotWidget.RECIPE_GUI); - // // blit(x + currentX, currentY + currentYY, 0, 222, 18, 18); - // SlotWidget slotWidget = new SlotWidget(x + currentX + 1, currentY + currentYY + 1, stack, true, false) { - // @Override - // public void render(int mouseX, int mouseY, float delta) { - // Renderer renderer = getCurrentRenderer(); - // boolean darkTheme = RoughlyEnoughItemsCore.getConfigManager().getConfig().darkTheme; - // blitOffset = 1000; - // minecraft.getTextureManager().bindTexture(darkTheme ? RECIPE_GUI_DARK : RECIPE_GUI); - //// blit(this.x - 1, this.y - 1, 0, 222, 18, 18); - // GlStateManager.pushMatrix(); - // GlStateManager.translatef(0, 0, 1000f); - // renderer.setBlitOffset(205); - // renderer.render(x + 8, y + 6, mouseX, mouseY, delta); - // GlStateManager.enableDepthTest(); - // GlStateManager.popMatrix(); - // } - // }; - // GuiLighting.disable(); - // slotWidget.render(-1, -1, client.getLastFrameDuration()); - // // GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F); - // // GuiLighting.enableForItems(); - // // itemRenderer.zOffset = blitOffset + 50; - // // itemRenderer.renderGuiItem(stack, x + currentX + 1, currentY + currentYY + 1); - // // itemRenderer.renderGuiItemOverlay(font, stack, x + currentX + 1, currentY + currentYY + 1); - // // itemRenderer.zOffset = 0; - // // GlStateManager.enableDepthTest(); - // currentX += 18; - // if (i > 9) { - // i = 1; - // currentX = 5; - // currentYY += 18; - // } - // } - // this.blitOffset = 0; - // }, width, height, 0); - // }; } public void setRenderer(RecipeCategory category, Renderer renderable, String categoryName, boolean selected) { - slots.clear(); if (renderable == null) { shown = false; this.renderer = null; } else { shown = true; this.renderer = renderable; - this.slots.addAll(RoughlyEnoughItemsCore.getRecipeHelper().getWorkingStations(category.getIdentifier())); } this.category = category; this.selected = selected; -- cgit