From 675387b674b648f013d7fd95508845eedc0e4647 Mon Sep 17 00:00:00 2001 From: Danielshe Date: Thu, 10 Oct 2019 20:42:31 +0800 Subject: 19w41a --- .../shedaniel/rei/gui/ContainerScreenOverlay.java | 72 ++++++++++++---------- .../me/shedaniel/rei/gui/RecipeViewingScreen.java | 2 +- .../rei/gui/VillagerRecipeViewingScreen.java | 8 +-- .../shedaniel/rei/gui/renderers/FluidRenderer.java | 8 +-- .../rei/gui/renderers/ItemStackRenderer.java | 2 +- .../gui/widget/CraftableToggleButtonWidget.java | 2 +- .../shedaniel/rei/gui/widget/DraggableWidget.java | 4 +- .../shedaniel/rei/gui/widget/EntryListWidget.java | 8 +-- .../rei/gui/widget/RecipeChoosePageWidget.java | 4 +- .../rei/gui/widget/SearchFieldWidget.java | 2 +- .../shedaniel/rei/gui/widget/TextFieldWidget.java | 8 +-- .../java/me/shedaniel/rei/impl/ScreenHelper.java | 2 +- .../me/shedaniel/rei/plugin/DefaultPlugin.java | 12 ++-- 13 files changed, 72 insertions(+), 62 deletions(-) (limited to 'src/main/java/me') diff --git a/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java b/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java index 024da33d0..1f44adaa4 100644 --- a/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java +++ b/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java @@ -22,14 +22,17 @@ import me.shedaniel.rei.impl.ScreenHelper; import me.shedaniel.rei.impl.Weather; import me.shedaniel.rei.listeners.ContainerScreenHooks; import net.minecraft.client.MinecraftClient; -import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.Element; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.ingame.AbstractContainerScreen; import net.minecraft.client.render.GuiLighting; +import net.minecraft.client.render.LayeredVertexConsumerStorage; +import net.minecraft.client.render.Tessellator; +import net.minecraft.client.render.item.ItemRenderer; import net.minecraft.client.resource.language.I18n; import net.minecraft.client.sound.PositionedSoundInstance; import net.minecraft.client.util.Window; +import net.minecraft.client.util.math.Matrix4f; import net.minecraft.client.world.ClientWorld; import net.minecraft.container.Slot; import net.minecraft.item.ItemStack; @@ -38,7 +41,9 @@ import net.minecraft.text.TranslatableText; import net.minecraft.util.ActionResult; import net.minecraft.util.Identifier; import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.MatrixStack; import net.minecraft.world.GameMode; +import org.apache.logging.log4j.util.TriConsumer; import javax.annotation.Nullable; import java.util.*; @@ -53,6 +58,36 @@ public class ContainerScreenOverlay extends Widget { private static EntryListWidget entryListWidget; private final List widgets = Lists.newLinkedList(); public boolean shouldReInit = false; + private int tooltipWidth; + private int tooltipHeight; + private List tooltipLines; + public final TriConsumer renderTooltipCallback = (x, y, aFloat) -> { + RenderSystem.disableRescaleNormal(); + RenderSystem.disableDepthTest(); + setBlitOffset(1000); + this.fillGradient(x - 3, y - 4, x + tooltipWidth + 3, y - 3, -267386864, -267386864); + this.fillGradient(x - 3, y + tooltipHeight + 3, x + tooltipWidth + 3, y + tooltipHeight + 4, -267386864, -267386864); + this.fillGradient(x - 3, y - 3, x + tooltipWidth + 3, y + tooltipHeight + 3, -267386864, -267386864); + this.fillGradient(x - 4, y - 3, x - 3, y + tooltipHeight + 3, -267386864, -267386864); + this.fillGradient(x + tooltipWidth + 3, y - 3, x + tooltipWidth + 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 + tooltipWidth + 2, y - 3 + 1, x + tooltipWidth + 3, y + tooltipHeight + 3 - 1, 1347420415, 1344798847); + this.fillGradient(x - 3, y - 3, x + tooltipWidth + 3, y - 3 + 1, 1347420415, 1347420415); + this.fillGradient(x - 3, y + tooltipHeight + 2, x + tooltipWidth + 3, y + tooltipHeight + 3, 1344798847, 1344798847); + int currentY = y; + MatrixStack matrixStack_1 = new MatrixStack(); + LayeredVertexConsumerStorage.class_4598 layeredVertexConsumerStorage$class_4598_1 = LayeredVertexConsumerStorage.method_22991(Tessellator.getInstance().getBufferBuilder()); + matrixStack_1.translate(0.0D, 0.0D, getBlitOffset()); + Matrix4f matrix4f_1 = matrixStack_1.peek(); + for (int lineIndex = 0; lineIndex < tooltipLines.size(); lineIndex++) { + font.method_22942(tooltipLines.get(lineIndex), (float) x, (float) currentY, -1, true, matrix4f_1, layeredVertexConsumerStorage$class_4598_1, false, 0, 15728880); + currentY += lineIndex == 0 ? 12 : 10; + } + layeredVertexConsumerStorage$class_4598_1.method_22993(); + setBlitOffset(0); + RenderSystem.enableDepthTest(); + RenderSystem.enableRescaleNormal(); + }; private Rectangle rectangle; private Window window; private CraftableToggleButtonWidget toggleButtonWidget; @@ -74,7 +109,7 @@ public class ContainerScreenOverlay extends Widget { this.shouldReInit = false; //Update Variables this.children().clear(); - this.window = MinecraftClient.getInstance().method_22683(); + this.window = MinecraftClient.getInstance().getWindow(); DisplayHelper.DisplayBoundsHandler boundsHandler = RoughlyEnoughItemsCore.getDisplayHelper().getResponsibleBoundsHandler(MinecraftClient.getInstance().currentScreen.getClass()); this.rectangle = RoughlyEnoughItemsCore.getConfigManager().getConfig().isLeftHandSidePanel() ? boundsHandler.getLeftBounds(MinecraftClient.getInstance().currentScreen) : boundsHandler.getRightBounds(MinecraftClient.getInstance().currentScreen); widgets.add(entryListWidget = new EntryListWidget(page)); @@ -422,35 +457,10 @@ public class ContainerScreenOverlay extends Widget { public void renderTooltip(List lines, int mouseX, int mouseY) { if (lines.isEmpty()) return; - TextRenderer font = MinecraftClient.getInstance().textRenderer; - int width = lines.stream().map(font::getStringWidth).max(Integer::compareTo).get(); - int height = lines.size() <= 1 ? 8 : lines.size() * 10; - ScreenHelper.drawHoveringWidget(mouseX, mouseY, (x, y, aFloat) -> { - RenderSystem.disableRescaleNormal(); - GuiLighting.disable(); - RenderSystem.disableLighting(); - setBlitOffset(1000); - this.fillGradient(x - 3, y - 4, x + width + 3, y - 3, -267386864, -267386864); - this.fillGradient(x - 3, y + height + 3, x + width + 3, y + height + 4, -267386864, -267386864); - this.fillGradient(x - 3, y - 3, x + width + 3, y + height + 3, -267386864, -267386864); - this.fillGradient(x - 4, y - 3, x - 3, y + height + 3, -267386864, -267386864); - this.fillGradient(x + width + 3, y - 3, x + width + 4, y + height + 3, -267386864, -267386864); - this.fillGradient(x - 3, y - 3 + 1, x - 3 + 1, y + height + 3 - 1, 1347420415, 1344798847); - this.fillGradient(x + width + 2, y - 3 + 1, x + width + 3, y + height + 3 - 1, 1347420415, 1344798847); - this.fillGradient(x - 3, y - 3, x + width + 3, y - 3 + 1, 1347420415, 1347420415); - this.fillGradient(x - 3, y + height + 2, x + width + 3, y + height + 3, 1344798847, 1344798847); - int currentY = y; - for (int lineIndex = 0; lineIndex < lines.size(); lineIndex++) { - RenderSystem.disableDepthTest(); - font.drawWithShadow(lines.get(lineIndex), x, currentY, -1); - RenderSystem.enableDepthTest(); - currentY += lineIndex == 0 ? 12 : 10; - } - setBlitOffset(0); - RenderSystem.enableLighting(); - GuiLighting.enable(); - RenderSystem.enableRescaleNormal(); - }, width, height, 0); + tooltipWidth = lines.stream().map(font::getStringWidth).max(Integer::compareTo).get(); + tooltipHeight = lines.size() <= 1 ? 8 : lines.size() * 10; + tooltipLines = lines; + ScreenHelper.drawHoveringWidget(mouseX, mouseY, renderTooltipCallback, tooltipWidth, tooltipHeight, 0); } private boolean hasSameListContent(List list1, List list2) { diff --git a/src/main/java/me/shedaniel/rei/gui/RecipeViewingScreen.java b/src/main/java/me/shedaniel/rei/gui/RecipeViewingScreen.java index 11df019f3..335780890 100644 --- a/src/main/java/me/shedaniel/rei/gui/RecipeViewingScreen.java +++ b/src/main/java/me/shedaniel/rei/gui/RecipeViewingScreen.java @@ -55,7 +55,7 @@ public class RecipeViewingScreen extends Screen { this.categoryPages = 0; this.preWidgets = Lists.newArrayList(); this.widgets = Lists.newArrayList(); - Window window = MinecraftClient.getInstance().method_22683(); + Window window = MinecraftClient.getInstance().getWindow(); this.bounds = new Rectangle(window.getScaledWidth() / 2 - guiWidth / 2, window.getScaledHeight() / 2 - guiHeight / 2, 176, 186); this.categoriesMap = categoriesMap; this.categories = Lists.newArrayList(); diff --git a/src/main/java/me/shedaniel/rei/gui/VillagerRecipeViewingScreen.java b/src/main/java/me/shedaniel/rei/gui/VillagerRecipeViewingScreen.java index 11606bce0..4d02a3a5f 100644 --- a/src/main/java/me/shedaniel/rei/gui/VillagerRecipeViewingScreen.java +++ b/src/main/java/me/shedaniel/rei/gui/VillagerRecipeViewingScreen.java @@ -375,10 +375,10 @@ public class VillagerRecipeViewingScreen extends Screen { RenderSystem.shadeModel(7425); buffer.begin(7, VertexFormats.POSITION_COLOR); float b = ScreenHelper.isDarkModeEnabled() ? 0.37f : 1f; - buffer.method_22912(scrollbarPositionMinX, minY + scrollBarHeight, 1000D).method_22915(b, b, b, scrollBarAlpha).next(); - buffer.method_22912(scrollbarPositionMaxX, minY + scrollBarHeight, 1000D).method_22915(b, b, b, scrollBarAlpha).next(); - buffer.method_22912(scrollbarPositionMaxX, minY, 1000D).method_22915(b, b, b, scrollBarAlpha).next(); - buffer.method_22912(scrollbarPositionMinX, minY, 1000D).method_22915(b, b, b, scrollBarAlpha).next(); + buffer.vertex(scrollbarPositionMinX, minY + scrollBarHeight, 1000D).color(b, b, b, scrollBarAlpha).next(); + buffer.vertex(scrollbarPositionMaxX, minY + scrollBarHeight, 1000D).color(b, b, b, scrollBarAlpha).next(); + buffer.vertex(scrollbarPositionMaxX, minY, 1000D).color(b, b, b, scrollBarAlpha).next(); + buffer.vertex(scrollbarPositionMinX, minY, 1000D).color(b, b, b, scrollBarAlpha).next(); tessellator.draw(); RenderSystem.shadeModel(7424); RenderSystem.disableBlend(); diff --git a/src/main/java/me/shedaniel/rei/gui/renderers/FluidRenderer.java b/src/main/java/me/shedaniel/rei/gui/renderers/FluidRenderer.java index dea84cea9..972545ec1 100644 --- a/src/main/java/me/shedaniel/rei/gui/renderers/FluidRenderer.java +++ b/src/main/java/me/shedaniel/rei/gui/renderers/FluidRenderer.java @@ -70,10 +70,10 @@ public abstract class FluidRenderer extends Renderer { Tessellator tess = Tessellator.getInstance(); BufferBuilder bb = tess.getBufferBuilder(); bb.begin(7, VertexFormats.POSITION_UV_COLOR); - bb.method_22912(x + 16, y, getBlitOffset()).method_22913(sprite.getMaxU(), sprite.getMinV()).color(r, g, b, a).next(); - bb.method_22912(x, y, getBlitOffset()).method_22913(sprite.getMinU(), sprite.getMinV()).color(r, g, b, a).next(); - bb.method_22912(x, y + 16, getBlitOffset()).method_22913(sprite.getMinU(), sprite.getMaxV()).color(r, g, b, a).next(); - bb.method_22912(x + 16, y + 16, getBlitOffset()).method_22913(sprite.getMaxU(), sprite.getMaxV()).color(r, g, b, a).next(); + bb.vertex(x + 16, y, getBlitOffset()).texture(sprite.getMaxU(), sprite.getMinV()).color(r, g, b, a).next(); + bb.vertex(x, y, getBlitOffset()).texture(sprite.getMinU(), sprite.getMinV()).color(r, g, b, a).next(); + bb.vertex(x, y + 16, getBlitOffset()).texture(sprite.getMinU(), sprite.getMaxV()).color(r, g, b, a).next(); + bb.vertex(x + 16, y + 16, getBlitOffset()).texture(sprite.getMaxU(), sprite.getMaxV()).color(r, g, b, a).next(); tess.draw(); } setBlitOffset(0); diff --git a/src/main/java/me/shedaniel/rei/gui/renderers/ItemStackRenderer.java b/src/main/java/me/shedaniel/rei/gui/renderers/ItemStackRenderer.java index 5eb581240..215259d6d 100644 --- a/src/main/java/me/shedaniel/rei/gui/renderers/ItemStackRenderer.java +++ b/src/main/java/me/shedaniel/rei/gui/renderers/ItemStackRenderer.java @@ -19,6 +19,7 @@ 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.math.MatrixStack; import javax.annotation.Nullable; import java.util.Collections; @@ -41,7 +42,6 @@ public abstract class ItemStackRenderer extends Renderer { RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F); ItemRenderer itemRenderer = MinecraftClient.getInstance().getItemRenderer(); itemRenderer.zOffset = getBlitOffset(); - GuiLighting.enableForItems(); RenderSystem.colorMask(true, true, true, true); RenderSystem.enableLighting(); RenderSystem.enableRescaleNormal(); 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 a0e5db1eb..cfa70e5cf 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/CraftableToggleButtonWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/CraftableToggleButtonWidget.java @@ -36,7 +36,7 @@ public abstract class CraftableToggleButtonWidget extends ButtonWidget { GuiLighting.disable(); super.render(mouseX, mouseY, delta); - GuiLighting.enableForItems(); +// GuiLighting.enableForItems(); this.itemRenderer.zOffset = getBlitOffset(); this.itemRenderer.renderGuiItem(new ItemStack(Blocks.CRAFTING_TABLE), getBounds().x + 2, getBounds().y + 2); this.itemRenderer.zOffset = 0.0F; diff --git a/src/main/java/me/shedaniel/rei/gui/widget/DraggableWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/DraggableWidget.java index 92068769c..e7f52e7e1 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/DraggableWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/DraggableWidget.java @@ -23,7 +23,7 @@ public abstract class DraggableWidget extends WidgetWithBounds { } public DraggableWidget() { - this(new Point(MinecraftClient.getInstance().method_22683().getScaledWidth() / 2, MinecraftClient.getInstance().method_22683().getScaledHeight() / 2)); + this(new Point(MinecraftClient.getInstance().getWindow().getScaledWidth() / 2, MinecraftClient.getInstance().getWindow().getScaledHeight() / 2)); } protected abstract void initWidgets(Point midPoint); @@ -50,7 +50,7 @@ public abstract class DraggableWidget extends WidgetWithBounds { dragged = true; } } else { - Window window = minecraft.method_22683(); + Window window = minecraft.getWindow(); midPoint = processMidPoint(midPoint, mouse, startPoint, window, relateX, relateY); updateWidgets(midPoint); } diff --git a/src/main/java/me/shedaniel/rei/gui/widget/EntryListWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/EntryListWidget.java index cbfdd9d10..30169ef6e 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/EntryListWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/EntryListWidget.java @@ -321,10 +321,10 @@ public class EntryListWidget extends Widget { RenderSystem.shadeModel(7425); buffer.begin(7, VertexFormats.POSITION_COLOR); float b = ScreenHelper.isDarkModeEnabled() ? 0.8f : 1f; - buffer.method_22912(scrollbarPositionMinX, minY + scrollBarHeight, 1000D).method_22915(b, b, b, scrollBarAlpha).next(); - buffer.method_22912(scrollbarPositionMaxX, minY + scrollBarHeight, 1000D).method_22915(b, b, b, scrollBarAlpha).next(); - buffer.method_22912(scrollbarPositionMaxX, minY, 1000D).method_22915(b, b, b, scrollBarAlpha).next(); - buffer.method_22912(scrollbarPositionMinX, minY, 1000D).method_22915(b, b, b, scrollBarAlpha).next(); + buffer.vertex(scrollbarPositionMinX, minY + scrollBarHeight, 1000D).color(b, b, b, scrollBarAlpha).next(); + buffer.vertex(scrollbarPositionMaxX, minY + scrollBarHeight, 1000D).color(b, b, b, scrollBarAlpha).next(); + buffer.vertex(scrollbarPositionMaxX, minY, 1000D).color(b, b, b, scrollBarAlpha).next(); + buffer.vertex(scrollbarPositionMinX, minY, 1000D).color(b, b, b, scrollBarAlpha).next(); tessellator.draw(); RenderSystem.shadeModel(7424); RenderSystem.disableBlend(); diff --git a/src/main/java/me/shedaniel/rei/gui/widget/RecipeChoosePageWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/RecipeChoosePageWidget.java index 1ffa0e311..51ebbbe21 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/RecipeChoosePageWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/RecipeChoosePageWidget.java @@ -46,7 +46,7 @@ public class RecipeChoosePageWidget extends DraggableWidget { } private static Point getPointFromConfig() { - Window window = MinecraftClient.getInstance().method_22683(); + Window window = MinecraftClient.getInstance().getWindow(); ConfigObjectImpl.RelativePoint point = RoughlyEnoughItemsCore.getConfigManager().getConfig().getChoosePageDialogPoint(); return new Point(point.getX(window.getScaledWidth()), point.getY(window.getScaledHeight())); } @@ -186,7 +186,7 @@ public class RecipeChoosePageWidget extends DraggableWidget { @Override public void onMouseReleaseMidPoint(Point midPoint) { ConfigManager configManager = RoughlyEnoughItemsCore.getConfigManager(); - Window window = minecraft.method_22683(); + Window window = minecraft.getWindow(); configManager.getConfig().setChoosePageDialogPoint(new ConfigObjectImpl.RelativePoint(midPoint.getX() / window.getScaledWidth(), midPoint.getY() / window.getScaledHeight())); try { configManager.saveConfig(); diff --git a/src/main/java/me/shedaniel/rei/gui/widget/SearchFieldWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/SearchFieldWidget.java index 76d7810e6..e6e386c2a 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/SearchFieldWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/SearchFieldWidget.java @@ -75,7 +75,7 @@ public class SearchFieldWidget extends TextFieldWidget { @Override public boolean charTyped(char char_1, int int_1) { - if (System.currentTimeMillis() - keybindFocusTime < 1000 && InputUtil.isKeyPressed(MinecraftClient.getInstance().method_22683().getHandle(), keybindFocusKey)) { + if (System.currentTimeMillis() - keybindFocusTime < 1000 && InputUtil.isKeyPressed(MinecraftClient.getInstance().getWindow().getHandle(), keybindFocusKey)) { keybindFocusTime = -1; keybindFocusKey = -1; return true; 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 c726fb2bd..6dcb1330e 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/TextFieldWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/TextFieldWidget.java @@ -484,10 +484,10 @@ public class TextFieldWidget extends WidgetWithBounds implements Tickable { RenderSystem.enableColorLogicOp(); RenderSystem.logicOp(GlStateManager.LogicOp.OR_REVERSE); bufferBuilder_1.begin(7, VertexFormats.POSITION); - bufferBuilder_1.method_22912((double) int_1, (double) int_4, getBlitOffset() + 50d).next(); - bufferBuilder_1.method_22912((double) int_3, (double) int_4, getBlitOffset() + 50d).next(); - bufferBuilder_1.method_22912((double) int_3, (double) int_2, getBlitOffset() + 50d).next(); - bufferBuilder_1.method_22912((double) int_1, (double) int_2, getBlitOffset() + 50d).next(); + bufferBuilder_1.vertex((double) int_1, (double) int_4, getBlitOffset() + 50d).next(); + bufferBuilder_1.vertex((double) int_3, (double) int_4, getBlitOffset() + 50d).next(); + bufferBuilder_1.vertex((double) int_3, (double) int_2, getBlitOffset() + 50d).next(); + bufferBuilder_1.vertex((double) int_1, (double) int_2, getBlitOffset() + 50d).next(); tessellator_1.draw(); RenderSystem.disableColorLogicOp(); RenderSystem.enableTexture(); diff --git a/src/main/java/me/shedaniel/rei/impl/ScreenHelper.java b/src/main/java/me/shedaniel/rei/impl/ScreenHelper.java index 1e7a20ae7..3759412c6 100644 --- a/src/main/java/me/shedaniel/rei/impl/ScreenHelper.java +++ b/src/main/java/me/shedaniel/rei/impl/ScreenHelper.java @@ -93,7 +93,7 @@ public class ScreenHelper implements ClientModInitializer { } public static void drawHoveringWidget(int x, int y, TriConsumer consumer, int width, int height, float delta) { - Window window = MinecraftClient.getInstance().method_22683(); + Window window = MinecraftClient.getInstance().getWindow(); drawHoveringWidget(window.getScaledWidth(), window.getScaledHeight(), x, y, consumer, width, height, delta); } diff --git a/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java b/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java index fb965ac5f..ef87e78c8 100644 --- a/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java +++ b/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java @@ -201,13 +201,13 @@ public class DefaultPlugin implements REIPluginV0 { @Override public Rectangle getLeftBounds(AbstractContainerScreen screen) { - return new Rectangle(2, 0, ScreenHelper.getLastContainerScreenHooks().rei_getContainerLeft() - 4, MinecraftClient.getInstance().method_22683().getScaledHeight()); + return new Rectangle(2, 0, ScreenHelper.getLastContainerScreenHooks().rei_getContainerLeft() - 4, MinecraftClient.getInstance().getWindow().getScaledHeight()); } @Override public Rectangle getRightBounds(AbstractContainerScreen screen) { int startX = ScreenHelper.getLastContainerScreenHooks().rei_getContainerLeft() + ScreenHelper.getLastContainerScreenHooks().rei_getContainerWidth() + 2; - return new Rectangle(startX, 0, MinecraftClient.getInstance().method_22683().getScaledWidth() - startX - 2, MinecraftClient.getInstance().method_22683().getScaledHeight()); + return new Rectangle(startX, 0, MinecraftClient.getInstance().getWindow().getScaledWidth() - startX - 2, MinecraftClient.getInstance().getWindow().getScaledHeight()); } @Override @@ -223,13 +223,13 @@ public class DefaultPlugin implements REIPluginV0 { @Override public Rectangle getLeftBounds(RecipeViewingScreen screen) { - return new Rectangle(2, 0, ((RecipeViewingScreen) screen).getBounds().x - 4, MinecraftClient.getInstance().method_22683().getScaledHeight()); + return new Rectangle(2, 0, ((RecipeViewingScreen) screen).getBounds().x - 4, MinecraftClient.getInstance().getWindow().getScaledHeight()); } @Override public Rectangle getRightBounds(RecipeViewingScreen screen) { int startX = ((RecipeViewingScreen) screen).getBounds().x + ((RecipeViewingScreen) screen).getBounds().width + 2; - return new Rectangle(startX, 0, MinecraftClient.getInstance().method_22683().getScaledWidth() - startX - 2, MinecraftClient.getInstance().method_22683().getScaledHeight()); + return new Rectangle(startX, 0, MinecraftClient.getInstance().getWindow().getScaledWidth() - startX - 2, MinecraftClient.getInstance().getWindow().getScaledHeight()); } @Override @@ -245,13 +245,13 @@ public class DefaultPlugin implements REIPluginV0 { @Override public Rectangle getLeftBounds(VillagerRecipeViewingScreen screen) { - return new Rectangle(2, 0, ((VillagerRecipeViewingScreen) screen).bounds.x - 4, MinecraftClient.getInstance().method_22683().getScaledHeight()); + return new Rectangle(2, 0, ((VillagerRecipeViewingScreen) screen).bounds.x - 4, MinecraftClient.getInstance().getWindow().getScaledHeight()); } @Override public Rectangle getRightBounds(VillagerRecipeViewingScreen screen) { int startX = ((VillagerRecipeViewingScreen) screen).bounds.x + ((VillagerRecipeViewingScreen) screen).bounds.width + 2; - return new Rectangle(startX, 0, MinecraftClient.getInstance().method_22683().getScaledWidth() - startX - 2, MinecraftClient.getInstance().method_22683().getScaledHeight()); + return new Rectangle(startX, 0, MinecraftClient.getInstance().getWindow().getScaledWidth() - startX - 2, MinecraftClient.getInstance().getWindow().getScaledHeight()); } @Override -- cgit