Skip to content

Commit f9faf40

Browse files
YeregorixYeregorix
committed
Update NeoForge (remove SecureJar). Fix #4246 
1 parent c490b7e commit f9faf40

File tree

8 files changed

+54
-18
lines changed

8 files changed

+54
-18
lines changed

‎gradle/libs.versions.toml‎

Lines changed: 1 addition & 1 deletion
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.14"
14+
fancymodloader = "10.0.21"
1515
jarjar = "0.3.26"
1616
guava = "32.1.2-jre"
1717
mockito = "5.11.0"

‎gradle/verification-metadata.xml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3063,6 +3063,14 @@
30633063
<sha256 value="0e2931279ad34d10c3a1dca8578789882832a6ec4774a25f4fd4d573183d4b33" origin="Generated by Gradle"/>
30643064
</artifact>
30653065
</component>
3066+
<component group="net.fabricmc" name="sponge-mixin" version="0.16.5+mixin.0.8.7">
3067+
<artifact name="sponge-mixin-0.16.5+mixin.0.8.7.jar">
3068+
<sha256 value="bf65996f6edd93ba4061a175e2c814205c1ba694357a1e5a336c7ba5078ca376" origin="Generated by Gradle"/>
3069+
</artifact>
3070+
<artifact name="sponge-mixin-0.16.5+mixin.0.8.7.pom">
3071+
<sha256 value="15a68f0645e1284662316e8934b3c11971423bc6a8d6c1fff549ce620d59c173" origin="Generated by Gradle"/>
3072+
</artifact>
3073+
</component>
30663074
<component group="net.fabricmc" name="stitch" version="0.6.2">
30673075
<artifact name="stitch-0.6.2.jar">
30683076
<sha256 value="3209f1fefba59f3ded04935463f2aabd137f1bf409cb42dab9a5870dd058b1a1" origin="Generated by Gradle"/>
@@ -6144,6 +6152,20 @@
61446152
<sha256 value="c76f5d766e74e6b02cb2930b2da608ecc2b87034a9089e0de384005e21a38b01" origin="Generated by Gradle"/>
61456153
</artifact>
61466154
</component>
6155+
<component group="net.neoforged" name="neoforge" version="21.10.16-beta">
6156+
<artifact name="neoforge-21.10.16-beta-moddev-config.json">
6157+
<sha256 value="a15fd1fefbd6395ae777bdfe6dbb03252fb9b5b572a52accfdd9448291774955" origin="Generated by Gradle"/>
6158+
</artifact>
6159+
<artifact name="neoforge-21.10.16-beta-universal.jar">
6160+
<sha256 value="d5225463238544ba548c1c65b978a736db7ea23cadd414755e2466018c68b11f" origin="Generated by Gradle"/>
6161+
</artifact>
6162+
<artifact name="neoforge-21.10.16-beta-userdev.jar">
6163+
<sha256 value="fb847ff8aa367881659eaac922c435b4bceb45697fc853f5ae45bd2d252fdec5" origin="Generated by Gradle"/>
6164+
</artifact>
6165+
<artifact name="neoforge-21.10.16-beta.module">
6166+
<sha256 value="709a951ed5424876844065e82b3b1ce61b9d2d187e88464cf05857b14f1127f2" origin="Generated by Gradle"/>
6167+
</artifact>
6168+
</component>
61476169
<component group="net.neoforged" name="neoforge" version="21.10.6-beta">
61486170
<artifact name="neoforge-21.10.6-beta-moddev-config.json">
61496171
<sha256 value="948619641ced31711c6375366e33fdfbe3f0b59eff75c44fdb1afeb43483131d" origin="Generated by Gradle"/>
@@ -6270,6 +6292,14 @@
62706292
<sha256 value="9ade125246ce8d04f698c8034eff45610123260c4c9786122f8c4f99c07a9c2b" origin="Generated by Gradle"/>
62716293
</artifact>
62726294
</component>
6295+
<component group="net.neoforged.fancymodloader" name="earlydisplay" version="10.0.21">
6296+
<artifact name="earlydisplay-10.0.21.jar">
6297+
<sha256 value="ed4efcd56fdad385d90e8e47666c4af4e48898a4111cba818ce6631660195b80" origin="Generated by Gradle"/>
6298+
</artifact>
6299+
<artifact name="earlydisplay-10.0.21.module">
6300+
<sha256 value="04ff37ea174e06bfcf9cc683d099dbbcbe9381f28908b995c65545e1f97a001d" origin="Generated by Gradle"/>
6301+
</artifact>
6302+
</component>
62736303
<component group="net.neoforged.fancymodloader" name="earlydisplay" version="4.0.24">
62746304
<artifact name="earlydisplay-4.0.24.jar">
62756305
<sha256 value="147a2da4102ebe5629b88fa9b95ce78be397936641a7f09302dc08ee92f93326" origin="Generated by Gradle"/>
@@ -6366,6 +6396,14 @@
63666396
<sha256 value="95f39cb9bfa28ecc4e252b3089027638fdb3e02108100a114fdc050f2a738240" origin="Generated by Gradle"/>
63676397
</artifact>
63686398
</component>
6399+
<component group="net.neoforged.fancymodloader" name="loader" version="10.0.21">
6400+
<artifact name="loader-10.0.21.jar">
6401+
<sha256 value="bf687cfe16a57fa3db9a7a619b67384e938a79c56b29516d6ada2f0f0bc95708" origin="Generated by Gradle"/>
6402+
</artifact>
6403+
<artifact name="loader-10.0.21.module">
6404+
<sha256 value="82dd612a81debcb25fa4485fef8c4e75865dd74c0e63a7d3190e883a7afe76b4" origin="Generated by Gradle"/>
6405+
</artifact>
6406+
</component>
63696407
<component group="net.neoforged.fancymodloader" name="loader" version="4.0.24">
63706408
<artifact name="loader-4.0.24.jar">
63716409
<sha256 value="c76d1e7c27b40dcb4ba9f376766a95845647dff21f5e3a77d32858461f109ca1" 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.6-beta
5+
neoForgeVersion=21.10.16-beta
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/loading/moddiscovery/SpongeNeoDependencyLocator.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
*/
2525
package org.spongepowered.neoforge.applaunch.loading.moddiscovery;
2626

27-
import net.neoforged.fml.classloading.SecureJar;
27+
import net.neoforged.fml.jarcontents.JarContents;
2828
import net.neoforged.fml.loading.FMLEnvironment;
2929
import net.neoforged.fml.loading.moddiscovery.readers.JarModsDotTomlModFileReader;
3030
import net.neoforged.neoforgespi.locating.IDependencyLocator;
@@ -71,9 +71,9 @@ public void scanMods(final List<IModFile> loadedMods, final IDiscoveryPipeline p
7171
final Path path = library.file();
7272
SpongeNeoDependencyLocator.LOGGER.debug("Proposing jar {} as a game library", path);
7373

74-
final SecureJar jar;
74+
final JarContents jar;
7575
try {
76-
jar = SecureJar.from(path);
76+
jar = JarContents.ofPath(path);
7777
} catch (IOException e) {
7878
throw new RuntimeException("Failed to create jar from " + path, e);
7979
}

‎neoforge/src/applaunch/java/org/spongepowered/neoforge/applaunch/loading/moddiscovery/SpongeNeoModLocator.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
*/
2525
package org.spongepowered.neoforge.applaunch.loading.moddiscovery;
2626

27-
import net.neoforged.fml.classloading.SecureJar;
2827
import net.neoforged.fml.jarcontents.JarContents;
2928
import net.neoforged.fml.loading.FMLEnvironment;
3029
import net.neoforged.fml.loading.FMLPaths;
@@ -84,7 +83,7 @@ public void findCandidates(ILaunchContext context, IDiscoveryPipeline pipeline)
8483
} catch (Exception ignored) {}
8584
if (modFile == null) {
8685
// fallback to game library
87-
modFile = IModFile.create(SecureJar.from(jarContents), JarModsDotTomlModFileReader::manifestParser, IModFile.Type.GAMELIBRARY, attributes);
86+
modFile = IModFile.create(jarContents, JarModsDotTomlModFileReader::manifestParser, IModFile.Type.GAMELIBRARY, attributes);
8887
}
8988
pipeline.addModFile(modFile);
9089
}

‎neoforge/src/applaunch/java/org/spongepowered/neoforge/applaunch/loading/moddiscovery/reader/PluginFileParser.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
*/
2525
package org.spongepowered.neoforge.applaunch.loading.moddiscovery.reader;
2626

27-
import net.neoforged.fml.classloading.SecureJar;
2827
import net.neoforged.fml.jarcontents.JarContents;
2928
import net.neoforged.fml.jarcontents.JarResource;
3029
import net.neoforged.fml.loading.moddiscovery.ModFile;
@@ -79,8 +78,8 @@ public static IModFile newPluginInstance(final JarContents contents, final ModFi
7978
return null;
8079
}
8180

82-
final ModJarMetadata mjm = new ModJarMetadata(contents);
83-
final IModFile modFile = IModFile.create(SecureJar.from(contents, mjm), PluginFileParser::parsePluginMetadata, attributes);
81+
final ModJarMetadata mjm = new ModJarMetadata();
82+
final IModFile modFile = new ModFile(contents, mjm, PluginFileParser::parsePluginMetadata, attributes);
8483
mjm.setModFile(modFile);
8584
return modFile;
8685
}

‎neoforge/src/applaunch/java/org/spongepowered/neoforge/applaunch/transformation/NeoAccessWidenerTransformer.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
*/
2525
package org.spongepowered.neoforge.applaunch.transformation;
2626

27-
import net.neoforged.fml.classloading.SecureJar;
27+
import net.neoforged.fml.jarcontents.JarContents;
2828
import net.neoforged.fml.loading.FMLLoader;
2929
import net.neoforged.fml.loading.moddiscovery.ModFileInfo;
3030
import net.neoforged.neoforgespi.transformation.ClassProcessor;
@@ -68,14 +68,14 @@ public ComputeFlags processClass(final TransformationContext context) {
6868
protected Collection<URL> collectResources() {
6969
final Collection<URL> resources = new ArrayList<>();
7070
for (ModFileInfo fileInfo : FMLLoader.getCurrent().getLoadingModList().getModFiles()) {
71-
final SecureJar jar = fileInfo.getFile().getSecureJar();
72-
final Attributes attributes = jar.moduleDataProvider().getManifest().getMainAttributes();
71+
final JarContents jar = fileInfo.getFile().getContents();
72+
final Attributes attributes = jar.getManifest().getMainAttributes();
7373

7474
final String attribute = attributes.getValue(AccessWidenerTransformer.MANIFEST_ATTRIBUTE);
7575
if (attribute != null) {
7676
for (final String path : attribute.split(",")) {
7777
try {
78-
resources.add(jar.contents().findFile(path).get().toURL());
78+
resources.add(jar.findFile(path).get().toURL());
7979
} catch (final Exception e) {
8080
LOGGER.warn("Failed to locate access widener {} from {}", path, fileInfo.getFile().getFileName(), e);
8181
}

‎neoforge/src/applaunch/java/org/spongepowered/neoforge/applaunch/transformation/NeoSuperclassChangeTransformer.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
*/
2525
package org.spongepowered.neoforge.applaunch.transformation;
2626

27-
import net.neoforged.fml.classloading.SecureJar;
27+
import net.neoforged.fml.jarcontents.JarContents;
2828
import net.neoforged.fml.loading.FMLLoader;
2929
import net.neoforged.fml.loading.moddiscovery.ModFileInfo;
3030
import net.neoforged.neoforgespi.transformation.ClassProcessor;
@@ -59,14 +59,14 @@ public ComputeFlags processClass(final TransformationContext context) {
5959
protected Collection<URL> collectResources() {
6060
final Collection<URL> resources = new ArrayList<>();
6161
for (ModFileInfo fileInfo : FMLLoader.getCurrent().getLoadingModList().getModFiles()) {
62-
final SecureJar jar = fileInfo.getFile().getSecureJar();
63-
final Attributes attributes = jar.moduleDataProvider().getManifest().getMainAttributes();
62+
final JarContents jar = fileInfo.getFile().getContents();
63+
final Attributes attributes = jar.getManifest().getMainAttributes();
6464

6565
final String attribute = attributes.getValue(SuperclassChangeTransformer.MANIFEST_ATTRIBUTE);
6666
if (attribute != null) {
6767
for (final String path : attribute.split(",")) {
6868
try {
69-
resources.add(jar.contents().findFile(path).get().toURL());
69+
resources.add(jar.findFile(path).get().toURL());
7070
} catch (final Exception e) {
7171
LOGGER.warn("Failed to locate superclass changer {} from {}", path, fileInfo.getFile().getFileName(), e);
7272
}

0 commit comments

Comments
 (0)