Skip to content

Commit 7dd3fe0

Browse files
committed
2 parents eaa3730 + 04aace7 commit 7dd3fe0

File tree

4 files changed

+88
-8
lines changed

4 files changed

+88
-8
lines changed

bootstrap/src/neoforge/java/org/spongepowered/bootstrap/neoforge/TestServer.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
package org.spongepowered.bootstrap.neoforge;
2626

2727
import net.neoforged.api.distmarker.Dist;
28-
import net.neoforged.fml.loading.FMLLoader;
2928
import net.neoforged.fml.startup.Entrypoint;
3029
import net.neoforged.fml.startup.FatalStartupException;
3130
import org.spongepowered.bootstrap.dev.DevClasspath;
@@ -38,13 +37,13 @@ public static void main(final String[] args) {
3837
DevClasspath.resolve();
3938

4039
// Do not close the loader until tests are done
41-
final FMLLoader loader = Entrypoint.startup(args, true, Dist.DEDICATED_SERVER, true);
40+
final StartupResult startup = Entrypoint.startup(args, true, Dist.DEDICATED_SERVER, true);
4241

43-
final MethodHandle main = Entrypoint.createMainMethodCallable(loader, "net.minecraft.server.Main");
42+
final MethodHandle main = Entrypoint.createMainMethodCallable(startup, "net.minecraft.server.Main");
4443
try {
45-
main.invokeExact(loader.getProgramArgs().getArguments());
44+
main.invokeExact(startup.loader().getProgramArgs().getArguments());
4645
} catch (Throwable e) {
47-
throw new FatalStartupException("Failed to invoke main", e);
46+
throw new FatalStartupException("Failed to invoke main", startup.startupArgs(), e);
4847
}
4948
}
5049
}

gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ mixin = "0.8.7"
1111
mixinextras = "0.5.0"
1212
modlauncher = "10.2.2"
1313
securemodules = "2.2.22"
14-
fancymodloader = "10.0.21"
14+
fancymodloader = "10.0.32"
1515
jarjar = "0.3.26"
1616
guava = "32.1.2-jre"
1717
mockito = "5.11.0"
@@ -75,4 +75,4 @@ indra-licenserSpotless = { id = "net.kyori.indra.licenser.spotless", version = "
7575
shadow = { id = "com.gradleup.shadow", version = "9.0.2" }
7676
versions = { id = "com.github.ben-manes.versions", version = "0.51.0" }
7777
forgeGradle = { id = "net.minecraftforge.gradle", version = "6.0.35" }
78-
modDevGradle = { id = "net.neoforged.moddev", version = "2.0.107" }
78+
modDevGradle = { id = "net.neoforged.moddev", version = "2.0.123" }

gradle/verification-metadata.xml

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6631,6 +6631,14 @@
66316631
<sha256 value="a71b1a5de03b1f96e79c4ad7ea93de76dbd4c31113fa0ed2b1eb68af0c4b7235" origin="Generated by Gradle"/>
66326632
</artifact>
66336633
</component>
6634+
<component group="net.neoforged" name="moddev-gradle" version="2.0.123">
6635+
<artifact name="moddev-gradle-2.0.123.jar">
6636+
<sha256 value="63905d9544c2441f341aeb54d23bf36e27eb27e23a7eb78a911fc5df56662f6c" origin="Generated by Gradle"/>
6637+
</artifact>
6638+
<artifact name="moddev-gradle-2.0.123.module">
6639+
<sha256 value="237c9553f78efda570ddfbf2903e8344da30b3c9ed3806a214a44582e082d679" origin="Generated by Gradle"/>
6640+
</artifact>
6641+
</component>
66346642
<component group="net.neoforged" name="moddev-gradle" version="2.0.78">
66356643
<artifact name="moddev-gradle-2.0.78.jar">
66366644
<sha256 value="7df71d7cc7e12bbcfb97a3384f3d5671d58e8fe6cf618df53e5ee4e2b6c9a887" origin="Generated by Gradle"/>
@@ -6667,6 +6675,20 @@
66676675
<sha256 value="b25d8a16ce072797293d15a799bca422f98a2c0cc3d34cd45682f84783b56dee" origin="Generated by Gradle"/>
66686676
</artifact>
66696677
</component>
6678+
<component group="net.neoforged" name="neoforge" version="21.10.64">
6679+
<artifact name="neoforge-21.10.64-moddev-config.json">
6680+
<sha256 value="64c2161f7b103cc1d3f8369f17c8840aa809f0d0ec4aef44845cc001dfc4483f" origin="Generated by Gradle"/>
6681+
</artifact>
6682+
<artifact name="neoforge-21.10.64-universal.jar">
6683+
<sha256 value="51dc4f8418cc0c067df2524bc220edef56097f475f60527d550992bed90a2b57" origin="Generated by Gradle"/>
6684+
</artifact>
6685+
<artifact name="neoforge-21.10.64-userdev.jar">
6686+
<sha256 value="5ef969c95fb13fecbbf43641565cd871c6d92436cf7c28baa480219b26e7364c" origin="Generated by Gradle"/>
6687+
</artifact>
6688+
<artifact name="neoforge-21.10.64.module">
6689+
<sha256 value="7db23e003902c6f38e7a1599213d51d3f30bf0c111fac0b201a01c463bbcb834" origin="Generated by Gradle"/>
6690+
</artifact>
6691+
</component>
66706692
<component group="net.neoforged" name="neoforge" version="21.11.0-beta">
66716693
<artifact name="neoforge-21.11.0-beta-moddev-config.json">
66726694
<sha256 value="5c93518ee6bc007b20b49817b895cf1d7118e7f5f81cd43a689831dedaca453b" origin="Generated by Gradle"/>
@@ -6681,6 +6703,20 @@
66816703
<sha256 value="51ff524b08d64c662de6f79364d1892e8fd4ae2ded6de6bdbfef3d508dc5994c" origin="Generated by Gradle"/>
66826704
</artifact>
66836705
</component>
6706+
<component group="net.neoforged" name="neoforge" version="21.11.3-beta">
6707+
<artifact name="neoforge-21.11.3-beta-moddev-config.json">
6708+
<sha256 value="b6876aab33d970c4b3b73eb068180a4550cd29e6fa40dff60f6cd84c392b2682" origin="Generated by Gradle"/>
6709+
</artifact>
6710+
<artifact name="neoforge-21.11.3-beta-universal.jar">
6711+
<sha256 value="ec05a21c2f51f28bd8cc479b3240b49266d86a6cd0838188bb8a2762a9d92e37" origin="Generated by Gradle"/>
6712+
</artifact>
6713+
<artifact name="neoforge-21.11.3-beta-userdev.jar">
6714+
<sha256 value="53d4816863d64f79d42ec75d4fc0ae2d8790368db0839ceaf28ddc9a42dd7ccf" origin="Generated by Gradle"/>
6715+
</artifact>
6716+
<artifact name="neoforge-21.11.3-beta.module">
6717+
<sha256 value="da4e41da1bb8a256dc9a1bce1fdaa35b2c7e6c182791687184e81fcc6ffe2831" origin="Generated by Gradle"/>
6718+
</artifact>
6719+
</component>
66846720
<component group="net.neoforged" name="neoform" version="1.21.10-20251007.142004">
66856721
<artifact name="neoform-1.21.10-20251007.142004.module">
66866722
<sha256 value="c4691930bbef5e3acc9b67a185810360abb0bc0de86d394fce537e2ece0d8634" origin="Generated by Gradle"/>
@@ -6689,6 +6725,14 @@
66896725
<sha256 value="a0e68ad6166c89c34b1f4de95df312131bf5fa1a08c35e470a9dd8a974e46c0d" origin="Generated by Gradle"/>
66906726
</artifact>
66916727
</component>
6728+
<component group="net.neoforged" name="neoform" version="1.21.10-20251010.172816">
6729+
<artifact name="neoform-1.21.10-20251010.172816.module">
6730+
<sha256 value="f87c012cd6ee6ef618541d8534ebfc45ef0b47f8f38ab5a82e108bbce845ac6c" origin="Generated by Gradle"/>
6731+
</artifact>
6732+
<artifact name="neoform-1.21.10-20251010.172816.zip">
6733+
<sha256 value="445940ac070d37ec4294d5392de0485bfd2b9245580f7a7b6d8e774d7306de84" origin="Generated by Gradle"/>
6734+
</artifact>
6735+
</component>
66926736
<component group="net.neoforged" name="neoform" version="1.21.11-20251209.172050">
66936737
<artifact name="neoform-1.21.11-20251209.172050.module">
66946738
<sha256 value="5bca2d362a116a69ddadb24a77ed5676f237aa2fdea6bb49f7cc18566eb3c578" origin="Generated by Gradle"/>
@@ -6713,6 +6757,14 @@
67136757
<sha256 value="4c324f8083fc8027bdbd54e193cc9e8b70ba3894961a819b3d6f9a0bef3a3daf" origin="Generated by Gradle"/>
67146758
</artifact>
67156759
</component>
6760+
<component group="net.neoforged" name="neoform-runtime" version="1.0.44">
6761+
<artifact name="neoform-runtime-1.0.44-all.jar">
6762+
<sha256 value="681f2cfa81670bc9a5ca3ea9e571e84ac4278f30386163d99a34cddb5560d453" origin="Generated by Gradle"/>
6763+
</artifact>
6764+
<artifact name="neoform-runtime-1.0.44.module">
6765+
<sha256 value="463f9cf9662daa6f1436580720fc449b91a9d4d8107152fc14ab64b0a74469c8" origin="Generated by Gradle"/>
6766+
</artifact>
6767+
</component>
67166768
<component group="net.neoforged" name="srgutils" version="1.0.0">
67176769
<artifact name="srgutils-1.0.0.jar">
67186770
<sha256 value="16663ae2504a0522cca386af6c11281d3fde61d25b6bd2690d7200e900b26c36" origin="Generated by Gradle"/>
@@ -6809,6 +6861,14 @@
68096861
<sha256 value="04ff37ea174e06bfcf9cc683d099dbbcbe9381f28908b995c65545e1f97a001d" origin="Generated by Gradle"/>
68106862
</artifact>
68116863
</component>
6864+
<component group="net.neoforged.fancymodloader" name="earlydisplay" version="10.0.32">
6865+
<artifact name="earlydisplay-10.0.32.jar">
6866+
<sha256 value="d1d70017bb6723663f4f5309c3c7dfccaeef68fbd9350abd4756acea64e0bcb1" origin="Generated by Gradle"/>
6867+
</artifact>
6868+
<artifact name="earlydisplay-10.0.32.module">
6869+
<sha256 value="ce8701e5d529868aab5438719de938465b68f209ddd23f28fe1a3ab9a14ac661" origin="Generated by Gradle"/>
6870+
</artifact>
6871+
</component>
68126872
<component group="net.neoforged.fancymodloader" name="earlydisplay" version="10.0.34">
68136873
<artifact name="earlydisplay-10.0.34.jar">
68146874
<sha256 value="5af6a24cd7cb56ba4b0650f4b6f6ae3af2025fe4dcdea840f1024f15ba557d61" origin="Generated by Gradle"/>
@@ -6921,6 +6981,14 @@
69216981
<sha256 value="82dd612a81debcb25fa4485fef8c4e75865dd74c0e63a7d3190e883a7afe76b4" origin="Generated by Gradle"/>
69226982
</artifact>
69236983
</component>
6984+
<component group="net.neoforged.fancymodloader" name="loader" version="10.0.32">
6985+
<artifact name="loader-10.0.32.jar">
6986+
<sha256 value="36935dd6403d291439f4478f40acd9dcb853aedab835dd301a028edc9b1a7298" origin="Generated by Gradle"/>
6987+
</artifact>
6988+
<artifact name="loader-10.0.32.module">
6989+
<sha256 value="f1b975c27271e418d9245ed3ce5a34c7615d63dd1417cbc4737e2855b4dbec3b" origin="Generated by Gradle"/>
6990+
</artifact>
6991+
</component>
69246992
<component group="net.neoforged.fancymodloader" name="loader" version="10.0.34">
69256993
<artifact name="loader-10.0.34.jar">
69266994
<sha256 value="b932f143c7768e8792a4acaea46f416dc6a806859dcf1adaaefed15e4ec28d5b" origin="Generated by Gradle"/>
@@ -7057,6 +7125,14 @@
70577125
<sha256 value="ac592cdfb16e7acdf17f6dd4d4f01e8b2dd5398c3851d78e73866105d052d0ba" origin="Generated by Gradle"/>
70587126
</artifact>
70597127
</component>
7128+
<component group="net.neoforged.installertools" name="installertools" version="3.0.13">
7129+
<artifact name="installertools-3.0.13-fatjar.jar">
7130+
<sha256 value="0266b19d63cd88a735186c37a41fe3db2c0223411358422b04841feafb446099" origin="Generated by Gradle"/>
7131+
</artifact>
7132+
<artifact name="installertools-3.0.13.module">
7133+
<sha256 value="34ccd28dd811dc9ef3200a16dcd2b442a976bbe78d5ab7ef0f94d5cc0d05b91b" origin="Generated by Gradle"/>
7134+
</artifact>
7135+
</component>
70607136
<component group="net.neoforged.installertools" name="installertools" version="4.0.7">
70617137
<artifact name="installertools-4.0.7-fatjar.jar">
70627138
<sha256 value="3d371ba82e89d25df90ba086cd08ab38490d3099fd05318046177e3678b2cfb3" origin="Generated by Gradle"/>
@@ -7086,6 +7162,11 @@
70867162
<sha256 value="037878efd7428ccc0bce1f7f2633b60a04bb863649a2316fc2b5068219d1afda" origin="Generated by Gradle"/>
70877163
</artifact>
70887164
</component>
7165+
<component group="net.neoforged.moddev" name="net.neoforged.moddev.gradle.plugin" version="2.0.123">
7166+
<artifact name="net.neoforged.moddev.gradle.plugin-2.0.123.pom">
7167+
<sha256 value="c13cb6bfc754284a44c4e6d28a6d183c8af9216168591b358fe8b8201e32d141" origin="Generated by Gradle"/>
7168+
</artifact>
7169+
</component>
70897170
<component group="net.neoforged.moddev" name="net.neoforged.moddev.gradle.plugin" version="2.0.78">
70907171
<artifact name="net.neoforged.moddev.gradle.plugin-2.0.78.pom">
70917172
<sha256 value="98b8f4c8f52331099672748396d1f4f17f0634faedc00ba82e258a372f0d9b77" origin="Generated by Gradle"/>

neoforge/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ name=SpongeNeo
22
implementation=NeoForge
33
description=The SpongeAPI implementation for NeoForge
44

5-
neoForgeVersion=21.11.0-beta
5+
neoForgeVersion=21.11.3-beta
66
mixinConfigs=mixins.spongeneo.accessors.json,mixins.spongeneo.api.json,mixins.spongeneo.inventory.json,mixins.spongeneo.core.json,mixins.spongeneo.tracker.json

0 commit comments

Comments
 (0)