Skip to content

Commit 04aace7

Browse files
YeregorixYeregorix
committed
Update NeoForge to 21.10.64
1 parent 3068e03 commit 04aace7

File tree

5 files changed

+91
-25
lines changed

5 files changed

+91
-25
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: 83 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6184,6 +6184,14 @@
61846184
<sha256 value="a71b1a5de03b1f96e79c4ad7ea93de76dbd4c31113fa0ed2b1eb68af0c4b7235" origin="Generated by Gradle"/>
61856185
</artifact>
61866186
</component>
6187+
<component group="net.neoforged" name="moddev-gradle" version="2.0.123">
6188+
<artifact name="moddev-gradle-2.0.123.jar">
6189+
<sha256 value="63905d9544c2441f341aeb54d23bf36e27eb27e23a7eb78a911fc5df56662f6c" origin="Generated by Gradle"/>
6190+
</artifact>
6191+
<artifact name="moddev-gradle-2.0.123.module">
6192+
<sha256 value="237c9553f78efda570ddfbf2903e8344da30b3c9ed3806a214a44582e082d679" origin="Generated by Gradle"/>
6193+
</artifact>
6194+
</component>
61876195
<component group="net.neoforged" name="moddev-gradle" version="2.0.78">
61886196
<artifact name="moddev-gradle-2.0.78.jar">
61896197
<sha256 value="7df71d7cc7e12bbcfb97a3384f3d5671d58e8fe6cf618df53e5ee4e2b6c9a887" origin="Generated by Gradle"/>
@@ -6220,6 +6228,20 @@
62206228
<sha256 value="b25d8a16ce072797293d15a799bca422f98a2c0cc3d34cd45682f84783b56dee" origin="Generated by Gradle"/>
62216229
</artifact>
62226230
</component>
6231+
<component group="net.neoforged" name="neoforge" version="21.10.64">
6232+
<artifact name="neoforge-21.10.64-moddev-config.json">
6233+
<sha256 value="64c2161f7b103cc1d3f8369f17c8840aa809f0d0ec4aef44845cc001dfc4483f" origin="Generated by Gradle"/>
6234+
</artifact>
6235+
<artifact name="neoforge-21.10.64-universal.jar">
6236+
<sha256 value="51dc4f8418cc0c067df2524bc220edef56097f475f60527d550992bed90a2b57" origin="Generated by Gradle"/>
6237+
</artifact>
6238+
<artifact name="neoforge-21.10.64-userdev.jar">
6239+
<sha256 value="5ef969c95fb13fecbbf43641565cd871c6d92436cf7c28baa480219b26e7364c" origin="Generated by Gradle"/>
6240+
</artifact>
6241+
<artifact name="neoforge-21.10.64.module">
6242+
<sha256 value="7db23e003902c6f38e7a1599213d51d3f30bf0c111fac0b201a01c463bbcb834" origin="Generated by Gradle"/>
6243+
</artifact>
6244+
</component>
62236245
<component group="net.neoforged" name="neoform" version="1.21.10-20251007.142004">
62246246
<artifact name="neoform-1.21.10-20251007.142004.module">
62256247
<sha256 value="c4691930bbef5e3acc9b67a185810360abb0bc0de86d394fce537e2ece0d8634" origin="Generated by Gradle"/>
@@ -6228,6 +6250,14 @@
62286250
<sha256 value="a0e68ad6166c89c34b1f4de95df312131bf5fa1a08c35e470a9dd8a974e46c0d" origin="Generated by Gradle"/>
62296251
</artifact>
62306252
</component>
6253+
<component group="net.neoforged" name="neoform" version="1.21.10-20251010.172816">
6254+
<artifact name="neoform-1.21.10-20251010.172816.module">
6255+
<sha256 value="f87c012cd6ee6ef618541d8534ebfc45ef0b47f8f38ab5a82e108bbce845ac6c" origin="Generated by Gradle"/>
6256+
</artifact>
6257+
<artifact name="neoform-1.21.10-20251010.172816.zip">
6258+
<sha256 value="445940ac070d37ec4294d5392de0485bfd2b9245580f7a7b6d8e774d7306de84" origin="Generated by Gradle"/>
6259+
</artifact>
6260+
</component>
62316261
<component group="net.neoforged" name="neoform-runtime" version="1.0.13">
62326262
<artifact name="neoform-runtime-1.0.13-all.jar">
62336263
<sha256 value="e435b9b38c364fc8be474dcfe4ccd4f3aed762bbfff26dcbf9312105ccf453ba" origin="Generated by Gradle"/>
@@ -6244,6 +6274,14 @@
62446274
<sha256 value="4c324f8083fc8027bdbd54e193cc9e8b70ba3894961a819b3d6f9a0bef3a3daf" origin="Generated by Gradle"/>
62456275
</artifact>
62466276
</component>
6277+
<component group="net.neoforged" name="neoform-runtime" version="1.0.44">
6278+
<artifact name="neoform-runtime-1.0.44-all.jar">
6279+
<sha256 value="681f2cfa81670bc9a5ca3ea9e571e84ac4278f30386163d99a34cddb5560d453" origin="Generated by Gradle"/>
6280+
</artifact>
6281+
<artifact name="neoform-runtime-1.0.44.module">
6282+
<sha256 value="463f9cf9662daa6f1436580720fc449b91a9d4d8107152fc14ab64b0a74469c8" origin="Generated by Gradle"/>
6283+
</artifact>
6284+
</component>
62476285
<component group="net.neoforged" name="srgutils" version="1.0.0">
62486286
<artifact name="srgutils-1.0.0.jar">
62496287
<sha256 value="16663ae2504a0522cca386af6c11281d3fde61d25b6bd2690d7200e900b26c36" origin="Generated by Gradle"/>
@@ -6340,6 +6378,14 @@
63406378
<sha256 value="04ff37ea174e06bfcf9cc683d099dbbcbe9381f28908b995c65545e1f97a001d" origin="Generated by Gradle"/>
63416379
</artifact>
63426380
</component>
6381+
<component group="net.neoforged.fancymodloader" name="earlydisplay" version="10.0.32">
6382+
<artifact name="earlydisplay-10.0.32.jar">
6383+
<sha256 value="d1d70017bb6723663f4f5309c3c7dfccaeef68fbd9350abd4756acea64e0bcb1" origin="Generated by Gradle"/>
6384+
</artifact>
6385+
<artifact name="earlydisplay-10.0.32.module">
6386+
<sha256 value="ce8701e5d529868aab5438719de938465b68f209ddd23f28fe1a3ab9a14ac661" origin="Generated by Gradle"/>
6387+
</artifact>
6388+
</component>
63436389
<component group="net.neoforged.fancymodloader" name="earlydisplay" version="4.0.24">
63446390
<artifact name="earlydisplay-4.0.24.jar">
63456391
<sha256 value="147a2da4102ebe5629b88fa9b95ce78be397936641a7f09302dc08ee92f93326" origin="Generated by Gradle"/>
@@ -6444,6 +6490,14 @@
64446490
<sha256 value="82dd612a81debcb25fa4485fef8c4e75865dd74c0e63a7d3190e883a7afe76b4" origin="Generated by Gradle"/>
64456491
</artifact>
64466492
</component>
6493+
<component group="net.neoforged.fancymodloader" name="loader" version="10.0.32">
6494+
<artifact name="loader-10.0.32.jar">
6495+
<sha256 value="36935dd6403d291439f4478f40acd9dcb853aedab835dd301a028edc9b1a7298" origin="Generated by Gradle"/>
6496+
</artifact>
6497+
<artifact name="loader-10.0.32.module">
6498+
<sha256 value="f1b975c27271e418d9245ed3ce5a34c7615d63dd1417cbc4737e2855b4dbec3b" origin="Generated by Gradle"/>
6499+
</artifact>
6500+
</component>
64476501
<component group="net.neoforged.fancymodloader" name="loader" version="4.0.24">
64486502
<artifact name="loader-4.0.24.jar">
64496503
<sha256 value="c76d1e7c27b40dcb4ba9f376766a95845647dff21f5e3a77d32858461f109ca1" origin="Generated by Gradle"/>
@@ -6572,6 +6626,14 @@
65726626
<sha256 value="ac592cdfb16e7acdf17f6dd4d4f01e8b2dd5398c3851d78e73866105d052d0ba" origin="Generated by Gradle"/>
65736627
</artifact>
65746628
</component>
6629+
<component group="net.neoforged.installertools" name="installertools" version="3.0.13">
6630+
<artifact name="installertools-3.0.13-fatjar.jar">
6631+
<sha256 value="0266b19d63cd88a735186c37a41fe3db2c0223411358422b04841feafb446099" origin="Generated by Gradle"/>
6632+
</artifact>
6633+
<artifact name="installertools-3.0.13.module">
6634+
<sha256 value="34ccd28dd811dc9ef3200a16dcd2b442a976bbe78d5ab7ef0f94d5cc0d05b91b" origin="Generated by Gradle"/>
6635+
</artifact>
6636+
</component>
65756637
<component group="net.neoforged.jst" name="jst-cli-bundle" version="1.0.66">
65766638
<artifact name="jst-cli-bundle-1.0.66.jar">
65776639
<sha256 value="d9b82a676a630a10d14fda216d60d1bcad203367d8aa58c06b2f00f85ab7be0e" origin="Generated by Gradle"/>
@@ -6593,6 +6655,11 @@
65936655
<sha256 value="037878efd7428ccc0bce1f7f2633b60a04bb863649a2316fc2b5068219d1afda" origin="Generated by Gradle"/>
65946656
</artifact>
65956657
</component>
6658+
<component group="net.neoforged.moddev" name="net.neoforged.moddev.gradle.plugin" version="2.0.123">
6659+
<artifact name="net.neoforged.moddev.gradle.plugin-2.0.123.pom">
6660+
<sha256 value="c13cb6bfc754284a44c4e6d28a6d183c8af9216168591b358fe8b8201e32d141" origin="Generated by Gradle"/>
6661+
</artifact>
6662+
</component>
65966663
<component group="net.neoforged.moddev" name="net.neoforged.moddev.gradle.plugin" version="2.0.78">
65976664
<artifact name="net.neoforged.moddev.gradle.plugin-2.0.78.pom">
65986665
<sha256 value="98b8f4c8f52331099672748396d1f4f17f0634faedc00ba82e258a372f0d9b77" origin="Generated by Gradle"/>
@@ -7435,14 +7502,6 @@
74357502
<sha256 value="23301a2129d410089925f4af41aecb52584a3dcc4526823e13234ecacb7e73e3" origin="Generated by Gradle"/>
74367503
</artifact>
74377504
</component>
7438-
<component group="org.apache.logging.log4j" name="log4j-api" version="2.25.1">
7439-
<artifact name="log4j-api-2.25.1.jar">
7440-
<sha256 value="20b9c77c0a9e54d1063a39e551dcaf98c7d8e7a4994648f84d0b9e14c71f7215" origin="Generated by Gradle"/>
7441-
</artifact>
7442-
<artifact name="log4j-api-2.25.1.module">
7443-
<sha256 value="ead3262822120b3c9f8a20cd0d99d5635960d527b2043d67fff66be877831c9a" origin="Generated by Gradle"/>
7444-
</artifact>
7445-
</component>
74467505
<component group="org.apache.logging.log4j" name="log4j-api" version="2.24.3">
74477506
<artifact name="log4j-api-2.24.3.jar">
74487507
<sha256 value="5b4a0a0cd0e751ded431c162442bdbdd53328d1f8bb2bae5fc1bbeee0f66d80f" origin="Generated by Gradle"/>
@@ -7451,6 +7510,14 @@
74517510
<sha256 value="bc05de33533a1259adbacbfcc826cd66376a2d9c4ee53fb836009f44a45b8239" origin="Generated by Gradle"/>
74527511
</artifact>
74537512
</component>
7513+
<component group="org.apache.logging.log4j" name="log4j-api" version="2.25.1">
7514+
<artifact name="log4j-api-2.25.1.jar">
7515+
<sha256 value="20b9c77c0a9e54d1063a39e551dcaf98c7d8e7a4994648f84d0b9e14c71f7215" origin="Generated by Gradle"/>
7516+
</artifact>
7517+
<artifact name="log4j-api-2.25.1.module">
7518+
<sha256 value="ead3262822120b3c9f8a20cd0d99d5635960d527b2043d67fff66be877831c9a" origin="Generated by Gradle"/>
7519+
</artifact>
7520+
</component>
74547521
<component group="org.apache.logging.log4j" name="log4j-api" version="2.8.1">
74557522
<artifact name="log4j-api-2.8.1.jar">
74567523
<sha256 value="1205ab764b1326f7d96d99baa4a4e12614599bf3d735790947748ee116511fa2" origin="Generated by Gradle"/>
@@ -7549,14 +7616,6 @@
75497616
<sha256 value="27242cb417a4df1978eedfc6958b45c89820f96cc7f4d16d1f482bfc2376e0cd" origin="Generated by Gradle"/>
75507617
</artifact>
75517618
</component>
7552-
<component group="org.apache.logging.log4j" name="log4j-core" version="2.25.1">
7553-
<artifact name="log4j-core-2.25.1.jar">
7554-
<sha256 value="78c232747855464b182f0abf78a99a22c88d4d270ff585343dab55576d7420e2" origin="Generated by Gradle"/>
7555-
</artifact>
7556-
<artifact name="log4j-core-2.25.1.module">
7557-
<sha256 value="a44abd6de18fc9997e553e5f51795d5c0da0f5f382da035ab9b9edec75e56675" origin="Generated by Gradle"/>
7558-
</artifact>
7559-
</component>
75607619
<component group="org.apache.logging.log4j" name="log4j-core" version="2.24.3">
75617620
<artifact name="log4j-core-2.24.3.jar">
75627621
<sha256 value="7eb4084596ae25bd3c61698e48e8d0ab65a9260758884ed5cbb9c6e55c44a56a" origin="Generated by Gradle"/>
@@ -7565,6 +7624,14 @@
75657624
<sha256 value="bfd5c0c4aac610242ccb61ff00108ad73780da20a2f729be063836a976577f57" origin="Generated by Gradle"/>
75667625
</artifact>
75677626
</component>
7627+
<component group="org.apache.logging.log4j" name="log4j-core" version="2.25.1">
7628+
<artifact name="log4j-core-2.25.1.jar">
7629+
<sha256 value="78c232747855464b182f0abf78a99a22c88d4d270ff585343dab55576d7420e2" origin="Generated by Gradle"/>
7630+
</artifact>
7631+
<artifact name="log4j-core-2.25.1.module">
7632+
<sha256 value="a44abd6de18fc9997e553e5f51795d5c0da0f5f382da035ab9b9edec75e56675" origin="Generated by Gradle"/>
7633+
</artifact>
7634+
</component>
75687635
<component group="org.apache.logging.log4j" name="log4j-core" version="2.8.1">
75697636
<artifact name="log4j-core-2.8.1.jar">
75707637
<sha256 value="815a73e20e90a413662eefe8594414684df3d5723edcd76070e1a5aee864616e" 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.10.16-beta
5+
neoForgeVersion=21.10.64
66
mixinConfigs=mixins.spongeneo.accessors.json,mixins.spongeneo.api.json,mixins.spongeneo.inventory.json,mixins.spongeneo.core.json,mixins.spongeneo.tracker.json

‎neoforge/src/applaunch/java/org/spongepowered/neoforge/applaunch/plugin/NeoForgePluginPlatform.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
import net.neoforged.fml.loading.FMLLoader;
2828
import net.neoforged.fml.loading.FMLPaths;
29-
import net.neoforged.neoforge.internal.versions.neoforge.NeoForgeVersion;
29+
import net.neoforged.neoforge.common.NeoForgeVersion;
3030
import org.spongepowered.common.applaunch.AppLaunch;
3131
import org.spongepowered.common.applaunch.config.LaunchConfig;
3232
import org.spongepowered.common.applaunch.config.TokenReplacement;

0 commit comments

Comments
 (0)