diff --git a/Common/build.gradle b/Common/build.gradle index 1e420cf..433fc53 100644 --- a/Common/build.gradle +++ b/Common/build.gradle @@ -74,8 +74,8 @@ publishing { name = "GitHubPackages" url = "https://maven.pkg.github.com/MrCrayfish/Maven" credentials { - username = githubCredentials['GITHUB_USERNAME'] - password = githubCredentials['GITHUB_TOKEN'] + username = System.getenv("GITHUB_USERNAME")//githubCredentials['GITHUB_USERNAME'] + password = System.getenv("GITHUB_TOKEN")//githubCredentials['GITHUB_TOKEN'] } } } diff --git a/Common/src/main/java/com/mrcrayfish/configured/client/screen/ChangeEnumScreen.java b/Common/src/main/java/com/mrcrayfish/configured/client/screen/ChangeEnumScreen.java index 0d71a60..86f7394 100644 --- a/Common/src/main/java/com/mrcrayfish/configured/client/screen/ChangeEnumScreen.java +++ b/Common/src/main/java/com/mrcrayfish/configured/client/screen/ChangeEnumScreen.java @@ -9,6 +9,7 @@ import com.mrcrayfish.configured.client.util.ScreenUtil; import com.mrcrayfish.configured.util.ConfigHelper; import net.minecraft.ChatFormatting; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.AbstractSelectionList; import net.minecraft.client.gui.components.EditBox; import net.minecraft.client.gui.components.ObjectSelectionList; @@ -116,16 +117,16 @@ private void constructEntries() } @Override - public void render(PoseStack poseStack, int mouseX, int mouseY, float partialTicks) + public void render(GuiGraphics poseStack, int mouseX, int mouseY, float partialTicks) { this.renderBackground(poseStack); this.list.render(poseStack, mouseX, mouseY, partialTicks); this.searchTextField.render(poseStack, mouseX, mouseY, partialTicks); - drawCenteredString(poseStack, this.font, this.title, this.width / 2, 7, 0xFFFFFF); + poseStack.drawCenteredString(this.font, this.title, this.width / 2, 7, 0xFFFFFF); super.render(poseStack, mouseX, mouseY, partialTicks); RenderSystem.setShaderTexture(0, ListMenuScreen.CONFIGURED_LOGO); RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); - blit(poseStack, 10, 13, 0, 0, 0, 23, 23, 32, 32); + poseStack.blit(ListMenuScreen.CONFIGURED_LOGO, 10, 13, 0, 0, 0, 23, 23, 32, 32); if(ScreenUtil.isMouseWithin(10, 13, 23, 23, mouseX, mouseY)) { this.setActiveTooltip(Component.translatable("configured.gui.info")); @@ -211,10 +212,10 @@ public Component getFormattedLabel() } @Override - public void render(PoseStack poseStack, int index, int top, int left, int width, int p_230432_6_, int mouseX, int mouseY, boolean hovered, float partialTicks) + public void render(GuiGraphics poseStack, int index, int top, int left, int width, int p_230432_6_, int mouseX, int mouseY, boolean hovered, float partialTicks) { Component label = Component.literal(this.label.getString()).withStyle(ChangeEnumScreen.this.list.getSelected() == this ? ChatFormatting.YELLOW : ChatFormatting.WHITE); - Screen.drawString(poseStack, ChangeEnumScreen.this.minecraft.font, label, left + 5, top + 4, 0xFFFFFF); + poseStack.drawString(ChangeEnumScreen.this.minecraft.font, label, left + 5, top + 4, 0xFFFFFF); } @Override diff --git a/Common/src/main/java/com/mrcrayfish/configured/client/screen/ConfigScreen.java b/Common/src/main/java/com/mrcrayfish/configured/client/screen/ConfigScreen.java index 70fdd81..e526034 100644 --- a/Common/src/main/java/com/mrcrayfish/configured/client/screen/ConfigScreen.java +++ b/Common/src/main/java/com/mrcrayfish/configured/client/screen/ConfigScreen.java @@ -19,6 +19,7 @@ import net.minecraft.Util; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.components.Tooltip; import net.minecraft.client.gui.components.events.GuiEventListener; @@ -289,13 +290,13 @@ private void updateButtons() } @Override - protected void renderForeground(PoseStack poseStack, int mouseX, int mouseY, float partialTicks) + protected void renderForeground(GuiGraphics poseStack, int mouseX, int mouseY, float partialTicks) { if(this.config.isReadOnly()) { RenderSystem.setShaderTexture(0, IconButton.ICONS); RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); - blit(poseStack, this.width - 30, 14, 20, 20, 0, 33, 10, 10, 64, 64); + poseStack.blit(IconButton.ICONS, this.width - 30, 14, 20, 20, 0, 33, 10, 10, 64, 64); if(ScreenUtil.isMouseWithin(this.width - 30, 14, 20, 20, mouseX, mouseY)) { this.setActiveTooltip(Component.translatable("configured.gui.read_only_config"), 0xFF1E6566); @@ -357,7 +358,7 @@ public List children() } @Override - public void render(PoseStack poseStack, int index, int top, int left, int width, int height, int mouseX, int mouseY, boolean selected, float partialTicks) + public void render(GuiGraphics poseStack, int index, int top, int left, int width, int height, int mouseX, int mouseY, boolean selected, float partialTicks) { super.render(poseStack, index, top, left, width, height, mouseX, mouseY, selected, partialTicks); this.button.setX(left - 1); @@ -412,18 +413,18 @@ public List children() } @Override - public void render(PoseStack poseStack, int x, int top, int left, int width, int p_230432_6_, int mouseX, int mouseY, boolean hovered, float partialTicks) + public void render(GuiGraphics poseStack, int x, int top, int left, int width, int p_230432_6_, int mouseX, int mouseY, boolean hovered, float partialTicks) { boolean showValidationHint = this.validationHint != null; int trimLength = showValidationHint ? 100 : 80; ChatFormatting labelStyle = this.holder.isChanged() ? Config.CLIENT.changedFormatting.get() : ChatFormatting.RESET; - Minecraft.getInstance().font.draw(poseStack, this.getTrimmedLabel(width - trimLength).withStyle(labelStyle), left, top + 6, 0xFFFFFF); + poseStack.drawString(Minecraft.getInstance().font, this.getTrimmedLabel(width - trimLength).withStyle(labelStyle), left, top + 6, 0xFFFFFF); if(showValidationHint) { RenderSystem.setShaderTexture(0, IconButton.ICONS); RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); - blit(poseStack, left + width - 88, top + 3, 16, 16, 11, 11, 11, 11, 64, 64); + poseStack.blit(IconButton.ICONS, left + width - 88, top + 3, 16, 16, 11, 11, 11, 11, 64, 64); } if(!ConfigScreen.this.config.isReadOnly()) @@ -433,7 +434,7 @@ public void render(PoseStack poseStack, int x, int top, int left, int width, int boolean gameRestart = this.holder.requiresGameRestart(); RenderSystem.setShaderTexture(0, IconButton.ICONS); RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); - blit(poseStack, left - 18, top + 5, 11, 11, gameRestart ? 51 : 11, 22, 11, 11, 64, 64); + poseStack.blit(IconButton.ICONS, left - 18, top + 5, 11, 11, gameRestart ? 51 : 11, 22, 11, 11, 64, 64); if(ScreenUtil.isMouseWithin(left - 18, top + 5, 11, 11, mouseX, mouseY)) { @@ -551,7 +552,7 @@ public NumberItem(IConfigValue holder, Function parser) } @Override - public void render(PoseStack poseStack, int index, int top, int left, int width, int p_230432_6_, int mouseX, int mouseY, boolean hovered, float partialTicks) + public void render(GuiGraphics poseStack, int index, int top, int left, int width, int p_230432_6_, int mouseX, int mouseY, boolean hovered, float partialTicks) { super.render(poseStack, index, top, left, width, p_230432_6_, mouseX, mouseY, hovered, partialTicks); long time = Util.getMillis(); @@ -613,7 +614,7 @@ public BooleanItem(IConfigValue holder) } @Override - public void render(PoseStack poseStack, int index, int top, int left, int width, int p_230432_6_, int mouseX, int mouseY, boolean hovered, float partialTicks) + public void render(GuiGraphics poseStack, int index, int top, int left, int width, int p_230432_6_, int mouseX, int mouseY, boolean hovered, float partialTicks) { super.render(poseStack, index, top, left, width, p_230432_6_, mouseX, mouseY, hovered, partialTicks); this.button.setX(left + width - 69); @@ -646,7 +647,7 @@ public StringItem(IConfigValue holder) } @Override - public void render(PoseStack poseStack, int index, int top, int left, int width, int p_230432_6_, int mouseX, int mouseY, boolean hovered, float partialTicks) + public void render(GuiGraphics poseStack, int index, int top, int left, int width, int p_230432_6_, int mouseX, int mouseY, boolean hovered, float partialTicks) { super.render(poseStack, index, top, left, width, p_230432_6_, mouseX, mouseY, hovered, partialTicks); this.button.setX(left + width - 69); @@ -668,7 +669,7 @@ public ListItem(IConfigValue> holder) } @Override - public void render(PoseStack poseStack, int index, int top, int left, int width, int p_230432_6_, int mouseX, int mouseY, boolean hovered, float partialTicks) + public void render(GuiGraphics poseStack, int index, int top, int left, int width, int p_230432_6_, int mouseX, int mouseY, boolean hovered, float partialTicks) { super.render(poseStack, index, top, left, width, p_230432_6_, mouseX, mouseY, hovered, partialTicks); this.button.setX(left + width - 69); @@ -693,7 +694,7 @@ public EnumItem(IConfigValue> holder) } @Override - public void render(PoseStack poseStack, int index, int top, int left, int width, int p_230432_6_, int mouseX, int mouseY, boolean hovered, float partialTicks) + public void render(GuiGraphics poseStack, int index, int top, int left, int width, int p_230432_6_, int mouseX, int mouseY, boolean hovered, float partialTicks) { super.render(poseStack, index, top, left, width, p_230432_6_, mouseX, mouseY, hovered, partialTicks); this.button.setX(left + width - 69); diff --git a/Common/src/main/java/com/mrcrayfish/configured/client/screen/ConfirmationScreen.java b/Common/src/main/java/com/mrcrayfish/configured/client/screen/ConfirmationScreen.java index c79454a..2e2ae51 100644 --- a/Common/src/main/java/com/mrcrayfish/configured/client/screen/ConfirmationScreen.java +++ b/Common/src/main/java/com/mrcrayfish/configured/client/screen/ConfirmationScreen.java @@ -4,12 +4,11 @@ import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.BufferBuilder; import com.mojang.blaze3d.vertex.DefaultVertexFormat; -import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.Tesselator; import com.mojang.blaze3d.vertex.VertexFormat; import com.mrcrayfish.configured.client.screen.widget.IconButton; import com.mrcrayfish.configured.client.util.ScreenUtil; -import net.minecraft.client.gui.GuiComponent; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.renderer.GameRenderer; import net.minecraft.network.chat.CommonComponents; @@ -78,7 +77,7 @@ protected void init() } @Override - public void render(PoseStack poseStack, int mouseX, int mouseY, float partialTicks) + public void render(GuiGraphics poseStack, int mouseX, int mouseY, float partialTicks) { this.renderBackground(poseStack); super.render(poseStack, mouseX, mouseY, partialTicks); @@ -88,14 +87,14 @@ public void render(PoseStack poseStack, int mouseX, int mouseY, float partialTic RenderSystem.setShader(GameRenderer::getPositionTexColorShader); RenderSystem.setShaderTexture(0, IconButton.ICONS); RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); - Screen.blit(poseStack, this.width / 2 - 10, this.startY - 30, 20, 20, this.icon.u(), this.icon.v(), 10, 10, 64, 64); + poseStack.blit(IconButton.ICONS, this.width / 2 - 10, this.startY - 30, 20, 20, this.icon.u(), this.icon.v(), 10, 10, 64, 64); drawListBackground(0.0, this.width, this.startY, this.endY); for(int i = 0; i < lines.size(); i++) { int lineWidth = this.font.width(lines.get(i)); - this.font.draw(poseStack, lines.get(i), this.width / 2 - lineWidth / 2, this.startY + MESSAGE_PADDING + i * (this.font.lineHeight + 2) + 1, 0xFFFFFF); + poseStack.drawString(this.font, lines.get(i), this.width / 2 - lineWidth / 2, this.startY + MESSAGE_PADDING + i * (this.font.lineHeight + 2) + 1, 0xFFFFFF); } } @@ -167,7 +166,7 @@ public static void drawListBackground(double startX, double endX, double startY, BufferBuilder buffer = tesselator.getBuilder(); RenderSystem.setShader(GameRenderer::getPositionTexColorShader); - RenderSystem.setShaderTexture(0, GuiComponent.BACKGROUND_LOCATION); + RenderSystem.setShaderTexture(0, BACKGROUND_LOCATION); RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); buffer.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR); buffer.vertex(startX, endY, 0.0).uv((float) startX / 32.0F, (float) endY / 32.0F).color(BRIGHTNESS, BRIGHTNESS, BRIGHTNESS, 255).endVertex(); diff --git a/Common/src/main/java/com/mrcrayfish/configured/client/screen/EditListScreen.java b/Common/src/main/java/com/mrcrayfish/configured/client/screen/EditListScreen.java index 78948c8..3b273fe 100644 --- a/Common/src/main/java/com/mrcrayfish/configured/client/screen/EditListScreen.java +++ b/Common/src/main/java/com/mrcrayfish/configured/client/screen/EditListScreen.java @@ -10,6 +10,7 @@ import com.mrcrayfish.configured.client.screen.widget.IconButton; import com.mrcrayfish.configured.client.util.ScreenUtil; import com.mrcrayfish.configured.util.ConfigHelper; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.components.ContainerObjectSelectionList; import net.minecraft.client.gui.components.Tooltip; @@ -109,11 +110,11 @@ protected void init() } @Override - public void render(PoseStack poseStack, int mouseX, int mouseY, float partialTicks) + public void render(GuiGraphics poseStack, int mouseX, int mouseY, float partialTicks) { this.renderBackground(poseStack); this.list.render(poseStack, mouseX, mouseY, partialTicks); - drawCenteredString(poseStack, this.font, this.title, this.width / 2, 14, 0xFFFFFF); + poseStack.drawCenteredString(this.font, this.title, this.width / 2, 14, 0xFFFFFF); super.render(poseStack, mouseX, mouseY, partialTicks); } @@ -182,7 +183,7 @@ public boolean removeEntry(StringEntry entry) } @Override - public void render(PoseStack poseStack, int mouseX, int mouseY, float partialTicks) + public void render(GuiGraphics poseStack, int mouseX, int mouseY, float partialTicks) { super.render(poseStack, mouseX, mouseY, partialTicks); this.children().forEach(entry -> @@ -243,10 +244,10 @@ public StringEntry(ObjectList list, StringHolder holder) } @Override - public void render(PoseStack poseStack, int x, int top, int left, int width, int p_230432_6_, int mouseX, int mouseY, boolean selected, float partialTicks) + public void render(GuiGraphics poseStack, int x, int top, int left, int width, int p_230432_6_, int mouseX, int mouseY, boolean selected, float partialTicks) { - if(x % 2 != 0) Screen.fill(poseStack, left, top, left + width, top + 24, 0x55000000); - EditListScreen.this.minecraft.font.draw(poseStack, Component.literal(this.holder.getValue()), left + 5, top + 8, 0xFFFFFF); + if(x % 2 != 0) poseStack.fill(left, top, left + width, top + 24, 0x55000000); + poseStack.drawString(EditListScreen.this.minecraft.font, Component.literal(this.holder.getValue()), left + 5, top + 8, 0xFFFFFF); this.editButton.visible = true; this.editButton.setX(left + width - 44); this.editButton.setY(top + 2); diff --git a/Common/src/main/java/com/mrcrayfish/configured/client/screen/EditStringScreen.java b/Common/src/main/java/com/mrcrayfish/configured/client/screen/EditStringScreen.java index dac0d93..5c31136 100644 --- a/Common/src/main/java/com/mrcrayfish/configured/client/screen/EditStringScreen.java +++ b/Common/src/main/java/com/mrcrayfish/configured/client/screen/EditStringScreen.java @@ -5,6 +5,7 @@ import com.mrcrayfish.configured.api.IModConfig; import com.mrcrayfish.configured.client.screen.widget.IconButton; import com.mrcrayfish.configured.client.util.ScreenUtil; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.components.EditBox; import net.minecraft.client.gui.screens.Screen; @@ -82,21 +83,21 @@ protected void updateValidation() } @Override - public void render(PoseStack poseStack, int mouseX, int mouseY, float partialTicks) + public void render(GuiGraphics poseStack, int mouseX, int mouseY, float partialTicks) { this.resetTooltip(); this.renderBackground(poseStack); ConfirmationScreen.drawListBackground(0.0, this.width, this.textField.getY() - 10, this.textField.getY() + 20 + 10); this.textField.render(poseStack, mouseX, mouseY, partialTicks); - drawCenteredString(poseStack, this.font, this.title, this.width / 2, this.height / 2 - 50, 0xFFFFFF); + poseStack.drawCenteredString(this.font, this.title, this.width / 2, this.height / 2 - 50, 0xFFFFFF); boolean showValidationHint = this.validationHint != null; if(showValidationHint) { RenderSystem.setShaderTexture(0, IconButton.ICONS); RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); - Screen.blit(poseStack, this.textField.getX() - 20, this.textField.getY() + 3, 16, 16, 11, 11, 11, 11, 64, 64); + poseStack.blit(IconButton.ICONS, this.textField.getX() - 20, this.textField.getY() + 3, 16, 16, 11, 11, 11, 11, 64, 64); if(ScreenUtil.isMouseWithin(this.textField.getX() - 20, this.textField.getY() + 3, 16, 16, mouseX, mouseY)) { diff --git a/Common/src/main/java/com/mrcrayfish/configured/client/screen/IColouredTooltip.java b/Common/src/main/java/com/mrcrayfish/configured/client/screen/IColouredTooltip.java index 6358afe..e060e90 100644 --- a/Common/src/main/java/com/mrcrayfish/configured/client/screen/IColouredTooltip.java +++ b/Common/src/main/java/com/mrcrayfish/configured/client/screen/IColouredTooltip.java @@ -2,6 +2,8 @@ import com.google.common.collect.ImmutableList; import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.screens.Screen; import net.minecraft.network.chat.CommonComponents; import net.minecraft.network.chat.Component; @@ -32,14 +34,14 @@ public interface IColouredTooltip @Nullable Integer getTooltipBackgroundColour(); - default boolean drawColouredTooltip(PoseStack poseStack, int mouseX, int mouseY, Screen screen) + default boolean drawColouredTooltip(GuiGraphics poseStack, int mouseX, int mouseY, Screen screen) { if(this.getTooltipText() != null) { boolean positioned = this.getTooltipX() != null && this.getTooltipY() != null; int x = positioned ? this.getTooltipX() + 12 : mouseX; int y = positioned ? this.getTooltipY() - 12 : mouseY; - screen.renderComponentTooltip(poseStack, DUMMY_TOOLTIP, x, y); // Yep, this is strange. See the forge events below! + poseStack.renderComponentTooltip(Minecraft.getInstance().font, DUMMY_TOOLTIP, x, y); // Yep, this is strange. See the forge events below! return true; } return false; diff --git a/Common/src/main/java/com/mrcrayfish/configured/client/screen/ListMenuScreen.java b/Common/src/main/java/com/mrcrayfish/configured/client/screen/ListMenuScreen.java index b6f0587..d39a074 100644 --- a/Common/src/main/java/com/mrcrayfish/configured/client/screen/ListMenuScreen.java +++ b/Common/src/main/java/com/mrcrayfish/configured/client/screen/ListMenuScreen.java @@ -10,6 +10,7 @@ import net.minecraft.ChatFormatting; import net.minecraft.client.gui.ComponentPath; import net.minecraft.client.gui.Font; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.components.ContainerObjectSelectionList; import net.minecraft.client.gui.components.EditBox; @@ -119,7 +120,7 @@ public void tick() } @Override - public void render(PoseStack poseStack, int mouseX, int mouseY, float partialTicks) + public void render(GuiGraphics poseStack, int mouseX, int mouseY, float partialTicks) { // Resets the active tooltip each draw call this.resetTooltip(); @@ -132,7 +133,7 @@ public void render(PoseStack poseStack, int mouseX, int mouseY, float partialTic this.searchTextField.render(poseStack, mouseX, mouseY, partialTicks); // Draw title - drawCenteredString(poseStack, this.font, this.title, this.width / 2, 7, 0xFFFFFF); + poseStack.drawCenteredString(this.font, this.title, this.width / 2, 7, 0xFFFFFF); super.render(poseStack, mouseX, mouseY, partialTicks); @@ -142,12 +143,12 @@ public void render(PoseStack poseStack, int mouseX, int mouseY, float partialTic // Draws the Configured logo in the top left of the screen RenderSystem.setShaderTexture(0, CONFIGURED_LOGO); RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); - Screen.blit(poseStack, 10, 13, 0, 0, 0, 23, 23, 32, 32); + poseStack.blit(CONFIGURED_LOGO, 10, 13, 0, 0, 0, 23, 23, 32, 32); // Draws the search icon next to the search text field RenderSystem.setShaderTexture(0, IconButton.ICONS); RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); - Screen.blit(poseStack, this.width / 2 - 128, 26, 14, 14, 22, 11, 10, 10, 64, 64); + poseStack.blit(IconButton.ICONS, this.width / 2 - 128, 26, 14, 14, 22, 11, 10, 10, 64, 64); // Gives a chance for child classes to set the active tooltip this.updateTooltip(mouseX, mouseY); @@ -163,7 +164,7 @@ public void render(PoseStack poseStack, int mouseX, int mouseY, float partialTic { if(widget instanceof Button && ((Button) widget).isHoveredOrFocused()) { - //TODO check + //TODO check this, not sure how this will work. Better using poseStack? (GuiGraphics) //((Button) widget).renderToolTip(poseStack, mouseX, mouseY); break; } @@ -171,7 +172,7 @@ public void render(PoseStack poseStack, int mouseX, int mouseY, float partialTic } } - protected void renderForeground(PoseStack poseStack, int mouseX, int mouseY, float partialTicks) {} + protected void renderForeground(GuiGraphics poseStack, int mouseX, int mouseY, float partialTicks) {} @Override public boolean mouseClicked(double mouseX, double mouseY, int button) @@ -223,13 +224,13 @@ public void replaceEntries(Collection entries) } @Override - public void render(PoseStack poseStack, int mouseX, int mouseY, float partialTicks) + public void render(GuiGraphics poseStack, int mouseX, int mouseY, float partialTicks) { super.render(poseStack, mouseX, mouseY, partialTicks); this.renderToolTips(poseStack, mouseX, mouseY); } - private void renderToolTips(PoseStack poseStack, int mouseX, int mouseY) + private void renderToolTips(GuiGraphics poseStack, int mouseX, int mouseY) { this.children().forEach(item -> { @@ -268,7 +269,7 @@ public String getLabel() } @Override - public void render(PoseStack poseStack, int x, int top, int left, int width, int height, int mouseX, int mouseY, boolean selected, float partialTicks) + public void render(GuiGraphics poseStack, int x, int top, int left, int width, int height, int mouseX, int mouseY, boolean selected, float partialTicks) { if(this.isMouseOver(mouseX, mouseY)) { @@ -321,9 +322,9 @@ public TitleItem(String title) } @Override - public void render(PoseStack poseStack, int x, int top, int left, int width, int height, int mouseX, int mouseY, boolean selected, float partialTicks) + public void render(GuiGraphics poseStack, int x, int top, int left, int width, int height, int mouseX, int mouseY, boolean selected, float partialTicks) { - Screen.drawCenteredString(poseStack, ListMenuScreen.this.minecraft.font, this.label, left + width / 2, top + 5, 0xFFFFFF); + poseStack.drawCenteredString(ListMenuScreen.this.minecraft.font, this.label, left + width / 2, top + 5, 0xFFFFFF); } } @@ -338,10 +339,10 @@ public MultiTextItem(Component topText, Component bottomText) } @Override - public void render(PoseStack poseStack, int x, int top, int left, int width, int height, int mouseX, int mouseY, boolean selected, float partialTicks) + public void render(GuiGraphics poseStack, int x, int top, int left, int width, int height, int mouseX, int mouseY, boolean selected, float partialTicks) { - Screen.drawCenteredString(poseStack, ListMenuScreen.this.minecraft.font, this.label, left + width / 2, top, 0xFFFFFFFF); - Screen.drawCenteredString(poseStack, ListMenuScreen.this.minecraft.font, this.bottomText, left + width / 2, top + 12, 0xFFFFFFFF); + poseStack.drawCenteredString(ListMenuScreen.this.minecraft.font, this.label, left + width / 2, top, 0xFFFFFFFF); + poseStack.drawCenteredString(ListMenuScreen.this.minecraft.font, this.bottomText, left + width / 2, top + 12, 0xFFFFFFFF); if(this.isMouseOver(mouseX, mouseY)) { @@ -385,7 +386,7 @@ public void setFocused(boolean focused) } @Override - public void render(PoseStack poseStack, int mouseX, int mouseY, float partialTick) + public void render(GuiGraphics poseStack, int mouseX, int mouseY, float partialTick) { super.render(poseStack, mouseX, mouseY, partialTick); if(this.clearable && !this.getValue().isEmpty()) @@ -394,7 +395,7 @@ public void render(PoseStack poseStack, int mouseX, int mouseY, float partialTic RenderSystem.setShaderTexture(0, IconButton.ICONS); RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, this.alpha); boolean hovered = ScreenUtil.isMouseWithin(this.getX() + this.width - 15, this.getY() + 5, 9, 9, mouseX, mouseY); - blit(poseStack, this.getX() + this.width - 15, this.getY() + 5, 9, 9, hovered ? 9 : 0, 55, 9, 9, 64, 64); + poseStack.blit(IconButton.ICONS, this.getX() + this.width - 15, this.getY() + 5, 9, 9, hovered ? 9 : 0, 55, 9, 9, 64, 64); } } diff --git a/Common/src/main/java/com/mrcrayfish/configured/client/screen/ModConfigSelectionScreen.java b/Common/src/main/java/com/mrcrayfish/configured/client/screen/ModConfigSelectionScreen.java index 5dac568..1f49cc7 100644 --- a/Common/src/main/java/com/mrcrayfish/configured/client/screen/ModConfigSelectionScreen.java +++ b/Common/src/main/java/com/mrcrayfish/configured/client/screen/ModConfigSelectionScreen.java @@ -14,6 +14,7 @@ import com.mrcrayfish.framework.api.util.EnvironmentHelper; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.components.events.GuiEventListener; import net.minecraft.client.gui.screens.Screen; @@ -283,17 +284,17 @@ private Button createRestoreButton(IModConfig config) } @Override - public void render(PoseStack poseStack, int x, int top, int left, int width, int p_230432_6_, int mouseX, int mouseY, boolean p_230432_9_, float partialTicks) + public void render(GuiGraphics poseStack, int x, int top, int left, int width, int p_230432_6_, int mouseX, int mouseY, boolean p_230432_9_, float partialTicks) { - Screen.drawString(poseStack, Minecraft.getInstance().font, this.title, left + 28, top + 2, 0xFFFFFF); - Screen.drawString(poseStack, Minecraft.getInstance().font, this.fileName, left + 28, top + 12, 0xFFFFFF); + poseStack.drawString(Minecraft.getInstance().font, this.title, left + 28, top + 2, 0xFFFFFF); + poseStack.drawString(Minecraft.getInstance().font, this.fileName, left + 28, top + 12, 0xFFFFFF); RenderSystem.setShaderTexture(0, IconButton.ICONS); RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); - blit(poseStack, left + 4, top, 18, 22, this.getIconU(), this.getIconV(), 9, 11, 64, 64); + poseStack.blit(IconButton.ICONS, left + 4, top, 18, 22, this.getIconU(), this.getIconV(), 9, 11, 64, 64); if(this.config.isReadOnly()) { - blit(poseStack, left + 1, top + 15, 11, 11, 0, 33, 11, 11, 64, 64); + poseStack.blit(IconButton.ICONS, left + 1, top + 15, 11, 11, 0, 33, 11, 11, 64, 64); } this.modifyButton.setX(left + width - 83); diff --git a/Common/src/main/java/com/mrcrayfish/configured/client/screen/RequestScreen.java b/Common/src/main/java/com/mrcrayfish/configured/client/screen/RequestScreen.java index d3615ba..1b65934 100644 --- a/Common/src/main/java/com/mrcrayfish/configured/client/screen/RequestScreen.java +++ b/Common/src/main/java/com/mrcrayfish/configured/client/screen/RequestScreen.java @@ -4,6 +4,7 @@ import com.mrcrayfish.configured.api.IModConfig; import com.mrcrayfish.configured.client.util.ScreenUtil; import net.minecraft.Util; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.screens.Screen; import net.minecraft.network.chat.CommonComponents; import net.minecraft.network.chat.Component; @@ -55,12 +56,12 @@ protected void init() } @Override - public void render(PoseStack poseStack, int mouseX, int mouseY, float deltaTick) + public void render(GuiGraphics poseStack, int mouseX, int mouseY, float deltaTick) { super.render(poseStack, mouseX, mouseY, deltaTick); if(this.failed) { - drawCenteredString(poseStack, this.font, this.message != null ? this.message : FAILED_LABEL, this.width / 2, this.height / 2, 8421504); + poseStack.drawCenteredString(this.font, this.message != null ? this.message : FAILED_LABEL, this.width / 2, this.height / 2, 8421504); } else if(this.requested) { @@ -69,8 +70,8 @@ else if(this.requested) case 1, 3 -> "o O o"; case 2 -> "o o O"; }; - drawCenteredString(poseStack, this.font, REQUESTING_LABEL, this.width / 2, this.height / 2 - this.font.lineHeight, 0xFFFFFFFF); - drawCenteredString(poseStack, this.font, label, this.width / 2, this.height / 2 + 5, 8421504); + poseStack.drawCenteredString(this.font, REQUESTING_LABEL, this.width / 2, this.height / 2 - this.font.lineHeight, 0xFFFFFFFF); + poseStack.drawCenteredString(this.font, label, this.width / 2, this.height / 2 + 5, 8421504); } } diff --git a/Common/src/main/java/com/mrcrayfish/configured/client/screen/TooltipScreen.java b/Common/src/main/java/com/mrcrayfish/configured/client/screen/TooltipScreen.java index 62462f0..f95ef04 100644 --- a/Common/src/main/java/com/mrcrayfish/configured/client/screen/TooltipScreen.java +++ b/Common/src/main/java/com/mrcrayfish/configured/client/screen/TooltipScreen.java @@ -2,6 +2,7 @@ import com.google.common.collect.ImmutableList; import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.screens.inventory.tooltip.ClientTextTooltip; import net.minecraft.network.chat.Component; @@ -71,7 +72,7 @@ public void setActiveTooltip(Component text, int outlineColour) this.tooltipOutlineColour = outlineColour; } - protected void drawTooltip(PoseStack poseStack, int mouseX, int mouseY) + protected void drawTooltip(GuiGraphics poseStack, int mouseX, int mouseY) { if(this.tooltipText != null) { diff --git a/Common/src/main/java/com/mrcrayfish/configured/client/screen/WorldSelectionScreen.java b/Common/src/main/java/com/mrcrayfish/configured/client/screen/WorldSelectionScreen.java index 464a597..e8a5a95 100644 --- a/Common/src/main/java/com/mrcrayfish/configured/client/screen/WorldSelectionScreen.java +++ b/Common/src/main/java/com/mrcrayfish/configured/client/screen/WorldSelectionScreen.java @@ -13,6 +13,7 @@ import net.minecraft.ChatFormatting; import net.minecraft.Util; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.components.events.GuiEventListener; import net.minecraft.client.gui.screens.Screen; @@ -82,14 +83,14 @@ protected void init() } @Override - public void render(PoseStack poseStack, int mouseX, int mouseY, float partialTicks) + public void render(GuiGraphics poseStack, int mouseX, int mouseY, float partialTicks) { super.render(poseStack, mouseX, mouseY, partialTicks); - poseStack.pushPose(); - poseStack.translate(this.width - 30, 15, 0); - poseStack.scale(2.5F, 2.5F, 2.5F); - Screen.drawString(poseStack, this.font, Component.literal("?").withStyle(ChatFormatting.BOLD), 0, 0, 0xFFFFFF); - poseStack.popPose(); + poseStack.pose().pushPose(); + poseStack.pose().translate(this.width - 30, 15, 0); + poseStack.pose().scale(2.5F, 2.5F, 2.5F); + poseStack.drawString(this.font, Component.literal("?").withStyle(ChatFormatting.BOLD), 0, 0, 0xFFFFFF); + poseStack.pose().popPose(); } @Override @@ -165,15 +166,15 @@ public List children() } @Override - public void render(PoseStack poseStack, int x, int top, int left, int width, int p_230432_6_, int mouseX, int mouseY, boolean p_230432_9_, float partialTicks) + public void render(GuiGraphics poseStack, int x, int top, int left, int width, int p_230432_6_, int mouseX, int mouseY, boolean p_230432_9_, float partialTicks) { - if(x % 2 != 0) Screen.fill(poseStack, left, top, left + width, top + 24, 0x55000000); - if(this.modifyButton.isMouseOver(mouseX, mouseY)) Screen.fill(poseStack, left - 1, top - 1, left + 25, top + 25, 0xFFFFFFFF); + if(x % 2 != 0) poseStack.fill(left, top, left + width, top + 24, 0x55000000); + if(this.modifyButton.isMouseOver(mouseX, mouseY)) poseStack.fill(left - 1, top - 1, left + 25, top + 25, 0xFFFFFFFF); RenderSystem.setShaderTexture(0, this.texture != null ? this.iconId : MISSING_ICON); RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); - blit(poseStack, left, top, 24, 24, 0, 0, 64, 64, 64, 64); - Screen.drawString(poseStack, WorldSelectionScreen.this.minecraft.font, this.worldName, left + 30, top + 3, 0xFFFFFF); - Screen.drawString(poseStack, WorldSelectionScreen.this.minecraft.font, this.folderName, left + 30, top + 13, 0xFFFFFF); + poseStack.blit(this.texture != null ? this.iconId : MISSING_ICON, left, top, 24, 24, 0, 0, 64, 64, 64, 64); + poseStack.drawString(WorldSelectionScreen.this.minecraft.font, this.worldName, left + 30, top + 3, 0xFFFFFF); + poseStack.drawString(WorldSelectionScreen.this.minecraft.font, this.folderName, left + 30, top + 13, 0xFFFFFF); this.modifyButton.setX(left + width - 61); this.modifyButton.setY(top + 2); this.modifyButton.render(poseStack, mouseX, mouseY, partialTicks); diff --git a/Common/src/main/java/com/mrcrayfish/configured/client/screen/widget/CheckBoxButton.java b/Common/src/main/java/com/mrcrayfish/configured/client/screen/widget/CheckBoxButton.java index 4601f80..aa9b520 100644 --- a/Common/src/main/java/com/mrcrayfish/configured/client/screen/widget/CheckBoxButton.java +++ b/Common/src/main/java/com/mrcrayfish/configured/client/screen/widget/CheckBoxButton.java @@ -4,6 +4,7 @@ import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Checkbox; import net.minecraft.client.renderer.GameRenderer; import net.minecraft.network.chat.CommonComponents; @@ -32,7 +33,7 @@ public void onPress() } @Override - public void renderWidget(PoseStack poseStack, int mouseX, int mouseY, float partialTicks) + public void renderWidget(GuiGraphics poseStack, int mouseX, int mouseY, float partialTicks) { Minecraft minecraft = Minecraft.getInstance(); RenderSystem.enableDepthTest(); @@ -42,7 +43,7 @@ public void renderWidget(PoseStack poseStack, int mouseX, int mouseY, float part RenderSystem.enableBlend(); RenderSystem.defaultBlendFunc(); RenderSystem.blendFunc(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA); - blit(poseStack, this.getX(), this.getY(), this.isHoveredOrFocused() ? 50 : 36, this.selected() ? 49 : 35, 14, 14, 64, 64); + poseStack.blit(ICONS, this.getX(), this.getY(), this.isHoveredOrFocused() ? 50 : 36, this.selected() ? 49 : 35, 14, 14, 64, 64); //this.renderBg(poseStack, minecraft, mouseX, mouseY); //TODO wat this? } diff --git a/Common/src/main/java/com/mrcrayfish/configured/client/screen/widget/ConfiguredButton.java b/Common/src/main/java/com/mrcrayfish/configured/client/screen/widget/ConfiguredButton.java index 2a73218..0e7315a 100644 --- a/Common/src/main/java/com/mrcrayfish/configured/client/screen/widget/ConfiguredButton.java +++ b/Common/src/main/java/com/mrcrayfish/configured/client/screen/widget/ConfiguredButton.java @@ -1,6 +1,7 @@ package com.mrcrayfish.configured.client.screen.widget; import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.components.Tooltip; import net.minecraft.network.chat.Component; @@ -29,7 +30,7 @@ public void setTooltip(@Nullable Tooltip tooltip, Predicate