From 3612d9cf9bf5287d600d29c05a6713d9124d3e77 Mon Sep 17 00:00:00 2001 From: Eclipse Date: Tue, 30 Sep 2025 17:39:41 +0000 Subject: [PATCH] Update/fix bootstraps, target new mappings --- .../mod/fabric/src/main/resources/fabric.mod.json | 4 ++-- .../platform/neoforge/GeyserNeoForgeBootstrap.java | 2 +- .../platform/neoforge/GeyserNeoForgeDumpInfo.java | 10 +++++----- .../platform/neoforge/GeyserNeoForgePlatform.java | 3 +-- .../geyser/platform/neoforge/PermissionUtils.java | 2 +- .../src/main/resources/META-INF/neoforge.mods.toml | 4 ++-- core/src/main/resources/mappings | 2 +- gradle/libs.versions.toml | 6 +++--- settings.gradle.kts | 4 ++-- 9 files changed, 18 insertions(+), 19 deletions(-) diff --git a/bootstrap/mod/fabric/src/main/resources/fabric.mod.json b/bootstrap/mod/fabric/src/main/resources/fabric.mod.json index 69071cea4..b042bb252 100644 --- a/bootstrap/mod/fabric/src/main/resources/fabric.mod.json +++ b/bootstrap/mod/fabric/src/main/resources/fabric.mod.json @@ -23,8 +23,8 @@ "geyser.mixins.json" ], "depends": { - "fabricloader": ">=0.16.7", + "fabricloader": ">=0.17.2", "fabric-api": "*", - "minecraft": ">=1.21.6" + "minecraft": ">=1.21.9" } } diff --git a/bootstrap/mod/neoforge/src/main/java/org/geysermc/geyser/platform/neoforge/GeyserNeoForgeBootstrap.java b/bootstrap/mod/neoforge/src/main/java/org/geysermc/geyser/platform/neoforge/GeyserNeoForgeBootstrap.java index aa731befc..803a06b6e 100644 --- a/bootstrap/mod/neoforge/src/main/java/org/geysermc/geyser/platform/neoforge/GeyserNeoForgeBootstrap.java +++ b/bootstrap/mod/neoforge/src/main/java/org/geysermc/geyser/platform/neoforge/GeyserNeoForgeBootstrap.java @@ -111,7 +111,7 @@ public class GeyserNeoForgeBootstrap extends GeyserModBootstrap { @Override public boolean isServer() { - return FMLLoader.getDist().isDedicatedServer(); + return FMLLoader.getCurrent().getDist().isDedicatedServer(); } private void onPermissionGather(PermissionGatherEvent.Nodes event) { diff --git a/bootstrap/mod/neoforge/src/main/java/org/geysermc/geyser/platform/neoforge/GeyserNeoForgeDumpInfo.java b/bootstrap/mod/neoforge/src/main/java/org/geysermc/geyser/platform/neoforge/GeyserNeoForgeDumpInfo.java index 623f68d3a..ae6b306ed 100644 --- a/bootstrap/mod/neoforge/src/main/java/org/geysermc/geyser/platform/neoforge/GeyserNeoForgeDumpInfo.java +++ b/bootstrap/mod/neoforge/src/main/java/org/geysermc/geyser/platform/neoforge/GeyserNeoForgeDumpInfo.java @@ -54,10 +54,10 @@ public class GeyserNeoForgeDumpInfo extends BootstrapDumpInfo { private final List mods; public GeyserNeoForgeDumpInfo(MinecraftServer server) { - this.platformName = FMLLoader.launcherHandlerName(); - this.platformVersion = FMLLoader.versionInfo().neoForgeVersion(); - this.minecraftVersion = FMLLoader.versionInfo().mcVersion(); - this.dist = FMLLoader.getDist(); + this.platformName = /*FMLLoader.getCurrent().launcherHandlerName()*/""; // TODO 1.21.9 FIXME + this.platformVersion = FMLLoader.getCurrent().getVersionInfo().neoForgeVersion(); + this.minecraftVersion = FMLLoader.getCurrent().getVersionInfo().mcVersion(); + this.dist = FMLLoader.getCurrent().getDist(); this.serverIP = server.getLocalIp() == null ? "unknown" : server.getLocalIp(); this.serverPort = server.getPort(); this.onlineMode = server.usesAuthentication(); @@ -81,4 +81,4 @@ public class GeyserNeoForgeDumpInfo extends BootstrapDumpInfo { public String version; public String url; } -} \ No newline at end of file +} diff --git a/bootstrap/mod/neoforge/src/main/java/org/geysermc/geyser/platform/neoforge/GeyserNeoForgePlatform.java b/bootstrap/mod/neoforge/src/main/java/org/geysermc/geyser/platform/neoforge/GeyserNeoForgePlatform.java index 41562baf3..6d25bade7 100644 --- a/bootstrap/mod/neoforge/src/main/java/org/geysermc/geyser/platform/neoforge/GeyserNeoForgePlatform.java +++ b/bootstrap/mod/neoforge/src/main/java/org/geysermc/geyser/platform/neoforge/GeyserNeoForgePlatform.java @@ -82,8 +82,7 @@ public class GeyserNeoForgePlatform implements GeyserModPlatform { @Override public @Nullable InputStream resolveResource(@NonNull String resource) { try { - Path path = container.getModInfo().getOwningFile().getFile().findResource(resource); - return Files.newInputStream(path); + return container.getModInfo().getOwningFile().getFile().getContents().openFile(resource); // TODO test 1.21.9 } catch (IOException e) { return null; } diff --git a/bootstrap/mod/neoforge/src/main/java/org/geysermc/geyser/platform/neoforge/PermissionUtils.java b/bootstrap/mod/neoforge/src/main/java/org/geysermc/geyser/platform/neoforge/PermissionUtils.java index 5755e407f..6ed5bc608 100644 --- a/bootstrap/mod/neoforge/src/main/java/org/geysermc/geyser/platform/neoforge/PermissionUtils.java +++ b/bootstrap/mod/neoforge/src/main/java/org/geysermc/geyser/platform/neoforge/PermissionUtils.java @@ -71,7 +71,7 @@ public class PermissionUtils { case FALSE -> false; case NOT_SET -> { if (player != null) { - yield player.createCommandSourceStack().hasPermission(Objects.requireNonNull(player.getServer()).getOperatorUserPermissionLevel()); + yield player.createCommandSourceStack().hasPermission(Objects.requireNonNull(player.level()).getServer().operatorUserPermissionLevel()); } yield false; // NeoForge javadocs say player is null in the case of an offline player. } diff --git a/bootstrap/mod/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/bootstrap/mod/neoforge/src/main/resources/META-INF/neoforge.mods.toml index 3f1fe574d..7fc8a1c63 100644 --- a/bootstrap/mod/neoforge/src/main/resources/META-INF/neoforge.mods.toml +++ b/bootstrap/mod/neoforge/src/main/resources/META-INF/neoforge.mods.toml @@ -16,12 +16,12 @@ config = "geyser_neoforge.mixins.json" [[dependencies.geyser_neoforge]] modId="neoforge" type="required" - versionRange="[21.6.0-beta,)" + versionRange="[21.9.0-beta,)" ordering="NONE" side="BOTH" [[dependencies.geyser_neoforge]] modId="minecraft" type="required" - versionRange="[1.21.6,)" + versionRange="[1.21.9,)" ordering="NONE" side="BOTH" diff --git a/core/src/main/resources/mappings b/core/src/main/resources/mappings index 95952c120..7a9bfc5d0 160000 --- a/core/src/main/resources/mappings +++ b/core/src/main/resources/mappings @@ -1 +1 @@ -Subproject commit 95952c1206a017ee7005366b44d08319423f056b +Subproject commit 7a9bfc5d09cebe08cf1fee24872426b35718c6ca diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a52f9b046..24d7ec3fc 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -36,13 +36,13 @@ viaproxy = "3.3.2-SNAPSHOT" fabric-loader = "0.17.2" fabric-api = "0.133.14+1.21.9" fabric-permissions-api = "0.4.1" -neoforge-minecraft = "21.8.0-beta" +neoforge-minecraft = "21.9.0-beta" mixin = "0.8.5" mixinextras = "0.3.5" -minecraft = "1.21.9-rc1" +minecraft = "1.21.9" mockito = "5.+" runtask = "2.3.1" -runpaperversion = "1.21.8" +runpaperversion = "1.21.9" runvelocityversion = "3.4.0-SNAPSHOT" # plugin versions diff --git a/settings.gradle.kts b/settings.gradle.kts index dd631ab8a..9aaf6ba59 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -20,7 +20,7 @@ include(":ap") include(":api") include(":bungeecord") include(":fabric") -//include(":neoforge") TODO 1.21.9 +include(":neoforge") include(":mod") include(":spigot") include(":standalone") @@ -32,7 +32,7 @@ include(":core") // Specify project dirs project(":bungeecord").projectDir = file("bootstrap/bungeecord") project(":fabric").projectDir = file("bootstrap/mod/fabric") -//project(":neoforge").projectDir = file("bootstrap/mod/neoforge") TODO 1.21.9 +project(":neoforge").projectDir = file("bootstrap/mod/neoforge") project(":mod").projectDir = file("bootstrap/mod") project(":spigot").projectDir = file("bootstrap/spigot") project(":standalone").projectDir = file("bootstrap/standalone")