From a5430e0f72ba4f43dcdb6a51f0c3f9d600283393 Mon Sep 17 00:00:00 2001 From: Vasco Garcia Date: Sat, 20 Jun 2026 18:43:14 +0100 Subject: [PATCH 1/2] wip: update to 26.2 --- build.gradle.kts | 6 +++--- common/src/main/java/com/vsngarcia/Config.java | 12 ++++++------ fabric/src/main/resources/fabric.mod.json | 6 +++--- gradle.properties | 12 ++++++------ gradle/wrapper/gradle-wrapper.properties | 2 +- neoforge/build.gradle.kts | 12 ++++++++---- .../main/resources/META-INF/accesstransformer.cfg | 2 -- .../src/main/resources/META-INF/neoforge.mods.toml | 4 ++-- 8 files changed, 29 insertions(+), 27 deletions(-) delete mode 100644 neoforge/src/main/resources/META-INF/accesstransformer.cfg diff --git a/build.gradle.kts b/build.gradle.kts index 5a44509..a6328c0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("dev.architectury.loom-no-remap") version "1.14-SNAPSHOT" apply false + id("dev.architectury.loom-no-remap") version "1.17-SNAPSHOT" apply false id("architectury-plugin") version "3.5-SNAPSHOT" id("com.gradleup.shadow") version "9.4.1" apply false } @@ -48,8 +48,8 @@ subprojects { "minecraft"("net.minecraft:minecraft:${property("minecraft_version")}") } - tasks.withType().configureEach { - options.release = 25 + configure { + toolchain.languageVersion = JavaLanguageVersion.of(25) } if (project.name != "common") { diff --git a/common/src/main/java/com/vsngarcia/Config.java b/common/src/main/java/com/vsngarcia/Config.java index 2dcc4c7..b56d1c5 100644 --- a/common/src/main/java/com/vsngarcia/Config.java +++ b/common/src/main/java/com/vsngarcia/Config.java @@ -23,7 +23,7 @@ public static class CommonGeneral { builder.push("General"); sameColor = builder - .comment("Should elevators have the same color in order to teleport ?") + .comment("Should elevators have the same color in order to teleport?") .define("sameColor", false); range = builder @@ -35,24 +35,24 @@ public static class CommonGeneral { .defineInRange("activationRange", 6, 1, 64); precisionTarget = builder - .comment("Realign players to the center of elevator ?") + .comment("Realign players to the center of elevator?") .define("precisionTarget", true); mobSpawn = builder .worldRestart() - .comment("Can mobs spawn on elevators ?") + .comment("Can mobs spawn on elevators?") .define("mobSpawn", false); resetPitchNormal = builder - .comment("Reset pitch to 0 when teleporting to normal elevators ?") + .comment("Reset pitch to 0 when teleporting to normal elevators?") .define("resetPitchNormal", false); resetPitchDirectional = builder - .comment("Reset pitch to 0 when teleporting to directional elevators ?") + .comment("Reset pitch to 0 when teleporting to directional elevators?") .define("resetPitchDirectional", true); useXP = builder - .comment("Should teleporting require XP ?") + .comment("Should teleporting require XP?") .define("useXP", false); XPPointsAmount = builder diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index 68c688c..3c59999 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -26,10 +26,10 @@ "elevatorid.mixins.json" ], "depends": { - "fabricloader": ">=0.18.0", - "minecraft": "~26.1", + "fabricloader": ">=0.19.0", + "minecraft": "~26.2", "java": ">=25", "fabric-api": "*", - "forgeconfigapiport": ">=26.1.0.0" + "forgeconfigapiport": ">=26.2.0.0" } } diff --git a/gradle.properties b/gradle.properties index 23a247f..21df4f4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,17 +2,17 @@ org.gradle.jvmargs=-Xmx2G org.gradle.parallel=true org.gradle.caching=true -minecraft_version=26.1.1 +minecraft_version=26.2 # Mod properties -mod_version=26.1.1-1.16.3 +mod_version=26.2-1.16.4 maven_group=com.vsngarcia archives_name=elevatorid enabled_platforms=fabric,neoforge # Dependencies -fabric_loader_version=0.18.6 -fabric_api_version=0.145.3+26.1.1 -neoforge_version=26.1.1.1-beta +fabric_loader_version=0.19.3 +fabric_api_version=0.152.2+26.2 +neoforge_version=26.2.0.6-beta -forge_config_api_port_version=26.1.3 +forge_config_api_port_version=26.2.0 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c04f8a9..be1db2c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Fri Mar 27 19:53:55 WET 2026 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/neoforge/build.gradle.kts b/neoforge/build.gradle.kts index 2c885b2..ce5d95c 100644 --- a/neoforge/build.gradle.kts +++ b/neoforge/build.gradle.kts @@ -1,7 +1,6 @@ -// TODO: Maintaining AT for now -//loom { -// accessWidenerPath = project(":common").loom.accessWidenerPath -//} +loom { + accessWidenerPath = project(":common").loom.accessWidenerPath +} architectury { platformSetupLoomIde() @@ -33,3 +32,8 @@ tasks.processResources { expand("version" to project.version) } } + +loom.neoForge.convertAccessWideners( + tasks.named("shadowJar"), + project(":common").loom.accessWidenerPath.get().asFile.name +) diff --git a/neoforge/src/main/resources/META-INF/accesstransformer.cfg b/neoforge/src/main/resources/META-INF/accesstransformer.cfg deleted file mode 100644 index 48a42a8..0000000 --- a/neoforge/src/main/resources/META-INF/accesstransformer.cfg +++ /dev/null @@ -1,2 +0,0 @@ -# TODO: Temporarily maintain ClassTweaker for Fabric and AccessTransformer for NeoForge -public net.minecraft.client.gui.components.Checkbox selected diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml index b28011c..aa9e4ca 100644 --- a/neoforge/src/main/resources/META-INF/neoforge.mods.toml +++ b/neoforge/src/main/resources/META-INF/neoforge.mods.toml @@ -15,14 +15,14 @@ description = '''Simple port of the elevator from OpenBlocks to 1.8+''' [[dependencies.elevatorid]] modId = "neoforge" type = "required" -versionRange = "[26.1.0.1-beta,)" +versionRange = "[26.2.0.0-beta,)" ordering = "NONE" side = "BOTH" [[dependencies.elevatorid]] modId = "minecraft" type = "required" -versionRange = "[26.1,)" +versionRange = "[26.2,)" ordering = "NONE" side = "BOTH" From 8094b598b4281040b3bb9c1cac9398273cb1c837 Mon Sep 17 00:00:00 2001 From: Vasco Garcia Date: Sat, 20 Jun 2026 19:25:15 +0100 Subject: [PATCH 2/2] fix(i18n): wrong key in `en_gb.json` --- common/src/main/resources/assets/elevatorid/lang/en_gb.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/main/resources/assets/elevatorid/lang/en_gb.json b/common/src/main/resources/assets/elevatorid/lang/en_gb.json index fc586cf..2df0ffe 100644 --- a/common/src/main/resources/assets/elevatorid/lang/en_gb.json +++ b/common/src/main/resources/assets/elevatorid/lang/en_gb.json @@ -1,5 +1,5 @@ { - "block.Liftid.elevator_white": "White Lift", + "block.elevatorid.elevator_white": "White Lift", "block.elevatorid.elevator_black": "Black Lift", "block.elevatorid.elevator_blue": "Blue Lift", "block.elevatorid.elevator_brown": "Brown Lift",