From b12bf996dd2b786b9166bd4534bdd3182a078d2f Mon Sep 17 00:00:00 2001 From: shedaniel Date: Mon, 20 Apr 2020 01:29:05 +0800 Subject: Fix endless recursion with item and fluid Signed-off-by: shedaniel --- .../me/shedaniel/rei/gui/FailedToLoadScreen.java | 299 --------------------- .../shedaniel/rei/gui/WarningAndErrorScreen.java | 299 +++++++++++++++++++++ .../me/shedaniel/rei/impl/FluidEntryStack.java | 28 +- .../java/me/shedaniel/rei/impl/ItemEntryStack.java | 46 +++- .../java/me/shedaniel/rei/impl/ScreenHelper.java | 15 +- 5 files changed, 366 insertions(+), 321 deletions(-) delete mode 100644 src/main/java/me/shedaniel/rei/gui/FailedToLoadScreen.java create mode 100644 src/main/java/me/shedaniel/rei/gui/WarningAndErrorScreen.java (limited to 'src/main/java/me') diff --git a/src/main/java/me/shedaniel/rei/gui/FailedToLoadScreen.java b/src/main/java/me/shedaniel/rei/gui/FailedToLoadScreen.java deleted file mode 100644 index a1d4ca3a3..000000000 --- a/src/main/java/me/shedaniel/rei/gui/FailedToLoadScreen.java +++ /dev/null @@ -1,299 +0,0 @@ -/* - * This file is licensed under the MIT License, part of Roughly Enough Items. - * Copyright (c) 2018, 2019, 2020 shedaniel - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package me.shedaniel.rei.gui; - -import me.shedaniel.clothconfig2.gui.widget.DynamicNewSmoothScrollingEntryListWidget; -import me.shedaniel.rei.RoughlyEnoughItemsState; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.DrawableHelper; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.widget.AbstractButtonWidget; -import net.minecraft.client.gui.widget.ButtonWidget; -import net.minecraft.client.sound.PositionedSoundInstance; -import net.minecraft.client.util.NarratorManager; -import net.minecraft.sound.SoundEvents; -import net.minecraft.text.Text; -import net.minecraft.util.Lazy; -import net.minecraft.util.Pair; -import net.minecraft.util.Util; -import org.jetbrains.annotations.ApiStatus; - -import java.net.URI; -import java.net.URISyntaxException; - -@ApiStatus.Internal -public class FailedToLoadScreen extends Screen { - public static final Lazy INSTANCE = new Lazy<>(FailedToLoadScreen::new); - private AbstractButtonWidget buttonExit; - private StringEntryListWidget listWidget; - private Screen parent; - - private FailedToLoadScreen() { - super(NarratorManager.EMPTY); - } - - @Override - public boolean shouldCloseOnEsc() { - return false; - } - - public void setParent(Screen parent) { - this.parent = parent; - } - - private void addText(String string) { - for (String s : textRenderer.wrapStringToWidthAsList(string, width - 80)) { - listWidget.creditsAddEntry(new TextItem(s)); - } - } - - private void addLink(String string, String link) { - for (String s : textRenderer.wrapStringToWidthAsList(string, width - 80)) { - listWidget.creditsAddEntry(new LinkItem(s, link)); - } - } - - @Override - protected void init() { - children.add(listWidget = new StringEntryListWidget(client, width, height, 32, height - 32)); - listWidget.max = 80; - listWidget.creditsClearEntries(); - listWidget.creditsAddEntry(new EmptyItem()); - if (!RoughlyEnoughItemsState.getWarnings().isEmpty()) - listWidget.creditsAddEntry(new TextItem("§6Warnings:")); - for (Pair pair : RoughlyEnoughItemsState.getWarnings()) { - addText(pair.getLeft()); - if (pair.getRight() != null) - addLink(pair.getRight(), pair.getRight()); - for (int i = 0; i < 2; i++) { - listWidget.creditsAddEntry(new EmptyItem()); - } - } - if (!RoughlyEnoughItemsState.getWarnings().isEmpty() && !RoughlyEnoughItemsState.getErrors().isEmpty()) { - listWidget.creditsAddEntry(new EmptyItem()); - } - if (!RoughlyEnoughItemsState.getErrors().isEmpty()) - listWidget.creditsAddEntry(new TextItem("§cErrors:")); - for (Pair pair : RoughlyEnoughItemsState.getErrors()) { - addText(pair.getLeft()); - if (pair.getRight() != null) - addLink(pair.getRight(), pair.getRight()); - for (int i = 0; i < 2; i++) { - listWidget.creditsAddEntry(new EmptyItem()); - } - } - for (StringItem child : listWidget.children()) { - listWidget.max = Math.max(listWidget.max, child.getWidth()); - } - children.add(buttonExit = new ButtonWidget(width / 2 - 100, height - 26, 200, 20, - RoughlyEnoughItemsState.getErrors().isEmpty() ? "Continue" : "Exit", - button -> { - if (RoughlyEnoughItemsState.getErrors().isEmpty()) { - RoughlyEnoughItemsState.clear(); - RoughlyEnoughItemsState.continues(); - MinecraftClient.getInstance().openScreen(parent); - setParent(null); - } else { - MinecraftClient.getInstance().scheduleStop(); - } - })); - } - - @Override - public boolean mouseScrolled(double double_1, double double_2, double double_3) { - return listWidget.mouseScrolled(double_1, double_2, double_3) || super.mouseScrolled(double_1, double_2, double_3); - } - - @Override - public void render(int int_1, int int_2, float float_1) { - this.renderDirtBackground(0); - this.listWidget.render(int_1, int_2, float_1); - if (RoughlyEnoughItemsState.getErrors().isEmpty()) { - this.drawCenteredString(this.textRenderer, "Warnings during Roughly Enough Items' initialization", this.width / 2, 16, 16777215); - } else { - this.drawCenteredString(this.textRenderer, "Errors during Roughly Enough Items' initialization", this.width / 2, 16, 16777215); - } - super.render(int_1, int_2, float_1); - this.buttonExit.render(int_1, int_2, float_1); - } - - private static class StringEntryListWidget extends DynamicNewSmoothScrollingEntryListWidget { - private boolean inFocus; - private int max = 80; - - public StringEntryListWidget(MinecraftClient client, int width, int height, int startY, int endY) { - super(client, width, height, startY, endY, DrawableHelper.BACKGROUND_TEXTURE); - } - - @Override - public boolean changeFocus(boolean boolean_1) { - if (!this.inFocus && this.getItemCount() == 0) { - return false; - } else { - this.inFocus = !this.inFocus; - if (this.inFocus && this.getFocused() == null && this.getItemCount() > 0) { - this.moveSelection(1); - } else if (this.inFocus && this.getFocused() != null) { - this.moveSelection(0); - } - - return this.inFocus; - } - } - - public void creditsClearEntries() { - clearItems(); - } - - private StringItem rei_getEntry(int int_1) { - return this.children().get(int_1); - } - - public void creditsAddEntry(StringItem entry) { - addItem(entry); - } - - @Override - public int getItemWidth() { - return max; - } - - @Override - protected int getScrollbarPosition() { - return width - 40; - } - } - - private abstract static class StringItem extends DynamicNewSmoothScrollingEntryListWidget.Entry { - public abstract int getWidth(); - } - - private static class EmptyItem extends StringItem { - @Override - public void render(int i, int i1, int i2, int i3, int i4, int i5, int i6, boolean b, float v) { - - } - - @Override - public int getItemHeight() { - return 5; - } - - @Override - public int getWidth() { - return 0; - } - } - - private static class TextItem extends StringItem { - private String text; - - public TextItem(Text textComponent) { - this(textComponent.asFormattedString()); - } - - public TextItem(String text) { - this.text = text; - } - - @Override - public void render(int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean isSelected, float delta) { - MinecraftClient.getInstance().textRenderer.drawWithShadow(text, x + 5, y, -1); - } - - @Override - public int getItemHeight() { - return 12; - } - - @Override - public boolean changeFocus(boolean boolean_1) { - return false; - } - - @Override - public int getWidth() { - return MinecraftClient.getInstance().textRenderer.getStringWidth(text) + 10; - } - } - - private class LinkItem extends StringItem { - private String text; - private String link; - private boolean contains; - - public LinkItem(Text textComponent) { - this(textComponent.asFormattedString()); - } - - public LinkItem(String text) { - this(text, text); - } - - public LinkItem(String text, String link) { - this.text = text; - this.link = link; - } - - @Override - public void render(int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean isSelected, float delta) { - contains = mouseX >= x && mouseX <= x + entryWidth && mouseY >= y && mouseY <= y + entryHeight; - if (contains) { - FailedToLoadScreen.this.renderTooltip("Click to open link.", mouseX, mouseY); - MinecraftClient.getInstance().textRenderer.drawWithShadow("§n" + text, x + 5, y, 0xff1fc3ff); - } else { - MinecraftClient.getInstance().textRenderer.drawWithShadow(text, x + 5, y, 0xff1fc3ff); - } - } - - @Override - public int getItemHeight() { - return 12; - } - - @Override - public boolean changeFocus(boolean boolean_1) { - return false; - } - - @Override - public int getWidth() { - return MinecraftClient.getInstance().textRenderer.getStringWidth(text) + 10; - } - - @Override - public boolean mouseClicked(double mouseX, double mouseY, int button) { - if (contains && button == 0) { - MinecraftClient.getInstance().getSoundManager().play(PositionedSoundInstance.master(SoundEvents.UI_BUTTON_CLICK, 1.0F)); - try { - Util.getOperatingSystem().open(new URI(link)); - return true; - } catch (URISyntaxException e) { - e.printStackTrace(); - } - } - return false; - } - } -} diff --git a/src/main/java/me/shedaniel/rei/gui/WarningAndErrorScreen.java b/src/main/java/me/shedaniel/rei/gui/WarningAndErrorScreen.java new file mode 100644 index 000000000..c62f89e31 --- /dev/null +++ b/src/main/java/me/shedaniel/rei/gui/WarningAndErrorScreen.java @@ -0,0 +1,299 @@ +/* + * This file is licensed under the MIT License, part of Roughly Enough Items. + * Copyright (c) 2018, 2019, 2020 shedaniel + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +package me.shedaniel.rei.gui; + +import me.shedaniel.clothconfig2.gui.widget.DynamicNewSmoothScrollingEntryListWidget; +import me.shedaniel.rei.RoughlyEnoughItemsState; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.gui.widget.AbstractButtonWidget; +import net.minecraft.client.gui.widget.ButtonWidget; +import net.minecraft.client.sound.PositionedSoundInstance; +import net.minecraft.client.util.NarratorManager; +import net.minecraft.sound.SoundEvents; +import net.minecraft.text.Text; +import net.minecraft.util.Lazy; +import net.minecraft.util.Pair; +import net.minecraft.util.Util; +import org.jetbrains.annotations.ApiStatus; + +import java.net.URI; +import java.net.URISyntaxException; + +@ApiStatus.Internal +public class WarningAndErrorScreen extends Screen { + public static final Lazy INSTANCE = new Lazy<>(WarningAndErrorScreen::new); + private AbstractButtonWidget buttonExit; + private StringEntryListWidget listWidget; + private Screen parent; + + private WarningAndErrorScreen() { + super(NarratorManager.EMPTY); + } + + @Override + public boolean shouldCloseOnEsc() { + return false; + } + + public void setParent(Screen parent) { + this.parent = parent; + } + + private void addText(String string) { + for (String s : textRenderer.wrapStringToWidthAsList(string, width - 80)) { + listWidget.creditsAddEntry(new TextItem(s)); + } + } + + private void addLink(String string, String link) { + for (String s : textRenderer.wrapStringToWidthAsList(string, width - 80)) { + listWidget.creditsAddEntry(new LinkItem(s, link)); + } + } + + @Override + protected void init() { + children.add(listWidget = new StringEntryListWidget(client, width, height, 32, height - 32)); + listWidget.max = 80; + listWidget.creditsClearEntries(); + listWidget.creditsAddEntry(new EmptyItem()); + if (!RoughlyEnoughItemsState.getWarnings().isEmpty()) + listWidget.creditsAddEntry(new TextItem("§6Warnings:")); + for (Pair pair : RoughlyEnoughItemsState.getWarnings()) { + addText(pair.getLeft()); + if (pair.getRight() != null) + addLink(pair.getRight(), pair.getRight()); + for (int i = 0; i < 2; i++) { + listWidget.creditsAddEntry(new EmptyItem()); + } + } + if (!RoughlyEnoughItemsState.getWarnings().isEmpty() && !RoughlyEnoughItemsState.getErrors().isEmpty()) { + listWidget.creditsAddEntry(new EmptyItem()); + } + if (!RoughlyEnoughItemsState.getErrors().isEmpty()) + listWidget.creditsAddEntry(new TextItem("§cErrors:")); + for (Pair pair : RoughlyEnoughItemsState.getErrors()) { + addText(pair.getLeft()); + if (pair.getRight() != null) + addLink(pair.getRight(), pair.getRight()); + for (int i = 0; i < 2; i++) { + listWidget.creditsAddEntry(new EmptyItem()); + } + } + for (StringItem child : listWidget.children()) { + listWidget.max = Math.max(listWidget.max, child.getWidth()); + } + children.add(buttonExit = new ButtonWidget(width / 2 - 100, height - 26, 200, 20, + RoughlyEnoughItemsState.getErrors().isEmpty() ? "Continue" : "Exit", + button -> { + if (RoughlyEnoughItemsState.getErrors().isEmpty()) { + RoughlyEnoughItemsState.clear(); + RoughlyEnoughItemsState.continues(); + MinecraftClient.getInstance().openScreen(parent); + setParent(null); + } else { + MinecraftClient.getInstance().scheduleStop(); + } + })); + } + + @Override + public boolean mouseScrolled(double double_1, double double_2, double double_3) { + return listWidget.mouseScrolled(double_1, double_2, double_3) || super.mouseScrolled(double_1, double_2, double_3); + } + + @Override + public void render(int int_1, int int_2, float float_1) { + this.renderDirtBackground(0); + this.listWidget.render(int_1, int_2, float_1); + if (RoughlyEnoughItemsState.getErrors().isEmpty()) { + this.drawCenteredString(this.textRenderer, "Warnings during Roughly Enough Items' initialization", this.width / 2, 16, 16777215); + } else { + this.drawCenteredString(this.textRenderer, "Errors during Roughly Enough Items' initialization", this.width / 2, 16, 16777215); + } + super.render(int_1, int_2, float_1); + this.buttonExit.render(int_1, int_2, float_1); + } + + private static class StringEntryListWidget extends DynamicNewSmoothScrollingEntryListWidget { + private boolean inFocus; + private int max = 80; + + public StringEntryListWidget(MinecraftClient client, int width, int height, int startY, int endY) { + super(client, width, height, startY, endY, DrawableHelper.BACKGROUND_TEXTURE); + } + + @Override + public boolean changeFocus(boolean boolean_1) { + if (!this.inFocus && this.getItemCount() == 0) { + return false; + } else { + this.inFocus = !this.inFocus; + if (this.inFocus && this.getFocused() == null && this.getItemCount() > 0) { + this.moveSelection(1); + } else if (this.inFocus && this.getFocused() != null) { + this.moveSelection(0); + } + + return this.inFocus; + } + } + + public void creditsClearEntries() { + clearItems(); + } + + private StringItem rei_getEntry(int int_1) { + return this.children().get(int_1); + } + + public void creditsAddEntry(StringItem entry) { + addItem(entry); + } + + @Override + public int getItemWidth() { + return max; + } + + @Override + protected int getScrollbarPosition() { + return width - 40; + } + } + + private abstract static class StringItem extends DynamicNewSmoothScrollingEntryListWidget.Entry { + public abstract int getWidth(); + } + + private static class EmptyItem extends StringItem { + @Override + public void render(int i, int i1, int i2, int i3, int i4, int i5, int i6, boolean b, float v) { + + } + + @Override + public int getItemHeight() { + return 5; + } + + @Override + public int getWidth() { + return 0; + } + } + + private static class TextItem extends StringItem { + private String text; + + public TextItem(Text textComponent) { + this(textComponent.asFormattedString()); + } + + public TextItem(String text) { + this.text = text; + } + + @Override + public void render(int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean isSelected, float delta) { + MinecraftClient.getInstance().textRenderer.drawWithShadow(text, x + 5, y, -1); + } + + @Override + public int getItemHeight() { + return 12; + } + + @Override + public boolean changeFocus(boolean boolean_1) { + return false; + } + + @Override + public int getWidth() { + return MinecraftClient.getInstance().textRenderer.getStringWidth(text) + 10; + } + } + + private class LinkItem extends StringItem { + private String text; + private String link; + private boolean contains; + + public LinkItem(Text textComponent) { + this(textComponent.asFormattedString()); + } + + public LinkItem(String text) { + this(text, text); + } + + public LinkItem(String text, String link) { + this.text = text; + this.link = link; + } + + @Override + public void render(int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean isSelected, float delta) { + contains = mouseX >= x && mouseX <= x + entryWidth && mouseY >= y && mouseY <= y + entryHeight; + if (contains) { + WarningAndErrorScreen.this.renderTooltip("Click to open link.", mouseX, mouseY); + MinecraftClient.getInstance().textRenderer.drawWithShadow("§n" + text, x + 5, y, 0xff1fc3ff); + } else { + MinecraftClient.getInstance().textRenderer.drawWithShadow(text, x + 5, y, 0xff1fc3ff); + } + } + + @Override + public int getItemHeight() { + return 12; + } + + @Override + public boolean changeFocus(boolean boolean_1) { + return false; + } + + @Override + public int getWidth() { + return MinecraftClient.getInstance().textRenderer.getStringWidth(text) + 10; + } + + @Override + public boolean mouseClicked(double mouseX, double mouseY, int button) { + if (contains && button == 0) { + MinecraftClient.getInstance().getSoundManager().play(PositionedSoundInstance.master(SoundEvents.UI_BUTTON_CLICK, 1.0F)); + try { + Util.getOperatingSystem().open(new URI(link)); + return true; + } catch (URISyntaxException e) { + e.printStackTrace(); + } + } + return false; + } + } +} diff --git a/src/main/java/me/shedaniel/rei/impl/FluidEntryStack.java b/src/main/java/me/shedaniel/rei/impl/FluidEntryStack.java index 02c524b75..c736703e7 100644 --- a/src/main/java/me/shedaniel/rei/impl/FluidEntryStack.java +++ b/src/main/java/me/shedaniel/rei/impl/FluidEntryStack.java @@ -52,12 +52,12 @@ import java.util.*; @ApiStatus.Internal public class FluidEntryStack extends AbstractEntryStack { private static final Map> FLUID_SPRITE_CACHE = new HashMap<>(); - private static final double EMPTY_AMOUNT = -1319182373; + private static final double IGNORE_AMOUNT = -1319182373; private Fluid fluid; private double amount; public FluidEntryStack(Fluid fluid) { - this(fluid, EMPTY_AMOUNT); + this(fluid, IGNORE_AMOUNT); } public FluidEntryStack(Fluid fluid, int amount) { @@ -103,7 +103,7 @@ public class FluidEntryStack extends AbstractEntryStack { @Override public void setFloatingAmount(double amount) { - this.amount = amount <= 0 ? EMPTY_AMOUNT : amount; + this.amount = amount == IGNORE_AMOUNT ? IGNORE_AMOUNT : Math.max(amount, 0); if (isEmpty()) { fluid = Fluids.EMPTY; } @@ -111,7 +111,7 @@ public class FluidEntryStack extends AbstractEntryStack { @Override public boolean isEmpty() { - return (amount != EMPTY_AMOUNT && amount <= 0) || fluid == Fluids.EMPTY; + return (amount != IGNORE_AMOUNT && amount <= 0) || fluid == Fluids.EMPTY; } @Override @@ -130,30 +130,38 @@ public class FluidEntryStack extends AbstractEntryStack { @Override public boolean equalsIgnoreTagsAndAmount(EntryStack stack) { + if (stack.getType() == Type.ITEM) + return equalsIgnoreTagsAndAmount(EntryStack.copyItemToFluid(stack)); if (stack.getType() != Type.FLUID) - return EntryStack.copyFluidToItem(this).equalsIgnoreTagsAndAmount(stack); + return false; return fluid == stack.getFluid(); } @Override public boolean equalsIgnoreTags(EntryStack stack) { + if (stack.getType() == Type.ITEM) + return equalsIgnoreTags(EntryStack.copyItemToFluid(stack)); if (stack.getType() != Type.FLUID) - return EntryStack.copyFluidToItem(this).equalsIgnoreTags(stack); - return fluid == stack.getFluid() && amount == stack.getAmount(); + return false; + return fluid == stack.getFluid() && (amount == IGNORE_AMOUNT || stack.getAmount() == IGNORE_AMOUNT || amount == stack.getAmount()); } @Override public boolean equalsIgnoreAmount(EntryStack stack) { + if (stack.getType() == Type.ITEM) + return equalsIgnoreAmount(EntryStack.copyItemToFluid(stack)); if (stack.getType() != Type.FLUID) - return EntryStack.copyFluidToItem(this).equalsIgnoreAmount(stack); + return false; return fluid == stack.getFluid(); } @Override public boolean equalsAll(EntryStack stack) { + if (stack.getType() == Type.ITEM) + return equalsAll(EntryStack.copyItemToFluid(stack)); if (stack.getType() != Type.FLUID) - return EntryStack.copyFluidToItem(this).equalsAll(stack); - return fluid == stack.getFluid() && amount == stack.getAmount(); + return false; + return fluid == stack.getFluid() && (amount == IGNORE_AMOUNT || stack.getAmount() == IGNORE_AMOUNT || amount == stack.getAmount()); } @Override diff --git a/src/main/java/me/shedaniel/rei/impl/ItemEntryStack.java b/src/main/java/me/shedaniel/rei/impl/ItemEntryStack.java index cceea85a6..23f3061d9 100644 --- a/src/main/java/me/shedaniel/rei/impl/ItemEntryStack.java +++ b/src/main/java/me/shedaniel/rei/impl/ItemEntryStack.java @@ -111,26 +111,56 @@ public class ItemEntryStack extends AbstractEntryStack implements OptimalEntrySt return itemStack; } + /** + * type: + * 0: ignore tags and amount + * 1: ignore tags + * 2: ignore amount + * 3: all + */ + private Boolean compareIfFluid(EntryStack stack, int type) { + EntryStack fluid = EntryStack.copyItemToFluid(this); + if (fluid.isEmpty()) return null; + if (stack.getType() == Type.ITEM) + stack = EntryStack.copyItemToFluid(stack); + if (stack.isEmpty()) return null; + switch (type) { + case 0: + return fluid.equalsIgnoreTagsAndAmount(stack); + case 1: + return fluid.equalsIgnoreTags(stack); + case 2: + return fluid.equalsIgnoreAmount(stack); + case 3: + return fluid.equalsAll(stack); + } + return null; + } + @Override public boolean equalsIgnoreTagsAndAmount(EntryStack stack) { + Boolean ifFluid = compareIfFluid(stack, 0); + if (ifFluid != null) return ifFluid; if (stack.getType() != Type.ITEM) - return EntryStack.copyItemToFluid(this).equalsIgnoreTagsAndAmount(stack); - return itemStack.getItem() == stack.getItem(); + return false; + return itemStack.getItem() == stack.getItem() || (stack.getType() != Type.ITEM ? stack : EntryStack.copyItemToFluid(stack)).equalsIgnoreTagsAndAmount(EntryStack.copyItemToFluid(this)); } @Override public boolean equalsAll(EntryStack stack) { + Boolean ifFluid = compareIfFluid(stack, 3); + if (ifFluid != null) return ifFluid; if (stack.getType() != Type.ITEM) - return EntryStack.copyItemToFluid(this).equalsAll(stack); - if (itemStack.getItem() != stack.getItem() || getAmount() != stack.getAmount()) return false; - return ItemStack.areTagsEqual(itemStack, stack.getItemStack()); + return itemStack.getItem() == stack.getItem() && getAmount() != stack.getAmount() && ItemStack.areTagsEqual(itemStack, stack.getItemStack()); } @Override public boolean equalsIgnoreAmount(EntryStack stack) { + Boolean ifFluid = compareIfFluid(stack, 2); + if (ifFluid != null) return ifFluid; if (stack.getType() != Type.ITEM) - return EntryStack.copyItemToFluid(this).equalsIgnoreAmount(stack); + return false; if (itemStack.getItem() != stack.getItem()) return false; ItemStack otherStack = stack.getItemStack(); @@ -183,8 +213,10 @@ public class ItemEntryStack extends AbstractEntryStack implements OptimalEntrySt @Override public boolean equalsIgnoreTags(EntryStack stack) { + Boolean ifFluid = compareIfFluid(stack, 1); + if (ifFluid != null) return ifFluid; if (stack.getType() != Type.ITEM) - return EntryStack.copyItemToFluid(this).equalsIgnoreTags(stack); + return false; if (itemStack.getItem() != stack.getItem()) return false; return getAmount() == stack.getAmount(); diff --git a/src/main/java/me/shedaniel/rei/impl/ScreenHelper.java b/src/main/java/me/shedaniel/rei/impl/ScreenHelper.java index 0b21f6175..f5f836552 100644 --- a/src/main/java/me/shedaniel/rei/impl/ScreenHelper.java +++ b/src/main/java/me/shedaniel/rei/impl/ScreenHelper.java @@ -34,9 +34,9 @@ import me.shedaniel.rei.api.ConfigObject; import me.shedaniel.rei.api.REIHelper; import me.shedaniel.rei.api.widgets.Tooltip; import me.shedaniel.rei.gui.ContainerScreenOverlay; -import me.shedaniel.rei.gui.FailedToLoadScreen; import me.shedaniel.rei.gui.OverlaySearchField; import me.shedaniel.rei.gui.RecipeScreen; +import me.shedaniel.rei.gui.WarningAndErrorScreen; import me.shedaniel.rei.gui.widget.TextFieldWidget; import net.fabricmc.api.ClientModInitializer; import net.fabricmc.fabric.api.event.client.ClientTickCallback; @@ -204,10 +204,15 @@ public class ScreenHelper implements ClientModInitializer, REIHelper { @Override public void onInitializeClient() { ClothClientHooks.SCREEN_INIT_PRE.register((client, screen, screenHooks) -> { - if ((!RoughlyEnoughItemsState.getErrors().isEmpty() || !RoughlyEnoughItemsState.getWarnings().isEmpty()) && !(screen instanceof FailedToLoadScreen)) { - FailedToLoadScreen failedToLoadScreen = FailedToLoadScreen.INSTANCE.get(); - failedToLoadScreen.setParent(screen); - client.openScreen(failedToLoadScreen); + if ((!RoughlyEnoughItemsState.getErrors().isEmpty() || !RoughlyEnoughItemsState.getWarnings().isEmpty()) && !(screen instanceof WarningAndErrorScreen)) { + WarningAndErrorScreen warningAndErrorScreen = WarningAndErrorScreen.INSTANCE.get(); + warningAndErrorScreen.setParent(screen); + try { + if (client.currentScreen != null) client.currentScreen.removed(); + } catch (Throwable ignored) { + } + client.currentScreen = null; + client.openScreen(warningAndErrorScreen); } else if (lastHandledScreen != screen && screen instanceof HandledScreen) lastHandledScreen = (HandledScreen) screen; return ActionResult.PASS; -- cgit