Skip to content

Commit 7504981

Browse files
me4502me4502
authored
Minecraft 26.2 (#157)
* Initial 26.2 work * Update fabric mod json version ranges
1 parent 8523387 commit 7504981

18 files changed

Lines changed: 109 additions & 708 deletions

‎build.gradle.kts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@ allprojects {
1313
version = "${rootProject.libs.versions.minecraft.get()}+01"
1414

1515
repositories {
16+
mavenCentral {
17+
name = "MavenCentralLWJGL"
18+
mavenContent {
19+
includeGroup("org.lwjgl")
20+
}
21+
}
1622
// mirrors:
1723
// - https://maven.minecraftforge.net/
1824
// - https://maven.neoforged.net/

‎gradle/libs.versions.toml‎

Lines changed: 8 additions & 8 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 = "26.1.1"
7-
fabricLoader = "0.18.6"
8-
fabricApi = "0.145.4+26.1.1"
9-
modmenu = "18.0.0-alpha.8"
6+
minecraft = "26.2"
7+
fabricLoader = "0.19.3"
8+
fabricApi = "0.152.1+26.2"
9+
modmenu = "20.0.0-beta.2"
1010
viafabricplus = "4.5.1"
1111
vineflower = "1.11.2"
1212
cuiProtocol = "4.0.3"
@@ -30,21 +30,21 @@ curseForgeGradle = { id = "net.darkhax.curseforgegradle", version = "1.1.26" }
3030
indra-git = { id = "net.kyori.indra.git", version.ref = "indra" }
3131
indra-spotlessLicenser = { id = "net.kyori.indra.licenser.spotless", version.ref = "indra" }
3232
jvmConflictResolution = { id = "org.gradlex.jvm-dependency-conflict-resolution", version = "2.1.2" }
33-
loom = { id = "dev.architectury.loom-no-remap", version = "1.14.471" }
33+
loom = { id = "dev.architectury.loom-no-remap", version = "1.14.476" }
3434
minotaur = { id = "com.modrinth.minotaur", version = "2.8.7" }
3535
publishGithubRelease = { id = "ca.stellardrift.publish-github-release", version = "0.1.0" }
3636
shadow = { id = "com.gradleup.shadow", version = "8.3.5" }
3737
spotless = { id = "com.diffplug.spotless", version = "6.25.0" }
3838
versions = { id = "com.github.ben-manes.versions", version = "0.51.0" }
3939

4040
[libraries.cuiProtocol-common]
41-
module = "org.enginehub.worldeditcui-protocol:worldeditcui-protocol-common-mc26.1"
41+
module = "org.enginehub.worldeditcui-protocol:worldeditcui-protocol-common-mc26.2"
4242
version.ref = "cuiProtocol"
4343

4444
[libraries.cuiProtocol-fabric]
45-
module = "org.enginehub.worldeditcui-protocol:worldeditcui-protocol-fabric-mc26.1"
45+
module = "org.enginehub.worldeditcui-protocol:worldeditcui-protocol-fabric-mc26.2"
4646
version.ref = "cuiProtocol"
4747

4848
[libraries.cuiProtocol-neoforge]
49-
module = "org.enginehub.worldeditcui-protocol:worldeditcui-protocol-neoforge-mc26.1"
49+
module = "org.enginehub.worldeditcui-protocol:worldeditcui-protocol-neoforge-mc26.2"
5050
version.ref = "cuiProtocol"

‎gradle/wrapper/gradle-wrapper.jar‎

2.23 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
44
networkTimeout=10000
5+
retries=0
6+
retryBackOffMs=500
57
validateDistributionUrl=true
68
zipStoreBase=GRADLE_USER_HOME
79
zipStorePath=wrapper/dists

‎gradlew‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎gradlew.bat‎

Lines changed: 10 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎worldeditcui-fabric/src/main/java/org/enginehub/worldeditcui/config/CUIConfiguration.java‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ public void write(
8080

8181
private boolean debugMode = false;
8282
private boolean promiscuous = false;
83-
private boolean compatibilityRenderer = false;
8483
private boolean clearAllOnKey = false;
8584

8685
private Colour cuboidGridColor = ConfiguredColour.CUBOIDGRID.getDefault();
@@ -136,10 +135,6 @@ public void setPromiscuous(boolean promiscuous) {
136135
this.promiscuous = promiscuous;
137136
}
138137

139-
public boolean isExperimentalRenderer() {
140-
return this.compatibilityRenderer;
141-
}
142-
143138
public boolean isClearAllOnKey() {
144139
return this.clearAllOnKey;
145140
}
@@ -172,7 +167,6 @@ public static CUIConfiguration create() {
172167

173168
configArray.put("debugMode", config.debugMode);
174169
configArray.put("promiscuous", config.promiscuous);
175-
configArray.put("compatibilityRenderer", config.compatibilityRenderer);
176170
configArray.put("clearAllOnKey", config.clearAllOnKey);
177171

178172
configArray.put("cuboidGridColor", config.cuboidGridColor);
@@ -208,7 +202,6 @@ public Map<String, Object> getConfigArray() {
208202
public void configChanged() {
209203
debugMode = (Boolean) configArray.get("debugMode");
210204
promiscuous = (Boolean) configArray.get("promiscuous");
211-
compatibilityRenderer = (Boolean) configArray.get("compatibilityRenderer");
212205
clearAllOnKey = (Boolean) configArray.get("clearAllOnKey");
213206

214207
cuboidGridColor = (Colour) configArray.get("cuboidGridColor");
@@ -230,7 +223,7 @@ public void configChanged() {
230223

231224
public Object getDefaultValue(String text) {
232225
return switch (text) {
233-
case "debugMode", "promiscuous", "compatibilityRenderer", "clearAllOnKey" -> false;
226+
case "debugMode", "promiscuous", "clearAllOnKey" -> false;
234227
case "cuboidGridColor" -> ConfiguredColour.CUBOIDGRID.getDefault();
235228
case "cuboidEdgeColor" -> ConfiguredColour.CUBOIDBOX.getDefault();
236229
case "cuboidFirstPointColor" -> ConfiguredColour.CUBOIDPOINT1.getDefault();
@@ -272,7 +265,6 @@ public Object getDefaultValue(String text) {
272265
return switch (text) {
273266
case "debugMode" -> "worldeditcui.options.debugMode";
274267
case "promiscuous" -> "worldeditcui.options.compat.spammy";
275-
case "compatibilityRenderer" -> "worldeditcui.options.compat.renderer";
276268
case "clearAllOnKey" -> "worldeditcui.options.extra.clearall";
277269
case "cuboidGridColor" -> "worldeditcui.color.cuboidgrid";
278270
case "cuboidEdgeColor" -> "worldeditcui.color.cuboidedge";

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

Lines changed: 5 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,16 @@
1010
package org.enginehub.worldeditcui.event.listeners;
1111

1212
import com.mojang.blaze3d.buffers.GpuBufferSlice;
13-
import com.mojang.blaze3d.opengl.GlStateManager;
1413
import com.mojang.blaze3d.systems.RenderSystem;
1514
import net.minecraft.client.Minecraft;
1615
import net.minecraft.client.renderer.fog.FogRenderer;
1716
import net.minecraft.util.profiling.Profiler;
1817
import net.minecraft.util.profiling.ProfilerFiller;
1918
import org.enginehub.worldeditcui.WorldEditCUI;
20-
import org.enginehub.worldeditcui.config.CUIConfiguration;
21-
import org.enginehub.worldeditcui.render.BufferBuilderRenderSink;
22-
import org.enginehub.worldeditcui.render.LineStyle;
2319
import org.enginehub.worldeditcui.render.PipelineProvider;
2420
import org.enginehub.worldeditcui.render.RenderSink;
2521
import org.enginehub.worldeditcui.util.Vector3;
2622
import org.joml.Matrix4fStack;
27-
import org.lwjgl.opengl.GL32;
2823

2924
import java.util.HashSet;
3025
import java.util.List;
@@ -42,41 +37,31 @@ public class CUIListenerWorldRender
4237
private final WorldEditCUI controller;
4338

4439
private final Minecraft minecraft;
45-
private final CUIConfiguration configuration;
4640
private final CUIRenderContext ctx = new CUIRenderContext();
4741
private final List<PipelineProvider> pipelines;
4842
private final Set<String> disabledPipelines = new HashSet<>();
49-
private boolean experimentalRendererSelected;
5043
private PipelineProvider activePipeline;
5144
private RenderSink sink;
5245

53-
public CUIListenerWorldRender(final WorldEditCUI controller, final Minecraft minecraft, final CUIConfiguration configuration, final List<PipelineProvider> pipelines)
46+
public CUIListenerWorldRender(final WorldEditCUI controller, final Minecraft minecraft, final List<PipelineProvider> pipelines)
5447
{
5548
this.controller = controller;
5649
this.minecraft = minecraft;
57-
this.configuration = configuration;
5850
this.pipelines = List.copyOf(pipelines);
59-
this.experimentalRendererSelected = configuration.isExperimentalRenderer();
6051
}
6152

6253
private RenderSink providePipeline()
6354
{
64-
final boolean useExperimentalRenderer = this.configuration.isExperimentalRenderer();
65-
final PipelineProvider preferred = preferredPipeline();
66-
if (useExperimentalRenderer != this.experimentalRendererSelected) {
67-
this.experimentalRendererSelected = useExperimentalRenderer;
68-
this.disabledPipelines.clear();
69-
this.activePipeline = null;
70-
this.sink = null;
71-
} else if (this.sink != null && this.activePipeline != null
55+
final PipelineProvider preferred = this.pipelines.getFirst();
56+
if (this.sink != null && this.activePipeline != null
7257
&& (this.activePipeline == preferred || !preferred.available() || this.disabledPipelines.contains(preferred.id()))) {
7358
return this.sink;
7459
} else if (this.sink != null && this.activePipeline != null && this.disabledPipelines.contains(this.activePipeline.id())) {
7560
this.activePipeline = null;
7661
this.sink = null;
7762
}
7863

79-
for (final PipelineProvider pipeline : orderedPipelines())
64+
for (final PipelineProvider pipeline : this.pipelines)
8065
{
8166
if (this.disabledPipelines.contains(pipeline.id())) {
8267
continue;
@@ -108,34 +93,6 @@ private void invalidatePipeline() {
10893
this.sink = null;
10994
}
11095

111-
private PipelineProvider preferredPipeline() {
112-
return pipelineById(this.configuration.isExperimentalRenderer() ? "vanilla" : "legacy-vanilla");
113-
}
114-
115-
private List<PipelineProvider> orderedPipelines() {
116-
if (this.configuration.isExperimentalRenderer()) {
117-
return List.of(
118-
pipelineById("vanilla"),
119-
pipelineById("legacy-vanilla"),
120-
pipelineById("optifine")
121-
);
122-
}
123-
return List.of(
124-
pipelineById("legacy-vanilla"),
125-
pipelineById("optifine"),
126-
pipelineById("vanilla")
127-
);
128-
}
129-
130-
private PipelineProvider pipelineById(final String id) {
131-
for (final PipelineProvider pipeline : this.pipelines) {
132-
if (pipeline.id().equals(id)) {
133-
return pipeline;
134-
}
135-
}
136-
throw new IllegalStateException("Missing pipeline provider " + id);
137-
}
138-
13996
public void onRender(final float partialTicks) {
14097
try {
14198
final RenderSink sink = this.providePipeline();
@@ -146,19 +103,11 @@ public void onRender(final float partialTicks) {
146103
}
147104
final ProfilerFiller profiler = Profiler.get();
148105
profiler.push("worldeditcui");
149-
this.ctx.init(new Vector3(this.minecraft.gameRenderer.getMainCamera().position()), partialTicks, sink);
106+
this.ctx.init(new Vector3(this.minecraft.gameRenderer.mainCamera().position()), partialTicks, sink);
150107
final GpuBufferSlice fogStart = RenderSystem.getShaderFog();
151108
RenderSystem.setShaderFog(this.minecraft.gameRenderer.fogRenderer.getBuffer(FogRenderer.FogMode.NONE));
152109
final Matrix4fStack poseStack = RenderSystem.getModelViewStack();
153-
final boolean legacySink = sink instanceof BufferBuilderRenderSink;
154110
poseStack.pushMatrix();
155-
if (legacySink) {
156-
GlStateManager._enableBlend();
157-
// RenderSystem.disableTexture();
158-
GlStateManager._enableDepthTest();
159-
GlStateManager._depthMask(true);
160-
BufferBuilderRenderSink.LineWidth.set(LineStyle.DEFAULT_WIDTH);
161-
}
162111

163112
try {
164113
this.controller.renderSelections(this.ctx);
@@ -168,11 +117,6 @@ public void onRender(final float partialTicks) {
168117
this.invalidatePipeline();
169118
}
170119

171-
if (legacySink) {
172-
GlStateManager._depthFunc(GL32.GL_LEQUAL);
173-
// RenderSystem.enableTexture();
174-
GlStateManager._disableBlend();
175-
}
176120
poseStack.popMatrix();
177121
RenderSystem.setShaderFog(fogStart);
178122
profiler.pop();

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,8 @@
2929
import org.enginehub.worldeditcui.config.CUIConfiguration;
3030
import org.enginehub.worldeditcui.event.listeners.CUIListenerChannel;
3131
import org.enginehub.worldeditcui.event.listeners.CUIListenerWorldRender;
32-
import org.enginehub.worldeditcui.render.LegacyVanillaPipelineProvider;
3332
import org.enginehub.worldeditcui.protocol.CUIPacket;
3433
import org.enginehub.worldeditcui.protocol.CUIPacketHandler;
35-
import org.enginehub.worldeditcui.render.OptifinePipelineProvider;
3634
import org.enginehub.worldeditcui.render.PipelineProvider;
3735
import org.enginehub.worldeditcui.render.VanillaPipelineProvider;
3836
import org.lwjgl.glfw.GLFW;
@@ -59,8 +57,6 @@ public final class FabricModWorldEditCUI implements ModInitializer {
5957
private final KeyMapping keyBindChunkBorder = key("chunk", GLFW.GLFW_KEY_UNKNOWN);
6058

6159
private static final List<PipelineProvider> RENDER_PIPELINES = List.of(
62-
new OptifinePipelineProvider(),
63-
new LegacyVanillaPipelineProvider(),
6460
new VanillaPipelineProvider()
6561
);
6662

@@ -124,7 +120,7 @@ private void onTick(final Minecraft mc) {
124120
final boolean inGame = mc.player != null;
125121
final boolean clock = mc.getDeltaTracker().getGameTimeDeltaPartialTick(false) > 0;
126122

127-
if (inGame && mc.screen == null) {
123+
if (inGame && mc.gui.screen() == null) {
128124
while (this.keyBindToggleUI.consumeClick()) {
129125
this.visible = !this.visible;
130126
}
@@ -178,7 +174,7 @@ private void onPluginMessage(final CUIPacket payload, final CUIPacketHandler.Pac
178174
public void onGameInitDone(final Minecraft client) {
179175
this.controller = new WorldEditCUI();
180176
this.controller.initialise(client);
181-
this.worldRenderListener = new CUIListenerWorldRender(this.controller, client, this.controller.getConfiguration(), RENDER_PIPELINES);
177+
this.worldRenderListener = new CUIListenerWorldRender(this.controller, client, RENDER_PIPELINES);
182178
this.channelListener = new CUIListenerChannel(this.controller);
183179
}
184180

‎worldeditcui-fabric/src/main/java/org/enginehub/worldeditcui/gui/CUIConfigPanel.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ protected void init() {
4343
this.addRenderableWidget(Button.builder(CommonComponents.GUI_DONE, (button) -> {
4444
configuration.configChanged();
4545
assert minecraft != null;
46-
this.minecraft.setScreen(parent);
46+
this.minecraft.gui.setScreen(parent);
4747
}).bounds((this.width - BUTTON_DONE_WIDTH) / 2, this.height - (BUTTON_HEIGHT + 7), BUTTON_DONE_WIDTH, BUTTON_HEIGHT).build());
4848

4949
this.configList = CUIConfigList.create(this, this.minecraft);

0 commit comments

Comments
 (0)