Skip to content

Commit 09333db

Browse files
zml2008zml2008
committed
initial port to 1.21.2-rc1
1 parent 606f272 commit 09333db

File tree

9 files changed

+35
-32
lines changed

9 files changed

+35
-32
lines changed

‎gradle/libs.versions.toml‎

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

44
[versions]
55
indra = "3.1.3"
6-
minecraft = "1.21.1"
6+
minecraft = "1.21.2-rc1"
77
fabricLoader = "0.16.7"
8-
fabricApi = "0.106.0+1.21.1"
9-
modmenu = "11.0.1"
8+
fabricApi = "0.106.0+1.21.2"
9+
modmenu = "12.0.0-beta.1"
1010
viafabricplus = "3.3.0"
1111
vineflower = "1.10.1"
1212

‎settings.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ sequenceOf(
2323
"fabric",
2424
"protocol-common",
2525
"protocol-fabric",
26-
"protocol-neoforge",
26+
// "protocol-neoforge", // not until release
2727
).forEach {
2828
include("worldeditcui-$it")
2929
}

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

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@
1111

1212
import com.mojang.blaze3d.platform.GlStateManager;
1313
import com.mojang.blaze3d.systems.RenderSystem;
14-
import com.mojang.blaze3d.vertex.PoseStack;
1514
import net.minecraft.client.Minecraft;
16-
import net.minecraft.client.renderer.FogRenderer;
17-
import net.minecraft.client.renderer.ShaderInstance;
15+
import net.minecraft.client.renderer.CompiledShaderProgram;
16+
import net.minecraft.client.renderer.FogParameters;
17+
import net.minecraft.util.profiling.Profiler;
18+
import net.minecraft.util.profiling.ProfilerFiller;
1819
import org.enginehub.worldeditcui.WorldEditCUI;
1920
import org.enginehub.worldeditcui.render.LineStyle;
2021
import org.enginehub.worldeditcui.render.PipelineProvider;
@@ -92,10 +93,11 @@ public void onRender(final float partialTicks) {
9293
// allow ignoring eg. shadow pass
9394
return;
9495
}
95-
Minecraft.getInstance().getProfiler().push("worldeditcui");
96+
final ProfilerFiller profiler = Profiler.get();
97+
profiler.push("worldeditcui");
9698
this.ctx.init(new Vector3(this.minecraft.gameRenderer.getMainCamera().getPosition()), partialTicks, sink);
97-
final float fogStart = RenderSystem.getShaderFogStart();
98-
FogRenderer.setupNoFog();
99+
final FogParameters fogStart = RenderSystem.getShaderFog();
100+
RenderSystem.setShaderFog(FogParameters.NO_FOG);
99101
final Matrix4fStack poseStack = RenderSystem.getModelViewStack();
100102
poseStack.pushMatrix();
101103
RenderSystem.disableCull();
@@ -106,7 +108,7 @@ public void onRender(final float partialTicks) {
106108
RenderSystem.depthMask(true);
107109
RenderSystem.lineWidth(LineStyle.DEFAULT_WIDTH);
108110

109-
final ShaderInstance oldShader = RenderSystem.getShader();
111+
final CompiledShaderProgram oldShader = RenderSystem.getShader();
110112
try {
111113
this.controller.renderSelections(this.ctx);
112114
this.sink.flush();
@@ -116,13 +118,13 @@ public void onRender(final float partialTicks) {
116118
}
117119

118120
RenderSystem.depthFunc(GL32.GL_LEQUAL);
119-
RenderSystem.setShader(() -> oldShader);
121+
RenderSystem.setShader(oldShader);
120122
// RenderSystem.enableTexture();
121123
RenderSystem.disableBlend();
122124
RenderSystem.enableCull();
123125
poseStack.popMatrix();
124-
RenderSystem.setShaderFogStart(fogStart);
125-
Minecraft.getInstance().getProfiler().pop();
126+
RenderSystem.setShaderFog(fogStart);
127+
profiler.pop();
126128
} catch (final Exception ex)
127129
{
128130
this.controller.getDebugger().error("Failed while preparing state for WorldEdit CUI", ex);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public Matrix4fStack matrixStack() {
3737
}
3838

3939
public void applyMatrices() {
40-
RenderSystem.applyModelViewMatrix();
40+
// RenderSystem.applyModelViewMatrix();
4141
}
4242

4343
public float dt() {

‎worldeditcui-fabric/src/main/java/org/enginehub/worldeditcui/fabric/FabricModWorldEditCUI.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public void onInitialize() {
9999
try {
100100
RenderSystem.getModelViewStack().pushMatrix();
101101
RenderSystem.getModelViewStack().mul(ctx.matrixStack().last().pose());
102-
RenderSystem.applyModelViewMatrix();
102+
// RenderSystem.applyModelViewMatrix();
103103
ctx.worldRenderer().getTranslucentTarget().bindWrite(false);
104104
this.onPostRenderEntities(ctx);
105105
} finally {
@@ -113,11 +113,11 @@ public void onInitialize() {
113113
try {
114114
RenderSystem.getModelViewStack().pushMatrix();
115115
RenderSystem.getModelViewStack().mul(ctx.matrixStack().last().pose());
116-
RenderSystem.applyModelViewMatrix();
116+
// RenderSystem.applyModelViewMatrix();
117117
this.onPostRenderEntities(ctx);
118118
} finally {
119119
RenderSystem.getModelViewStack().popMatrix();
120-
RenderSystem.applyModelViewMatrix();
120+
// RenderSystem.applyModelViewMatrix();
121121
}
122122
}
123123
});
@@ -126,7 +126,7 @@ public void onInitialize() {
126126
private void onTick(final Minecraft mc) {
127127
final CUIConfiguration config = this.controller.getConfiguration();
128128
final boolean inGame = mc.player != null;
129-
final boolean clock = mc.getTimer().getGameTimeDeltaPartialTick(false) > 0;
129+
final boolean clock = mc.getDeltaTracker().getGameTimeDeltaPartialTick(false) > 0;
130130

131131
if (inGame && mc.screen == null) {
132132
while (this.keyBindToggleUI.consumeClick()) {

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,13 @@
1414
import com.mojang.blaze3d.vertex.BufferUploader;
1515
import com.mojang.blaze3d.vertex.Tesselator;
1616
import com.mojang.blaze3d.vertex.VertexFormat;
17-
import net.minecraft.client.renderer.ShaderInstance;
17+
import net.minecraft.client.renderer.ShaderProgram;
1818
import org.jetbrains.annotations.Nullable;
1919
import org.joml.Vector3f;
2020
import org.lwjgl.opengl.GL11;
2121
import org.lwjgl.opengl.GL32;
2222

2323
import java.util.Objects;
24-
import java.util.function.Supplier;
2524

2625
public class BufferBuilderRenderSink implements RenderSink {
2726

@@ -270,9 +269,9 @@ public static class RenderType {
270269
private final VertexFormat.Mode mode;
271270
private final VertexFormat format;
272271
private final boolean hasNormals;
273-
private final Supplier<ShaderInstance> shader;
272+
private final ShaderProgram shader;
274273

275-
public RenderType(final VertexFormat.Mode mode, final VertexFormat format, final Supplier<ShaderInstance> shader) {
274+
public RenderType(final VertexFormat.Mode mode, final VertexFormat format, final ShaderProgram shader) {
276275
this.mode = mode;
277276
this.format = format;
278277
this.hasNormals = format.getElementAttributeNames().contains("Normal");
@@ -291,7 +290,7 @@ boolean hasNormals() {
291290
return this.hasNormals;
292291
}
293292

294-
Supplier<ShaderInstance> shader() {
293+
ShaderProgram shader() {
295294
return this.shader;
296295
}
297296

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
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;
1516
import net.minecraft.client.renderer.GameRenderer;
1617
import org.slf4j.Logger;
1718

@@ -86,9 +87,9 @@ static String activeProgram() {
8687
public static class OptifineTypeFactory implements BufferBuilderRenderSink.TypeFactory {
8788
public static final OptifineTypeFactory INSTANCE = new OptifineTypeFactory();
8889

89-
private static final BufferBuilderRenderSink.RenderType QUADS = new BufferBuilderRenderSink.RenderType(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR, GameRenderer::getPositionColorShader);
90-
private static final BufferBuilderRenderSink.RenderType LINES = new BufferBuilderRenderSink.RenderType(VertexFormat.Mode.DEBUG_LINES, DefaultVertexFormat.POSITION_COLOR, GameRenderer::getPositionColorShader);
91-
private static final BufferBuilderRenderSink.RenderType LINES_LOOP = new BufferBuilderRenderSink.RenderType(VertexFormat.Mode.DEBUG_LINES, DefaultVertexFormat.POSITION_COLOR, GameRenderer::getPositionColorShader);
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);
9293

9394
private OptifineTypeFactory() {}
9495

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

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

1212
import com.mojang.blaze3d.vertex.DefaultVertexFormat;
1313
import com.mojang.blaze3d.vertex.VertexFormat;
14+
import net.minecraft.client.renderer.CoreShaders;
1415
import net.minecraft.client.renderer.GameRenderer;
1516

1617
public final class VanillaPipelineProvider implements PipelineProvider {
1718

1819
public static class DefaultTypeFactory implements BufferBuilderRenderSink.TypeFactory {
1920
public static final DefaultTypeFactory INSTANCE = new DefaultTypeFactory();
2021

21-
private static final BufferBuilderRenderSink.RenderType QUADS = new BufferBuilderRenderSink.RenderType(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR, GameRenderer::getPositionColorShader);
22-
private static final BufferBuilderRenderSink.RenderType LINES = new BufferBuilderRenderSink.RenderType(VertexFormat.Mode.LINES, DefaultVertexFormat.POSITION_COLOR_NORMAL, GameRenderer::getRendertypeLinesShader);
23-
private static final BufferBuilderRenderSink.RenderType LINES_LOOP = new BufferBuilderRenderSink.RenderType(VertexFormat.Mode.LINES, DefaultVertexFormat.POSITION_COLOR_NORMAL, GameRenderer::getRendertypeLinesShader);
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);
2425

2526
private DefaultTypeFactory() {}
2627

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@
3434
]
3535
},
3636
"depends": {
37-
"worldeditcui-protocol": "*",
37+
"worldeditcui_protocol": "*",
3838
"fabric-api-base": "*",
3939
"fabric-key-binding-api-v1": "^1.0.0",
4040
"fabric-networking-api-v1": "*",
4141
"fabric-rendering-v1": ">=1.5.0",
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.20.5"
45+
"minecraft": ">=1.21.1"
4646
},
4747
"suggests": {
4848
"worldedit": ">=7.2.0"

0 commit comments

Comments
 (0)