diff --git a/RebornCore/src/client/java/reborncore/client/RenderUtil.java b/RebornCore/src/client/java/reborncore/client/RenderUtil.java index d1bdb74ab..11c6d244c 100644 --- a/RebornCore/src/client/java/reborncore/client/RenderUtil.java +++ b/RebornCore/src/client/java/reborncore/client/RenderUtil.java @@ -24,22 +24,10 @@ package reborncore.client; -import com.mojang.blaze3d.systems.RenderSystem; -import net.fabricmc.fabric.api.client.render.fluid.v1.FluidRenderHandler; -import net.fabricmc.fabric.api.client.render.fluid.v1.FluidRenderHandlerRegistry; import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.DrawContext; -import net.minecraft.client.render.*; import net.minecraft.client.texture.Sprite; -import net.minecraft.client.texture.TextureManager; -import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.fluid.Fluid; import net.minecraft.screen.PlayerScreenHandler; import net.minecraft.util.Identifier; -import net.minecraft.util.math.BlockPos; -import reborncore.common.fluid.FluidValue; -import reborncore.common.fluid.container.FluidInstance; -import reborncore.common.util.Tank; /** * Created by Gigabit101 on 08/08/2016. @@ -48,34 +36,4 @@ public class RenderUtil { public static Sprite getSprite(Identifier identifier) { return MinecraftClient.getInstance().getSpriteAtlas(PlayerScreenHandler.BLOCK_ATLAS_TEXTURE).apply(identifier); } - - public static void drawGradientRect(DrawContext drawContext, int zLevel, int left, int top, int right, int bottom, int startColor, int endColor) { - RenderSystem.enableBlend(); - RenderSystem.defaultBlendFunc(); - RenderSystem.setShader(GameRenderer::getPositionColorProgram); - - Tessellator tessellator = Tessellator.getInstance(); - BufferBuilder bufferBuilder = tessellator.getBuffer(); - bufferBuilder.begin(VertexFormat.DrawMode.QUADS, VertexFormats.POSITION_COLOR); - - float f = (startColor >> 24 & 0xFF) / 255.0F; - float g = (startColor >> 16 & 0xFF) / 255.0F; - float h = (startColor >> 8 & 0xFF) / 255.0F; - float i = (startColor & 0xFF) / 255.0F; - - float j = (endColor >> 24 & 0xFF) / 255.0F; - float k = (endColor >> 16 & 0xFF) / 255.0F; - float l = (endColor >> 8 & 0xFF) / 255.0F; - float m = (endColor & 0xFF) / 255.0F; - - bufferBuilder.vertex(drawContext.getMatrices().peek().getPositionMatrix(), right, top, zLevel).color(g, h, i, f).next(); - bufferBuilder.vertex(drawContext.getMatrices().peek().getPositionMatrix(), left, top, zLevel).color(g, h, i, f).next(); - bufferBuilder.vertex(drawContext.getMatrices().peek().getPositionMatrix(), left, bottom, zLevel).color(k, l, m, j).next(); - bufferBuilder.vertex(drawContext.getMatrices().peek().getPositionMatrix(), right, bottom, zLevel).color(k, l, m, j).next(); - - tessellator.draw(); - RenderSystem.disableBlend(); - - } - } diff --git a/RebornCore/src/client/java/reborncore/client/gui/GuiUtil.java b/RebornCore/src/client/java/reborncore/client/gui/GuiUtil.java deleted file mode 100644 index d6cf980fc..000000000 --- a/RebornCore/src/client/java/reborncore/client/gui/GuiUtil.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * This file is part of RebornCore, licensed under the MIT License (MIT). - * - * Copyright (c) 2021 TeamReborn - * - * 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 reborncore.client.gui; - -import net.minecraft.client.gui.DrawContext; -import reborncore.client.RenderUtil; - -public class GuiUtil { - @Deprecated(forRemoval = true) // TODO 1.20 remove me - public static void drawGradientRect(DrawContext drawContext, int x, int y, int w, int h, int colour1, int colour2) { - RenderUtil.drawGradientRect(drawContext, 0, x, y, x + w, y + h, colour1, colour2); - } - -} diff --git a/RebornCore/src/client/java/reborncore/client/gui/builder/GuiBase.java b/RebornCore/src/client/java/reborncore/client/gui/builder/GuiBase.java index 75cfec0f7..709c983ab 100644 --- a/RebornCore/src/client/java/reborncore/client/gui/builder/GuiBase.java +++ b/RebornCore/src/client/java/reborncore/client/gui/builder/GuiBase.java @@ -24,7 +24,6 @@ package reborncore.client.gui.builder; -import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.block.entity.BlockEntity; import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; @@ -33,7 +32,6 @@ import net.minecraft.client.gui.Selectable; import net.minecraft.client.gui.screen.ingame.HandledScreen; import net.minecraft.client.gui.widget.ClickableWidget; import net.minecraft.client.resource.language.I18n; -import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.fluid.Fluid; import net.minecraft.fluid.Fluids; @@ -199,7 +197,6 @@ public class GuiBase extends HandledScreen { @Override protected void drawBackground(DrawContext drawContext, float lastFrameDuration, int mouseX, int mouseY) { - RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); renderBackground(drawContext); boolean drawPlayerSlots = selectedTab == null && drawPlayerSlots(); updateSlotDraw(drawPlayerSlots); @@ -248,13 +245,17 @@ public class GuiBase extends HandledScreen { @Override protected void drawForeground(DrawContext drawContext, int mouseX, int mouseY) { drawTitle(drawContext); - getTab().ifPresent(guiTab -> guiTab.draw(drawContext, mouseX, mouseY)); } @Override public void render(DrawContext drawContext, int mouseX, int mouseY, float partialTicks) { super.render(drawContext, mouseX, mouseY, partialTicks); this.drawMouseoverTooltip(drawContext, mouseX, mouseY); + + drawContext.getMatrices().push(); + drawContext.getMatrices().translate(this.x, this.y, 900); + getTab().ifPresent(guiTab -> guiTab.draw(drawContext, mouseX, mouseY)); + drawContext.getMatrices().pop(); } @Override @@ -306,7 +307,6 @@ public class GuiBase extends HandledScreen { factorY = this.y; } drawContext.drawText(MinecraftClient.getInstance().textRenderer, text, x + factorX, y + factorY, colour, false); - RenderSystem.setShaderColor(1F, 1F, 1F, 1F); } public GuiButtonHologram addHologramButton(int x, int y, int id, Layer layer) { diff --git a/RebornCore/src/client/java/reborncore/client/gui/builder/RedstoneConfigGui.java b/RebornCore/src/client/java/reborncore/client/gui/builder/RedstoneConfigGui.java index c209e6d71..35940e8f0 100644 --- a/RebornCore/src/client/java/reborncore/client/gui/builder/RedstoneConfigGui.java +++ b/RebornCore/src/client/java/reborncore/client/gui/builder/RedstoneConfigGui.java @@ -56,11 +56,10 @@ public class RedstoneConfigGui { boolean hovered = withinBounds(guiBase, mouseX, mouseY, x + 92, y + (i * spread) - 2, 63, 15); int color = hovered ? 0xFF8b8b8b : 0x668b8b8b; - RenderUtil.drawGradientRect(drawContext, 0, x + 91, y + (i * spread) - 2, x + 93 + 65, y + (i * spread) + 10, color, color); + drawContext.fill(x + 91, y + (i * spread) - 2, x + 93 + 65, y + (i * spread) + 10, color); Text name = Text.translatable("reborncore.gui.fluidconfig." + configuration.getState(element).name().toLowerCase(Locale.ROOT)); guiBase.drawCentredText(drawContext, name, y + (i * spread), -1, x + 37, GuiBase.Layer.FOREGROUND); - //guiBase.getTextRenderer().drawWithShadow(name, x + 92, y + (i * spread), -1); i++; } diff --git a/RebornCore/src/client/java/reborncore/client/gui/builder/slot/SlotConfigGui.java b/RebornCore/src/client/java/reborncore/client/gui/builder/slot/SlotConfigGui.java index cca112d2c..854072553 100644 --- a/RebornCore/src/client/java/reborncore/client/gui/builder/slot/SlotConfigGui.java +++ b/RebornCore/src/client/java/reborncore/client/gui/builder/slot/SlotConfigGui.java @@ -25,16 +25,13 @@ package reborncore.client.gui.builder.slot; import com.google.common.collect.Lists; -import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.DrawContext; -import net.minecraft.client.util.math.MatrixStack; import net.minecraft.screen.slot.Slot; import net.minecraft.text.Text; import org.jetbrains.annotations.Nullable; import reborncore.client.ClientChatUtils; import reborncore.client.ClientNetworkManager; -import reborncore.client.gui.GuiUtil; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.builder.slot.elements.ConfigSlotElement; import reborncore.client.gui.builder.slot.elements.ElementBase; @@ -81,14 +78,12 @@ public class SlotConfigGui { if (guiBase.be != slot.inventory) { continue; } - RenderSystem.setShaderColor(1.0F, 0, 0, 1.0F); Color color = new Color(255, 0, 0, 128); - GuiUtil.drawGradientRect(drawContext, slot.x - 1, slot.y - 1, 18, 18, color.getColor(), color.getColor()); - RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); + + drawContext.fill(slot.x -1, slot.y -1, slot.x + 17, slot.y + 17, color.getColor()); } if (selectedSlot != -1) { - slotElementMap.get(selectedSlot).draw(drawContext, guiBase); } } diff --git a/RebornCore/src/client/java/reborncore/client/gui/builder/slot/elements/AbstractConfigPopupElement.java b/RebornCore/src/client/java/reborncore/client/gui/builder/slot/elements/AbstractConfigPopupElement.java index 5a900ecda..7660e57bc 100644 --- a/RebornCore/src/client/java/reborncore/client/gui/builder/slot/elements/AbstractConfigPopupElement.java +++ b/RebornCore/src/client/java/reborncore/client/gui/builder/slot/elements/AbstractConfigPopupElement.java @@ -34,11 +34,8 @@ import net.minecraft.client.render.VertexConsumerProvider; import net.minecraft.client.render.block.BlockRenderManager; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.screen.PlayerScreenHandler; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.util.math.RotationAxis; -import net.minecraft.world.World; import org.joml.Quaternionf; import reborncore.client.gui.builder.GuiBase; import reborncore.common.blockentity.MachineBaseBlockEntity; @@ -56,20 +53,18 @@ public abstract class AbstractConfigPopupElement extends ElementBase { drawDefaultBackground(drawContext, gui, adjustX(gui, getX() - 8), adjustY(gui, getY() - 7), 84, 105 + (filter ? 15 : 0)); super.draw(drawContext, gui); - MachineBaseBlockEntity machine = ((MachineBaseBlockEntity) gui.be); - World world = machine.getWorld(); - BlockPos pos = machine.getPos(); - BlockState state = world.getBlockState(pos); - BlockState actualState = state.getBlock().getDefaultState(); - BlockRenderManager dispatcher = MinecraftClient.getInstance().getBlockRenderManager(); - BakedModel model = dispatcher.getModels().getModel(state.getBlock().getDefaultState()); - MinecraftClient.getInstance().getTextureManager().bindTexture(PlayerScreenHandler.BLOCK_ATLAS_TEXTURE); - drawState(drawContext, gui, world, model, actualState, pos, dispatcher, 4, 23, RotationAxis.POSITIVE_Y.rotationDegrees(90F)); //left - drawState(drawContext, gui, world, model, actualState, pos, dispatcher, 23, 4, RotationAxis.NEGATIVE_X.rotationDegrees(90F)); //top - drawState(drawContext, gui, world, model, actualState, pos, dispatcher, 23, 23, null); //centre - drawState(drawContext, gui, world, model, actualState, pos, dispatcher, 23, 26, RotationAxis.POSITIVE_X.rotationDegrees(90F)); //bottom - drawState(drawContext, gui, world, model, actualState, pos, dispatcher, 42, 23, RotationAxis.POSITIVE_Y.rotationDegrees(90F)); //right - drawState(drawContext, gui, world, model, actualState, pos, dispatcher, 26, 42, RotationAxis.POSITIVE_Y.rotationDegrees(180F)); //back + final MachineBaseBlockEntity machine = ((MachineBaseBlockEntity) gui.be); + final BlockState state = machine.getCachedState(); + final BlockState defaultState = state.getBlock().getDefaultState(); + final BlockRenderManager dispatcher = MinecraftClient.getInstance().getBlockRenderManager(); + final BakedModel model = dispatcher.getModels().getModel(defaultState); + + drawState(drawContext, gui, model, defaultState, dispatcher, 4, 23, RotationAxis.POSITIVE_Y.rotationDegrees(90F)); //left + drawState(drawContext, gui, model, defaultState, dispatcher, 23, 4, RotationAxis.NEGATIVE_X.rotationDegrees(90F)); //top + drawState(drawContext, gui, model, defaultState, dispatcher, 23, 23, null); //centre + drawState(drawContext, gui, model, defaultState, dispatcher, 23, 26, RotationAxis.POSITIVE_X.rotationDegrees(90F)); //bottom + drawState(drawContext, gui, model, defaultState, dispatcher, 42, 23, RotationAxis.POSITIVE_Y.rotationDegrees(90F)); //right + drawState(drawContext, gui, model, defaultState, dispatcher, 26, 42, RotationAxis.POSITIVE_Y.rotationDegrees(180F)); //back drawSateColor(drawContext, gui, MachineFacing.UP.getFacing(machine), 22, -1); drawSateColor(drawContext, gui, MachineFacing.FRONT.getFacing(machine), 22, 18); @@ -112,20 +107,18 @@ public abstract class AbstractConfigPopupElement extends ElementBase { protected void drawState(DrawContext drawContext, GuiBase gui, - World world, BakedModel model, BlockState actualState, - BlockPos pos, BlockRenderManager dispatcher, int x, int y, Quaternionf quaternion) { MatrixStack matrixStack = drawContext.getMatrices(); matrixStack.push(); - matrixStack.translate(8 + gui.getGuiLeft() + this.x + x, 8 + gui.getGuiTop() + this.y + y, 512); + matrixStack.translate(8 + gui.getGuiLeft() + this.x + x, 8 + gui.getGuiTop() + this.y + y, 0); matrixStack.scale(16F, 16F, 16F); - matrixStack.translate(0.5F, 0.5F, 0.5F); - matrixStack.scale(-1, -1, -1); + matrixStack.translate(0.5F, 0.5F, 0); + matrixStack.scale(-1, -1, 0); if (quaternion != null) { matrixStack.multiply(quaternion); diff --git a/RebornCore/src/client/java/reborncore/client/gui/builder/slot/elements/ConfigSlotElement.java b/RebornCore/src/client/java/reborncore/client/gui/builder/slot/elements/ConfigSlotElement.java index e7252f2f8..a981e38c9 100644 --- a/RebornCore/src/client/java/reborncore/client/gui/builder/slot/elements/ConfigSlotElement.java +++ b/RebornCore/src/client/java/reborncore/client/gui/builder/slot/elements/ConfigSlotElement.java @@ -24,12 +24,7 @@ package reborncore.client.gui.builder.slot.elements; -import com.mojang.blaze3d.platform.GlStateManager; -import com.mojang.blaze3d.systems.RenderSystem; -import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.DrawContext; -import net.minecraft.client.render.item.ItemRenderer; -import net.minecraft.client.util.math.MatrixStack; import net.minecraft.inventory.Inventory; import net.minecraft.item.ItemStack; import net.minecraft.text.Text; diff --git a/RebornCore/src/client/java/reborncore/client/gui/builder/slot/elements/ElementBase.java b/RebornCore/src/client/java/reborncore/client/gui/builder/slot/elements/ElementBase.java index ffb3cdf95..436c9feb7 100644 --- a/RebornCore/src/client/java/reborncore/client/gui/builder/slot/elements/ElementBase.java +++ b/RebornCore/src/client/java/reborncore/client/gui/builder/slot/elements/ElementBase.java @@ -24,16 +24,10 @@ package reborncore.client.gui.builder.slot.elements; -import com.mojang.blaze3d.platform.GlStateManager; -import com.mojang.blaze3d.systems.RenderSystem; -import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.render.item.ItemRenderer; -import net.minecraft.client.util.math.MatrixStack; import net.minecraft.text.Text; import net.minecraft.util.Identifier; -import reborncore.client.RenderUtil; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.guibuilder.GuiBuilder; import reborncore.common.blockentity.MachineBaseBlockEntity; @@ -286,7 +280,6 @@ public class ElementBase { Sprite sprite = iSprite.getSprite(gui.getMachine()); if (sprite != null) { if (sprite.hasTextureInfo()) { - RenderSystem.setShaderColor(1F, 1F, 1F, 1F); drawContext.drawTexture(sprite.textureLocation, x + gui.getGuiLeft(), y + gui.getGuiTop(), sprite.x, sprite.y, sprite.width, sprite.height); } if (sprite.hasStack()) { diff --git a/RebornCore/src/client/java/reborncore/client/gui/builder/slot/elements/FluidConfigPopupElement.java b/RebornCore/src/client/java/reborncore/client/gui/builder/slot/elements/FluidConfigPopupElement.java index 843dcff34..f2adc5ba5 100644 --- a/RebornCore/src/client/java/reborncore/client/gui/builder/slot/elements/FluidConfigPopupElement.java +++ b/RebornCore/src/client/java/reborncore/client/gui/builder/slot/elements/FluidConfigPopupElement.java @@ -24,12 +24,10 @@ package reborncore.client.gui.builder.slot.elements; -import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.gui.DrawContext; import net.minecraft.util.math.Direction; import reborncore.RebornCore; import reborncore.client.ClientNetworkManager; -import reborncore.client.gui.GuiUtil; import reborncore.client.gui.builder.GuiBase; import reborncore.common.blockentity.FluidConfiguration; import reborncore.common.blockentity.MachineBaseBlockEntity; @@ -96,8 +94,6 @@ public class FluidConfigPopupElement extends AbstractConfigPopupElement { case OUTPUT -> new Color(255, 69, 0, 128); case ALL -> new Color(52, 255, 30, 128); }; - RenderSystem.setShaderColor(1, 1, 1, 1); - GuiUtil.drawGradientRect(drawContext, sx, sy, 18, 18, color.getColor(), color.getColor()); - RenderSystem.setShaderColor(1, 1, 1, 1); + drawContext.fill(sx, sy, sx + 18, sy + 18, color.getColor()); } } diff --git a/RebornCore/src/client/java/reborncore/client/gui/builder/slot/elements/SlotConfigPopupElement.java b/RebornCore/src/client/java/reborncore/client/gui/builder/slot/elements/SlotConfigPopupElement.java index 62bc2ffb2..7b2249ca2 100644 --- a/RebornCore/src/client/java/reborncore/client/gui/builder/slot/elements/SlotConfigPopupElement.java +++ b/RebornCore/src/client/java/reborncore/client/gui/builder/slot/elements/SlotConfigPopupElement.java @@ -24,12 +24,10 @@ package reborncore.client.gui.builder.slot.elements; -import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.gui.DrawContext; import net.minecraft.util.math.Direction; import reborncore.RebornCore; import reborncore.client.ClientNetworkManager; -import reborncore.client.gui.GuiUtil; import reborncore.client.gui.builder.GuiBase; import reborncore.common.blockentity.SlotConfiguration; import reborncore.common.network.IdentifiedPacket; @@ -99,8 +97,6 @@ public class SlotConfigPopupElement extends AbstractConfigPopupElement { case OUTPUT -> new Color(255, 69, 0, 128); default -> new Color(0, 0, 0, 0); }; - RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); - GuiUtil.drawGradientRect(drawContext, sx, sy, 18, 18, color.getColor(), color.getColor()); - RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); + drawContext.fill(sx, sy, sx + 18, sy + 18, color.getColor()); } } diff --git a/RebornCore/src/client/java/reborncore/client/gui/guibuilder/GuiBuilder.java b/RebornCore/src/client/java/reborncore/client/gui/guibuilder/GuiBuilder.java index 1ff22c81a..c7e6db55c 100644 --- a/RebornCore/src/client/java/reborncore/client/gui/guibuilder/GuiBuilder.java +++ b/RebornCore/src/client/java/reborncore/client/gui/guibuilder/GuiBuilder.java @@ -25,7 +25,6 @@ package reborncore.client.gui.guibuilder; import com.google.common.collect.Lists; -import com.mojang.blaze3d.systems.RenderSystem; import net.fabricmc.fabric.api.transfer.v1.client.fluid.FluidVariantRendering; import net.fabricmc.loader.api.FabricLoader; import net.minecraft.client.MinecraftClient; @@ -40,7 +39,6 @@ import net.minecraft.text.Text; import net.minecraft.util.Formatting; import net.minecraft.util.Identifier; import reborncore.api.IListInfoProvider; -import reborncore.client.RenderUtil; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.builder.slot.GuiTab; import reborncore.common.fluid.FluidUtils; @@ -328,13 +326,11 @@ public class GuiBuilder { x += gui.getGuiLeft(); y += gui.getGuiTop(); } - RenderSystem.enableDepthTest(); - RenderSystem.colorMask(true, true, true, false); - RenderUtil.drawGradientRect(drawContext, 0, x, y, x + 176, y + 20, 0x000000, 0xC0000000); - RenderUtil.drawGradientRect(drawContext, 0, x, y + 20, x + 176, y + 20 + 48, 0xC0000000, 0xC0000000); - RenderUtil.drawGradientRect(drawContext, 0, x, y + 68, x + 176, y + 70 + 20, 0xC0000000, 0x00000000); - RenderSystem.colorMask(true, true, true, true); - RenderSystem.disableDepthTest(); + + drawContext.fillGradient(x, y, x + 176, y + 20, 0x000000, 0xC0000000); + drawContext.fillGradient(x, y + 20, x + 176, y + 20 + 48, 0xC0000000, 0xC0000000); + drawContext.fillGradient(x, y + 68, x + 176, y + 70 + 20, 0xC0000000, 0x00000000); + gui.drawCentredText(drawContext, Text.translatable("reborncore.gui.missingmultiblock"), 43, 0xFFFFFF, layer); } diff --git a/src/client/java/techreborn/client/gui/GuiManual.java b/src/client/java/techreborn/client/gui/GuiManual.java index 265f67b15..f86973b2c 100644 --- a/src/client/java/techreborn/client/gui/GuiManual.java +++ b/src/client/java/techreborn/client/gui/GuiManual.java @@ -24,10 +24,9 @@ package techreborn.client.gui; -import com.mojang.blaze3d.systems.RenderSystem; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.ConfirmLinkScreen; import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.DrawContext; import net.minecraft.text.Text; import net.minecraft.util.Identifier; import net.minecraft.util.Util;