chore: bump 26.3 to snapshot-4

GLFW → SDL

Author: MattSturgeon

common/src/main/java/net/xolt/freecam/config/ModBindings.java

@@ -14,14 +14,14 @@
 import java.util.stream.Stream;
 
 import static net.xolt.freecam.config.keys.FreecamKeyMappingBuilder.builder;
-import static org.lwjgl.glfw.GLFW.GLFW_KEY_F4;
+import static org.lwjgl.sdl.SDLScancode.SDL_SCANCODE_F4;
 
 public enum ModBindings {
 
     KEY_TOGGLE(() -> builder("toggle")
             .action(Freecam::toggle)
             .holdAction(Freecam::activateTripodHandler)
-            .defaultKey(GLFW_KEY_F4)
+            .defaultKey(SDL_SCANCODE_F4)
             .build()),
     KEY_CONTROL_PLAYER(() -> builder("controlPlayer.toggle")
             .action(Freecam::switchControls)

common/src/main/java/net/xolt/freecam/config/keys/FreecamKeyMappingBuilder.java

@@ -2,12 +2,12 @@
 
 import com.mojang.blaze3d.platform.InputConstants;
 
-import static org.lwjgl.glfw.GLFW.GLFW_KEY_UNKNOWN;
+import static org.lwjgl.sdl.SDLScancode.SDL_SCANCODE_UNKNOWN;
 
 public class FreecamKeyMappingBuilder {
     private final String translationKey;
-    private InputConstants.Type type = InputConstants.Type.KEYSYM;
-    private int keyCode = GLFW_KEY_UNKNOWN;
+    private InputConstants.Type type = InputConstants.Type.KEYBOARD;
+    private int keyCode = SDL_SCANCODE_UNKNOWN;
     private Runnable action;
     private HoldAction holdAction;
     private long maxTicks = 10;

common/src/main/java/net/xolt/freecam/tripod/TripodSlot.java

@@ -1,6 +1,6 @@
 package net.xolt.freecam.tripod;
 
-import static org.lwjgl.glfw.GLFW.GLFW_KEY_0;
+import static org.lwjgl.sdl.SDLScancode.SDL_SCANCODE_0;
 
 public enum TripodSlot {
     NONE, ONE, TWO, THREE, FOUR, FIVE, SIX, SEVEN, EIGHT, NINE;
@@ -25,7 +25,7 @@ public static TripodSlot valueOf(int number) throws IndexOutOfBoundsException {
     }
 
     public static TripodSlot ofKeyCode(int keyCode) {
-        int number = keyCode - GLFW_KEY_0;
+        int number = keyCode - SDL_SCANCODE_0;
         return inRange(number) ? valueOfUnsafe(number) : NONE;
     }
 

common/src/main/java/net/xolt/freecam/util/FreeCamera.java

@@ -191,7 +191,11 @@ public MobEffectInstance getEffect(@NotNull Holder<MobEffect> effect) {
     // Prevents pistons from moving FreeCamera when collision.ignoreAll is enabled.
     @Override
     public @NotNull PushReaction getPistonPushReaction() {
-        return ModConfig.get().ignoreAllCollision() ? PushReaction.IGNORE : PushReaction.NORMAL;
+        if (ModConfig.get().ignoreAllCollision()) {
+            //~ if >=26.3-0 IGNORE -> IGNORE_ENTITY
+            return PushReaction.IGNORE_ENTITY;
+        }
+        return super.getPistonPushReaction();
     }
 
     // Prevents collision with solid entities (shulkers, boats)

fabric/build.gradle.kts

@@ -58,8 +58,13 @@ dependencies {
         exclude(module = "fabric-loader")
     }
 
-    modImplementation("com.terraformersmc:modmenu:${meta.deps["modmenu"]}") {
+    create("com.terraformersmc:modmenu:${meta.deps["modmenu"]}") {
         exclude(module = "fabric-loader")
+    }.let {
+        // FIXME: compile only until a 26.3 build is available
+        // Consider fetching via JitPack
+        if (sc.current.parsed >= "26.3-0") modCompileOnly(it)
+        else modImplementation(it)
     }
 
     sc.node.sibling("cloth-config")?.let {

stonecutter.gradle.kts

@@ -65,6 +65,11 @@ stonecutter parameters {
     }
 
     replacements {
+        string(current.parsed >= "26.3-0") {
+            replace("InputConstants.Type.KEYSYM", "InputConstants.Type.KEYBOARD")
+            replace("org.lwjgl.glfw.GLFW.GLFW_KEY_", "org.lwjgl.sdl.SDLScancode.SDL_SCANCODE_")
+            replace("GLFW_KEY_", "SDL_SCANCODE_")
+        }
         string(current.parsed >= "26.2") {
             replace("renderHandsWithItems", "submitHandsWithItems")
         }

stonecutter.properties.toml

@@ -13,7 +13,7 @@
 # Fabric: https://fabricmc.net/develop
 # NeoForge: https://projects.neoforged.net/neoforged/neoforge
 # Cloth Config: https://maven.shedaniel.me/me/shedaniel/cloth/cloth-config-fabric
-# ModMenu: https://maven.terraformersmc.com/releases/com/terraformersmc/modmenu
+# ModMenu: https://maven.terraformersmc.com/#browse/browse:maven-terraformers:com%2Fterraformersmc%2Fmodmenu
 
 
 [relationship]
@@ -33,9 +33,10 @@ reqs.mc = "26.3.x-0"
 
 deps.cloth = "26.2.155"
 reqs.cloth = "~26.3"
+# TODO: https://github.com/TerraformersMC/ModMenu/pull/1054
 deps.modmenu = "20.0.1"
 
-deps.fabric_api = "0.154.3+26.3"
+deps.fabric_api = "0.155.1+26.3"
 reqs.fabric_loader = ">=0.18.0"
 
 deps.neoforge_pr = ""

stonecutter.settings.toml

@@ -6,7 +6,7 @@ vcs = "26.3"
 
 # Gradle projects to build for the corresponding Minecraft version.
 [versions]
-"26.3:26.3-snapshot-3" = ["common", "fabric"]
+"26.3:26.3-snapshot-4" = ["common", "fabric"]
 "26.2" = ["cloth-config", "common", "fabric", "neoforge"]
 "26.1:26.1.2" = ["cloth-config", "common", "fabric", "neoforge"]
 "1.21.11" = ["cloth-config", "common", "fabric", "neoforge"]