Skip to content

Commit 94cb836

Browse files
me4502me4502
committed
Start an attempt at a 1.21.5 update; it appears that MC is now mostly forcing a deferred rendering pipeline, so this'll likely be a lot more work
1 parent 5b39b88 commit 94cb836

File tree

6 files changed

+28
-28
lines changed

6 files changed

+28
-28
lines changed

‎gradle/libs.versions.toml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,23 @@ format = { version = "1.1" }
33

44
[versions]
55
indra = "3.1.3"
6-
minecraft = "1.21.4"
7-
fabricLoader = "0.16.9"
8-
fabricApi = "0.112.2+1.21.4"
6+
minecraft = "1.21.5"
7+
fabricLoader = "0.16.14"
8+
fabricApi = "0.124.0+1.21.5"
99
modmenu = "13.0.0-beta.1"
1010
viafabricplus = "3.3.0"
1111
vineflower = "1.10.1"
1212
cuiProtocol = "4.0.0"
1313

1414
[libraries]
1515
minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" }
16-
parchment = { module = "org.parchmentmc.data:parchment-1.21.4", version = "2024.12.07" }
16+
parchment = { module = "org.parchmentmc.data:parchment-1.21.5", version = "2025.04.19" }
1717
fabric-loader = { module = "net.fabricmc:fabric-loader", version.ref = "fabricLoader" }
1818
fabric-api = { module = "net.fabricmc.fabric-api:fabric-api", version.ref = "fabricApi" }
1919
fabric-api-bom = { module = "net.fabricmc.fabric-api:fabric-api-bom", version.ref = "fabricApi" }
2020
fabric-api-networking = { module = "net.fabricmc.fabric-api:fabric-networking-api-v1" }
2121
modmenu = { module = "com.terraformersmc:modmenu", version.ref = "modmenu" }
22-
neoforge = { module = "net.neoforged:neoforge", version = "21.4.38-beta"}
22+
neoforge = { module = "net.neoforged:neoforge", version = "21.5.63-beta"}
2323
viafabricplus-api = { module = "de.florianmichael:ViaFabricPlus", version.ref = "viafabricplus" }
2424
viaversion = { module = "com.viaversion:viaversion-common", version = "5.0.5" }
2525
vineflower = { module = "org.vineflower:vineflower", version.ref = "vineflower" }
@@ -31,17 +31,17 @@ curseForgeGradle = { id = "net.darkhax.curseforgegradle", version = "1.1.26" }
3131
indra-git = { id = "net.kyori.indra.git", version.ref = "indra" }
3232
indra-spotlessLicenser = { id = "net.kyori.indra.licenser.spotless", version.ref = "indra" }
3333
jvmConflictResolution = { id = "org.gradlex.jvm-dependency-conflict-resolution", version = "2.1.2" }
34-
loom = { id = "dev.architectury.loom", version = "1.9.420" }
34+
loom = { id = "dev.architectury.loom", version = "1.10.430" }
3535
minotaur = { id = "com.modrinth.minotaur", version = "2.8.7" }
3636
publishGithubRelease = { id = "ca.stellardrift.publish-github-release", version = "0.1.0" }
3737
shadow = { id = "com.gradleup.shadow", version = "8.3.5" }
3838
spotless = { id = "com.diffplug.spotless", version = "6.25.0" }
3939
versions = { id = "com.github.ben-manes.versions", version = "0.51.0" }
4040

4141
[libraries.cuiProtocol-fabric]
42-
module = "org.enginehub.worldeditcui-protocol:worldeditcui-protocol-fabric-mc1.21.4"
42+
module = "org.enginehub.worldeditcui-protocol:worldeditcui-protocol-fabric-mc1.21.5"
4343
version.ref = "cuiProtocol"
4444

4545
[libraries.cuiProtocol-neoforge]
46-
module = "org.enginehub.worldeditcui-protocol:worldeditcui-protocol-neoforge-mc1.21.4"
46+
module = "org.enginehub.worldeditcui-protocol:worldeditcui-protocol-neoforge-mc1.21.5"
4747
version.ref = "cuiProtocol"

‎worldeditcui-fabric/src/main/java/org/enginehub/worldeditcui/event/listeners/CUIListenerWorldRender.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
*/
1010
package org.enginehub.worldeditcui.event.listeners;
1111

12-
import com.mojang.blaze3d.platform.GlStateManager;
12+
import com.mojang.blaze3d.platform.DestFactor;
13+
import com.mojang.blaze3d.platform.SourceFactor;
1314
import com.mojang.blaze3d.systems.RenderSystem;
1415
import net.minecraft.client.Minecraft;
1516
import net.minecraft.client.renderer.CompiledShaderProgram;
@@ -104,7 +105,7 @@ public void onRender(final float partialTicks) {
104105
RenderSystem.enableBlend();
105106
// RenderSystem.disableTexture();
106107
RenderSystem.enableDepthTest();
107-
RenderSystem.blendFunc(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA);
108+
RenderSystem.blendFunc(SourceFactor.SRC_ALPHA, DestFactor.ONE_MINUS_SRC_ALPHA);
108109
RenderSystem.depthMask(true);
109110
RenderSystem.lineWidth(LineStyle.DEFAULT_WIDTH);
110111

‎worldeditcui-fabric/src/main/java/org/enginehub/worldeditcui/render/BufferBuilderRenderSink.java‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@
99
*/
1010
package org.enginehub.worldeditcui.render;
1111

12+
import com.mojang.blaze3d.pipeline.RenderPipeline;
1213
import com.mojang.blaze3d.systems.RenderSystem;
1314
import com.mojang.blaze3d.vertex.BufferBuilder;
1415
import com.mojang.blaze3d.vertex.BufferUploader;
1516
import com.mojang.blaze3d.vertex.Tesselator;
1617
import com.mojang.blaze3d.vertex.VertexFormat;
17-
import net.minecraft.client.renderer.ShaderProgram;
18+
import net.minecraft.client.renderer.MultiBufferSource;
1819
import org.jetbrains.annotations.Nullable;
1920
import org.joml.Vector3f;
2021
import org.lwjgl.opengl.GL11;
@@ -228,7 +229,7 @@ public void flush() {
228229
this.preFlush.run();
229230
try {
230231
if (this.activeRenderType != null) {
231-
RenderSystem.setShader(this.activeRenderType.shader);
232+
RenderSystem.setShader(this.activeRenderType.renderPipeline);
232233
}
233234
BufferUploader.drawWithShader(this.builder.buildOrThrow());
234235
} finally {
@@ -269,13 +270,13 @@ public static class RenderType {
269270
private final VertexFormat.Mode mode;
270271
private final VertexFormat format;
271272
private final boolean hasNormals;
272-
private final ShaderProgram shader;
273+
private final RenderPipeline renderPipeline;
273274

274-
public RenderType(final VertexFormat.Mode mode, final VertexFormat format, final ShaderProgram shader) {
275+
public RenderType(final VertexFormat.Mode mode, final VertexFormat format, @Nullable final RenderPipeline renderPipeline) {
275276
this.mode = mode;
276277
this.format = format;
277278
this.hasNormals = format.getElementAttributeNames().contains("Normal");
278-
this.shader = shader;
279+
this.renderPipeline = renderPipeline;
279280
}
280281

281282
VertexFormat.Mode mode() {
@@ -290,8 +291,9 @@ boolean hasNormals() {
290291
return this.hasNormals;
291292
}
292293

293-
ShaderProgram shader() {
294-
return this.shader;
294+
@Nullable
295+
RenderPipeline shader() {
296+
return this.renderPipeline;
295297
}
296298

297299
boolean mustFlushAfter(final RenderType previous) {

‎worldeditcui-fabric/src/main/java/org/enginehub/worldeditcui/render/OptifinePipelineProvider.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
import com.mojang.blaze3d.vertex.DefaultVertexFormat;
1313
import com.mojang.blaze3d.vertex.VertexFormat;
1414
import com.mojang.logging.LogUtils;
15-
import net.minecraft.client.renderer.CoreShaders;
16-
import net.minecraft.client.renderer.GameRenderer;
1715
import org.slf4j.Logger;
1816

1917
import java.lang.invoke.MethodHandle;
@@ -87,9 +85,9 @@ static String activeProgram() {
8785
public static class OptifineTypeFactory implements BufferBuilderRenderSink.TypeFactory {
8886
public static final OptifineTypeFactory INSTANCE = new OptifineTypeFactory();
8987

90-
private static final BufferBuilderRenderSink.RenderType QUADS = new BufferBuilderRenderSink.RenderType(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR, CoreShaders.POSITION_COLOR);
91-
private static final BufferBuilderRenderSink.RenderType LINES = new BufferBuilderRenderSink.RenderType(VertexFormat.Mode.DEBUG_LINES, DefaultVertexFormat.POSITION_COLOR, CoreShaders.POSITION_COLOR);
92-
private static final BufferBuilderRenderSink.RenderType LINES_LOOP = new BufferBuilderRenderSink.RenderType(VertexFormat.Mode.DEBUG_LINES, DefaultVertexFormat.POSITION_COLOR, CoreShaders.POSITION_COLOR);
88+
private static final BufferBuilderRenderSink.RenderType QUADS = new BufferBuilderRenderSink.RenderType(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR, null);
89+
private static final BufferBuilderRenderSink.RenderType LINES = new BufferBuilderRenderSink.RenderType(VertexFormat.Mode.DEBUG_LINES, DefaultVertexFormat.POSITION_COLOR, null);
90+
private static final BufferBuilderRenderSink.RenderType LINES_LOOP = new BufferBuilderRenderSink.RenderType(VertexFormat.Mode.DEBUG_LINES, DefaultVertexFormat.POSITION_COLOR, null);
9391

9492
private OptifineTypeFactory() {}
9593

‎worldeditcui-fabric/src/main/java/org/enginehub/worldeditcui/render/VanillaPipelineProvider.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,16 @@
1111

1212
import com.mojang.blaze3d.vertex.DefaultVertexFormat;
1313
import com.mojang.blaze3d.vertex.VertexFormat;
14-
import net.minecraft.client.renderer.CoreShaders;
15-
import net.minecraft.client.renderer.GameRenderer;
14+
import net.minecraft.client.renderer.RenderPipelines;
1615

1716
public final class VanillaPipelineProvider implements PipelineProvider {
1817

1918
public static class DefaultTypeFactory implements BufferBuilderRenderSink.TypeFactory {
2019
public static final DefaultTypeFactory INSTANCE = new DefaultTypeFactory();
2120

22-
private static final BufferBuilderRenderSink.RenderType QUADS = new BufferBuilderRenderSink.RenderType(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR, CoreShaders.POSITION_COLOR);
23-
private static final BufferBuilderRenderSink.RenderType LINES = new BufferBuilderRenderSink.RenderType(VertexFormat.Mode.LINES, DefaultVertexFormat.POSITION_COLOR_NORMAL, CoreShaders.RENDERTYPE_LINES);
24-
private static final BufferBuilderRenderSink.RenderType LINES_LOOP = new BufferBuilderRenderSink.RenderType(VertexFormat.Mode.LINES, DefaultVertexFormat.POSITION_COLOR_NORMAL, CoreShaders.RENDERTYPE_LINES);
21+
private static final BufferBuilderRenderSink.RenderType QUADS = new BufferBuilderRenderSink.RenderType(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR, null);
22+
private static final BufferBuilderRenderSink.RenderType LINES = new BufferBuilderRenderSink.RenderType(VertexFormat.Mode.LINES, DefaultVertexFormat.POSITION_COLOR_NORMAL, RenderPipelines.LINES);
23+
private static final BufferBuilderRenderSink.RenderType LINES_LOOP = new BufferBuilderRenderSink.RenderType(VertexFormat.Mode.LINES, DefaultVertexFormat.POSITION_COLOR_NORMAL, RenderPipelines.LINES);
2524

2625
private DefaultTypeFactory() {}
2726

‎worldeditcui-fabric/src/main/resources/fabric.mod.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"fabric-lifecycle-events-v1": "^2.0.0",
4343
"fabric-screen-api-v1": ">=1.0.9",
4444
"fabric-resource-loader-v0": ">=0.4.17",
45-
"minecraft": ">=1.21.2"
45+
"minecraft": ">=1.21.5"
4646
},
4747
"suggests": {
4848
"worldedit": ">=7.2.0"

0 commit comments

Comments
 (0)