diff options
Diffstat (limited to 'src/main/java/me/shedaniel/rei/gui/widget')
5 files changed, 26 insertions, 26 deletions
diff --git a/src/main/java/me/shedaniel/rei/gui/widget/AutoCraftingButtonWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/AutoCraftingButtonWidget.java index 3b1817d18..06bc25eca 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/AutoCraftingButtonWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/AutoCraftingButtonWidget.java @@ -33,7 +33,7 @@ import me.shedaniel.rei.gui.toast.CopyRecipeIdentifierToast; import me.shedaniel.rei.impl.ClientHelperImpl; import me.shedaniel.rei.impl.ScreenHelper; import me.shedaniel.rei.utils.CollectionUtils; -import net.minecraft.client.gui.screen.ingame.ContainerScreen; +import net.minecraft.client.gui.screen.ingame.ScreenWithHandler; import net.minecraft.client.resource.language.I18n; import net.minecraft.text.LiteralText; import net.minecraft.util.Formatting; @@ -51,7 +51,7 @@ public class AutoCraftingButtonWidget extends ButtonWidget { private String extraTooltip; private List<String> errorTooltip; private List<Widget> setupDisplay; - private ContainerScreen<?> containerScreen; + private ScreenWithHandler<?> screenWithHandler; private boolean visible = false; private RecipeCategory<?> category; private Rectangle displayBounds; @@ -62,14 +62,14 @@ public class AutoCraftingButtonWidget extends ButtonWidget { this.displaySupplier = displaySupplier; Optional<Identifier> recipe = displaySupplier.get().getRecipeLocation(); extraTooltip = recipe.isPresent() ? I18n.translate("text.rei.recipe_id", Formatting.GRAY.toString(), recipe.get().toString()) : ""; - this.containerScreen = ScreenHelper.getLastContainerScreen(); + this.screenWithHandler = ScreenHelper.getLastScreenWithHandler(); this.setupDisplay = setupDisplay; this.category = recipeCategory; } @Override public void onPressed() { - AutoTransferHandler.Context context = AutoTransferHandler.Context.create(true, containerScreen, displaySupplier.get()); + AutoTransferHandler.Context context = AutoTransferHandler.Context.create(true, screenWithHandler, displaySupplier.get()); for (AutoTransferHandler autoTransferHandler : RecipeHelper.getInstance().getSortedAutoCraftingHandler()) try { AutoTransferHandler.Result result = autoTransferHandler.handle(context); @@ -78,7 +78,7 @@ public class AutoCraftingButtonWidget extends ButtonWidget { } catch (Exception e) { e.printStackTrace(); } - minecraft.openScreen(containerScreen); + minecraft.openScreen(screenWithHandler); ScreenHelper.getLastOverlay().init(); } @@ -89,7 +89,7 @@ public class AutoCraftingButtonWidget extends ButtonWidget { int color = 0; visible = false; IntList redSlots = null; - AutoTransferHandler.Context context = AutoTransferHandler.Context.create(false, containerScreen, displaySupplier.get()); + AutoTransferHandler.Context context = AutoTransferHandler.Context.create(false, screenWithHandler, displaySupplier.get()); for (AutoTransferHandler autoTransferHandler : RecipeHelper.getInstance().getSortedAutoCraftingHandler()) { try { AutoTransferHandler.Result result = autoTransferHandler.handle(context); diff --git a/src/main/java/me/shedaniel/rei/gui/widget/ButtonWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/ButtonWidget.java index 0fd86752d..9f9614b53 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/ButtonWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/ButtonWidget.java @@ -122,19 +122,19 @@ public abstract class ButtonWidget extends WidgetWithBounds { RenderSystem.blendFuncSeparate(770, 771, 1, 0); RenderSystem.blendFunc(770, 771); //Four Corners - blit(x, y, getBlitOffset(), 0, textureOffset * 80, 4, 4, 512, 256); - blit(x + width - 4, y, getBlitOffset(), 252, textureOffset * 80, 4, 4, 512, 256); - blit(x, y + height - 4, getBlitOffset(), 0, textureOffset * 80 + 76, 4, 4, 512, 256); - blit(x + width - 4, y + height - 4, getBlitOffset(), 252, textureOffset * 80 + 76, 4, 4, 512, 256); + blit(x, y, getZOffset(), 0, textureOffset * 80, 4, 4, 512, 256); + blit(x + width - 4, y, getZOffset(), 252, textureOffset * 80, 4, 4, 512, 256); + blit(x, y + height - 4, getZOffset(), 0, textureOffset * 80 + 76, 4, 4, 512, 256); + blit(x + width - 4, y + height - 4, getZOffset(), 252, textureOffset * 80 + 76, 4, 4, 512, 256); //Sides - blit(x + 4, y, getBlitOffset(), 4, textureOffset * 80, MathHelper.ceil((width - 8) / 2f), 4, 512, 256); - blit(x + 4, y + height - 4, getBlitOffset(), 4, textureOffset * 80 + 76, MathHelper.ceil((width - 8) / 2f), 4, 512, 256); - blit(x + 4 + MathHelper.ceil((width - 8) / 2f), y + height - 4, getBlitOffset(), 252 - MathHelper.floor((width - 8) / 2f), textureOffset * 80 + 76, MathHelper.floor((width - 8) / 2f), 4, 512, 256); - blit(x + 4 + MathHelper.ceil((width - 8) / 2f), y, getBlitOffset(), 252 - MathHelper.floor((width - 8) / 2f), textureOffset * 80, MathHelper.floor((width - 8) / 2f), 4, 512, 256); + blit(x + 4, y, getZOffset(), 4, textureOffset * 80, MathHelper.ceil((width - 8) / 2f), 4, 512, 256); + blit(x + 4, y + height - 4, getZOffset(), 4, textureOffset * 80 + 76, MathHelper.ceil((width - 8) / 2f), 4, 512, 256); + blit(x + 4 + MathHelper.ceil((width - 8) / 2f), y + height - 4, getZOffset(), 252 - MathHelper.floor((width - 8) / 2f), textureOffset * 80 + 76, MathHelper.floor((width - 8) / 2f), 4, 512, 256); + blit(x + 4 + MathHelper.ceil((width - 8) / 2f), y, getZOffset(), 252 - MathHelper.floor((width - 8) / 2f), textureOffset * 80, MathHelper.floor((width - 8) / 2f), 4, 512, 256); for (int i = y + 4; i < y + height - 4; i += 76) { - blit(x, i, getBlitOffset(), 0, 4 + textureOffset * 80, MathHelper.ceil(width / 2f), MathHelper.clamp(y + height - 4 - i, 0, 76), 512, 256); - blit(x + MathHelper.ceil(width / 2f), i, getBlitOffset(), 256 - MathHelper.floor(width / 2f), 4 + textureOffset * 80, MathHelper.floor(width / 2f), MathHelper.clamp(y + height - 4 - i, 0, 76), 512, 256); + blit(x, i, getZOffset(), 0, 4 + textureOffset * 80, MathHelper.ceil(width / 2f), MathHelper.clamp(y + height - 4 - i, 0, 76), 512, 256); + blit(x + MathHelper.ceil(width / 2f), i, getZOffset(), 256 - MathHelper.floor(width / 2f), 4 + textureOffset * 80, MathHelper.floor(width / 2f), MathHelper.clamp(y + height - 4 - i, 0, 76), 512, 256); } } diff --git a/src/main/java/me/shedaniel/rei/gui/widget/CraftableToggleButtonWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/CraftableToggleButtonWidget.java index e136d82d9..7f5ebe151 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/CraftableToggleButtonWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/CraftableToggleButtonWidget.java @@ -53,17 +53,17 @@ public abstract class CraftableToggleButtonWidget extends LateRenderedButton { @Override public void lateRender(int mouseX, int mouseY, float delta) { - setBlitOffset(600); + setZOffset(600); super.render(mouseX, mouseY, delta); - this.itemRenderer.zOffset = getBlitOffset() - 98; + this.itemRenderer.zOffset = getZOffset() - 98; Rectangle bounds = getBounds(); this.itemRenderer.renderGuiItemIcon(ICON, bounds.x + 2, bounds.y + 2); this.itemRenderer.zOffset = 0.0F; int color = ConfigManager.getInstance().isCraftableOnlyEnabled() ? 939579655 : 956235776; - setBlitOffset(getBlitOffset() + 1); + setZOffset(getZOffset() + 1); this.fillGradient(bounds.x + 1, bounds.y + 1, bounds.getMaxX() - 1, bounds.getMaxY() - 1, color, color); - setBlitOffset(0); + setZOffset(0); } @Override diff --git a/src/main/java/me/shedaniel/rei/gui/widget/TextFieldWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/TextFieldWidget.java index b199f6539..677f92ad3 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/TextFieldWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/TextFieldWidget.java @@ -507,10 +507,10 @@ public class TextFieldWidget extends WidgetWithBounds implements Tickable { RenderSystem.blendFuncSeparate(770, 771, 1, 0); RenderSystem.shadeModel(7425); buffer.begin(7, VertexFormats.POSITION_COLOR); - buffer.vertex(x1, y2, getBlitOffset() + 50d).color(r, g, b, 120).next(); - buffer.vertex(x2, y2, getBlitOffset() + 50d).color(r, g, b, 120).next(); - buffer.vertex(x2, y1, getBlitOffset() + 50d).color(r, g, b, 120).next(); - buffer.vertex(x1, y1, getBlitOffset() + 50d).color(r, g, b, 120).next(); + buffer.vertex(x1, y2, getZOffset() + 50d).color(r, g, b, 120).next(); + buffer.vertex(x2, y2, getZOffset() + 50d).color(r, g, b, 120).next(); + buffer.vertex(x2, y1, getZOffset() + 50d).color(r, g, b, 120).next(); + buffer.vertex(x1, y1, getZOffset() + 50d).color(r, g, b, 120).next(); tessellator.draw(); RenderSystem.shadeModel(7424); RenderSystem.disableBlend(); diff --git a/src/main/java/me/shedaniel/rei/gui/widget/Widget.java b/src/main/java/me/shedaniel/rei/gui/widget/Widget.java index cc8ec6955..b5610d5f6 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/Widget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/Widget.java @@ -46,11 +46,11 @@ public abstract class Widget extends AbstractParentElement implements Drawable { protected final TextRenderer font = minecraft.textRenderer; public int getZ() { - return this.getBlitOffset(); + return this.getZOffset(); } public void setZ(int z) { - this.setBlitOffset(z); + this.setZOffset(z); } public boolean containsMouse(double mouseX, double mouseY) { |