Update mod to Minecraft snapshot 25w06a (#828)

- Updated to 25w06a
TerraformersMC · Feb 12, 2025 · 521f7af · 521f7af
1 parent 1de07a2
commit 521f7af
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 16 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -3,10 +3,10 @@ org.gradle.jvmargs=-Xmx1G
 maven_group=com.terraformersmc
 archive_name=modmenu
 
-minecraft_version=1.21.4
-yarn_mappings=1.21.4+build.7
-loader_version=0.16.9
-fabric_version=0.114.0+1.21.4
+minecraft_version=25w06a
+yarn_mappings=25w06a+build.1
+loader_version=0.16.10
+fabric_version=0.115.3+1.21.5
 text_placeholder_api_version=2.5.1+1.21.3
 quilt_loader_version=0.26.4
 
@@ -21,14 +21,14 @@ default_release_type=stable
 # Modrinth Metadata
 modrinth_slug=modmenu
 modrinth_id=mOgUt4GM
-modrinth_game_versions=1.21.4
+modrinth_game_versions=25w06a
 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.4, Fabric, Quilt
+curseforge_game_versions=1.21.5-Snapshot, Fabric, Quilt
 curseforge_required_dependencies=fabric-api, text-placeholder-api
 curseforge_optional_dependencies=
 

diff --git a/src/main/java/com/terraformersmc/modmenu/gui/widget/DescriptionListWidget.java b/src/main/java/com/terraformersmc/modmenu/gui/widget/DescriptionListWidget.java
@@ -9,7 +9,9 @@
 import com.terraformersmc.modmenu.util.mod.Mod;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
+import net.minecraft.client.gl.GlUsage;
 import net.minecraft.client.gl.ShaderProgramKeys;
+import net.minecraft.client.gl.VertexBuffer;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.Element;
 import net.minecraft.client.gui.Selectable;
@@ -328,8 +330,13 @@ public void renderList(DrawContext DrawContext, int mouseX, int mouseY, float de
 
 		try {
 			builtBuffer = bufferBuilder.end();
-			BufferRenderer.drawWithGlobalProgram(builtBuffer);
-			builtBuffer.close();
+
+			try (VertexBuffer vertexBuffer = new VertexBuffer(GlUsage.STATIC_WRITE)) {
+				vertexBuffer.bind();
+				vertexBuffer.upload(builtBuffer);
+				vertexBuffer.draw(RenderSystem.getModelViewMatrix(), RenderSystem.getProjectionMatrix(), RenderSystem.getShader());
+				builtBuffer.close();
+			}
 		} catch (Exception e) {
 			// Ignored
 		}
@@ -366,8 +373,13 @@ public void renderScrollBar(BufferBuilder bufferBuilder, Tessellator tessellator
 			bufferBuilder.vertex(scrollbarStartX, q, 0.0F).color(192, 192, 192, 255);
 			try {
 				builtBuffer = bufferBuilder.end();
-				BufferRenderer.drawWithGlobalProgram(builtBuffer);
-				builtBuffer.close();
+
+				try (VertexBuffer vertexBuffer = new VertexBuffer(GlUsage.STATIC_WRITE)) {
+					vertexBuffer.bind();
+					vertexBuffer.upload(builtBuffer);
+					vertexBuffer.draw(RenderSystem.getModelViewMatrix(), RenderSystem.getProjectionMatrix(), RenderSystem.getShader());
+					builtBuffer.close();
+				}
 			} catch (Exception e) {
 				// Ignored
 			}

diff --git a/src/main/java/com/terraformersmc/modmenu/gui/widget/ModListWidget.java b/src/main/java/com/terraformersmc/modmenu/gui/widget/ModListWidget.java
@@ -12,7 +12,9 @@
 import com.terraformersmc.modmenu.util.mod.ModSearch;
 import com.terraformersmc.modmenu.util.mod.fabric.FabricIconHandler;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gl.GlUsage;
 import net.minecraft.client.gl.ShaderProgramKeys;
+import net.minecraft.client.gl.VertexBuffer;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.widget.AlwaysSelectedEntryListWidget;
 import net.minecraft.client.render.*;
@@ -242,8 +244,13 @@ protected void renderList(DrawContext DrawContext, int mouseX, int mouseY, float
 					buffer.vertex(matrix, entryLeft, entryTop - 2, 0.0F);
 					try {
 						builtBuffer = buffer.end();
-						BufferRenderer.drawWithGlobalProgram(builtBuffer);
-						builtBuffer.close();
+
+						try (VertexBuffer vertexBuffer = new VertexBuffer(GlUsage.STATIC_WRITE)) {
+							vertexBuffer.bind();
+							vertexBuffer.upload(builtBuffer);
+							vertexBuffer.draw(RenderSystem.getModelViewMatrix(), RenderSystem.getProjectionMatrix(), RenderSystem.getShader());
+							builtBuffer.close();
+						}
 					} catch (Exception e) {
 						// Ignored
 					}
@@ -256,8 +263,13 @@ protected void renderList(DrawContext DrawContext, int mouseX, int mouseY, float
 					buffer.vertex(matrix, entryLeft + 1, entryTop - 1, 0.0F);
 					try {
 						builtBuffer = buffer.end();
-						BufferRenderer.drawWithGlobalProgram(builtBuffer);
-						builtBuffer.close();
+
+						try (VertexBuffer vertexBuffer = new VertexBuffer(GlUsage.STATIC_WRITE)) {
+							vertexBuffer.bind();
+							vertexBuffer.upload(builtBuffer);
+							vertexBuffer.draw(RenderSystem.getModelViewMatrix(), RenderSystem.getProjectionMatrix(), RenderSystem.getShader());
+							builtBuffer.close();
+						}
 					} catch (Exception e) {
 						// Ignored
 					}

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -24,8 +24,8 @@
     "fabric-screen-api-v1": ">=1.0.4",
     "fabric-key-binding-api-v1": "*",
     "fabric-lifecycle-events-v1": "*",
-    "fabricloader": ">=0.16.9",
-    "minecraft": ">=1.21.4-rc.3"
+    "fabricloader": ">=0.16.10",
+    "minecraft": ">=1.21.5-alpha.24.6.a"
   },
   "authors": [
     "Prospector",