Skip to content

Update for 26.3 #161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
me4502 merged 1 commit into from
Sep 26, 2026
Merged

Update for 26.3 #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ plugins {

allprojects {
group = "org.enginehub.worldeditcui"
version = "${rootProject.libs.versions.minecraft.get()}+04+SNAPSHOT"
version = "${rootProject.libs.versions.minecraft.get()}+01+SNAPSHOT"

repositories {
mavenCentral {
Expand Down
14 changes: 7 additions & 7 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ format = { version = "1.1" }

[versions]
indra = "3.1.3"
minecraft = "26.2"
fabricLoader = "0.19.3"
fabricApi = "0.156.0+26.2"
minecraft = "26.3"
fabricLoader = "0.19.5"
fabricApi = "0.161.0+26.3"
modmenu = "20.0.0-beta.2"
iris = "1.11.2+26.2-fabric"
iris = "1.11.6+26.3-fabric"
viafabricplus = "4.5.1"
vineflower = "1.11.2"
cuiProtocol = "4.0.3"
Expand Down Expand Up @@ -40,13 +40,13 @@ spotless = { id = "com.diffplug.spotless", version = "6.25.0" }
versions = { id = "com.github.ben-manes.versions", version = "0.51.0" }

[libraries.cuiProtocol-common]
module = "org.enginehub.worldeditcui-protocol:worldeditcui-protocol-common-mc26.2"
module = "org.enginehub.worldeditcui-protocol:worldeditcui-protocol-common-mc26.3"
version.ref = "cuiProtocol"

[libraries.cuiProtocol-fabric]
module = "org.enginehub.worldeditcui-protocol:worldeditcui-protocol-fabric-mc26.2"
module = "org.enginehub.worldeditcui-protocol:worldeditcui-protocol-fabric-mc26.3"
version.ref = "cuiProtocol"

[libraries.cuiProtocol-neoforge]
module = "org.enginehub.worldeditcui-protocol:worldeditcui-protocol-neoforge-mc26.2"
module = "org.enginehub.worldeditcui-protocol:worldeditcui-protocol-neoforge-mc26.3"
version.ref = "cuiProtocol"
41 changes: 23 additions & 18 deletions ...bric/src/main/java/org/enginehub/worldeditcui/event/listeners/CUIListenerWorldRender.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@
*/
package org.enginehub.worldeditcui.event.listeners;

import com.mojang.blaze3d.buffers.GpuBufferSlice;
import com.mojang.blaze3d.systems.RenderSystem;
import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.renderpearl.api.buffers.GpuBufferSlice;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.SubmitNodeCollector;
import net.minecraft.client.renderer.fog.FogRenderer;
import net.minecraft.util.profiling.Profiler;
import net.minecraft.util.profiling.ProfilerFiller;
import org.enginehub.worldeditcui.WorldEditCUI;
import org.enginehub.worldeditcui.render.PipelineProvider;
import org.enginehub.worldeditcui.render.RenderSink;
import org.enginehub.worldeditcui.util.Vector3;
import org.joml.Matrix4fStack;

import java.util.HashSet;
import java.util.List;
import java.util.Set;
Expand Down Expand Up @@ -93,7 +93,7 @@ private void invalidatePipeline() {
this.sink = null;
}

public void onRender(final float partialTicks) {
public void onRender(final float partialTicks, final SubmitNodeCollector collector, final PoseStack poseStack) {
try {
final RenderSink sink = this.providePipeline();
if (this.activePipeline != null && !this.activePipeline.shouldRender())
Expand All @@ -103,28 +103,33 @@ public void onRender(final float partialTicks) {
}
final ProfilerFiller profiler = Profiler.get();
profiler.push("worldeditcui");
this.ctx.init(
new Vector3(this.minecraft.gameRenderer.mainCamera().position()),
partialTicks,
sink,
this.controller.getConfiguration().isHideObstructedLines()
);
final GpuBufferSlice fogStart = RenderSystem.getShaderFog();
RenderSystem.setShaderFog(this.minecraft.gameRenderer.fogRenderer.getBuffer(FogRenderer.FogMode.NONE));
final Matrix4fStack poseStack = RenderSystem.getModelViewStack();
poseStack.pushMatrix();

boolean posePushed = false;
try {
this.ctx.init(
new Vector3(this.minecraft.gameRenderer.mainCamera().position()),
partialTicks,
sink,
this.controller.getConfiguration().isHideObstructedLines(),
poseStack
);
this.ctx.beginFrame(collector, poseStack);
RenderSystem.setShaderFog(this.minecraft.gameRenderer.fogRenderer.getBuffer(FogRenderer.FogMode.NONE));
poseStack.pushPose();
posePushed = true;
this.controller.renderSelections(this.ctx);
this.sink.flush();
} catch (final Exception e) {
this.controller.getDebugger().error("Error while attempting to render WorldEdit CUI", e);
this.invalidatePipeline();
} finally {
if (posePushed) {
poseStack.popPose();
}
RenderSystem.setShaderFog(fogStart);
this.ctx.reset();
profiler.pop();
}

poseStack.popMatrix();
RenderSystem.setShaderFog(fogStart);
profiler.pop();
} catch (final Exception ex)
{
this.controller.getDebugger().error("Failed while preparing state for WorldEdit CUI", ex);
Expand Down
22 changes: 13 additions & 9 deletions ...cui-fabric/src/main/java/org/enginehub/worldeditcui/event/listeners/CUIRenderContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
*/
package org.enginehub.worldeditcui.event.listeners;

import com.mojang.blaze3d.systems.RenderSystem;
import com.mojang.blaze3d.vertex.PoseStack;
import net.minecraft.client.renderer.SubmitNodeCollector;
import org.enginehub.worldeditcui.config.Colour;
import org.enginehub.worldeditcui.render.LineStyle;
import org.enginehub.worldeditcui.render.RenderSink;
import org.enginehub.worldeditcui.render.RenderStyle;
import org.enginehub.worldeditcui.util.Vector3;
import org.joml.Matrix4fStack;

import java.util.function.Consumer;

Expand All @@ -28,17 +28,14 @@ public final class CUIRenderContext implements RenderSink {
private float dt;
private RenderSink delegateSink;
private boolean hideObstructedLines;
private PoseStack poseStack;

public Vector3 cameraPos() {
return this.cameraPos;
}

public Matrix4fStack matrixStack() {
return RenderSystem.getModelViewStack();
}

public void applyMatrices() {
// RenderSystem.applyModelViewMatrix();
public PoseStack poseStack() {
return this.poseStack;
}

public float dt() {
Expand All @@ -55,11 +52,12 @@ public void withCameraAt(final Vector3 pos, final Consumer<CUIRenderContext> act
}
}

void init(final Vector3 cameraPos, final float dt, final RenderSink sink, final boolean hideObstructedLines) {
void init(final Vector3 cameraPos, final float dt, final RenderSink sink, final boolean hideObstructedLines, final PoseStack poseStack) {
this.cameraPos = cameraPos;
this.dt = dt;
this.delegateSink = sink;
this.hideObstructedLines = hideObstructedLines;
this.poseStack = poseStack;
}

/**
Expand All @@ -69,10 +67,16 @@ void reset() {
this.cameraPos = null;
this.delegateSink = null;
this.hideObstructedLines = false;
this.poseStack = null;
}

// RenderSink delegation

@Override
public void beginFrame(final SubmitNodeCollector collector, final PoseStack poseStack) {
this.delegateSink.beginFrame(collector, poseStack);
}

@Override
public CUIRenderContext color(final float r, final float g, final float b, final float alpha) {
this.delegateSink.color(r, g, b, alpha);
Expand Down
21 changes: 6 additions & 15 deletions ...editcui-fabric/src/main/java/org/enginehub/worldeditcui/fabric/FabricModWorldEditCUI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*/
package org.enginehub.worldeditcui.fabric;

import com.mojang.blaze3d.systems.RenderSystem;
import com.mojang.blaze3d.platform.InputConstants;
import net.fabricmc.api.ModInitializer;
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
Expand All @@ -34,7 +34,6 @@
import org.enginehub.worldeditcui.protocol.CUIPacketHandler;
import org.enginehub.worldeditcui.render.PipelineProvider;
import org.enginehub.worldeditcui.render.VanillaPipelineProvider;
import org.lwjgl.glfw.GLFW;
import org.spongepowered.asm.mixin.MixinEnvironment;

import java.util.List;
Expand All @@ -53,9 +52,9 @@ public final class FabricModWorldEditCUI implements ModInitializer {
private static final KeyMapping.Category KEYBIND_CATEGORY_WECUI
= new KeyMapping.Category(Identifier.fromNamespaceAndPath(MOD_ID, "general"));

private final KeyMapping keyBindToggleUI = key("toggle", GLFW.GLFW_KEY_UNKNOWN);
private final KeyMapping keyBindClearSel = key("clear", GLFW.GLFW_KEY_UNKNOWN);
private final KeyMapping keyBindChunkBorder = key("chunk", GLFW.GLFW_KEY_UNKNOWN);
private final KeyMapping keyBindToggleUI = key("toggle", InputConstants.UNKNOWN.getValue());
private final KeyMapping keyBindClearSel = key("clear", InputConstants.UNKNOWN.getValue());
private final KeyMapping keyBindChunkBorder = key("chunk", InputConstants.UNKNOWN.getValue());

private static final List<PipelineProvider> RENDER_PIPELINES = List.of(
new VanillaPipelineProvider()
Expand Down Expand Up @@ -104,15 +103,7 @@ public void onInitialize() {
this.onEndExtraction(ctx);
});
LevelRenderEvents.END_MAIN.register(ctx -> {
try {
RenderSystem.getModelViewStack().pushMatrix();
RenderSystem.getModelViewStack().mul(ctx.poseStack().last().pose());
// RenderSystem.applyModelViewMatrix();
this.onPostRenderEntities(ctx);
} finally {
RenderSystem.getModelViewStack().popMatrix();
// RenderSystem.applyModelViewMatrix();
}
this.onPostRenderEntities(ctx);
});
}

Expand Down Expand Up @@ -191,7 +182,7 @@ private void onEndExtraction(final LevelExtractionContext ctx) {

public void onPostRenderEntities(final LevelRenderContext ctx) {
if (this.visible) {
this.worldRenderListener.onRender(lastPartialTicks);
this.worldRenderListener.onRender(lastPartialTicks, ctx.submitNodeCollector(), ctx.poseStack());
}
}

Expand Down
Loading
Loading