aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/me/shedaniel/rei/gui/ContainerGuiOverlay.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/me/shedaniel/rei/gui/ContainerGuiOverlay.java')
-rw-r--r--src/main/java/me/shedaniel/rei/gui/ContainerGuiOverlay.java105
1 files changed, 81 insertions, 24 deletions
diff --git a/src/main/java/me/shedaniel/rei/gui/ContainerGuiOverlay.java b/src/main/java/me/shedaniel/rei/gui/ContainerGuiOverlay.java
index 42bd77bf5..3ffd95238 100644
--- a/src/main/java/me/shedaniel/rei/gui/ContainerGuiOverlay.java
+++ b/src/main/java/me/shedaniel/rei/gui/ContainerGuiOverlay.java
@@ -1,16 +1,16 @@
package me.shedaniel.rei.gui;
-import me.shedaniel.rei.RoughlyEnoughItemsCore;
+import com.mojang.blaze3d.platform.GlStateManager;
import me.shedaniel.rei.client.ClientHelper;
-import me.shedaniel.rei.gui.widget.IWidget;
-import me.shedaniel.rei.gui.widget.ItemListOverlay;
-import me.shedaniel.rei.gui.widget.LabelWidget;
-import me.shedaniel.rei.gui.widget.QueuedTooltip;
+import me.shedaniel.rei.gui.widget.*;
import me.shedaniel.rei.listeners.IMixinContainerGui;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.ContainerGui;
import net.minecraft.client.gui.Gui;
-import net.minecraft.client.gui.widget.ButtonWidget;
+import net.minecraft.client.gui.GuiEventListener;
+import net.minecraft.client.gui.widget.TextFieldWidget;
+import net.minecraft.client.render.GuiLighting;
+import net.minecraft.client.resource.language.I18n;
import net.minecraft.client.util.Window;
import net.minecraft.util.math.MathHelper;
@@ -20,14 +20,15 @@ import java.util.List;
public class ContainerGuiOverlay extends Gui {
+ private static int page = 0;
+ private final List<IWidget> widgets;
+ private final List<QueuedTooltip> queuedTooltips;
private Rectangle rectangle;
private IMixinContainerGui containerGui;
private Window window;
- private static int page = 0;
- private final List<IWidget> widgets;
private ItemListOverlay itemListOverlay;
private ButtonWidget buttonLeft, buttonRight;
- private final List<QueuedTooltip> queuedTooltips;
+ private TextFieldWidget searchField;
public ContainerGuiOverlay(ContainerGui containerGui) {
this.queuedTooltips = new ArrayList<>();
@@ -36,6 +37,7 @@ public class ContainerGuiOverlay extends Gui {
}
public void onInitialized() {
+ String searchTerm = searchField != null ? searchField.getText() : "";
//Update Variables
this.widgets.clear();
this.window = MinecraftClient.getInstance().window;
@@ -44,23 +46,36 @@ public class ContainerGuiOverlay extends Gui {
this.rectangle = calculateBoundary();
widgets.add(this.itemListOverlay = new ItemListOverlay(this, containerGui, page));
- this.itemListOverlay.updateList(getItemListArea(), page);
- addButton(buttonLeft = new ButtonWidget(-1, rectangle.x, rectangle.y + 3, 16, 20, "<") {
+ this.itemListOverlay.updateList(getItemListArea(), page, searchTerm);
+ widgets.add(buttonLeft = new ButtonWidget(rectangle.x, rectangle.y + 5, 16, 16, "<") {
@Override
- public void onPressed(double double_1, double double_2) {
+ public void onPressed(int button, double mouseX, double mouseY) {
page--;
if (page < 0)
page = getTotalPage();
- itemListOverlay.updateList(getItemListArea(), page);
+ itemListOverlay.updateList(getItemListArea(), page, searchField.getText());
}
});
- addButton(buttonRight = new ButtonWidget(-1, rectangle.x + rectangle.width - 18, rectangle.y + 3, 16, 20, ">") {
+ widgets.add(buttonRight = new ButtonWidget(rectangle.x + rectangle.width - 18, rectangle.y + 5, 16, 16, ">") {
@Override
- public void onPressed(double double_1, double double_2) {
+ public void onPressed(int button, double mouseX, double mouseY) {
page++;
if (page > getTotalPage())
page = 0;
- itemListOverlay.updateList(getItemListArea(), page);
+ itemListOverlay.updateList(getItemListArea(), page, searchField.getText());
+ }
+ });
+ page = MathHelper.clamp(page, 0, getTotalPage());
+ widgets.add(new ButtonWidget(10, 10, 40, 20, "") {
+ @Override
+ public void draw(int int_1, int int_2, float float_1) {
+ this.text = getCheatModeText();
+ super.draw(int_1, int_2, float_1);
+ }
+
+ @Override
+ public void onPressed(int button, double mouseX, double mouseY) {
+ ClientHelper.setCheating(!ClientHelper.isCheating());
}
});
this.widgets.add(new LabelWidget(rectangle.x + (rectangle.width / 2), rectangle.y + 10, "") {
@@ -70,10 +85,29 @@ public class ContainerGuiOverlay extends Gui {
super.draw(mouseX, mouseY, partialTicks);
}
});
+ Rectangle textFieldArea = getTextFieldArea();
+ this.listeners.add(searchField = new TextFieldWidget(-1, MinecraftClient.getInstance().fontRenderer,
+ (int) textFieldArea.getX(), (int) textFieldArea.getY(), (int) textFieldArea.getWidth(), (int) textFieldArea.getHeight()));
+ searchField.setChangedListener((id, text) -> {
+ itemListOverlay.updateList(page, text);
+ });
+ searchField.setText(searchTerm);
this.listeners.addAll(widgets);
}
+ private Rectangle getTextFieldArea() {
+ if (MinecraftClient.getInstance().currentGui instanceof RecipeViewingWidget) {
+ RecipeViewingWidget widget = (RecipeViewingWidget) MinecraftClient.getInstance().currentGui;
+ return new Rectangle(widget.getBounds().x, window.getScaledHeight() - 22, widget.getBounds().width, 18);
+ }
+ return new Rectangle(containerGui.getContainerLeft(), window.getScaledHeight() - 22, containerGui.getContainerWidth(), 18);
+ }
+
+ private String getCheatModeText() {
+ return I18n.translate(String.format("%s%s", "text.rei.", ClientHelper.isCheating() ? "cheat" : "nocheat"));
+ }
+
private Rectangle getItemListArea() {
return new Rectangle(rectangle.x + 2, rectangle.y + 24, rectangle.width - 4, rectangle.height - 27);
}
@@ -83,9 +117,14 @@ public class ContainerGuiOverlay extends Gui {
}
public void render(int mouseX, int mouseY, float partialTicks) {
- draw(mouseX, mouseY, partialTicks);
+ GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F);
+ GuiLighting.disable();
+ this.draw(mouseX, mouseY, partialTicks);
+ GuiLighting.disable();
queuedTooltips.forEach(queuedTooltip -> containerGui.getContainerGui().drawTooltip(queuedTooltip.text, queuedTooltip.mouse.x, queuedTooltip.mouse.y));
queuedTooltips.clear();
+ GuiLighting.disable();
+ searchField.render(mouseX, mouseY, partialTicks);
}
public void addTooltip(QueuedTooltip queuedTooltip) {
@@ -94,28 +133,37 @@ public class ContainerGuiOverlay extends Gui {
@Override
public void draw(int int_1, int int_2, float float_1) {
- widgets.forEach(widget -> widget.draw(int_1, int_2, float_1));
+ widgets.forEach(widget -> {
+ GuiLighting.disable();
+ widget.draw(int_1, int_2, float_1);
+ });
+ GuiLighting.disable();
itemListOverlay.draw(int_1, int_2, float_1);
+ GuiLighting.disable();
super.draw(int_1, int_2, float_1);
}
private Rectangle calculateBoundary() {
int startX = containerGui.getContainerLeft() + containerGui.getContainerWidth() + 10;
int width = window.getScaledWidth() - startX;
+ if (MinecraftClient.getInstance().currentGui instanceof RecipeViewingWidget) {
+ RecipeViewingWidget widget = (RecipeViewingWidget) MinecraftClient.getInstance().currentGui;
+ width = window.getScaledWidth() - (widget.getBounds().x + widget.getBounds().width + 10);
+ }
return new Rectangle(startX, 0, width, window.getScaledHeight());
}
private int getTotalPage() {
- return MathHelper.ceil(ClientHelper.getItemList().size() / itemListOverlay.getTotalSlotsPerPage());
+ return MathHelper.ceil(itemListOverlay.getCurrentDisplayed().size() / itemListOverlay.getTotalSlotsPerPage());
}
@Override
public boolean mouseScrolled(double amount) {
if (rectangle.contains(ClientHelper.getMouseLocation())) {
if (amount > 0 && buttonLeft.enabled)
- buttonLeft.onPressed(0, 0);
+ buttonLeft.onPressed(0, 0, 0);
else if (amount < 0 && buttonRight.enabled)
- buttonRight.onPressed(0, 0);
+ buttonRight.onPressed(0, 0, 0);
else return false;
return true;
}
@@ -126,10 +174,19 @@ public class ContainerGuiOverlay extends Gui {
}
@Override
- public boolean mouseClicked(double double_1, double double_2, int int_1) {
- for(IWidget widget : widgets)
- if (widget.mouseClicked(double_1, double_2, int_1))
+ public boolean keyPressed(int int_1, int int_2, int int_3) {
+ for(GuiEventListener listener : listeners)
+ if (listener.keyPressed(int_1, int_2, int_3))
return true;
return false;
}
+
+ @Override
+ public boolean charTyped(char char_1, int int_1) {
+ for(GuiEventListener listener : listeners)
+ if (listener.charTyped(char_1, int_1))
+ return true;
+ return super.charTyped(char_1, int_1);
+ }
+
}
generated by cgit (git 2.34.1) at 2026-06-22 08:07:48 +0000