Skip to content

Update to 1.21.6-rc1; lowercasebtw's PR with style changes reverted #861

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jun 17, 2025
Merged

Update to 1.21.6-rc1; lowercasebtw's PR with style changes reverted #861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ccaa214
Update to 25w15a
lowercasebtw Apr 9, 2025
8fe1c8e
Update to 25w16a
lowercasebtw Apr 16, 2025
a8febaa
Update to 25w20a (Very Broken)
lowercasebtw May 14, 2025
9ad85e3
Update to latest pre-release & fix issues
lowercasebtw Jun 7, 2025
66ceb89
Fix search box title text
lowercasebtw Jun 7, 2025
d27e7d1
Fix colors
lowercasebtw Jun 7, 2025
143f10f
Require >=1.21.6-pre3 to launch
lowercasebtw Jun 7, 2025
7148a26
Revert code style changes so a squash merge will give a clean diff.
gniftygnome Jun 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
org.gradle.jvmargs=-Xmx2G
org.gradle.jvmargs=-Xmx4G
org.gradle.parallel=true

maven_group=com.terraformersmc
archive_name=modmenu

minecraft_version=1.21.5-rc1
yarn_mappings=1.21.5-rc1+build.2
loader_version=0.16.10
fabric_version=0.119.2+1.21.5
text_placeholder_api_version=2.6.0+1.21.5
quilt_loader_version=0.28.1-beta.1
minecraft_version=1.21.6-rc1
yarn_mappings=1.21.6-rc1+build.1
loader_version=0.16.14
fabric_version=0.127.0+1.21.6
text_placeholder_api_version=2.7.0+1.21.6
quilt_loader_version=0.29.0-beta.3

# Project Metadata
project_name=Mod Menu
Expand All @@ -21,14 +22,14 @@ default_release_type=stable
# Modrinth Metadata
modrinth_slug=modmenu
modrinth_id=mOgUt4GM
modrinth_game_versions=1.21.5-rc1, 1.21.5-rc2, 1.21.5
modrinth_game_versions=1.21.6-rc1
modrinth_mod_loaders=fabric, quilt
modrinth_required_dependencies=fabric-api, placeholder-api

# CurseForge Metadata
curseforge_slug=modmenu
curseforge_id=308702
curseforge_game_versions=1.21.5-Snapshot, 1.21.5, Fabric, Quilt
curseforge_game_versions=1.21.6-snapshot, Fabric, Quilt
curseforge_required_dependencies=fabric-api, text-placeholder-api
curseforge_optional_dependencies=

Expand Down
36 changes: 15 additions & 21 deletions src/main/java/com/terraformersmc/modmenu/gui/ModsScreen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package com.terraformersmc.modmenu.gui;

import com.google.common.base.Joiner;
import com.mojang.blaze3d.opengl.GlStateManager;
import com.mojang.blaze3d.systems.RenderSystem;
import com.terraformersmc.modmenu.ModMenu;
import com.terraformersmc.modmenu.config.ModMenuConfig;
import com.terraformersmc.modmenu.config.ModMenuConfigManager;
Expand All @@ -17,6 +15,7 @@
import com.terraformersmc.modmenu.util.mod.ModBadgeRenderer;
import net.fabricmc.loader.api.FabricLoader;
import net.minecraft.SharedConstants;
import net.minecraft.client.gl.RenderPipelines;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.screen.ConfirmLinkScreen;
import net.minecraft.client.gui.screen.ConfirmScreen;
Expand All @@ -25,7 +24,6 @@
import net.minecraft.client.gui.widget.ButtonWidget;
import net.minecraft.client.gui.widget.ClickableWidget;
import net.minecraft.client.gui.widget.TextFieldWidget;
import net.minecraft.client.render.RenderLayer;
import net.minecraft.client.resource.language.I18n;
import net.minecraft.client.toast.SystemToast;
import net.minecraft.screen.ScreenTexts;
Expand Down Expand Up @@ -203,7 +201,7 @@ protected void init() {
final Mod mod = Objects.requireNonNull(selected).getMod();
boolean isMinecraft = selected.getMod().getId().equals("minecraft");
if (isMinecraft) {
var url = SharedConstants.getGameVersion().isStable() ? Urls.JAVA_FEEDBACK : Urls.SNAPSHOT_FEEDBACK;
var url = SharedConstants.getGameVersion().stable() ? Urls.JAVA_FEEDBACK : Urls.SNAPSHOT_FEEDBACK;
ConfirmLinkScreen.open(this, url, true);
} else {
var url = mod.getWebsite();
Expand Down Expand Up @@ -295,10 +293,9 @@ public void render(DrawContext drawContext, int mouseX, int mouseY, float delta)

this.modList.render(drawContext, mouseX, mouseY, delta);
this.searchBox.render(drawContext, mouseX, mouseY, delta);
GlStateManager._disableBlend();
drawContext.drawCenteredTextWithShadow(this.textRenderer, this.title, this.modList.getWidth() / 2, 8, 16777215);
drawContext.drawCenteredTextWithShadow(this.textRenderer, this.title, this.modList.getWidth() / 2, 8, 0xFFFFFFFF);
assert client != null;
int grayColor = 11184810;
int grayColor = 0xFFAAAAAA;
if (!ModMenuConfig.DISABLE_DRAG_AND_DROP.getValue()) {
drawContext.drawCenteredTextWithShadow(
this.textRenderer,
Expand Down Expand Up @@ -327,7 +324,7 @@ public void render(DrawContext drawContext, int mouseX, int mouseY, float delta)
fullModCount.asOrderedText(),
this.searchBoxX,
52,
0xFFFFFF,
0xFFFFFFFF,
true
);
} else {
Expand All @@ -336,15 +333,15 @@ public void render(DrawContext drawContext, int mouseX, int mouseY, float delta)
computeModCountText(false, false).asOrderedText(),
this.searchBoxX,
46,
0xFFFFFF,
0xFFFFFFFF,
true
);
drawContext.drawText(
textRenderer,
computeLibraryCountText(false).asOrderedText(),
this.searchBoxX,
57,
0xFFFFFF,
0xFFFFFFFF,
true
);
}
Expand All @@ -355,7 +352,7 @@ public void render(DrawContext drawContext, int mouseX, int mouseY, float delta)
fullModCount.asOrderedText(),
this.searchBoxX,
52,
0xFFFFFF,
0xFFFFFFFF,
true
);
} else {
Expand All @@ -364,15 +361,15 @@ public void render(DrawContext drawContext, int mouseX, int mouseY, float delta)
computeModCountText(false, false).asOrderedText(),
this.searchBoxX,
46,
0xFFFFFF,
0xFFFFFFFF,
true
);
drawContext.drawText(
textRenderer,
computeLibraryCountText(false).asOrderedText(),
this.searchBoxX,
57,
0xFFFFFF,
0xFFFFFFFF,
true
);
}
Expand All @@ -387,10 +384,7 @@ public void render(DrawContext drawContext, int mouseX, int mouseY, float delta)
DrawingUtil.drawRandomVersionBackground(mod, drawContext, x, RIGHT_PANE_Y, 32, 32);
}

RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
GlStateManager._enableBlend();
drawContext.drawTexture(RenderLayer::getGuiTextured, this.selected.getIconTexture(), x, RIGHT_PANE_Y, 0.0F, 0.0F, 32, 32, 32, 32);
GlStateManager._disableBlend();
drawContext.drawTexture(RenderPipelines.GUI_TEXTURED, this.selected.getIconTexture(), x, RIGHT_PANE_Y, 0.0F, 0.0F, 32, 32, 32, 32, 0xFFFFFFFF);
int lineSpacing = textRenderer.fontHeight + 1;
int imageOffset = 36;
Text name = Text.literal(mod.getTranslatedName());
Expand All @@ -406,14 +400,14 @@ public void render(DrawContext drawContext, int mouseX, int mouseY, float delta)
Language.getInstance().reorder(trimmedName),
x + imageOffset,
RIGHT_PANE_Y + 1,
0xFFFFFF,
0xFFFFFFFF,
true
);

if (mouseX > x + imageOffset && mouseY > RIGHT_PANE_Y + 1 &&
mouseY < RIGHT_PANE_Y + 1 + textRenderer.fontHeight &&
mouseX < x + imageOffset + textRenderer.getWidth(trimmedName)) {
this.setTooltip(ModMenuScreenTexts.modIdTooltip(mod.getId()));
drawContext.drawTooltip(ModMenuScreenTexts.modIdTooltip(mod.getId()), mouseX, mouseY);
}

if (this.init || modBadgeRenderer == null || modBadgeRenderer.getMod() != mod) {
Expand All @@ -437,7 +431,7 @@ public void render(DrawContext drawContext, int mouseX, int mouseY, float delta)
mod.getPrefixedVersion(),
x + imageOffset,
RIGHT_PANE_Y + 2 + lineSpacing,
0x808080,
0xFFAAAAAA,
true
);
}
Expand All @@ -458,7 +452,7 @@ public void render(DrawContext drawContext, int mouseX, int mouseY, float delta)
RIGHT_PANE_Y + 2 + lineSpacing * 2,
this.paneWidth - imageOffset - 4,
1,
0x808080
0xFFAAAAAA
);
}
}
Expand Down
80 changes: 40 additions & 40 deletions src/main/java/com/terraformersmc/modmenu/gui/widget/DescriptionListWidget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package com.terraformersmc.modmenu.gui.widget;

import com.mojang.blaze3d.buffers.BufferType;
import com.mojang.blaze3d.buffers.BufferUsage;
import com.mojang.blaze3d.buffers.GpuBuffer;
import com.mojang.blaze3d.pipeline.RenderPipeline;
import com.mojang.blaze3d.systems.RenderPass;
Expand All @@ -13,7 +11,8 @@
import com.terraformersmc.modmenu.util.mod.Mod;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.font.TextRenderer;
import net.minecraft.client.gl.*;
import net.minecraft.client.gl.Framebuffer;
import net.minecraft.client.gl.RenderPipelines;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.Element;
import net.minecraft.client.gui.Selectable;
Expand All @@ -23,7 +22,8 @@
import net.minecraft.client.gui.screen.option.CreditsAndAttributionScreen;
import net.minecraft.client.gui.widget.ElementListWidget;
import net.minecraft.client.gui.widget.EntryListWidget;
import net.minecraft.client.render.*;
import net.minecraft.client.render.BufferBuilder;
import net.minecraft.client.render.BuiltBuffer;
import net.minecraft.client.util.BufferAllocator;
import net.minecraft.text.OrderedText;
import net.minecraft.text.Text;
Expand Down Expand Up @@ -133,7 +133,6 @@ private void rebuildUI() {
children().add(new DescriptionEntry(line, 8));
}


Text updateMessage = updateInfo.getUpdateMessage();
String downloadLink = updateInfo.getDownloadLink();
if (updateMessage == null) {
Expand All @@ -145,14 +144,15 @@ private void rebuildUI() {
.formatted(Formatting.UNDERLINE);
}
}

for (OrderedText line : textRenderer.wrapLines(updateMessage, wrapWidth - 16)) {
if (downloadLink != null) {
children().add(new LinkEntry(line, downloadLink, 8));
} else {
children().add(new DescriptionEntry(line, 8));
}
}
}
}

if (mod.getChildHasUpdate()) {
children().add(emptyEntry);
Expand Down Expand Up @@ -282,38 +282,38 @@ public void renderList(DrawContext drawContext, int mouseX, int mouseY, float de
super.renderList(drawContext, mouseX, mouseY, delta);
drawContext.disableScissor();

RenderPipeline pipeline = RenderPipelines.GUI;
try (BufferAllocator alloc = new BufferAllocator(pipeline.getVertexFormat().getVertexSize() * 4)) {
BufferBuilder bufferBuilder = new BufferBuilder(alloc, pipeline.getVertexFormatMode(), pipeline.getVertexFormat());
final int black = ColorHelper.fullAlpha(0);
bufferBuilder.vertex(this.getX(), (this.getY() + 4), 0.0F).color(0);
bufferBuilder.vertex(this.getRight(), (this.getY() + 4), 0.0F).color(0);
bufferBuilder.vertex(this.getRight(), this.getY(), 0.0F).color(black);
bufferBuilder.vertex(this.getX(), this.getY(), 0.0F).color(black);
bufferBuilder.vertex(this.getX(), this.getBottom(), 0.0F).color(black);
bufferBuilder.vertex(this.getRight(), this.getBottom(), 0.0F).color(black);
bufferBuilder.vertex(this.getRight(), (this.getBottom() - 4), 0.0F).color(0);
bufferBuilder.vertex(this.getX(), (this.getBottom() - 4), 0.0F).color(0);
this.renderScrollBar(bufferBuilder);
try (BuiltBuffer builtBuffer = bufferBuilder.endNullable()) {
if (builtBuffer == null) {
alloc.close();
return;
}
Framebuffer framebuffer = MinecraftClient.getInstance().getFramebuffer();
RenderSystem.ShapeIndexBuffer autoStorageIndexBuffer = RenderSystem.getSequentialBuffer(pipeline.getVertexFormatMode());
VertexFormat.IndexType indexType = autoStorageIndexBuffer.getIndexType();
GpuBuffer vertexBuffer = RenderSystem.getDevice().createBuffer(() -> "Description List", BufferType.VERTICES, BufferUsage.DYNAMIC_WRITE, builtBuffer.getBuffer().remaining());
GpuBuffer indexBuffer = autoStorageIndexBuffer.getIndexBuffer(builtBuffer.getDrawParameters().indexCount());
RenderSystem.getDevice().createCommandEncoder().writeToBuffer(vertexBuffer, builtBuffer.getBuffer(), 0);
try (RenderPass renderPass = RenderSystem.getDevice().createCommandEncoder().createRenderPass(framebuffer.getColorAttachment(), OptionalInt.empty(), framebuffer.getDepthAttachment(), OptionalDouble.empty())) {
renderPass.setPipeline(pipeline);
renderPass.setVertexBuffer(0, vertexBuffer);
renderPass.setIndexBuffer(indexBuffer, indexType);
renderPass.drawIndexed(0, builtBuffer.getDrawParameters().indexCount());
}
}
}
RenderPipeline pipeline = RenderPipelines.GUI;
try (BufferAllocator alloc = new BufferAllocator(pipeline.getVertexFormat().getVertexSize() * 4)) {
BufferBuilder bufferBuilder = new BufferBuilder(alloc, pipeline.getVertexFormatMode(), pipeline.getVertexFormat());
final int black = 0xFF000000;
bufferBuilder.vertex(this.getX(), (this.getY() + 4), 0.0F).color(0);
bufferBuilder.vertex(this.getRight(), (this.getY() + 4), 0.0F).color(0);
bufferBuilder.vertex(this.getRight(), this.getY(), 0.0F).color(black);
bufferBuilder.vertex(this.getX(), this.getY(), 0.0F).color(black);
bufferBuilder.vertex(this.getX(), this.getBottom(), 0.0F).color(black);
bufferBuilder.vertex(this.getRight(), this.getBottom(), 0.0F).color(black);
bufferBuilder.vertex(this.getRight(), (this.getBottom() - 4), 0.0F).color(0);
bufferBuilder.vertex(this.getX(), (this.getBottom() - 4), 0.0F).color(0);
this.renderScrollBar(bufferBuilder);
try (BuiltBuffer builtBuffer = bufferBuilder.endNullable()) {
if (builtBuffer == null) {
alloc.close();
return;
}
Framebuffer framebuffer = MinecraftClient.getInstance().getFramebuffer();
RenderSystem.ShapeIndexBuffer autoStorageIndexBuffer = RenderSystem.getSequentialBuffer(pipeline.getVertexFormatMode());
VertexFormat.IndexType indexType = autoStorageIndexBuffer.getIndexType();
GpuBuffer vertexBuffer = RenderSystem.getDevice().createBuffer(() -> "Description List", GpuBuffer.USAGE_COPY_DST, builtBuffer.getBuffer().remaining());
GpuBuffer indexBuffer = autoStorageIndexBuffer.getIndexBuffer(builtBuffer.getDrawParameters().indexCount());
RenderSystem.getDevice().createCommandEncoder().writeToBuffer(vertexBuffer.slice(), builtBuffer.getBuffer());
try (RenderPass renderPass = RenderSystem.getDevice().createCommandEncoder().createRenderPass(() -> "Description List", framebuffer.getColorAttachmentView(), OptionalInt.empty(), framebuffer.getDepthAttachmentView(), OptionalDouble.empty())) {
renderPass.setPipeline(pipeline);
renderPass.setVertexBuffer(0, vertexBuffer);
renderPass.setIndexBuffer(indexBuffer, indexType);
renderPass.drawIndexed(0, 0, builtBuffer.getDrawParameters().indexCount(), 1);
}
}
}
}

public void renderScrollBar(BufferBuilder bufferBuilder) {
Expand All @@ -328,7 +328,7 @@ public void renderScrollBar(BufferBuilder bufferBuilder) {
q = this.getY();
}

final int black = ColorHelper.fullAlpha(0);
final int black = 0xFF000000;
final int firstColor = ColorHelper.fromFloats(255, 128, 128, 128);
final int lastColor = ColorHelper.fromFloats(255, 192, 192, 192);
bufferBuilder.vertex(scrollbarStartX, this.getBottom(), 0.0F).color(black);
Expand Down Expand Up @@ -393,7 +393,7 @@ public void render(
x += 11;
}

drawContext.drawTextWithShadow(textRenderer, text, x + indent, y, 0xAAAAAA);
drawContext.drawTextWithShadow(textRenderer, text, x + indent, y, 0xFFAAAAAA);
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/terraformersmc/modmenu/gui/widget/LegacyTexturedButtonWidget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.terraformersmc.modmenu.gui.widget;

import net.minecraft.client.gl.RenderPipelines;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.widget.ButtonWidget;
import net.minecraft.client.gui.widget.TexturedButtonWidget;
import net.minecraft.client.render.RenderLayer;
import net.minecraft.text.Text;
import net.minecraft.util.Identifier;

Expand Down Expand Up @@ -53,7 +53,7 @@ public void renderWidget(DrawContext context, int mouseX, int mouseY, float delt
}

context.drawTexture(
RenderLayer::getGuiTextured,
RenderPipelines.GUI_TEXTURED,
this.texture,
this.getX(),
this.getY(),
Expand Down
Loading