Skip to content

1.21.2/1.21.3 #123

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

Open
wants to merge 2 commits into
base: mc/1.21
Choose a base branch
from
Open

1.21.2/1.21.3 #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
daf161d
initial port to 1.21.2-rc1
zml2008 Oct 20, 2024
89b6810
1.21.3 release
zml2008 Oct 28, 2024
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
12 changes: 6 additions & 6 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ format = { version = "1.1" }

[versions]
indra = "3.1.3"
minecraft = "1.21.1"
minecraft = "1.21.3"
fabricLoader = "0.16.7"
fabricApi = "0.106.0+1.21.1"
modmenu = "11.0.1"
fabricApi = "0.106.1+1.21.3"
modmenu = "12.0.0-beta.1"
viafabricplus = "3.3.0"
vineflower = "1.10.1"
cuiProtocol = "4.0.0"
Expand All @@ -19,7 +19,7 @@ fabric-api = { module = "net.fabricmc.fabric-api:fabric-api", version.ref = "fab
fabric-api-bom = { module = "net.fabricmc.fabric-api:fabric-api-bom", version.ref = "fabricApi" }
fabric-api-networking = { module = "net.fabricmc.fabric-api:fabric-networking-api-v1" }
modmenu = { module = "com.terraformersmc:modmenu", version.ref = "modmenu" }
neoforge = { module = "net.neoforged:neoforge", version = "21.1.72"}
neoforge = { module = "net.neoforged:neoforge", version = "21.3.3-beta"}
viafabricplus-api = { module = "de.florianmichael:ViaFabricPlus", version.ref = "viafabricplus" }
viaversion = { module = "com.viaversion:viaversion-common", version = "5.0.5" }
vineflower = { module = "org.vineflower:vineflower", version.ref = "vineflower" }
Expand All @@ -39,9 +39,9 @@ spotless = { id = "com.diffplug.spotless", version = "6.25.0" }
versions = { id = "com.github.ben-manes.versions", version = "0.51.0" }

[libraries.cuiProtocol-fabric]
module = "org.enginehub.worldeditcui-protocol:worldeditcui-protocol-fabric-mc1.21.1"
module = "org.enginehub.worldeditcui-protocol:worldeditcui-protocol-fabric-mc1.21.3"
version.ref = "cuiProtocol"

[libraries.cuiProtocol-neoforge]
module = "org.enginehub.worldeditcui-protocol:worldeditcui-protocol-neoforge-mc1.21.1"
module = "org.enginehub.worldeditcui-protocol:worldeditcui-protocol-neoforge-mc1.21.3"
version.ref = "cuiProtocol"
22 changes: 12 additions & 10 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 @@ -11,10 +11,11 @@

import com.mojang.blaze3d.platform.GlStateManager;
import com.mojang.blaze3d.systems.RenderSystem;
import com.mojang.blaze3d.vertex.PoseStack;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.FogRenderer;
import net.minecraft.client.renderer.ShaderInstance;
import net.minecraft.client.renderer.CompiledShaderProgram;
import net.minecraft.client.renderer.FogParameters;
import net.minecraft.util.profiling.Profiler;
import net.minecraft.util.profiling.ProfilerFiller;
import org.enginehub.worldeditcui.WorldEditCUI;
import org.enginehub.worldeditcui.render.LineStyle;
import org.enginehub.worldeditcui.render.PipelineProvider;
Expand Down Expand Up @@ -92,10 +93,11 @@ public void onRender(final float partialTicks) {
// allow ignoring eg. shadow pass
return;
}
Minecraft.getInstance().getProfiler().push("worldeditcui");
final ProfilerFiller profiler = Profiler.get();
profiler.push("worldeditcui");
this.ctx.init(new Vector3(this.minecraft.gameRenderer.getMainCamera().getPosition()), partialTicks, sink);
final float fogStart = RenderSystem.getShaderFogStart();
FogRenderer.setupNoFog();
final FogParameters fogStart = RenderSystem.getShaderFog();
RenderSystem.setShaderFog(FogParameters.NO_FOG);
final Matrix4fStack poseStack = RenderSystem.getModelViewStack();
poseStack.pushMatrix();
RenderSystem.disableCull();
Expand All @@ -106,7 +108,7 @@ public void onRender(final float partialTicks) {
RenderSystem.depthMask(true);
RenderSystem.lineWidth(LineStyle.DEFAULT_WIDTH);

final ShaderInstance oldShader = RenderSystem.getShader();
final CompiledShaderProgram oldShader = RenderSystem.getShader();
try {
this.controller.renderSelections(this.ctx);
this.sink.flush();
Expand All @@ -116,13 +118,13 @@ public void onRender(final float partialTicks) {
}

RenderSystem.depthFunc(GL32.GL_LEQUAL);
RenderSystem.setShader(() -> oldShader);
RenderSystem.setShader(oldShader);
// RenderSystem.enableTexture();
RenderSystem.disableBlend();
RenderSystem.enableCull();
poseStack.popMatrix();
RenderSystem.setShaderFogStart(fogStart);
Minecraft.getInstance().getProfiler().pop();
RenderSystem.setShaderFog(fogStart);
profiler.pop();
} catch (final Exception ex)
{
this.controller.getDebugger().error("Failed while preparing state for WorldEdit CUI", ex);
Expand Down
2 changes: 1 addition & 1 deletion ...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 @@ -37,7 +37,7 @@ public Matrix4fStack matrixStack() {
}

public void applyMatrices() {
RenderSystem.applyModelViewMatrix();
// RenderSystem.applyModelViewMatrix();
}

public float dt() {
Expand Down
8 changes: 4 additions & 4 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 @@ -99,7 +99,7 @@ public void onInitialize() {
try {
RenderSystem.getModelViewStack().pushMatrix();
RenderSystem.getModelViewStack().mul(ctx.matrixStack().last().pose());
RenderSystem.applyModelViewMatrix();
// RenderSystem.applyModelViewMatrix();
ctx.worldRenderer().getTranslucentTarget().bindWrite(false);
this.onPostRenderEntities(ctx);
} finally {
Expand All @@ -113,11 +113,11 @@ public void onInitialize() {
try {
RenderSystem.getModelViewStack().pushMatrix();
RenderSystem.getModelViewStack().mul(ctx.matrixStack().last().pose());
RenderSystem.applyModelViewMatrix();
// RenderSystem.applyModelViewMatrix();
this.onPostRenderEntities(ctx);
} finally {
RenderSystem.getModelViewStack().popMatrix();
RenderSystem.applyModelViewMatrix();
// RenderSystem.applyModelViewMatrix();
}
}
});
Expand All @@ -126,7 +126,7 @@ public void onInitialize() {
private void onTick(final Minecraft mc) {
final CUIConfiguration config = this.controller.getConfiguration();
final boolean inGame = mc.player != null;
final boolean clock = mc.getTimer().getGameTimeDeltaPartialTick(false) > 0;
final boolean clock = mc.getDeltaTracker().getGameTimeDeltaPartialTick(false) > 0;

if (inGame && mc.screen == null) {
while (this.keyBindToggleUI.consumeClick()) {
Expand Down
9 changes: 4 additions & 5 deletions ...itcui-fabric/src/main/java/org/enginehub/worldeditcui/render/BufferBuilderRenderSink.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,13 @@
import com.mojang.blaze3d.vertex.BufferUploader;
import com.mojang.blaze3d.vertex.Tesselator;
import com.mojang.blaze3d.vertex.VertexFormat;
import net.minecraft.client.renderer.ShaderInstance;
import net.minecraft.client.renderer.ShaderProgram;
import org.jetbrains.annotations.Nullable;
import org.joml.Vector3f;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL32;

import java.util.Objects;
import java.util.function.Supplier;

public class BufferBuilderRenderSink implements RenderSink {

Expand Down Expand Up @@ -270,9 +269,9 @@ public static class RenderType {
private final VertexFormat.Mode mode;
private final VertexFormat format;
private final boolean hasNormals;
private final Supplier<ShaderInstance> shader;
private final ShaderProgram shader;

public RenderType(final VertexFormat.Mode mode, final VertexFormat format, final Supplier<ShaderInstance> shader) {
public RenderType(final VertexFormat.Mode mode, final VertexFormat format, final ShaderProgram shader) {
this.mode = mode;
this.format = format;
this.hasNormals = format.getElementAttributeNames().contains("Normal");
Expand All @@ -291,7 +290,7 @@ boolean hasNormals() {
return this.hasNormals;
}

Supplier<ShaderInstance> shader() {
ShaderProgram shader() {
return this.shader;
}

Expand Down
7 changes: 4 additions & 3 deletions ...tcui-fabric/src/main/java/org/enginehub/worldeditcui/render/OptifinePipelineProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import com.mojang.blaze3d.vertex.DefaultVertexFormat;
import com.mojang.blaze3d.vertex.VertexFormat;
import com.mojang.logging.LogUtils;
import net.minecraft.client.renderer.CoreShaders;
import net.minecraft.client.renderer.GameRenderer;
import org.slf4j.Logger;

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

private static final BufferBuilderRenderSink.RenderType QUADS = new BufferBuilderRenderSink.RenderType(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR, GameRenderer::getPositionColorShader);
private static final BufferBuilderRenderSink.RenderType LINES = new BufferBuilderRenderSink.RenderType(VertexFormat.Mode.DEBUG_LINES, DefaultVertexFormat.POSITION_COLOR, GameRenderer::getPositionColorShader);
private static final BufferBuilderRenderSink.RenderType LINES_LOOP = new BufferBuilderRenderSink.RenderType(VertexFormat.Mode.DEBUG_LINES, DefaultVertexFormat.POSITION_COLOR, GameRenderer::getPositionColorShader);
private static final BufferBuilderRenderSink.RenderType QUADS = new BufferBuilderRenderSink.RenderType(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR, CoreShaders.POSITION_COLOR);
private static final BufferBuilderRenderSink.RenderType LINES = new BufferBuilderRenderSink.RenderType(VertexFormat.Mode.DEBUG_LINES, DefaultVertexFormat.POSITION_COLOR, CoreShaders.POSITION_COLOR);
private static final BufferBuilderRenderSink.RenderType LINES_LOOP = new BufferBuilderRenderSink.RenderType(VertexFormat.Mode.DEBUG_LINES, DefaultVertexFormat.POSITION_COLOR, CoreShaders.POSITION_COLOR);

private OptifineTypeFactory() {}

Expand Down
7 changes: 4 additions & 3 deletions ...itcui-fabric/src/main/java/org/enginehub/worldeditcui/render/VanillaPipelineProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,17 @@

import com.mojang.blaze3d.vertex.DefaultVertexFormat;
import com.mojang.blaze3d.vertex.VertexFormat;
import net.minecraft.client.renderer.CoreShaders;
import net.minecraft.client.renderer.GameRenderer;

public final class VanillaPipelineProvider implements PipelineProvider {

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

private static final BufferBuilderRenderSink.RenderType QUADS = new BufferBuilderRenderSink.RenderType(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR, GameRenderer::getPositionColorShader);
private static final BufferBuilderRenderSink.RenderType LINES = new BufferBuilderRenderSink.RenderType(VertexFormat.Mode.LINES, DefaultVertexFormat.POSITION_COLOR_NORMAL, GameRenderer::getRendertypeLinesShader);
private static final BufferBuilderRenderSink.RenderType LINES_LOOP = new BufferBuilderRenderSink.RenderType(VertexFormat.Mode.LINES, DefaultVertexFormat.POSITION_COLOR_NORMAL, GameRenderer::getRendertypeLinesShader);
private static final BufferBuilderRenderSink.RenderType QUADS = new BufferBuilderRenderSink.RenderType(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR, CoreShaders.POSITION_COLOR);
private static final BufferBuilderRenderSink.RenderType LINES = new BufferBuilderRenderSink.RenderType(VertexFormat.Mode.LINES, DefaultVertexFormat.POSITION_COLOR_NORMAL, CoreShaders.RENDERTYPE_LINES);
private static final BufferBuilderRenderSink.RenderType LINES_LOOP = new BufferBuilderRenderSink.RenderType(VertexFormat.Mode.LINES, DefaultVertexFormat.POSITION_COLOR_NORMAL, CoreShaders.RENDERTYPE_LINES);

private DefaultTypeFactory() {}

Expand Down
2 changes: 1 addition & 1 deletion worldeditcui-fabric/src/main/resources/fabric.mod.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"fabric-lifecycle-events-v1": "^2.0.0",
"fabric-screen-api-v1": ">=1.0.9",
"fabric-resource-loader-v0": ">=0.4.17",
"minecraft": ">=1.20.5"
"minecraft": ">=1.21.2"
},
"suggests": {
"worldedit": ">=7.2.0"
Expand Down
Loading