aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/me
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/me')
-rw-r--r--src/main/java/me/shedaniel/rei/gui/widget/SlotWidget.java2
-rw-r--r--src/main/java/me/shedaniel/rei/gui/widget/TabWidget.java178
2 files changed, 89 insertions, 91 deletions
diff --git a/src/main/java/me/shedaniel/rei/gui/widget/SlotWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/SlotWidget.java
index aaa997631..9bb20a201 100644
--- a/src/main/java/me/shedaniel/rei/gui/widget/SlotWidget.java
+++ b/src/main/java/me/shedaniel/rei/gui/widget/SlotWidget.java
@@ -33,7 +33,7 @@ public class SlotWidget extends HighlightableWidget {
public static final Identifier RECIPE_GUI_DARK = new Identifier("roughlyenoughitems", "textures/gui/recipecontainer_dark.png");
private List<Renderer> renderers = new LinkedList<>();
private boolean drawBackground, showToolTips, clickToMoreRecipes, drawHighlightedBackground;
- private int x, y;
+ protected int x, y;
public SlotWidget(int x, int y, ItemStack itemStack, boolean drawBackground, boolean showToolTips) {
this(x, y, Collections.singletonList(itemStack), drawBackground, showToolTips);
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<QueuedTooltip> tooltipRenderer;
+ // private final Consumer<QueuedTooltip> tooltipRenderer;
private final List<ItemStack> 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<String> 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<Pair<Point, ItemStack>> 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<String> 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<Pair<Point, ItemStack>> 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
generated by cgit (git 2.34.1) at 2026-06-22 08:36:34 +0000