Skip to content

Commit 563d326

Browse files
me4502me4502
committed
Early 1.21.11 work; WIP
1 parent 75a104d commit 563d326

6 files changed

Lines changed: 36 additions & 32 deletions

File tree

‎build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ plugins {
1010

1111
allprojects {
1212
group = "org.enginehub.worldeditcui"
13-
version = "${rootProject.libs.versions.minecraft.get()}+02-SNAPSHOT"
13+
version = "${rootProject.libs.versions.minecraft.get()}+01-SNAPSHOT"
1414

1515
repositories {
1616
// mirrors:

‎gradle/libs.versions.toml‎

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

44
[versions]
55
indra = "3.1.3"
6-
minecraft = "1.21.10"
7-
fabricLoader = "0.17.3"
8-
fabricApi = "0.138.0+1.21.10"
6+
minecraft = "1.21.11"
7+
fabricLoader = "0.18.3"
8+
fabricApi = "0.140.0+1.21.11"
99
modmenu = "16.0.0-rc.1"
1010
viafabricplus = "3.3.0"
1111
vineflower = "1.10.1"
1212
cuiProtocol = "4.0.2"
1313

1414
[libraries]
1515
minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" }
16-
parchment = { module = "org.parchmentmc.data:parchment-1.21.9", version = "2025.10.05" }
16+
parchment = { module = "org.parchmentmc.data:parchment-1.21.10", version = "2025.10.12" }
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" }
@@ -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.11.454" }
34+
loom = { id = "dev.architectury.loom", version = "1.13.463" }
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.9"
42+
module = "org.enginehub.worldeditcui-protocol:worldeditcui-protocol-fabric-mc1.21.11"
4343
version.ref = "cuiProtocol"
4444

4545
[libraries.cuiProtocol-neoforge]
46-
module = "org.enginehub.worldeditcui-protocol:worldeditcui-protocol-neoforge-mc1.21.9"
46+
module = "org.enginehub.worldeditcui-protocol:worldeditcui-protocol-neoforge-mc1.21.11"
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
@@ -20,6 +20,7 @@
2020
import net.minecraft.util.profiling.Profiler;
2121
import net.minecraft.util.profiling.ProfilerFiller;
2222
import org.enginehub.worldeditcui.WorldEditCUI;
23+
import org.enginehub.worldeditcui.render.BufferBuilderRenderSink;
2324
import org.enginehub.worldeditcui.render.LineStyle;
2425
import org.enginehub.worldeditcui.render.PipelineProvider;
2526
import org.enginehub.worldeditcui.render.RenderSink;
@@ -98,7 +99,7 @@ public void onRender(final float partialTicks) {
9899
}
99100
final ProfilerFiller profiler = Profiler.get();
100101
profiler.push("worldeditcui");
101-
this.ctx.init(new Vector3(this.minecraft.gameRenderer.getMainCamera().getPosition()), partialTicks, sink);
102+
this.ctx.init(new Vector3(this.minecraft.gameRenderer.getMainCamera().position()), partialTicks, sink);
102103
final GpuBufferSlice fogStart = RenderSystem.getShaderFog();
103104
RenderSystem.setShaderFog(this.minecraft.gameRenderer.fogRenderer.getBuffer(FogRenderer.FogMode.NONE));
104105
final Matrix4fStack poseStack = RenderSystem.getModelViewStack();
@@ -113,7 +114,7 @@ public void onRender(final float partialTicks) {
113114
GlConst.toGl(SourceFactor.SRC_ALPHA),
114115
GlConst.toGl(DestFactor.ONE_MINUS_SRC_ALPHA));
115116
GlStateManager._depthMask(true);
116-
RenderSystem.lineWidth(LineStyle.DEFAULT_WIDTH);
117+
BufferBuilderRenderSink.LineWidth.set(LineStyle.DEFAULT_WIDTH);
117118

118119
try {
119120
this.controller.renderSelections(this.ctx);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import net.minecraft.client.Minecraft;
2323
import net.minecraft.client.multiplayer.ClientPacketListener;
2424
import net.minecraft.client.player.LocalPlayer;
25-
import net.minecraft.resources.ResourceLocation;
25+
import net.minecraft.resources.Identifier;
2626
import net.minecraft.world.level.Level;
2727
import org.enginehub.worldeditcui.WorldEditCUI;
2828
import org.enginehub.worldeditcui.config.CUIConfiguration;
@@ -50,7 +50,7 @@ public final class FabricModWorldEditCUI implements ModInitializer {
5050
private static FabricModWorldEditCUI instance;
5151

5252
private static final KeyMapping.Category KEYBIND_CATEGORY_WECUI
53-
= new KeyMapping.Category(ResourceLocation.fromNamespaceAndPath(MOD_ID, "general"));
53+
= new KeyMapping.Category(Identifier.fromNamespaceAndPath(MOD_ID, "general"));
5454

5555
private final KeyMapping keyBindToggleUI = key("toggle", GLFW.GLFW_KEY_UNKNOWN);
5656
private final KeyMapping keyBindClearSel = key("clear", GLFW.GLFW_KEY_UNKNOWN);

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
package org.enginehub.worldeditcui.render;
1111

1212
import com.mojang.blaze3d.opengl.GlStateManager;
13-
import com.mojang.blaze3d.pipeline.RenderPipeline;
1413
import com.mojang.blaze3d.systems.RenderSystem;
1514
import com.mojang.blaze3d.vertex.BufferBuilder;
1615
import com.mojang.blaze3d.vertex.Tesselator;
@@ -29,7 +28,7 @@ public class BufferBuilderRenderSink implements RenderSink {
2928
private final RenderType quads;
3029
private final Runnable preFlush;
3130
private final Runnable postFlush;
32-
private BufferBuilder builder;
31+
private static BufferBuilder builder;
3332
private @Nullable BufferBuilderRenderSink.RenderType activeRenderType;
3433
private boolean active;
3534
private boolean canFlush;
@@ -54,18 +53,19 @@ public BufferBuilderRenderSink(final TypeFactory types, final Runnable preFlush,
5453
this.postFlush = postFlush;
5554
}
5655

57-
static class LineWidth {
56+
public static class LineWidth {
5857
private static final boolean HAS_COMPATIBILITY = (GL11.glGetInteger(GL32.GL_CONTEXT_PROFILE_MASK) & GL32.GL_CONTEXT_COMPATIBILITY_PROFILE_BIT) != 0;
5958
private static float lineWidth = GL11.glGetInteger(GL11.GL_LINE_WIDTH);
6059

61-
static void set(final float width) {
60+
public static void set(final float width) {
6261
if (HAS_COMPATIBILITY) {
6362
if (lineWidth != width) {
6463
GL11.glLineWidth(width);
6564
lineWidth = width;
6665
}
6766
}
68-
RenderSystem.lineWidth(width);
67+
68+
builder.setLineWidth(width);
6969
}
7070

7171
}
@@ -267,9 +267,9 @@ public static class RenderType {
267267
private final VertexFormat.Mode mode;
268268
private final VertexFormat format;
269269
private final boolean hasNormals;
270-
private final net.minecraft.client.renderer.RenderType type;
270+
private final net.minecraft.client.renderer.rendertype.RenderType type;
271271

272-
public RenderType(final VertexFormat.Mode mode, final VertexFormat format, @Nullable final net.minecraft.client.renderer.RenderType renderPipeline) {
272+
public RenderType(final VertexFormat.Mode mode, final VertexFormat format, @Nullable final net.minecraft.client.renderer.rendertype.RenderType renderPipeline) {
273273
this.mode = mode;
274274
this.format = format;
275275
this.hasNormals = format.getElementAttributeNames().contains("Normal");

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

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,25 +14,28 @@
1414
import com.mojang.blaze3d.vertex.DefaultVertexFormat;
1515
import com.mojang.blaze3d.vertex.VertexFormat;
1616
import net.minecraft.client.renderer.RenderPipelines;
17-
import net.minecraft.client.renderer.RenderType;
17+
import net.minecraft.client.renderer.rendertype.RenderSetup;
18+
import net.minecraft.client.renderer.rendertype.RenderType;
19+
import net.minecraft.client.renderer.rendertype.RenderTypes;
1820

1921
public final class VanillaPipelineProvider implements PipelineProvider {
2022

2123
public static class DefaultTypeFactory implements BufferBuilderRenderSink.TypeFactory {
2224
public static final DefaultTypeFactory INSTANCE = new DefaultTypeFactory();
25+
private static final RenderSetup QUADS_SETUP = RenderSetup.builder(
26+
RenderPipeline.builder(RenderPipeline.builder(RenderPipelines.MATRICES_PROJECTION_SNIPPET)
27+
.withVertexShader("core/position_color")
28+
.withFragmentShader("core/position_color")
29+
.withBlend(BlendFunction.TRANSLUCENT)
30+
.withVertexFormat(DefaultVertexFormat.POSITION_COLOR, VertexFormat.Mode.QUADS)
31+
.buildSnippet())
32+
.withLocation("pipeline/wecui_quads").withCull(false).build()
33+
).bufferSize(1536).sortOnUpload().createRenderSetup();
2334
private static final BufferBuilderRenderSink.RenderType QUADS = new BufferBuilderRenderSink.RenderType(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR,
24-
RenderType.create("quads", 1536, false, true,
25-
RenderPipeline.builder(RenderPipeline.builder(RenderPipelines.MATRICES_PROJECTION_SNIPPET)
26-
.withVertexShader("core/position_color")
27-
.withFragmentShader("core/position_color")
28-
.withBlend(BlendFunction.TRANSLUCENT)
29-
.withVertexFormat(DefaultVertexFormat.POSITION_COLOR, VertexFormat.Mode.QUADS)
30-
.buildSnippet())
31-
.withLocation("pipeline/wecui_quads").withCull(false).build(),
32-
RenderType.CompositeState.builder().createCompositeState(false)
33-
));
34-
private static final BufferBuilderRenderSink.RenderType LINES = new BufferBuilderRenderSink.RenderType(VertexFormat.Mode.LINES, DefaultVertexFormat.POSITION_COLOR_NORMAL, RenderType.LINES);
35-
private static final BufferBuilderRenderSink.RenderType LINES_LOOP = new BufferBuilderRenderSink.RenderType(VertexFormat.Mode.LINES, DefaultVertexFormat.POSITION_COLOR_NORMAL, RenderType.LINES);
35+
RenderType.create("quads", QUADS_SETUP)
36+
);
37+
private static final BufferBuilderRenderSink.RenderType LINES = new BufferBuilderRenderSink.RenderType(VertexFormat.Mode.LINES, DefaultVertexFormat.POSITION_COLOR_NORMAL, RenderTypes.LINES);
38+
private static final BufferBuilderRenderSink.RenderType LINES_LOOP = new BufferBuilderRenderSink.RenderType(VertexFormat.Mode.LINES, DefaultVertexFormat.POSITION_COLOR_NORMAL, RenderTypes.LINES);
3639

3740
private DefaultTypeFactory() {}
3841

0 commit comments

Comments
 (0)