diff options
Diffstat (limited to 'runtime')
3 files changed, 12 insertions, 7 deletions
diff --git a/runtime/src/main/java/me/shedaniel/rei/gui/AbstractRecipeViewingScreen.java b/runtime/src/main/java/me/shedaniel/rei/gui/AbstractRecipeViewingScreen.java index fd8007d19..02deb5231 100644 --- a/runtime/src/main/java/me/shedaniel/rei/gui/AbstractRecipeViewingScreen.java +++ b/runtime/src/main/java/me/shedaniel/rei/gui/AbstractRecipeViewingScreen.java @@ -25,6 +25,7 @@ package me.shedaniel.rei.gui; import com.google.common.collect.Lists; import me.shedaniel.math.Rectangle; +import me.shedaniel.rei.api.gui.widgets.Slot; import me.shedaniel.rei.api.gui.widgets.Widget; import me.shedaniel.rei.api.ingredient.EntryStack; import me.shedaniel.rei.api.registry.display.Display; @@ -110,11 +111,11 @@ public abstract class AbstractRecipeViewingScreen extends Screen implements Reci } protected void transformIngredientNotice(List<Widget> setupDisplay, EntryStack<?> noticeStack) { - transformNotice(1, setupDisplay, noticeStack); + transformNotice(Slot.INPUT, setupDisplay, noticeStack); } protected void transformResultNotice(List<Widget> setupDisplay, EntryStack<?> noticeStack) { - transformNotice(2, setupDisplay, noticeStack); + transformNotice(Slot.OUTPUT, setupDisplay, noticeStack); } private static void transformNotice(int marker, List<Widget> setupDisplay, EntryStack<?> noticeStack) { diff --git a/runtime/src/main/java/me/shedaniel/rei/gui/widget/EntryWidget.java b/runtime/src/main/java/me/shedaniel/rei/gui/widget/EntryWidget.java index e9288668b..2947539d4 100644 --- a/runtime/src/main/java/me/shedaniel/rei/gui/widget/EntryWidget.java +++ b/runtime/src/main/java/me/shedaniel/rei/gui/widget/EntryWidget.java @@ -247,12 +247,14 @@ public class EntryWidget extends Slot { return this; } + @Override public EntryStack<?> getCurrentEntry() { - if (entryStacks.isEmpty()) + int size = entryStacks.size(); + if (size == 0) return EntryStack.empty(); - if (entryStacks.size() == 1) + if (size == 1) return entryStacks.get(0); - return entryStacks.get(Mth.floor(((System.currentTimeMillis() + stackDisplayOffset) / 1000 % (double) entryStacks.size()))); + return entryStacks.get(Mth.floor(((System.currentTimeMillis() + stackDisplayOffset) / 1000 % (double) size))); } @Override @@ -266,7 +268,8 @@ public class EntryWidget extends Slot { return bounds; } - protected Rectangle getInnerBounds() { + @Override + public Rectangle getInnerBounds() { return new Rectangle(bounds.x + 1, bounds.y + 1, bounds.width - 2, bounds.height - 2); } diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/AbstractEntryStack.java b/runtime/src/main/java/me/shedaniel/rei/impl/AbstractEntryStack.java index 9556b2866..6c176dbc1 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/AbstractEntryStack.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/AbstractEntryStack.java @@ -102,7 +102,8 @@ public abstract class AbstractEntryStack<A> extends AbstractRenderer implements } @Override - public @Nullable Tooltip getTooltip(Point mouse) { + @Nullable + public Tooltip getTooltip(Point mouse) { return this.getDefinition().getRenderer().getTooltip(this, mouse); } |