Skip to content

Commit 796d637

Browse files
gniftygnomegniftygnome
committed
Update to Minecraft 26.1-pre-2.
- Update to Minecraft 26.1-pre-2 * DrawContext becomes DrawContextExtractor * render methods become extract methods
1 parent 3486e9f commit 796d637

15 files changed

Lines changed: 70 additions & 72 deletions

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id 'net.fabricmc.fabric-loom' version '1.14-SNAPSHOT'
2+
id 'net.fabricmc.fabric-loom' version '1.15-SNAPSHOT'
33
}
44

55
apply from: 'https://raw.githubusercontent.com/TerraformersMC/GradleScripts/3.1/ferry.gradle'

‎gradle.properties‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ org.gradle.parallel=true
44
maven_group=com.terraformersmc
55
archive_name=modmenu
66

7-
minecraft_version=26.1-snapshot-4
7+
minecraft_version=26.1-pre-2
88
loader_version=0.18.4
9-
fabric_version=0.142.1+26.1
10-
text_placeholder_api_version=2.8.1+1.21.10
9+
fabric_version=0.143.14+26.1
10+
text_placeholder_api_version=3.0.0-beta.1+26.1
1111
quilt_loader_version=0.29.0-beta.3
1212

1313
# Project Metadata
@@ -21,7 +21,7 @@ default_release_type=stable
2121
# Modrinth Metadata
2222
modrinth_slug=modmenu
2323
modrinth_id=mOgUt4GM
24-
modrinth_game_versions=26.1-snapshot-4
24+
modrinth_game_versions=26.1-pre-2
2525
modrinth_mod_loaders=fabric, quilt
2626
modrinth_required_dependencies=fabric-api, placeholder-api
2727

‎src/main/java/com/terraformersmc/modmenu/gui/ModsScreen.java‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import net.fabricmc.loader.api.ModContainer;
1818
import net.fabricmc.loader.api.metadata.ModOrigin;
1919
import net.minecraft.SharedConstants;
20-
import net.minecraft.client.gui.GuiGraphics;
20+
import net.minecraft.client.gui.GuiGraphicsExtractor;
2121
import net.minecraft.client.gui.components.AbstractWidget;
2222
import net.minecraft.client.gui.components.Button;
2323
import net.minecraft.client.gui.components.EditBox;
@@ -283,27 +283,26 @@ public boolean charTyped(CharacterEvent input) {
283283
}
284284

285285
@Override
286-
public void render(GuiGraphics drawContext, int mouseX, int mouseY, float delta) {
287-
super.render(drawContext, mouseX, mouseY, delta);
286+
public void extractRenderState(GuiGraphicsExtractor drawContext, int mouseX, int mouseY, float delta) {
287+
super.extractRenderState(drawContext, mouseX, mouseY, delta);
288288
ModListEntry selectedEntry = selected;
289289
if (selectedEntry != null) {
290-
this.descriptionListWidget.render(drawContext, mouseX, mouseY, delta);
290+
this.descriptionListWidget.extractRenderState(drawContext, mouseX, mouseY, delta);
291291
}
292292

293-
this.modList.render(drawContext, mouseX, mouseY, delta);
294-
this.searchBox.render(drawContext, mouseX, mouseY, delta);
295-
drawContext.drawCenteredString(this.font, this.title, this.modList.getWidth() / 2, 8, 0xFFFFFFFF);
296-
assert minecraft != null;
293+
this.modList.extractRenderState(drawContext, mouseX, mouseY, delta);
294+
this.searchBox.extractRenderState(drawContext, mouseX, mouseY, delta);
295+
drawContext.centeredText(this.font, this.title, this.modList.getWidth() / 2, 8, 0xFFFFFFFF);
297296
int grayColor = 0xFFAAAAAA;
298297
if (!ModMenuConfig.DISABLE_DRAG_AND_DROP.getValue()) {
299-
drawContext.drawCenteredString(
298+
drawContext.centeredText(
300299
this.font,
301300
ModMenuScreenTexts.DROP_INFO_LINE_1,
302301
this.width - this.modList.getWidth() / 2,
303302
RIGHT_PANE_Y / 2 - minecraft.font.lineHeight - 1,
304303
grayColor
305304
);
306-
drawContext.drawCenteredString(
305+
drawContext.centeredText(
307306
this.font,
308307
ModMenuScreenTexts.DROP_INFO_LINE_2,
309308
this.width - this.modList.getWidth() / 2,
@@ -318,7 +317,7 @@ public void render(GuiGraphics drawContext, int mouseX, int mouseY, float delta)
318317
if (this.filterOptionsShown) {
319318
if (!ModMenuConfig.SHOW_LIBRARIES.getValue() ||
320319
font.width(fullModCount) <= this.filtersX - 5) {
321-
drawContext.drawString(
320+
drawContext.text(
322321
font,
323322
fullModCount.getVisualOrderText(),
324323
this.searchBoxX,
@@ -327,15 +326,15 @@ public void render(GuiGraphics drawContext, int mouseX, int mouseY, float delta)
327326
true
328327
);
329328
} else {
330-
drawContext.drawString(
329+
drawContext.text(
331330
font,
332331
computeModCountText(false, false).getVisualOrderText(),
333332
this.searchBoxX,
334333
46,
335334
0xFFFFFFFF,
336335
true
337336
);
338-
drawContext.drawString(
337+
drawContext.text(
339338
font,
340339
computeLibraryCountText(false).getVisualOrderText(),
341340
this.searchBoxX,
@@ -347,23 +346,23 @@ public void render(GuiGraphics drawContext, int mouseX, int mouseY, float delta)
347346
} else {
348347
if (!ModMenuConfig.SHOW_LIBRARIES.getValue() ||
349348
font.width(fullModCount) <= modList.getWidth() - 5) {
350-
drawContext.drawString(font,
349+
drawContext.text(font,
351350
fullModCount.getVisualOrderText(),
352351
this.searchBoxX,
353352
52,
354353
0xFFFFFFFF,
355354
true
356355
);
357356
} else {
358-
drawContext.drawString(
357+
drawContext.text(
359358
font,
360359
computeModCountText(false, false).getVisualOrderText(),
361360
this.searchBoxX,
362361
46,
363362
0xFFFFFFFF,
364363
true
365364
);
366-
drawContext.drawString(
365+
drawContext.text(
367366
font,
368367
computeLibraryCountText(false).getVisualOrderText(),
369368
this.searchBoxX,
@@ -394,7 +393,7 @@ public void render(GuiGraphics drawContext, int mouseX, int mouseY, float delta)
394393
trimmedName = FormattedText.composite(font.substrByWidth(name, maxNameWidth - font.width(ellipsis)), ellipsis);
395394
}
396395

397-
drawContext.drawString(
396+
drawContext.text(
398397
font,
399398
Language.getInstance().getVisualOrder(trimmedName),
400399
x + imageOffset,
@@ -425,7 +424,7 @@ public void render(GuiGraphics drawContext, int mouseX, int mouseY, float delta)
425424
}
426425

427426
if (mod.isReal()) {
428-
drawContext.drawString(
427+
drawContext.text(
429428
font,
430429
mod.getPrefixedVersion(),
431430
x + imageOffset,

‎src/main/java/com/terraformersmc/modmenu/gui/widget/DescriptionListWidget.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import net.minecraft.ChatFormatting;
99
import net.minecraft.client.Minecraft;
1010
import net.minecraft.client.gui.Font;
11-
import net.minecraft.client.gui.GuiGraphics;
11+
import net.minecraft.client.gui.GuiGraphicsExtractor;
1212
import net.minecraft.client.gui.components.AbstractSelectionList;
1313
import net.minecraft.client.gui.components.ContainerObjectSelectionList;
1414
import net.minecraft.client.gui.components.events.GuiEventListener;
@@ -270,9 +270,9 @@ public void updateSelectedMod(Mod mod) {
270270
}
271271

272272
@Override
273-
public void renderListItems(GuiGraphics drawContext, int mouseX, int mouseY, float delta) {
273+
public void extractListItems(GuiGraphicsExtractor drawContext, int mouseX, int mouseY, float delta) {
274274
this.enableScissor(drawContext);
275-
super.renderListItems(drawContext, mouseX, mouseY, delta);
275+
super.extractListItems(drawContext, mouseX, mouseY, delta);
276276
drawContext.disableScissor();
277277
}
278278

@@ -306,8 +306,8 @@ public DescriptionEntry setUpdateTextEntry() {
306306
}
307307

308308
@Override
309-
public void renderContent(
310-
GuiGraphics drawContext,
309+
public void extractContent(
310+
GuiGraphicsExtractor drawContext,
311311
int mouseX,
312312
int mouseY,
313313
boolean isSelected,
@@ -320,7 +320,7 @@ public void renderContent(
320320
x += 11;
321321
}
322322

323-
drawContext.drawString(textRenderer, text, x + indent, y, 0xFFAAAAAA);
323+
drawContext.text(textRenderer, text, x + indent, y, 0xFFAAAAAA);
324324
}
325325

326326
@Override
@@ -412,9 +412,9 @@ public MailableContactEntry(FormattedCharSequence text, String link) {
412412
}
413413

414414
@Override
415-
public void renderContent(GuiGraphics drawContext, int mouseX, int mouseY, boolean isSelected, float delta) {
416-
super.renderContent(drawContext, mouseX, mouseY, isSelected, delta);
417-
drawContext.drawString(textRenderer, Component.literal(" ").append(Component.literal("✉")), this.getContentX() + indent + textRenderer.width(text) + 1, this.getContentY(), 0xFFAAAAAA);
415+
public void extractContent(GuiGraphicsExtractor drawContext, int mouseX, int mouseY, boolean isSelected, float delta) {
416+
super.extractContent(drawContext, mouseX, mouseY, isSelected, delta);
417+
drawContext.text(textRenderer, Component.literal(" ").append(Component.literal("✉")), this.getContentX() + indent + textRenderer.width(text) + 1, this.getContentY(), 0xFFAAAAAA);
418418
}
419419

420420
@Override

‎src/main/java/com/terraformersmc/modmenu/gui/widget/LegacyTexturedButtonWidget.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.terraformersmc.modmenu.gui.widget;
22

3-
import net.minecraft.client.gui.GuiGraphics;
3+
import net.minecraft.client.gui.GuiGraphicsExtractor;
44
import net.minecraft.client.gui.components.Button;
55
import net.minecraft.client.gui.components.ImageButton;
66
import net.minecraft.client.renderer.RenderPipelines;
@@ -43,7 +43,7 @@ public LegacyTexturedButtonWidget(
4343
}
4444

4545
@Override
46-
public void renderContents(GuiGraphics context, int mouseX, int mouseY, float deltaTicks) {
46+
public void extractContents(GuiGraphicsExtractor context, int mouseX, int mouseY, float deltaTicks) {
4747
int v = this.v;
4848
if (!this.isActive()) {
4949
v += this.hoveredVOffset * 2;

‎src/main/java/com/terraformersmc/modmenu/gui/widget/ModListWidget.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,13 @@
1010
import com.terraformersmc.modmenu.util.mod.Mod;
1111
import com.terraformersmc.modmenu.util.mod.ModSearch;
1212
import com.terraformersmc.modmenu.util.mod.fabric.FabricIconHandler;
13+
import net.minecraft.client.gui.GuiGraphicsExtractor;
1314
import org.jetbrains.annotations.Nullable;
1415

1516
import java.util.*;
1617
import java.util.stream.Collectors;
1718

1819
import net.minecraft.client.Minecraft;
19-
import net.minecraft.client.gui.GuiGraphics;
20-
import net.minecraft.client.gui.components.AbstractSelectionList;
2120
import net.minecraft.client.gui.components.ObjectSelectionList;
2221
import net.minecraft.client.input.KeyEvent;
2322
import net.minecraft.network.chat.Component;
@@ -231,7 +230,7 @@ public void filter(String searchTerm, boolean refresh, boolean reposition) {
231230
}
232231

233232
@Override
234-
protected void renderListItems(GuiGraphics drawContext, int mouseX, int mouseY, float delta) {
233+
protected void extractListItems(GuiGraphicsExtractor drawContext, int mouseX, int mouseY, float delta) {
235234
int entryLeft = this.getRowLeft();
236235
int entryWidth = this.getRowWidth();
237236
int entryHeight = this.defaultEntryHeight - 4;
@@ -259,7 +258,7 @@ protected void renderListItems(GuiGraphics drawContext, int mouseX, int mouseY,
259258
}
260259

261260
entry.setYOffset(yOffset);
262-
entry.renderContent(
261+
entry.extractContent(
263262
drawContext,
264263
mouseX,
265264
mouseY,
@@ -271,9 +270,9 @@ protected void renderListItems(GuiGraphics drawContext, int mouseX, int mouseY,
271270
}
272271

273272
/**
274-
* Version of {@link #renderSelection(GuiGraphics, AbstractSelectionList.Entry, int)} with unconstrained positioning and sizing.
273+
* Version of {@link #drawSelectionHighlight(GuiGraphicsExtractor, int, int, int, int, int, int)} with unconstrained positioning and sizing.
275274
*/
276-
protected void drawSelectionHighlight(GuiGraphics context, int x, int y, int width, int height, int borderColor, int fillColor) {
275+
protected void drawSelectionHighlight(GuiGraphicsExtractor context, int x, int y, int width, int height, int borderColor, int fillColor) {
277276
context.fill(x, y - 2, x + width, y + height + 2, borderColor);
278277
context.fill(x + 1, y - 1, x + width - 1, y + height + 1, fillColor);
279278
}

‎src/main/java/com/terraformersmc/modmenu/gui/widget/ModMenuButtonWidget.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import com.terraformersmc.modmenu.config.ModMenuConfig;
55
import com.terraformersmc.modmenu.gui.ModsScreen;
66
import net.minecraft.client.Minecraft;
7-
import net.minecraft.client.gui.GuiGraphics;
7+
import net.minecraft.client.gui.GuiGraphicsExtractor;
88
import net.minecraft.client.gui.components.Button;
99
import net.minecraft.client.gui.screens.Screen;
1010

@@ -22,8 +22,8 @@ public ModMenuButtonWidget(int x, int y, int width, int height, net.minecraft.ne
2222
}
2323

2424
@Override
25-
public void renderContents(GuiGraphics drawContext, int mouseX, int mouseY, float delta) {
26-
super.renderContents(drawContext, mouseX, mouseY, delta);
25+
public void extractContents(GuiGraphicsExtractor drawContext, int mouseX, int mouseY, float delta) {
26+
super.extractContents(drawContext, mouseX, mouseY, delta);
2727
if (ModMenuConfig.BUTTON_UPDATE_BADGE.getValue() && ModMenu.areModUpdatesAvailable()) {
2828
UpdateAvailableBadge.renderBadge(
2929
drawContext,

‎src/main/java/com/terraformersmc/modmenu/gui/widget/UpdateAvailableBadge.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package com.terraformersmc.modmenu.gui.widget;
22

3-
import net.minecraft.client.gui.GuiGraphics;
3+
import net.minecraft.client.gui.GuiGraphicsExtractor;
44
import net.minecraft.client.renderer.RenderPipelines;
55
import net.minecraft.resources.Identifier;
66

77
public class UpdateAvailableBadge {
88
private static final Identifier UPDATE_ICON = Identifier.withDefaultNamespace("icon/trial_available");
99

10-
public static void renderBadge(GuiGraphics drawContext, int x, int y) {
10+
public static void renderBadge(GuiGraphicsExtractor drawContext, int x, int y) {
1111
drawContext.blitSprite(RenderPipelines.GUI_TEXTURED, UPDATE_ICON, x, y, 8, 8, 0xFFFFFFFF);
1212
}
1313
}

‎src/main/java/com/terraformersmc/modmenu/gui/widget/UpdateCheckerTexturedButtonWidget.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.terraformersmc.modmenu.ModMenu;
44
import com.terraformersmc.modmenu.config.ModMenuConfig;
5-
import net.minecraft.client.gui.GuiGraphics;
5+
import net.minecraft.client.gui.GuiGraphicsExtractor;
66
import net.minecraft.client.gui.components.Button;
77
import net.minecraft.resources.Identifier;
88

@@ -25,8 +25,8 @@ public UpdateCheckerTexturedButtonWidget(
2525
}
2626

2727
@Override
28-
public void renderContents(GuiGraphics drawContext, int mouseX, int mouseY, float delta) {
29-
super.renderContents(drawContext, mouseX, mouseY, delta);
28+
public void extractContents(GuiGraphicsExtractor drawContext, int mouseX, int mouseY, float delta) {
29+
super.extractContents(drawContext, mouseX, mouseY, delta);
3030
if (ModMenuConfig.BUTTON_UPDATE_BADGE.getValue() && ModMenu.areModUpdatesAvailable()) {
3131
UpdateAvailableBadge.renderBadge(drawContext, this.getX() + this.width - 5, this.getY() - 3);
3232
}

‎src/main/java/com/terraformersmc/modmenu/gui/widget/entries/ChildEntry.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.terraformersmc.modmenu.gui.widget.ModListWidget;
44
import com.terraformersmc.modmenu.util.mod.Mod;
5-
import net.minecraft.client.gui.GuiGraphics;
5+
import net.minecraft.client.gui.GuiGraphicsExtractor;
66
import net.minecraft.client.input.KeyEvent;
77

88
public class ChildEntry extends ModListEntry {
@@ -16,14 +16,14 @@ public ChildEntry(Mod mod, ParentEntry parent, ModListWidget list, boolean botto
1616
}
1717

1818
@Override
19-
public void renderContent(
20-
GuiGraphics drawContext,
19+
public void extractContent(
20+
GuiGraphicsExtractor drawContext,
2121
int mouseX,
2222
int mouseY,
2323
boolean isSelected,
2424
float delta
2525
) {
26-
super.renderContent(drawContext, mouseX, mouseY, isSelected, delta);
26+
super.extractContent(drawContext, mouseX, mouseY, isSelected, delta);
2727
int x = this.getContentX() - 2;
2828
int y = this.getContentY() + this.getYOffset();
2929
// int rowWidth = this.getContentWidth();

0 commit comments

Comments
 (0)