Skip to content

Commit 521f7af

Browse files
authored
Update mod to Minecraft snapshot 25w06a (#828)
- Updated to 25w06a
1 parent 1de07a2 commit 521f7af

4 files changed

Lines changed: 40 additions & 16 deletions

File tree

gradle.properties

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ org.gradle.jvmargs=-Xmx1G
33
maven_group=com.terraformersmc
44
archive_name=modmenu
55

6-
minecraft_version=1.21.4
7-
yarn_mappings=1.21.4+build.7
8-
loader_version=0.16.9
9-
fabric_version=0.114.0+1.21.4
6+
minecraft_version=25w06a
7+
yarn_mappings=25w06a+build.1
8+
loader_version=0.16.10
9+
fabric_version=0.115.3+1.21.5
1010
text_placeholder_api_version=2.5.1+1.21.3
1111
quilt_loader_version=0.26.4
1212

@@ -21,14 +21,14 @@ default_release_type=stable
2121
# Modrinth Metadata
2222
modrinth_slug=modmenu
2323
modrinth_id=mOgUt4GM
24-
modrinth_game_versions=1.21.4
24+
modrinth_game_versions=25w06a
2525
modrinth_mod_loaders=fabric, quilt
2626
modrinth_required_dependencies=fabric-api, placeholder-api
2727

2828
# CurseForge Metadata
2929
curseforge_slug=modmenu
3030
curseforge_id=308702
31-
curseforge_game_versions=1.21.4, Fabric, Quilt
31+
curseforge_game_versions=1.21.5-Snapshot, Fabric, Quilt
3232
curseforge_required_dependencies=fabric-api, text-placeholder-api
3333
curseforge_optional_dependencies=
3434

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

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
import com.terraformersmc.modmenu.util.mod.Mod;
1010
import net.minecraft.client.MinecraftClient;
1111
import net.minecraft.client.font.TextRenderer;
12+
import net.minecraft.client.gl.GlUsage;
1213
import net.minecraft.client.gl.ShaderProgramKeys;
14+
import net.minecraft.client.gl.VertexBuffer;
1315
import net.minecraft.client.gui.DrawContext;
1416
import net.minecraft.client.gui.Element;
1517
import net.minecraft.client.gui.Selectable;
@@ -328,8 +330,13 @@ public void renderList(DrawContext DrawContext, int mouseX, int mouseY, float de
328330

329331
try {
330332
builtBuffer = bufferBuilder.end();
331-
BufferRenderer.drawWithGlobalProgram(builtBuffer);
332-
builtBuffer.close();
333+
334+
try (VertexBuffer vertexBuffer = new VertexBuffer(GlUsage.STATIC_WRITE)) {
335+
vertexBuffer.bind();
336+
vertexBuffer.upload(builtBuffer);
337+
vertexBuffer.draw(RenderSystem.getModelViewMatrix(), RenderSystem.getProjectionMatrix(), RenderSystem.getShader());
338+
builtBuffer.close();
339+
}
333340
} catch (Exception e) {
334341
// Ignored
335342
}
@@ -366,8 +373,13 @@ public void renderScrollBar(BufferBuilder bufferBuilder, Tessellator tessellator
366373
bufferBuilder.vertex(scrollbarStartX, q, 0.0F).color(192, 192, 192, 255);
367374
try {
368375
builtBuffer = bufferBuilder.end();
369-
BufferRenderer.drawWithGlobalProgram(builtBuffer);
370-
builtBuffer.close();
376+
377+
try (VertexBuffer vertexBuffer = new VertexBuffer(GlUsage.STATIC_WRITE)) {
378+
vertexBuffer.bind();
379+
vertexBuffer.upload(builtBuffer);
380+
vertexBuffer.draw(RenderSystem.getModelViewMatrix(), RenderSystem.getProjectionMatrix(), RenderSystem.getShader());
381+
builtBuffer.close();
382+
}
371383
} catch (Exception e) {
372384
// Ignored
373385
}

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

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212
import com.terraformersmc.modmenu.util.mod.ModSearch;
1313
import com.terraformersmc.modmenu.util.mod.fabric.FabricIconHandler;
1414
import net.minecraft.client.MinecraftClient;
15+
import net.minecraft.client.gl.GlUsage;
1516
import net.minecraft.client.gl.ShaderProgramKeys;
17+
import net.minecraft.client.gl.VertexBuffer;
1618
import net.minecraft.client.gui.DrawContext;
1719
import net.minecraft.client.gui.widget.AlwaysSelectedEntryListWidget;
1820
import net.minecraft.client.render.*;
@@ -242,8 +244,13 @@ protected void renderList(DrawContext DrawContext, int mouseX, int mouseY, float
242244
buffer.vertex(matrix, entryLeft, entryTop - 2, 0.0F);
243245
try {
244246
builtBuffer = buffer.end();
245-
BufferRenderer.drawWithGlobalProgram(builtBuffer);
246-
builtBuffer.close();
247+
248+
try (VertexBuffer vertexBuffer = new VertexBuffer(GlUsage.STATIC_WRITE)) {
249+
vertexBuffer.bind();
250+
vertexBuffer.upload(builtBuffer);
251+
vertexBuffer.draw(RenderSystem.getModelViewMatrix(), RenderSystem.getProjectionMatrix(), RenderSystem.getShader());
252+
builtBuffer.close();
253+
}
247254
} catch (Exception e) {
248255
// Ignored
249256
}
@@ -256,8 +263,13 @@ protected void renderList(DrawContext DrawContext, int mouseX, int mouseY, float
256263
buffer.vertex(matrix, entryLeft + 1, entryTop - 1, 0.0F);
257264
try {
258265
builtBuffer = buffer.end();
259-
BufferRenderer.drawWithGlobalProgram(builtBuffer);
260-
builtBuffer.close();
266+
267+
try (VertexBuffer vertexBuffer = new VertexBuffer(GlUsage.STATIC_WRITE)) {
268+
vertexBuffer.bind();
269+
vertexBuffer.upload(builtBuffer);
270+
vertexBuffer.draw(RenderSystem.getModelViewMatrix(), RenderSystem.getProjectionMatrix(), RenderSystem.getShader());
271+
builtBuffer.close();
272+
}
261273
} catch (Exception e) {
262274
// Ignored
263275
}

src/main/resources/fabric.mod.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
"fabric-screen-api-v1": ">=1.0.4",
2525
"fabric-key-binding-api-v1": "*",
2626
"fabric-lifecycle-events-v1": "*",
27-
"fabricloader": ">=0.16.9",
28-
"minecraft": ">=1.21.4-rc.3"
27+
"fabricloader": ">=0.16.10",
28+
"minecraft": ">=1.21.5-alpha.24.6.a"
2929
},
3030
"authors": [
3131
"Prospector",

0 commit comments

Comments
 (0)