From 3bcd325f2d9454753990c2ea2b06b7947c118d3d Mon Sep 17 00:00:00 2001 From: Danielshe Date: Fri, 8 Nov 2019 17:32:35 +0800 Subject: 19w45a --- .../java/me/shedaniel/rei/gui/ContainerScreenOverlay.java | 12 ++++++------ .../me/shedaniel/rei/gui/VillagerRecipeViewingScreen.java | 10 +++++----- .../java/me/shedaniel/rei/gui/widget/EntryListWidget.java | 2 +- .../java/me/shedaniel/rei/gui/widget/TextFieldWidget.java | 2 +- src/main/java/me/shedaniel/rei/impl/FluidEntryStack.java | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) (limited to 'src') diff --git a/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java b/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java index 9e285e756..ee35a42a3 100644 --- a/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java +++ b/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java @@ -27,8 +27,8 @@ 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.VertexConsumerProvider; import net.minecraft.client.resource.language.I18n; import net.minecraft.client.sound.PositionedSoundInstance; import net.minecraft.client.util.Window; @@ -63,7 +63,7 @@ public class ContainerScreenOverlay extends Widget { public final TriConsumer renderTooltipCallback = (x, y, aFloat) -> { RenderSystem.disableRescaleNormal(); RenderSystem.disableDepthTest(); - setBlitOffset(1000); + setBlitOffset(999); 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); @@ -75,14 +75,14 @@ public class ContainerScreenOverlay extends Widget { this.fillGradient(x - 3, y + tooltipHeight + 2, x + tooltipWidth + 3, y + tooltipHeight + 3, 1344798847, 1344798847); int currentY = y; MatrixStack matrixStack_1 = new MatrixStack(); - LayeredVertexConsumerStorage.Drawer drawer = LayeredVertexConsumerStorage.makeDrawer(Tessellator.getInstance().getBufferBuilder()); + VertexConsumerProvider.Immediate immediate = VertexConsumerProvider.immediate(Tessellator.getInstance().getBuffer()); matrixStack_1.translate(0.0D, 0.0D, getBlitOffset()); - Matrix4f matrix4f_1 = matrixStack_1.peek(); + Matrix4f matrix4f_1 = matrixStack_1.method_23760().method_23761(); for (int lineIndex = 0; lineIndex < tooltipLines.size(); lineIndex++) { - font.method_22942(tooltipLines.get(lineIndex), (float) x, (float) currentY, -1, true, matrix4f_1, drawer, false, 0, 15728880); + font.draw(tooltipLines.get(lineIndex), x, currentY, -1, true, matrix4f_1, immediate, false, 0, 15728880); currentY += lineIndex == 0 ? 12 : 10; } - drawer.draw(); + immediate.draw(); setBlitOffset(0); RenderSystem.enableDepthTest(); RenderSystem.enableRescaleNormal(); diff --git a/src/main/java/me/shedaniel/rei/gui/VillagerRecipeViewingScreen.java b/src/main/java/me/shedaniel/rei/gui/VillagerRecipeViewingScreen.java index 98968340b..773374bf5 100644 --- a/src/main/java/me/shedaniel/rei/gui/VillagerRecipeViewingScreen.java +++ b/src/main/java/me/shedaniel/rei/gui/VillagerRecipeViewingScreen.java @@ -377,7 +377,7 @@ public class VillagerRecipeViewingScreen extends Screen { double maxScroll = getMaxScrollPosition(); if (maxScroll > scrollListBounds.height - 2) { Tessellator tessellator = Tessellator.getInstance(); - BufferBuilder buffer = tessellator.getBufferBuilder(); + BufferBuilder buffer = tessellator.getBuffer(); int height = (int) (((scrollListBounds.height - 2) * (scrollListBounds.height - 2)) / this.getMaxScrollPosition()); height = MathHelper.clamp(height, 32, scrollListBounds.height - 2 - 8); height -= Math.min((scroll < 0 ? (int) -scroll : scroll > getMaxScroll() ? (int) scroll - getMaxScroll() : 0), height * .95); @@ -392,10 +392,10 @@ public class VillagerRecipeViewingScreen extends Screen { RenderSystem.shadeModel(7425); buffer.begin(7, VertexFormats.POSITION_COLOR); float b = ScreenHelper.isDarkModeEnabled() ? 0.37f : 1f; - buffer.vertex(scrollbarPositionMinX, minY + height, 1000D).color(b, b, b, scrollBarAlpha).next(); - buffer.vertex(scrollbarPositionMaxX, minY + height, 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(); + buffer.vertex(scrollbarPositionMinX, minY + height, 800).color(b, b, b, scrollBarAlpha).next(); + buffer.vertex(scrollbarPositionMaxX, minY + height, 800).color(b, b, b, scrollBarAlpha).next(); + buffer.vertex(scrollbarPositionMaxX, minY, 800).color(b, b, b, scrollBarAlpha).next(); + buffer.vertex(scrollbarPositionMinX, minY, 800).color(b, b, b, scrollBarAlpha).next(); tessellator.draw(); RenderSystem.shadeModel(7424); RenderSystem.disableBlend(); 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 2a18676b7..d6b4457e5 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/EntryListWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/EntryListWidget.java @@ -310,7 +310,7 @@ public class EntryListWidget extends Widget { double height = getMaxScroll(); if (height > rectangle.height) { Tessellator tessellator = Tessellator.getInstance(); - BufferBuilder buffer = tessellator.getBufferBuilder(); + BufferBuilder buffer = tessellator.getBuffer(); double maxScroll = height; int scrollBarHeight = MathHelper.floor((rectangle.height) * (rectangle.height) / maxScroll); scrollBarHeight = MathHelper.clamp(scrollBarHeight, 32, rectangle.height - 8); 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 6dcb1330e..b823a6030 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/TextFieldWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/TextFieldWidget.java @@ -478,7 +478,7 @@ public class TextFieldWidget extends WidgetWithBounds implements Tickable { } Tessellator tessellator_1 = Tessellator.getInstance(); - BufferBuilder bufferBuilder_1 = tessellator_1.getBufferBuilder(); + BufferBuilder bufferBuilder_1 = tessellator_1.getBuffer(); RenderSystem.color4f(0.0F, 0.0F, 255.0F, 255.0F); RenderSystem.disableTexture(); RenderSystem.enableColorLogicOp(); diff --git a/src/main/java/me/shedaniel/rei/impl/FluidEntryStack.java b/src/main/java/me/shedaniel/rei/impl/FluidEntryStack.java index c9583dae7..a071485da 100644 --- a/src/main/java/me/shedaniel/rei/impl/FluidEntryStack.java +++ b/src/main/java/me/shedaniel/rei/impl/FluidEntryStack.java @@ -176,8 +176,8 @@ public class FluidEntryStack extends AbstractEntryStack { MinecraftClient.getInstance().getTextureManager().bindTexture(SpriteAtlasTexture.BLOCK_ATLAS_TEX); GuiLighting.disable(); Tessellator tess = Tessellator.getInstance(); - BufferBuilder bb = tess.getBufferBuilder(); - bb.begin(7, VertexFormats.POSITION_UV_COLOR); + BufferBuilder bb = tess.getBuffer(); + bb.begin(7, VertexFormats.POSITION_TEXTURE_COLOR); bb.vertex(bounds.getMaxX(), bounds.y, getZ()).texture(sprite.getMaxU(), sprite.getMinV()).color(r, g, b, a).next(); bb.vertex(bounds.x, bounds.y, getZ()).texture(sprite.getMinU(), sprite.getMinV()).color(r, g, b, a).next(); bb.vertex(bounds.x, bounds.getMaxY(), getZ()).texture(sprite.getMinU(), sprite.getMaxV()).color(r, g, b, a).next(); -- cgit