Compare commits

...
205 Commits
Author SHA1 Message Date
Jonathing c047cf136c 1.21.3 RB 1
https://forums.minecraftforge.net/topic/154393-forge-531-minecraft-1213/
2025-03-01 16:56:32 -05:00
Jonathing f4287ecc81 Add missed license headers (#10475) 2025-03-01 21:35:03 +00:00
JonathingandLexManos 364a1e737f Speed up mod annotation scanning by ~30% (#10466)
Co-authored-by: LexManos <[email protected]>
2025-03-01 21:34:40 +00:00
Jonathing 45a977bb33 [1.21.3] Bump dependencies, most notably EventBus (#10385)
- CoreMods 5.2.4 -> 5.2.6
- EventBus 6.2.15 -> 6.2.27
    - Reduced memory usage
    - Further performance improvements
    - Fixed EventBus#39, unregistered listeners are now immediately reclaimable by the GC
- Apache MavenArtifact 3.8.5 -> 3.8.8
- NightConfig 3.7.3 -> 3.7.4
2025-02-12 17:51:46 -08:00
Jonathing ab00c907e7 Add fast graphics render type to block model jsons (#10395)
Make modded leaves behave like vanilla leaves by default (Fixes #10389)
2025-02-12 17:39:27 -08:00
979abb2b93 Re-introduce ItemStack Capabilities (#10362)
Co-authored-by: RealMangoRage <[email protected]>
Co-authored-by: LexManos <[email protected]>
2025-02-12 17:30:29 -08:00
Jonathing 056360b050 Re-introduce IForgeItem.damageItem when an item takes damage, Fixes #10344 (#10372) 2025-02-12 17:29:44 -08:00
Jonathing 960fce505c Add updated tag context to AddReloadListenerEvent (#10416)
Fixes using custom tags in GlobalLootModifiers.
2025-02-12 17:21:30 -08:00
JonathingandLexManos ea597ff45a Fix redstone update order not matching vanilla. (#10392)
Fix redstone updates for comparators going up/down incorrectly. Related: #9973
Fix game test structure rotations being inconsistant (#10391)

Co-authored-by: LexManos <[email protected]>
2025-02-12 17:11:56 -08:00
Jonathing f35dce7eb3 Fix corrupted and invalidly symlinked worlds crashing on level select (#10415) 2025-02-12 17:03:06 -08:00
Jonathing ef224bd2b8 Fix ModelDiscovery using Item components early (#10418) 2025-02-12 17:02:52 -08:00
Jonathing 0749f49b6c Fix forced chunks never being ticked by the server (#10365) 2025-02-12 13:37:21 -08:00
Jonathing 5c508efaa9 Fix shield disabling being completely ignored (#10317) 2025-01-27 15:28:07 -08:00
JonathingandJoseph T. McQuigg dbafe039d8 Fix issues in VillagerTrades.EmeraldsForVillagerTypeItem related to custom Villager Types (#10357)
Co-authored-by: Joseph T. McQuigg <[email protected]>
2025-01-27 15:27:42 -08:00
JonathingandLexManos b36ee22925 GameTestHelper additions (#10339)
Co-authored-by: LexManos <[email protected]>
2025-01-27 09:44:26 -08:00
Jonathing 287ee7b0b5 Update Gradle to 8.12.1 (#10353)
IntelliJ download sources in MDK
2025-01-27 09:44:11 -08:00
Jonathing 5f67621477 Fix JOpt Simple by bumping ModLaucnher (#10348) 2025-01-27 09:43:49 -08:00
Jonathing f237e7a8c3 Fix incorrect method reference in TntBlock.explode() (#10327) 2025-01-25 18:15:54 +00:00
Jonathing a54420de36 Fix JOpt Simple needing a strict version requirement declaration (#10312) 2025-01-25 18:15:36 +00:00
Jonathing 65dbdc8eb0 Bump dependencies (#10275)
- EventBus 6.2.8 -> 6.2.15
- Bootstrap 2.1.3 -> 2.1.8
- SecureModules 2.2.20 -> 2.2.21
- AccessTransformers 8.2.0 -> 8.2.1
- ModLauncher 10.2.2 -> 10.2.3
These bumps include further cleanup and optimisations.
2025-01-04 16:17:38 +00:00
Jonathing d42979f620 Simplify Title Screen Brandings (#10288) 2025-01-02 21:34:03 -08:00
Jonathing ac56afc99c Clean and fix Forge's internal coremods, fixes finalizeSpawn hook. 2024-12-30 14:36:16 -08:00
Gabriel Harris-Rouquette 81b7bfe4ea Update jline for better darwin/arm64 support (#10281) 2024-12-30 09:46:25 -08:00
Jonathing 4cbcf64ce1 Bump CoreMods to 5.2.4 (#10267) 2024-12-23 15:36:20 -08:00
JonathingandPaint_Ninja 29b763a0c3 Simplify memory usage display on loading screen (#10237)
Co-authored-by: Paint_Ninja <[email protected]>
2024-12-23 12:52:39 -08:00
JonathingandPaint_Ninja 52f41a4448 Deprecate @ObjectHolder, add a couple of fast-paths (#10232)
Co-authored-by: Paint_Ninja <[email protected]>
2024-12-23 12:51:51 -08:00
JonathingandPaint_Ninja 597409e2f2 Skip Vanilla classes for the CapabilityTokenSubclass transformer (#10225)
Co-authored-by: Paint_Ninja <[email protected]>
2024-12-23 12:42:07 -08:00
JonathingandPaint_Ninja 21fbd72585 Skip Forge classes in the RuntimeEnumExtender transformer (#10220)
Mod classes are still transformed as usual

Co-authored-by: Paint_Ninja <[email protected]>
2024-12-23 12:30:09 -08:00
JonathingandPaint_Ninja 83a09f7584 Skip processing Forge classes in RuntimeDistCleaner (#10212)
Co-authored-by: Paint_Ninja <[email protected]>
2024-12-23 12:19:40 -08:00
Jonathing 0e864fbe6e Fix NightConfig FileWatcher causing dedicated server to hang when exiting (#10214) 2024-12-23 12:09:22 -08:00
Jonathing 2fd8900c01 Allow mipmap lowering to be disabled (#10256) 2024-12-23 11:57:00 -08:00
LexManos e643d0a11f Remove debug code. Closes #10182 2024-11-21 11:57:00 -08:00
LexManos 5efb8d3f12 Pass the Holder<Enchantment> to Item.canApplyAtEnchantingTable. Closes #10181 2024-11-21 09:52:32 -08:00
LexManos 70537542d1 Fix incorrect patch 2024-11-20 21:04:24 -08:00
LexManos bd4b059c2b Change vanilla registry order to last-seen. Closes #10179 2024-11-20 19:32:28 -08:00
LexManos e0d2c68c5b Call IUnbakedGeometry.bake from BlockModel Closes #10178 2024-11-18 12:30:22 -08:00
LexManos 86d4bda32e Cleanup some warnings 2024-11-18 12:27:16 -08:00
LexManos 98b90f26bc Fix not being able to swim in lava 2024-11-14 23:12:26 -08:00
LexManos 4e7c471fa3 Move mdk back to com/example/examplemod to align with what people expect. 2024-11-14 23:12:11 -08:00
LexManos ec6f9fc6e7 Move MDK example to test sourceset and fix Item/Block registration example. Closes #10139 2024-11-14 14:24:21 -08:00
LexManos 427fef1d4b Added support for using optional tags on Forge registries
Add DeferredRegister.key(name) helper function to make ResourceKey creation easier
Fix TagManager not binding tags
Fix Unbound Tag Exception when modders register tags during Register events Closes #10154
2024-11-14 14:23:00 -08:00
LexManos 83594b0b0a Fix empty tag conditional recipe test 2024-11-14 14:08:00 -08:00
LexManos b76064e57a Fixed missed call to getFriction hook in AbstractBoat 2024-11-12 09:33:05 -08:00
Martijn van den Brand b2bf70c7f1 Pass player argument when firing OnDatapackSyncEvent (#10170) 2024-11-11 20:39:55 -08:00
LexManos 384286a453 Cleanup lifecycle transitions
Fix mod ordering for multi-mod jars
Make dependency resolution issues easier to debug/diagnose
2024-11-11 03:04:23 -08:00
Jonathing d93b7db69a Bump CoreMods to 5.2 (#10156)
Full Changelog:
https://gist.github.com/Jonathing/c3ad28b2a048ac839a7baba5417ee870

The key features are:
- ES6 language support
- Thoroughly updated ASMAPI, with full documentation
- Bug fixes (some optional for backwards-compatibility)
- Partial internal code cleanup
2024-11-08 12:28:39 -08:00
StavWasPlayZ bdbde4bb0f Fix PlayerRenderer#render invoking RenderLivingEvent and not RenderPlayerEvent (#10167) 2024-11-07 20:03:37 -08:00
LexManos e2a68ad903 Fix Powered Rails acting like Activator Rails due to misaligned patch 2024-11-06 23:38:09 -08:00
LexManos 46cfe50108 Properly allow normal mods.toml mods to specify the module names and use a full module-info.
Make FMLModContainer read and apply Add-Opens and Add-Exports manifest entries from mod files.
Forge is now the `net.minecraftforge.forge` module instead of `forge`

https://forums.minecraftforge.net/topic/153333-proper-java-module-support-in-forge-mods/
2024-11-04 16:55:10 -08:00
LexManos 4b423a3087 Fix LootTableLoadEvent not being fired. Closes #10144 2024-10-28 16:08:03 -07:00
LexManos 7d0b07e858 Fix items with use durations of 0 being repeatedly used when use button is held down. Fixed #10150 2024-10-28 14:54:39 -07:00
yurisuika 40220600b0 Add AT for BlockEntityType constructor. (#10149) 2024-10-27 18:05:19 -07:00
Jonathing 0c7a0e927c Add c:stripped_logs and c:stripped_woods tags (#10146) 2024-10-27 02:36:36 +00:00
Jonathing 60e8157b9a Bump CoreMods and ASM (#10145)
CoreMods 5.1.13 changelog: https://gist.github.com/Jonathing/905d142447ecef670526ae27243adbba
2024-10-27 02:34:06 +00:00
Paint_Ninja b8f5e4553b Remove redundant rendering options (#10140) 2024-10-26 20:24:18 +01:00
Ven de587eb50a Fix pause menu having a black background, reverts PR #10115 2024-10-26 12:22:19 -07:00
LexManos 086bcb7148 1.21.3 update 2024-10-25 18:04:34 -07:00
Joseph T. McQuigg c22589b5b3 Add c:foods/pie tag (#10135)
Replaces `forge:foods/pie`, which is now deprecated.
2024-10-17 18:40:33 +01:00
Paint_Ninja e0fbab3c49 Fix back-compat with legacy forge: tags (#10126) 2024-10-14 20:23:09 +01:00
Paint_Ninja 7cfed38194 Implement the de-facto common tags, add many new Forge tags (#9955)
https://forums.minecraftforge.net/topic/152815-common-tags-in-forge/
2024-10-13 14:38:37 +01:00
Joseph T. McQuigg b8105ca5a6 Patch BlockEntity.java to use getType Method (#10124) 2024-10-10 09:56:17 -07:00
LexManos c3ee633897 Fix and cleanup RuntimeDistCleaner 2024-10-08 14:31:17 -07:00
LexManos 23b41ce9b3 Sync component registry ids
Fix deprecation typo
Bump ModLauncher (better stack traces)
Set Automatic-Module-Name
2024-10-07 17:26:13 -07:00
StavWasPlayZ 2c6156be25 Fix layering of translucent sprites being broken by re-adding blur call Mojang removed (#10115) 2024-09-17 08:13:30 -07:00
Tygyh eeb3eb3689 Cleanup length and size checks (#10108) 2024-09-12 14:14:19 +01:00
Tygyh 44a158a714 Update vulnerable eclipse dependency (#10109) 2024-09-12 14:14:01 +01:00
LexManos 770298b1d5 Add and fire SystemMessageReceivedEvent
Replaces ClientChatReceivedEvent.System which was not fired due to Mojang changing ChatType to a registry.
2024-09-11 11:10:41 -07:00
LexManos 7bd50903a6 Fix highlighted item tooltip rendering twice. Closes #10112 2024-09-11 10:18:49 -07:00
Michael Bunting 64295d04ff Fix Network hooks not being initialized on GameTestServer (#10081)
Add rudimentary custom networking tests.
2024-09-11 09:57:17 -07:00
Michael Bunting f168ce4499 Fix inverted logic in TagEmptyCondition (#10069) 2024-09-04 12:19:15 -07:00
RealMangoRage 419c349a1f [1.21.1] Optionally supply FMLJavaModLoadingContext as a param to mod constructors (#10074)
Also made `FMLJavaModLoadingContext` extend `ModLoadingContext`. See the PR description for example usage.
2024-08-25 21:38:31 +01:00
Martijn van den Brand 26d0f7282f Fix issues with QuadBakingVertexConsumer and Forge's OBJ loader (#10065) 2024-08-22 17:26:44 -07:00
Martijn van den Brand 93c72d2d92 Fire OnDatapackSyncEvent when a player joins a server (#10076) 2024-08-22 14:37:39 -07:00
RealMangoRage f252871322 Add a few Method Helpers onto ResourceKey to make getting Data Driven Entries Simpler (#10071) 2024-08-17 20:50:07 -07:00
LexManos 32c8597305 Fix network channels not initializing during server transfers. Closes #10067 2024-08-17 13:04:02 -07:00
Paint_Ninja 9714512c31 [1.21.1] ModLoading cleanup and optimisations (#10052) 2024-08-16 22:49:11 +01:00
Yeregorix f106ff0c21 Properly ignore unknown mod files (#10063) 2024-08-14 02:17:09 -07:00
LexManos 9c85a6bb64 Add level access to Item.TooltipContext if available. 2024-08-09 19:39:00 -07:00
LexManos dc594f196a Load mods that declare explicit 1.21 compatibility as 1.21.1 is a minor bugfix. 2024-08-08 14:01:31 -07:00
LexManos db4d8a4729 1.21.1 2024-08-08 13:40:50 -07:00
andan42 0ca1d0ebd0 Removed unneeded boat patch related to MC-119811 (#10061) 2024-08-07 21:49:40 -07:00
LexManos 4995902bc0 Fix network sync of custom datapack registries.
Add gametest to verify that it functions.
2024-08-05 13:30:14 -07:00
James Mitchell 28e55b2843 Add a way to render tooltips from Formatted text and TooltipComponents elements (#10056) 2024-08-04 19:25:23 +01:00
LexManos decaace84a Fix custom creative tabs with search listing all items instead of just their own. 2024-08-01 17:21:35 -07:00
Joseph T. McQuigg 72f98dc4a3 Patch CropBlock to use instanceOf FarmBlock check instead of hard coding to Blocks.FARMLAND (#10044)
Signed-off-by: Joseph T. McQuigg <[email protected]>
2024-07-26 13:06:07 -07:00
LexManos 2951c1dac8 Fix ItemStack sensitive getDefaultAttributeModifiers not being called. 2024-07-25 16:01:53 -07:00
LexManos 40a0a16db0 Add missed @user_jvm_args.txt to run.bat 2024-07-25 16:00:04 -07:00
Martijn van den Brand 520680b037 Fix onPlaceItemIntoWorld always resetting item stack when in creative mode (#10047) 2024-07-18 12:43:11 -07:00
Martijn van den Brand 2844bead6e Fix matrix stack translations for RenderHighlightEvent (#10050) 2024-07-17 20:17:33 -07:00
LexManos d498ec4a45 Fix Global Loot Modifier deserialization not having registry access. Closes #10042 and #10043 2024-07-10 11:46:23 -07:00
LexManos e2d1ca7d0e Bump Mixin to 0.8.7 and allocate more ram to java compile tasks. 2024-07-08 13:11:00 -07:00
Paint_Ninja a547327c61 Use the new fire() and Result#isAllowed/isDenied/isDefault methods from EventBus (#10028) 2024-07-06 11:35:37 -07:00
LexManos e9a7ce9544 Some build cleanup 2024-07-02 10:25:49 -07:00
LexManos 511be6415c Make HangingSignBlockEntity useable with custom BlockEntityTypes. #10038 2024-07-02 10:25:35 -07:00
LexManos 4d85053a4d Send last PoseStack pos to RenderLevelStageEvent AFTER_PARTICLES stage. Fixes #10031 2024-07-02 10:12:16 -07:00
Jonathing 4fcf1877c1 Fix compile errors in MDK (#10029) 2024-06-24 11:52:00 -07:00
LexManos 41fd15fc57 Fix converting dirt to mud consumes whole bottle (not just emptying) Closes #10027 2024-06-21 13:34:37 -07:00
LexManos 8e0845d032 Add support for named sub-caps 2024-06-19 15:30:46 -07:00
LexManos c04e533a61 Fix conditional checking swallowing decoding errors when loading registry entries from datapacks. Fixes #9995 2024-06-19 15:09:37 -07:00
LexManos 54f4997f71 Apply license headers 2024-06-19 12:54:22 -07:00
LexManos 3272e995ab Some code cleanup in ModInfo/ModFileInfo to use less streams and make things easier to debug. 2024-06-18 11:47:11 -07:00
LexManos 8edb551571 Bump NightConfig to 3.7.3, to fix toml sub-configs being completely broken. Fixes #10015 2024-06-18 11:46:34 -07:00
LexManos 4bf0de4763 Make ForgeSpawnEgg assume color is opaque if alpha is set to 0.
Fixes "invisible" spawn eggs by default, but still allows modders to specify partial transparency.
2024-06-18 11:45:13 -07:00
vicmatskiv f6a54436b9 Fixed perspective rendering in SeparateTransformsModel (#10014) 2024-06-17 15:55:22 -07:00
Gabriel Harris-Rouquette 7a497cdbd6 Fix missed PartEntity patch in Player.attack (#10011) 2024-06-16 19:05:01 -07:00
thedarkcolour 06336a40d8 Choose default JarJar mod file type based on parent JAR Closes #9939 2024-06-14 09:50:05 -07:00
Ven 842c95cfb9 Fixed falling block entities not rendering as moving blocks (#10006) 2024-06-14 09:03:14 -07:00
LexManos aa2f471e87 Bump Night Config, Should fix #9122 2024-06-14 08:37:07 -07:00
LexManos 4209d1fc12 Fix ClientTickEvent not firing properly. 2024-06-13 17:13:15 -07:00
LexManos 583f363b6b Change tick event to have pre/post classes (#9890) 2024-06-13 15:15:04 -07:00
LexManos 1c633b4624 Fix Bogged and Wolf armor not being shearable by custom shears. Closes #10005 2024-06-13 14:21:30 -07:00
LexManos 2677511da6 Set team city branch 2024-06-13 14:20:03 -07:00
LexManos 387441c045 Remove Non-HolderLookup methods from INBTSerializeable and mark it as deprecated in favor of using Vanilla's new Component system. Closes #9998 2024-06-13 13:17:03 -07:00
4a2db246e0 1.21 Update
Co-authored-by: RealMangoRage <[email protected]>
Co-authored-by: Daniel Norris <[email protected]>
Co-authored-by: Ven <[email protected]>
2024-06-13 10:42:32 -07:00
Paint_Ninja 3d9e12a71d Cleanup FML Bindings (#10004) 2024-06-05 09:57:42 -07:00
LexManos cdeb786877 Fix NPE when calling ForgeHooks.getDefaultCreatorModId(ItemStack) on Spawn Eggs. Closes #10002 2024-06-04 15:48:07 -07:00
LexManos ff7085b95b Fix boat travel distance being incorrect. Closes #9997 2024-06-03 17:31:51 -07:00
LexManos 16dde4d551 1.20.6 RB 1
https://forums.minecraftforge.net/topic/149458-forge-501-minecraft-1206/
2024-06-03 13:15:55 -07:00
Paint_Ninja 60661350c6 Fix minor typo in MDK build.gradle 2024-06-03 20:53:10 +01:00
LexManos 7ee4a44c75 Fire EntityInteractSpecific on server side. Closes #9984 2024-06-03 12:33:53 -07:00
LexManos f22894cf70 Unlock wrapped registries when firing register events. 2024-06-03 12:31:59 -07:00
Paint_Ninja a3fce36942 Update Bootstrap to improve the Java version check error message (#9990) 2024-05-30 23:51:44 +01:00
Paint_Ninja 549dbe7df4 Minor cleanup to ModListScreen and VersionChecker (#9988) 2024-05-30 23:51:25 +01:00
Daniel Norris 5505e472aa Prevent the @OnlyIn being misused on @EventBusSubscriber and @Mod annotated classes (#9891) 2024-05-30 23:51:09 +01:00
Mysticdrew c2c7f9b656 Fix CustomizeGuiOverlayEvent.DebugText and CustomizeGuiOverlayEvent.Chat not being fired. (#9982) 2024-05-24 08:33:52 -07:00
LexManos fd8a0f9c8b Actually fix creative tab count, IDE didn't save the file before regenning patches. 2024-05-23 09:08:51 -07:00
LexManos 0ac873e296 Move Creative Inventory page count to fix issue with partially transparent tooltips. Closes #9983 2024-05-22 12:14:38 -07:00
LexManos 38b5b678cb Make OpenContainer and SpawnEntity packets process on main game thread. 2024-05-21 11:02:44 -07:00
LexManos 9a2bc1e7c2 Add File.exists check to ConfigFileTypeHandler. Closes #9976 2024-05-21 11:02:43 -07:00
RealMangoRage 95b49bedbc Fix crash when reloading a world that uses custom placed features. Closes #9979 2024-05-20 23:23:45 -07:00
LexManos 7c36115e3d Fix NPE in HurtByTargetGoal when mods set targets to null. Closes #7853 2024-05-20 16:21:17 -07:00
R0b0Li0n c037e6aca1 Fix RenderHandEvent firing with incorrect hand and item for offhand items. (#9977) 2024-05-20 11:50:09 -07:00
Mysticdrew e8f1b7ed6d Fix screen layering and re-add the test. (#9978) 2024-05-20 11:49:41 -07:00
RealMangoRage 5da16e6719 Add GatherComponentsEvent (#9944) 2024-05-14 23:02:58 -07:00
LexManos f0a82d79a6 Fix powered rails not propogating correctly. 2024-05-14 22:43:27 -07:00
LexManos 2b3a4137e1 Remove ICustomPacket and add PayloadChannel. (#9972)
New PayloadChannel that uses the vanilla payload Type for packet distinction
Implement the minecraft:register/unregister channels using the new PayloadChannel
New generic channel builder function allowing people to implement channels however they want.
2024-05-14 08:36:42 -07:00
LexManos 640c206117 Implement entity aware armor model and texture hooks. Closes #9960 2024-05-12 17:07:45 -07:00
LexManos 59a7bbdb57 Fix finalizeSpawn's return value not being used correctly. Closes #9964 2024-05-12 13:48:20 -07:00
LexManos be7ad14b4b Fix Biome patch change that caused our field redirect coremod to not function correctly. 2024-05-12 11:21:49 -07:00
LexManos c700b4ea9d Make RegistryObject.getHolder lazy, Should help cases where vanilla registries use holders from other vanilla registries. Closes #9961 2024-05-12 10:53:10 -07:00
LexManos dffa3dd4c9 Ignore jar files in the mods folder that are not Forge mods. Closes #9968 2024-05-12 03:36:22 -07:00
LexManos 4b934809c4 Fix canceling MobSpawnEvent.FinalizeSpawn causing a NPE closes #9971 2024-05-11 23:05:19 -07:00
LexManos ddf76db9b3 Fix potion brewing having arguments reversed. Closes #9970 2024-05-10 14:55:38 -07:00
LexManos 64d6b4f76a Fix Melons/Pumpkins not growing correctly. 2024-05-10 10:39:13 -07:00
Paint_Ninja 58012bfb17 Some patch cleanup (#9951) 2024-05-09 18:07:41 +01:00
LexManos 0cad6b14d9 Filter paths discovered by ServiceProvider in ClasspathLocator. Closes #9899 2024-05-09 09:39:25 -07:00
8848294210 Update SimpleChannel to make StreamCodecs easier (#9959)
Rework networking so that RegistryFriendlyByteBuf is useable for modders
Simple support for StreamCodec in SimpleChannel
Codecify all Forge packets
Make simpler builder pattern for SimpleChannel. Will eventually deprecate the old MessageBuilder as it's verbose and poorly written.

Co-authored-by: MrCrayfish <[email protected]>
Co-authored-by: Paint_Ninja <[email protected]>
2024-05-07 22:53:14 -07:00
LexManos 0e28336fc0 Fix shields not working correctly. Fixes #9966 2024-05-06 18:56:20 -07:00
LexManos 968fa9eeb5 Fix RenderTarget stencil patch location. Fixes #9965 2024-05-06 09:33:27 -07:00
EnZaXD 43768ea328 Add ModelLayers patch back (#9962) 2024-05-05 09:15:05 -07:00
LexManos 0e829630da Fix canApplyAtEnchantingTable null pointer, Closes #9956
Bump SecureModules for package info and multi-release jar fixes.
2024-05-03 14:10:17 -07:00
Paint_Ninja 0467d71466 Remove zombie chance config options (#9950) 2024-05-01 22:27:28 +01:00
Paint_Ninja 115eb5e4c8 Remove deprecated compressLanIPv6Addresses config option (#9949)
LAN IPv6 addresses are always compressed these days, so this config option is redundant
2024-05-01 22:27:16 +01:00
LexManos a7345372fd Fix custom payloads not being handled on the server in the game state. Closes #9948
Fix villagers not opening trade guis. Closes #9946
2024-05-01 13:16:41 -07:00
LexManos bd714b2f76 Fix MDK by bumping FG and disabling reobf tasks
Fix LAN server IPs being duplicated
Fix connecting to vanilla servers due to misapplied patch.
2024-05-01 11:28:43 -07:00
7b782e5b05 1.20.6 Initial Update
New Decompiler
Runtime Official mappings
ItemStacks arnt Capability providers anymore, use Vanilla's system.

Co-authored-by: RealMangoRage <[email protected]>
Co-authored-by: Paint_Ninja <[email protected]>
2024-04-30 11:42:52 -07:00
Paint_Ninja e1fa61080a Make non-Forge mods.toml detection more robust (#9935) 2024-04-25 22:36:56 +01:00
Paint_Ninja 381998c35c Fix early window crash when parsing some forms of options.txt (#9933) 2024-04-19 21:39:23 +01:00
Paint_Ninja 11ed2500a6 Fix edge-case regression with single-jar multiloader mods (#9931) 2024-04-19 21:38:57 +01:00
J-RAP a647237db4 Add ClientPauseChangeEvent (#9905) 2024-04-18 21:36:00 +01:00
Paint_Ninja e0dccae041 Improve mod loading errors (#9870) 2024-04-18 20:02:41 +01:00
Paint_Ninja e7a5c58907 Early display fixes/workarounds for buggy drivers (#9921) 2024-04-18 20:02:18 +01:00
oldkingOK e094eee54d Prevent registering null tiers (#9895)
Makes it easier to identify broken mods, as it moves the crash to when the broken mod in question registers the tier, rather than when any mod tries getting the tier.
2024-04-15 14:49:03 +01:00
Paint_NinjaandblockingHD a6adc58655 Add helper method to OnDatapackSyncEvent (#9901)
Co-authored-by: blockingHD <[email protected]>
2024-04-15 14:47:45 +01:00
J-RAP d31ea640f9 Fix NPE when acceptableValues in defineInList() does not allow nulls, fixes #9300 (#9903) 2024-04-13 12:47:35 +01:00
J-RAP 8e16765438 [1.20.x] Add ByteValue, ShortValue and FloatValue to ForgeConfigSpec, cleanup code (#9902) 2024-04-13 12:42:31 +01:00
Joseph T. McQuigg 73b0088cb4 Add Leaves method to ModelProvider.java (#9887) 2024-04-04 13:53:55 +01:00
LexManos 203fbbb742 Bump bootstrap 2024-03-18 18:31:29 -07:00
LexManos 46d78c8210 Fix level data not loading from existing worlds. Whole system needs a re-write. 2024-03-18 18:15:39 -07:00
LexManos cfba4381b6 Fix modlist size 2024-03-18 18:09:37 -07:00
LexManos 7113701322 Bump Bootstrap 2024-03-18 17:45:58 -07:00
Paint_Ninja 73e02c6add Optimize Entity capabilities a bit by reordering conditions (#9886) 2024-03-16 17:16:11 -07:00
Paint_Ninja 7f2b85d2ff [1.20.x] Make common config screen registration tasks easier (#9884) 2024-03-10 21:27:57 +00:00
Paint_Ninja 099d121c2c [1.20.4] Add CPU usage config option to early window, hide it by default (#9866) 2024-03-10 21:10:06 +00:00
Luis a6978eed68 Fix DatapackBuiltinEntriesProvider issues with forge registries, Fixes #9874 2024-03-01 13:26:00 -08:00
Luis 309116520b Readded DatapackBuiltinEntriesProvider (#9848) 2024-02-15 14:04:51 -08:00
Paint_NinjaandDennis C 3e358acbe1 Fix slightly offset mods screen link positioning (#9860)
Co-authored-by: Dennis C <[email protected]>
2024-02-15 14:04:05 -08:00
LexManos c243adf6aa Fix DNS SRV record lookup not working by hacking the module system. Closes #9846 2024-02-12 13:46:29 -08:00
LexManos 5d0047753d Add null check to DimensionDataStorage. Fixes #9859 2024-02-02 12:50:09 -08:00
LexManos aa6f268c74 Fix cases where LivingConversionEvents were not fired for vanilla conversions. Closes #9850 2024-01-29 13:13:28 -08:00
LexManos d21556a4da Update licenser plugin, and re-run it. Closes #9855 2024-01-29 12:27:45 -08:00
LexManos d4c998e311 Fix background music looping when it shouldn't 2024-01-29 12:16:46 -08:00
LexManos 25727a0e93 Fix Criterion Test Mod 2024-01-29 12:16:21 -08:00
Paint_Ninja 80286594c5 Improve help text on server Java check failure 2024-01-20 00:28:02 +00:00
Paint_Ninja 870e3ebcab [1.20.4] Restore the option of server run scripts (#9849)
Executable server jar is still a thing, but the run scripts are restored as an option for those that prefer it.
2024-01-19 20:55:00 +00:00
Paint_Ninja a4c26c9b2b [1.20.x] More buildscript clean-up (#9845) 2024-01-19 20:54:15 +00:00
Mostafa Mabrok 45b00b0004 Fixed Spelling error in credits.txt (#9694) 2024-01-09 11:42:01 -08:00
LexManos 4b1c5ddb2c Bump JarJar to fix more issues with UnionFileSystem assumptions. 2024-01-09 11:41:20 -08:00
DBotThePony 0966109602 Criterion test mod + unit test (#9744) 2024-01-09 11:40:02 -08:00
LexManos b31006534a Fix launcher version name missing - between forge and the version. Closes #9843 2024-01-08 13:43:46 -08:00
LexManos 740a5d5039 Bump JarJar and SecureModule to fix issue with jars containing [] in their name. Closes #9842 2024-01-08 13:42:36 -08:00
LexManos 817e20821d Only add sorted/deduplicated mods to the classpath.
Fixes some mods causing the Forge error displays to break. Closes #9833
2024-01-02 12:51:57 -08:00
Paint_Ninja fdb22d02cc Improve server panel compatibility (#9836) 2023-12-30 20:56:18 +00:00
Paint_Ninja f09fd1f05b Make common DisplayTest registration tasks easier (#9822) 2023-12-27 08:57:02 -08:00
LexManos ed2ba0f52c Cleanup Explosion patch but keep bin compatibility by using asm hacks. Closes #9817 2023-12-21 11:22:31 -08:00
LexManos b04118982f Bump SecureModules, Closes #9820 2023-12-18 14:24:59 -08:00
LexManos d44d0b8edc Support pack overlay system. Closes #9818 2023-12-13 14:42:49 -08:00
LexManos 6d7fda6a9b Fix Server bundle 2023-12-11 21:27:32 -08:00
Paint_Ninja 0303ca651e Optimise ForgeConfigSpec and make Range public (#9810) 2023-12-11 13:10:53 -08:00
Paint_Ninja 8445f73b2d Add clientSideOnly feature to mods.toml (#9804) 2023-12-11 13:10:33 -08:00
Paint_Ninja c7446a5180 Add impl. of IModFileInfo#showAsDataPack (#9802) 2023-12-11 13:08:50 -08:00
LexManos 5c15aa3322 Get rid of LibraryFinder 2023-12-11 12:27:23 -08:00
LexManos 588466f5e4 1.20.4 - Minor bug fix from Mojang 2023-12-07 11:35:53 -08:00
LexManos 470f03b2f9 Fix java version check in bootstrap shim 2023-12-06 16:29:53 -08:00
LexManos d2367d81fc 1.20.3 Initial Update
https://forums.minecraftforge.net/topic/139822-forge-490-minecraft-1203/
2023-12-06 10:38:20 -08:00
2428 changed files with 47080 additions and 43648 deletions

No files matched your search

+1 -12
View File
@@ -26,7 +26,6 @@
/projects/mcp/ /projects/mcp/
/projects/clean/ /projects/clean/
/projects/forge/ /projects/forge/
#/patches/*
#occupational hazards #occupational hazards
/projects/**/build/ /projects/**/build/
@@ -35,20 +34,10 @@
/projects/**/*.launch /projects/**/*.launch
/repo/ /repo/
src/*/generated/**/.cache/ src/*/generated/**/.cache/
# Generated by gradle every import # Generated by gradle every import
**/src/main/resources/META-INF/MANIFEST.MF **/src/main/resources/META-INF/MANIFEST.MF
/fmlloader/src/main/resources/forge_version.json /fmlloader/src/main/resources/forge_version.json
#Patch rejects
#/patches-/
#*.patch.rej
#/projects/*/rejects/
# FML changelog
changelog.txt
*.py
*.7z
/logs/
/ForgeRoot.ipr /ForgeRoot.ipr
/ForgeRoot.iws /ForgeRoot.iws
+3 -3
View File
@@ -36,9 +36,9 @@ project {
buildType(PullRequestCompatibility) buildType(PullRequestCompatibility)
params { params {
text("docker_jdk_version", "17", label = "Gradle version", description = "The version of the JDK to use during execution of tasks in a JDK.", display = ParameterDisplay.HIDDEN, allowEmpty = false) text("docker_jdk_version", "21", label = "Gradle version", description = "The version of the JDK to use during execution of tasks in a JDK.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
text("docker_gradle_version", "7.5.1", label = "Gradle version", description = "The version of Gradle to use during execution of Gradle tasks.", display = ParameterDisplay.HIDDEN, allowEmpty = false) text("docker_gradle_version", "8.7", label = "Gradle version", description = "The version of Gradle to use during execution of Gradle tasks.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
text("git_main_branch", "1.20.x", label = "Git Main Branch", description = "The git main or default branch to use in VCS operations.", display = ParameterDisplay.HIDDEN, allowEmpty = false) text("git_main_branch", "1.21.x", label = "Git Main Branch", description = "The git main or default branch to use in VCS operations.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
text("git_branch_spec", """ text("git_branch_spec", """
+:refs/heads/(main*) +:refs/heads/(main*)
+:refs/heads/(master*) +:refs/heads/(master*)
+4 -4
View File
@@ -3,7 +3,7 @@ Minecraft Forge: Credits/Thank You
Forge is a set of tools and modifications to the Minecraft base game code to assist Forge is a set of tools and modifications to the Minecraft base game code to assist
mod developers in creating new and exciting content. It has been in development for mod developers in creating new and exciting content. It has been in development for
several years now, but I would like to take this time thank a few people who have several years now, but I would like to take this time thank a few people who have
helped it along it's way. helped it along its way.
First, the people who originally created the Forge projects way back in Minecraft First, the people who originally created the Forge projects way back in Minecraft
alpha. Eloraam of RedPower, and SpaceToad of Buildcraft, without their acceptiance alpha. Eloraam of RedPower, and SpaceToad of Buildcraft, without their acceptiance
@@ -11,7 +11,7 @@ of me taking over the project, who knows what Minecraft modding would be today.
Secondly, someone who has worked with me, and developed some of the core features Secondly, someone who has worked with me, and developed some of the core features
that allow modding to be as functional, and as simple as it is, cpw. For developing that allow modding to be as functional, and as simple as it is, cpw. For developing
FML, which stabelized the client and server modding ecosystem. As well as the base FML, which stabilized the client and server modding ecosystem. As well as the base
loading system that allows us to modify Minecraft's code as elegently as possible. loading system that allows us to modify Minecraft's code as elegently as possible.
Mezz, who has stepped up as the issue and pull request manager. Helping to keep me Mezz, who has stepped up as the issue and pull request manager. Helping to keep me
@@ -45,11 +45,11 @@ and minecraft clients.
The code is authored by cpw. The code is authored by cpw.
It began by partially implementing an API defined by the client side ModLoader, authored by Risugami. It began by partially implementing an API defined by the client side ModLoader, authored by Risugami.
http://www.minecraftforum.net/topic/75440- https://www.minecraftforum.net/topic/75440-
This support has been dropped as of Minecraft release 1.7, as Risugami no longer maintains ModLoader. This support has been dropped as of Minecraft release 1.7, as Risugami no longer maintains ModLoader.
It also contains suggestions and hints and generous helpings of code from LexManos, author of MinecraftForge. It also contains suggestions and hints and generous helpings of code from LexManos, author of MinecraftForge.
http://www.minecraftforge.net/ https://minecraftforge.net/
Additionally, it contains an implementation of topological sort based on that Additionally, it contains an implementation of topological sort based on that
published at http://keithschwarz.com/interesting/code/?dir=topological-sort published at http://keithschwarz.com/interesting/code/?dir=topological-sort
+5 -9
View File
@@ -2,13 +2,13 @@ import net.minecraftforge.forge.tasks.*
import net.minecraftforge.gradleutils.PomUtils import net.minecraftforge.gradleutils.PomUtils
plugins { plugins {
id 'org.cadixdev.licenser' version '0.6.1' id 'net.minecraftforge.licenser' version '1.0.1'
id 'com.github.ben-manes.versions' version '0.46.0' id 'com.github.ben-manes.versions' version '0.46.0'
id 'net.minecraftforge.gradleutils' version '[2.3.0,2.4.0)' id 'net.minecraftforge.gradleutils' version '[2.3.0,2.4.0)'
id 'eclipse' id 'eclipse'
id 'de.undercouch.download' version '5.4.0' id 'de.undercouch.download' version '5.4.0'
id 'net.minecraftforge.gradle.patcher' version '[6.0.16,6.2)' apply false id 'net.minecraftforge.gradle.patcher' version '[6.0.22,6.2)' apply false
id 'net.minecraftforge.gradle.mcp' version '[6.0.16,6.2)' apply false id 'net.minecraftforge.gradle.mcp' version '[6.0.22,6.2)' apply false
id 'net.minecraftforge.gradlejarsigner' version '1.0.4' id 'net.minecraftforge.gradlejarsigner' version '1.0.4'
id 'org.barfuin.gradle.taskinfo' version '2.1.0' id 'org.barfuin.gradle.taskinfo' version '2.1.0'
} }
@@ -19,10 +19,6 @@ ext {
GIT_INFO = gradleutils.gitInfo GIT_INFO = gradleutils.gitInfo
VERSION = gradleutils.getFilteredMCTagOffsetBranchVersion(true, '[0-9]', MC_VERSION) VERSION = gradleutils.getFilteredMCTagOffsetBranchVersion(true, '[0-9]', MC_VERSION)
FORGE_VERSION = VERSION.substring(MC_VERSION.length() + 1) FORGE_VERSION = VERSION.substring(MC_VERSION.length() + 1)
BINPATCH_TOOL = 'net.minecraftforge:binarypatcher:1.2.0:fatjar'
INSTALLER_TOOLS = 'net.minecraftforge:installertools:1.4.0'
FART = 'net.minecraftforge:ForgeAutoRenamingTool:1.0.6'
} }
changelog { changelog {
@@ -50,10 +46,10 @@ project(':mcp') {
if (System.env.TEAMCITY_VERSION) { if (System.env.TEAMCITY_VERSION) {
//Only setup the CI environment if and only if the environment variables are set. //Only setup the CI environment if and only if the environment variables are set.
tasks.configureTeamCity { tasks.named('configureTeamCity').configure {
doLast { doLast {
println "##teamcity[buildNumber '${project(':forge').version}']" println "##teamcity[buildNumber '${project(':forge').version}']"
println "##teamcity[setParameter name='env.PUBLISHED_JAVA_ARTIFACT_VERSION' value='${project(':forge').version}']" println "##teamcity[setParameter name='env.PUBLISHED_JAVA_ARTIFACT_VERSION' value='${project(':forge').version}']"
} }
} }
} }
+6 -6
View File
@@ -4,10 +4,10 @@ repositories {
} }
dependencies { dependencies {
implementation 'org.ow2.asm:asm:9.5' implementation 'org.ow2.asm:asm:9.7'
implementation 'org.ow2.asm:asm-tree:9.5' implementation 'org.ow2.asm:asm-tree:9.7'
implementation 'net.minecraftforge:srgutils:0.5.+' implementation 'net.minecraftforge:srgutils:0.5.10'
implementation 'commons-io:commons-io:2.12.0' implementation 'commons-io:commons-io:2.13.0'
implementation 'com.google.code.gson:gson:2.10.1' implementation 'com.google.code.gson:gson:2.10.1'
implementation 'org.eclipse.jgit:org.eclipse.jgit:6.5.0.202303070854-r' implementation 'org.eclipse.jgit:org.eclipse.jgit:6.7.0.202309050840-r'
} }
@@ -4,14 +4,19 @@ import org.gradle.api.tasks.*
import org.gradle.api.DefaultTask import org.gradle.api.DefaultTask
import org.gradle.api.file.ConfigurableFileCollection import org.gradle.api.file.ConfigurableFileCollection
import org.gradle.api.file.RegularFileProperty import org.gradle.api.file.RegularFileProperty
import org.gradle.api.tasks.bundling.AbstractArchiveTask
import java.util.zip.ZipFile
abstract class BundleList extends DefaultTask { abstract class BundleList extends DefaultTask {
@InputFiles abstract ConfigurableFileCollection getConfig() @InputFiles abstract ConfigurableFileCollection getConfig()
@InputFiles abstract ConfigurableFileCollection getConfigExtra()
@InputFile abstract RegularFileProperty getServerBundle() @InputFile abstract RegularFileProperty getServerBundle()
@OutputFile abstract RegularFileProperty getOutput() @OutputFile abstract RegularFileProperty getOutput()
BundleList() { BundleList() {
config.setFrom(project.configurations.installer) config.setFrom(project.configurations.installer)
configExtra.setFrom(project.configurations.installerextra)
output.convention(project.layout.buildDirectory.file("$name/output.list")) output.convention(project.layout.buildDirectory.file("$name/output.list"))
configure { configure {
dependsOn(project.tasks.universalJar) dependsOn(project.tasks.universalJar)
@@ -23,21 +28,31 @@ abstract class BundleList extends DefaultTask {
void run() { void run() {
def entries = [:] as TreeMap def entries = [:] as TreeMap
def resolved = project.configurations.installer.resolvedConfiguration.resolvedArtifacts def resolved = project.configurations.installer.resolvedConfiguration.resolvedArtifacts
for (var dep : resolved) { for (def dep : resolved) {
def info = Util.getMavenInfoFromDep(dep) def info = Util.getMavenInfoFromDep(dep)
//println("$dep.file.sha1\t$info.name\t$info.path") //println("$dep.file.sha1\t$info.name\t$info.path")
entries.put("$info.art.group:$info.art.name", "$dep.file.sha256\t$info.name\t$info.path") entries.put("$info.art.group:$info.art.name", "$dep.file.sha256\t$info.name\t$info.path")
} }
[ resolved = project.configurations.installerextra.resolvedConfiguration.resolvedArtifacts
project.tasks.universalJar for (def dep : resolved) {
].forEach{ packed -> def info = Util.getMavenInfoFromDep(dep)
def info = Util.getMavenInfoFromTask(packed) //println("$dep.file.sha1\t$info.name\t$info.path")
def file = packed.archiveFile.get().asFile entries.put("$info.art.group:$info.art.name", "$dep.file.sha256\t$info.name\t$info.path")
entries.put("$info.art.group:$info.art.name:$info.art.classifier", "$file.sha256\t$info.name\t$info.path")
} }
var packed = (AbstractArchiveTask) project.tasks.universalJar
var info = Util.getMavenInfoFromTask(packed)
def file = packed.archiveFile.get().asFile
entries.put("$info.art.group:$info.art.name:$info.art.classifier", "$file.sha256\t$info.name\t$info.path")
var classifier = 'server'
var genned = project.tasks.applyServerBinPatches
info = Util.getMavenInfoFromTask(genned, classifier)
file = genned.output.get().asFile
entries.put("$info.art.group:$info.art.name:$info.art.classifier", "$file.sha256\t$info.name\t$info.path")
try (def zip = new java.util.zip.ZipFile(serverBundle.get().asFile)) { try (def zip = new ZipFile(serverBundle.get().asFile)) {
def entry = zip.getEntry('META-INF/libraries.list') def entry = zip.getEntry('META-INF/libraries.list')
def data = zip.getInputStream(entry).text.split('\n') def data = zip.getInputStream(entry).text.split('\n')
for (def line : data) { for (def line : data) {
@@ -1,6 +1,7 @@
package net.minecraftforge.forge.tasks package net.minecraftforge.forge.tasks
import groovy.json.JsonBuilder import groovy.json.JsonBuilder
import groovy.transform.CompileStatic
import org.gradle.api.DefaultTask import org.gradle.api.DefaultTask
import org.gradle.api.file.RegularFileProperty import org.gradle.api.file.RegularFileProperty
import org.gradle.api.tasks.InputFile import org.gradle.api.tasks.InputFile
@@ -10,6 +11,7 @@ import org.objectweb.asm.tree.ClassNode
import org.objectweb.asm.tree.FieldNode import org.objectweb.asm.tree.FieldNode
import org.objectweb.asm.tree.MethodNode import org.objectweb.asm.tree.MethodNode
@CompileStatic
abstract class BytecodeFinder extends DefaultTask { abstract class BytecodeFinder extends DefaultTask {
@InputFile abstract RegularFileProperty getJar() @InputFile abstract RegularFileProperty getJar()
// It should be fine to mark the output as internal as we want to control when we run it anyways. // It should be fine to mark the output as internal as we want to control when we run it anyways.
@@ -24,13 +26,13 @@ abstract class BytecodeFinder extends DefaultTask {
protected void exec() { protected void exec() {
Util.init() Util.init()
def outputFile = output.get().asFile var outputFile = output.get().asFile
if (outputFile.exists()) if (outputFile.exists())
outputFile.delete() outputFile.delete()
pre() pre()
Util.processClassNodes(jar.get().asFile, this::process) Util.processClassNodes(jar.get().asFile, this.&process)
post() post()
outputFile.text = new JsonBuilder(getData()).toPrettyString() outputFile.text = new JsonBuilder(getData()).toPrettyString()
@@ -38,8 +40,8 @@ abstract class BytecodeFinder extends DefaultTask {
protected process(ClassNode node) { protected process(ClassNode node) {
if (node.fields != null) node.fields.each { process(node, it) } if (node.fields !== null) node.fields.each { process(node, it) }
if (node.methods != null) node.methods.each { process(node, it) } if (node.methods !== null) node.methods.each { process(node, it) }
} }
protected pre() {} protected pre() {}
@@ -3,6 +3,7 @@ package net.minecraftforge.forge.tasks
import groovy.transform.CompileStatic import groovy.transform.CompileStatic
import org.gradle.api.provider.Property import org.gradle.api.provider.Property
import org.gradle.api.tasks.Internal import org.gradle.api.tasks.Internal
import org.objectweb.asm.Opcodes
import org.objectweb.asm.tree.ClassNode import org.objectweb.asm.tree.ClassNode
import org.objectweb.asm.tree.MethodNode import org.objectweb.asm.tree.MethodNode
@@ -12,13 +13,19 @@ abstract class BytecodePredicateFinder extends BytecodeFinder {
@Internal @Internal
abstract Property<Closure<Boolean>> getPredicate() abstract Property<Closure<Boolean>> getPredicate()
private final Set<String> matches = new HashSet() private final Map<String, List<String>> matches = new TreeMap<>(Comparator.naturalOrder())
@Override @Override
protected process(ClassNode parent, MethodNode node) { protected process(ClassNode parent, MethodNode node) {
for (final current : node.instructions) { for (final current : node.instructions) {
if (predicate.get().call(parent, node, current)) { if (predicate.get().call(parent, node, current)) {
matches.add(parent.name) var methods = matches.compute(parent.name, { k, v -> v ?: new ArrayList<>() })
// only add non-synthetic methods
if ((node.access & Opcodes.ACC_SYNTHETIC) == 0) {
methods.add(node.name + node.desc)
}
return return
} }
} }
@@ -27,6 +34,15 @@ abstract class BytecodePredicateFinder extends BytecodeFinder {
@Internal @Internal
@Override @Override
protected Object getData() { protected Object getData() {
return matches.toSorted(Comparator.naturalOrder()) ?: {throw new RuntimeException('Failed to find any targets, please ensure that method names and descriptors are correct.')}() var array = new ArrayList<Object>()
matches.forEach { c, m ->
{
array.add(
'class': c,
'methods': m
)
}
}
return array ?: { throw new RuntimeException('Failed to find any targets, please ensure that method names and descriptors are correct.') }()
} }
} }
@@ -1,5 +1,8 @@
package net.minecraftforge.forge.tasks; package net.minecraftforge.forge.tasks;
import groovy.transform.CompileDynamic;
import groovy.transform.CompileStatic;
import java.util.Properties; import java.util.Properties;
import java.util.Enumeration; import java.util.Enumeration;
import java.util.Map; import java.util.Map;
@@ -26,6 +29,7 @@ import java.util.Set;
* This does the same thing, as well as sorting alphabetically. * This does the same thing, as well as sorting alphabetically.
* It also ignores all comments. We can add them latter if someone cares. * It also ignores all comments. We can add them latter if someone cares.
*/ */
@CompileStatic
public class CleanProperties extends Properties { public class CleanProperties extends Properties {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private static final String LINE_SEP = System.getProperty("line.separator"); private static final String LINE_SEP = System.getProperty("line.separator");
@@ -58,6 +62,7 @@ public class CleanProperties extends Properties {
return Collections.enumeration(ret); return Collections.enumeration(ret);
} }
@CompileDynamic
@Override @Override
public Set<Map.Entry<Object, Object>> entrySet() { public Set<Map.Entry<Object, Object>> entrySet() {
Set<Map.Entry<Object, Object>> ret = new TreeSet<>((l, r) -> ((String)l.getKey()).compareTo((String)r.getKey())); Set<Map.Entry<Object, Object>> ret = new TreeSet<>((l, r) -> ((String)l.getKey()).compareTo((String)r.getKey()));
@@ -1,5 +1,7 @@
package net.minecraftforge.forge.tasks package net.minecraftforge.forge.tasks
import groovy.transform.stc.FirstParam
import java.util.function.BiConsumer import java.util.function.BiConsumer
public class ClosureHelper { public class ClosureHelper {
@@ -22,7 +24,7 @@ public class ClosureHelper {
} }
} }
static <T> T apply(T obj, Closure cl) { static <T> T apply(T obj, @DelegatesTo(value = FirstParam, strategy = Closure.DELEGATE_FIRST) Closure cl) {
cl.delegate = obj cl.delegate = obj
cl.resolveStrategy = Closure.DELEGATE_FIRST cl.resolveStrategy = Closure.DELEGATE_FIRST
cl() cl()
@@ -27,7 +27,7 @@ abstract class DownloadLibraries extends DefaultTask {
def run() { def run() {
Util.init() Util.init()
File outputDir = output.get().asFile File outputDir = output.get().asFile
def libraries = new ArrayList() var libraries = new ArrayList<String>()
def json = input.get().asFile.json().libraries.each { lib -> def json = input.get().asFile.json().libraries.each { lib ->
//TODO: Thread? //TODO: Thread?
@@ -35,7 +35,7 @@ abstract class DownloadLibraries extends DefaultTask {
artifacts.each{ art -> artifacts.each{ art ->
def target = new File(outputDir, art.path) def target = new File(outputDir, art.path)
libraries.add(target.absolutePath) libraries.add(target.absolutePath)
if (!target.exists() || !art.sha1.equals(target.sha1())) { if (!target.exists() || art.sha1 != target.sha1()) {
project.logger.lifecycle("Downloading ${art.url}") project.logger.lifecycle("Downloading ${art.url}")
if (!target.parentFile.exists()) { if (!target.parentFile.exists()) {
target.parentFile.mkdirs() target.parentFile.mkdirs()
@@ -43,7 +43,7 @@ abstract class DownloadLibraries extends DefaultTask {
new URL(art.url).withInputStream { i -> new URL(art.url).withInputStream { i ->
target.withOutputStream { it << i } target.withOutputStream { it << i }
} }
if (!art.sha1.equals(target.sha1())) { if (art.sha1 != target.sha1()) {
throw new IllegalStateException("Failed to download ${art.url} to ${target.canonicalPath} SHA Mismatch") throw new IllegalStateException("Failed to download ${art.url} to ${target.canonicalPath} SHA Mismatch")
} }
} }
@@ -1,10 +1,14 @@
package net.minecraftforge.forge.tasks package net.minecraftforge.forge.tasks
import groovy.transform.CompileStatic
import org.gradle.api.DefaultTask import org.gradle.api.DefaultTask
import org.gradle.api.file.RegularFileProperty import org.gradle.api.file.RegularFileProperty
import org.gradle.api.provider.Property import org.gradle.api.provider.Property
import org.gradle.api.tasks.* import org.gradle.api.tasks.*
import java.util.zip.ZipFile
@CompileStatic
abstract class ExtractFile extends DefaultTask { abstract class ExtractFile extends DefaultTask {
@InputFile abstract RegularFileProperty getInput() @InputFile abstract RegularFileProperty getInput()
@Input abstract Property<String> getTarget() @Input abstract Property<String> getTarget()
@@ -12,11 +16,11 @@ abstract class ExtractFile extends DefaultTask {
@TaskAction @TaskAction
protected void exec() { protected void exec() {
def zip = new java.util.zip.ZipFile(input.get().asFile); var zip = new ZipFile(input.get().asFile);
def entry = zip.getEntry(target.get()) var entry = zip.getEntry(target.get())
if (entry == null) if (entry == null)
throw new IllegalStateException(input.get().asFile.absolutePath + " does not contain " + target.get()) throw new IllegalStateException(input.get().asFile.absolutePath + " does not contain " + target.get())
def stream = zip.getInputStream(entry) var stream = zip.getInputStream(entry)
output.get().asFile.withOutputStream { out -> output.get().asFile.withOutputStream { out ->
stream.transferTo(out) stream.transferTo(out)
} }
@@ -1,20 +1,11 @@
package net.minecraftforge.forge.tasks package net.minecraftforge.forge.tasks
import groovy.transform.CompileStatic
import groovy.transform.EqualsAndHashCode import groovy.transform.EqualsAndHashCode
import java.util.ArrayList
import java.util.HashMap
import java.util.TreeMap
import java.util.TreeSet
import java.util.function.BiConsumer
import org.gradle.api.DefaultTask
import org.gradle.api.tasks.* import org.gradle.api.tasks.*
import org.objectweb.asm.tree.AbstractInsnNode
import org.objectweb.asm.Opcodes
import org.objectweb.asm.Type
import org.objectweb.asm.tree.ClassNode import org.objectweb.asm.tree.ClassNode
import org.objectweb.asm.tree.FieldNode
import org.objectweb.asm.tree.MethodNode import org.objectweb.asm.tree.MethodNode
import static org.objectweb.asm.Opcodes.* import static org.objectweb.asm.Opcodes.*
@@ -34,17 +25,17 @@ abstract class FieldCompareFinder extends BytecodeFinder {
@Override @Override
protected process(ClassNode parent, MethodNode node) { protected process(ClassNode parent, MethodNode node) {
def last = null AbstractInsnNode last = null
def parentInstance = new ObjectTarget(owner: parent.name, name: '', desc: '') def parentInstance = new ObjectTarget(owner: parent.name, name: '', desc: '')
for (int x = 0; x < node.instructions.size(); x++) { for (int x = 0; x < node.instructions.size(); x++) {
def current = node.instructions.get(x) def current = node.instructions.get(x)
if (current.opcode == IF_ACMPEQ || current.opcode == IF_ACMPNE) { if (current.opcode === IF_ACMPEQ || current.opcode === IF_ACMPNE) {
if (last != null && (last.opcode == GETSTATIC || last.opcode == GETFIELD)) { if (last !== null && (last.opcode === GETSTATIC || last.opcode === GETFIELD)) {
def target = new Search(cls: last.owner, name: last.name) def target = new Search(cls: last.owner, name: last.name)
def wanted = fieldsReverse.get(target) def wanted = fieldsReverse.get(target)
def original = fields.get(wanted) def original = fields.get(wanted)
def instance = new ObjectTarget(owner: parent.name, name: node.name, desc: node.desc) def instance = new ObjectTarget(owner: parent.name, name: node.name, desc: node.desc)
if (wanted != null && (original.blacklist == null || (!original.blacklist.contains(instance) && !original.blacklist.contains(parentInstance)))) { if (wanted !== null && (original.blacklist === null || (!original.blacklist.contains(instance) && !original.blacklist.contains(parentInstance)))) {
targets.computeIfAbsent(wanted, { k -> new TreeSet() }).add(instance) targets.computeIfAbsent(wanted, { k -> new TreeSet() }).add(instance)
} }
} }
@@ -68,9 +59,10 @@ abstract class FieldCompareFinder extends BytecodeFinder {
} }
return ret return ret
} }
@CompileStatic
@EqualsAndHashCode(excludes = ['replacement', 'blacklist']) @EqualsAndHashCode(excludes = ['replacement', 'blacklist'])
public static class Search { static class Search {
@Input @Input
String cls String cls
@@ -89,17 +81,17 @@ abstract class FieldCompareFinder extends BytecodeFinder {
return cls + '.' + name return cls + '.' + name
} }
def blacklist(def owner, def name, def desc) { def blacklist(String owner, String name, String desc) {
if (blacklist == null) if (blacklist === null)
blacklist = new HashSet() blacklist = new HashSet<>()
blacklist.add(new ObjectTarget(owner: owner, name: name, desc: desc)) blacklist.add(new ObjectTarget(owner: owner, name: name, desc: desc))
} }
def blacklist(def owner) { def blacklist(String owner) {
blacklist(owner, '', '') blacklist(owner, '', '')
} }
} }
def fields(Closure cl) { void fields(Closure cl) {
new ClosureHelper(cl, {name, ccl -> new ClosureHelper(cl, {name, ccl ->
def search = ClosureHelper.apply(new Search(), ccl) def search = ClosureHelper.apply(new Search(), ccl)
this.fields.put(name, search) this.fields.put(name, search)
@@ -1,5 +1,7 @@
package net.minecraftforge.forge.tasks package net.minecraftforge.forge.tasks
import org.gradle.api.file.DuplicatesStrategy
import org.gradle.api.tasks.bundling.AbstractArchiveTask
import org.gradle.api.tasks.bundling.Zip import org.gradle.api.tasks.bundling.Zip
import org.gradle.api.tasks.* import org.gradle.api.tasks.*
import org.gradle.api.DefaultTask import org.gradle.api.DefaultTask
@@ -27,7 +29,7 @@ abstract class InstallerJar extends Zip {
from(project.rootProject.file('/src/main/resources/url.png')) from(project.rootProject.file('/src/main/resources/url.png'))
project.afterEvaluate { project.afterEvaluate {
from(project.zipTree(downloadInstaller.output)) { from(project.zipTree(downloadInstaller.output)) {
duplicatesStrategy = 'exclude' duplicatesStrategy = DuplicatesStrategy.EXCLUDE
} }
if (fat.get() || offline.get()) { if (fat.get() || offline.get()) {
@@ -42,7 +44,7 @@ abstract class InstallerJar extends Zip {
// I should make it allow downloads but thats a spec break, and this is just a ~14KB jar // I should make it allow downloads but thats a spec break, and this is just a ~14KB jar
[ [
project.tasks.serverShimJar // Server bootstrap executable jar project.tasks.serverShimJar // Server bootstrap executable jar
].forEach { packed -> ].forEach { AbstractArchiveTask packed ->
def path = Util.getMavenInfoFromTask(packed).path def path = Util.getMavenInfoFromTask(packed).path
from(packed) { from(packed) {
rename { "maven/$path" } rename { "maven/$path" }
@@ -67,8 +69,8 @@ abstract class InstallerJar extends Zip {
].each { task -> ].each { task ->
def json = task.output.get().asFile.json def json = task.output.get().asFile.json
json.libraries.each { lib -> json.libraries.each { lib ->
deps.put(lib.name, lib.downloads.artifact) if (lib.downloads?.artifact?.url !== null && !lib.downloads.artifact.url.isEmpty())
//println(lib.name) deps.put(lib.name, lib.downloads.artifact)
} }
} }
@@ -76,10 +78,10 @@ abstract class InstallerJar extends Zip {
[ [
project.tasks.universalJar, // Forge runtime code project.tasks.universalJar, // Forge runtime code
project.tasks.serverShimJar // Shim jar for dedicated server project.tasks.serverShimJar // Shim jar for dedicated server
].forEach { packed -> ].forEach { AbstractArchiveTask packed ->
def name = Util.getMavenInfoFromTask(packed).name def name = Util.getMavenInfoFromTask(packed).name
def info = deps.remove(name) def info = deps.remove(name)
if (info != null) { if (info !== null) {
println("Adding: $packed.path $name") println("Adding: $packed.path $name")
parent.from(packed) { parent.from(packed) {
rename { "maven/$info.path" } rename { "maven/$info.path" }
@@ -96,7 +98,7 @@ abstract class InstallerJar extends Zip {
//println('') //println('')
def resolved = cfg.resolvedConfiguration.resolvedArtifacts def resolved = cfg.resolvedConfiguration.resolvedArtifacts
int found = 0 int found = 0
for (var dep : resolved) { for (def dep : resolved) {
def name = Util.getMavenInfoFromDep(dep).name def name = Util.getMavenInfoFromDep(dep).name
def info = deps.remove(name) def info = deps.remove(name)
if (info == null) { if (info == null) {
@@ -132,13 +134,13 @@ abstract class InstallerJar extends Zip {
} }
void addFile(file, info) { void addFile(file, info) {
def pack = parent.offline.get() || info.url.isEmpty() boolean pack = parent.offline.get() || info.url.isEmpty()
// If it's a offline jar just always pack // If it's a offline jar just always pack
if (!pack) { if (!pack) {
try { try {
def remote = new URL("${info.url}.sha1").getText('UTF-8') var remote = new URL("${info.url}.sha1").getText('UTF-8')
pack = !info.sha1.equals(remote) pack = info.sha1 != remote
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {
pack = !info.url.startsWith('https://libraries.minecraft.net/') pack = !info.url.startsWith('https://libraries.minecraft.net/')
// Oh noes its not there! // Oh noes its not there!
@@ -7,6 +7,7 @@ import org.gradle.api.file.RegularFileProperty
import org.gradle.api.provider.Property import org.gradle.api.provider.Property
import org.gradle.api.provider.SetProperty import org.gradle.api.provider.SetProperty
import org.gradle.api.tasks.* import org.gradle.api.tasks.*
import org.gradle.api.tasks.bundling.AbstractArchiveTask
import java.nio.file.Files import java.nio.file.Files
@@ -45,7 +46,7 @@ abstract class InstallerJson extends DefaultTask {
[ [
project.tasks.universalJar, project.tasks.universalJar,
project.tasks.serverShimJar project.tasks.serverShimJar
].forEach { packed -> ].forEach { AbstractArchiveTask packed ->
def info = Util.getMavenInfoFromTask(packed) def info = Util.getMavenInfoFromTask(packed)
libs.put(info.name, [ libs.put(info.name, [
name: info.name, name: info.name,
@@ -6,6 +6,7 @@ import org.gradle.api.file.ConfigurableFileCollection
import org.gradle.api.file.RegularFileProperty import org.gradle.api.file.RegularFileProperty
import org.gradle.api.provider.SetProperty import org.gradle.api.provider.SetProperty
import org.gradle.api.tasks.* import org.gradle.api.tasks.*
import org.gradle.api.tasks.bundling.AbstractArchiveTask
import java.nio.file.Files import java.nio.file.Files
@@ -23,6 +24,7 @@ abstract class LauncherJson extends DefaultTask {
dependsOn(project.tasks.universalJar) dependsOn(project.tasks.universalJar)
input.from(project.tasks.universalJar.archiveFile) input.from(project.tasks.universalJar.archiveFile)
input.from(project.configurations.installer) input.from(project.configurations.installer)
input.from(project.configurations.installerextra)
configure { configure {
def mc = project.rootProject.ext.MC_VERSION def mc = project.rootProject.ext.MC_VERSION
def forge = project.rootProject.ext.FORGE_VERSION def forge = project.rootProject.ext.FORGE_VERSION
@@ -33,7 +35,7 @@ abstract class LauncherJson extends DefaultTask {
"Our efforts are supported by ads from the download page.", "Our efforts are supported by ads from the download page.",
"If you MUST automate this, please consider supporting the project through https://www.patreon.com/LexManos/" "If you MUST automate this, please consider supporting the project through https://www.patreon.com/LexManos/"
], ],
id: "$mc-$project.name$forge", id: "$mc-$project.name-$forge",
time: timestamp, time: timestamp,
releaseTime: timestamp, releaseTime: timestamp,
inheritsFrom: mc, inheritsFrom: mc,
@@ -49,30 +51,46 @@ abstract class LauncherJson extends DefaultTask {
dependsOn(packed) dependsOn(packed)
input.from packed.archiveFile input.from packed.archiveFile
} }
def patched = project.tasks.applyClientBinPatches
dependsOn(patched)
input.from patched.output
} }
} }
@TaskAction @TaskAction
protected void exec() { protected void exec() {
[ var packed = (AbstractArchiveTask) project.tasks.universalJar
project.tasks.universalJar def info = Util.getMavenInfoFromTask(packed)
].forEach { packed -> json.libraries.add([
def info = Util.getMavenInfoFromTask(packed) name: info.name,
json.libraries.add([ downloads: [
name: info.name, artifact: [
downloads: [ path: info.path,
artifact: [ url: "https://maven.minecraftforge.net/$info.path",
path: info.path, sha1: packed.archiveFile.get().asFile.sha1(),
url: "https://maven.minecraftforge.net/$info.path", size: packed.archiveFile.get().asFile.length()
sha1: packed.archiveFile.get().asFile.sha1(),
size: packed.archiveFile.get().asFile.length()
]
] ]
]) ]
} ])
getArtifacts(project, project.configurations.installer).each { key, lib ->
json.libraries.add(lib) var classifier = 'client'
} var genned = project.tasks.applyClientBinPatches
info = Util.getMavenInfoFromTask(genned, classifier)
json.libraries.add([
name: info.name,
downloads: [
artifact: [
path: info.path,
url: "",
sha1: genned.output.get().asFile.sha1(),
size: genned.output.get().asFile.length()
]
]
])
json.libraries.addAll(getArtifacts(project.configurations.installerextra).values())
json.libraries.addAll(getArtifacts(project.configurations.installer).values())
Files.writeString(output.get().asFile.toPath(), new JsonBuilder(json).toPrettyString()) Files.writeString(output.get().asFile.toPath(), new JsonBuilder(json).toPrettyString())
} }
} }
@@ -1,5 +1,6 @@
package net.minecraftforge.forge.tasks package net.minecraftforge.forge.tasks
import groovy.transform.CompileStatic
import org.apache.commons.io.IOUtils import org.apache.commons.io.IOUtils
import org.gradle.api.DefaultTask import org.gradle.api.DefaultTask
import org.gradle.api.file.ConfigurableFileCollection import org.gradle.api.file.ConfigurableFileCollection
@@ -12,6 +13,7 @@ import java.util.zip.ZipEntry
import java.util.zip.ZipInputStream import java.util.zip.ZipInputStream
import java.util.zip.ZipOutputStream import java.util.zip.ZipOutputStream
@CompileStatic
abstract class MergeJars extends DefaultTask { abstract class MergeJars extends DefaultTask {
MergeJars() { MergeJars() {
output.convention(project.layout.buildDirectory.dir(name).map { it.file('output.jar') }) output.convention(project.layout.buildDirectory.dir(name).map { it.file('output.jar') })
@@ -24,8 +26,8 @@ abstract class MergeJars extends DefaultTask {
try (ZipOutputStream zout = new ZipOutputStream(new FileOutputStream(output.get().asFile))) { try (ZipOutputStream zout = new ZipOutputStream(new FileOutputStream(output.get().asFile))) {
for (def jar : jars) { for (def jar : jars) {
try (ZipInputStream zin = new ZipInputStream(new FileInputStream(jar))) { try (ZipInputStream zin = new ZipInputStream(new FileInputStream(jar))) {
def entry ZipEntry entry
while ((entry = zin.getNextEntry()) != null) { while ((entry = zin.getNextEntry()) !== null) {
ZipEntry _new = new ZipEntry(entry.getName()) ZipEntry _new = new ZipEntry(entry.getName())
_new.setTime(0) //SHOULD be the same time as the main entry, but NOOOO _new.setTime(entry.getTime()) throws DateTimeException, so you get 0, screw you! _new.setTime(0) //SHOULD be the same time as the main entry, but NOOOO _new.setTime(entry.getTime()) throws DateTimeException, so you get 0, screw you!
zout.putNextEntry(_new) zout.putNextEntry(_new)
@@ -27,6 +27,6 @@ public class ObjectTarget implements Comparable<ObjectTarget> {
@Override @Override
int compareTo(ObjectTarget o) { int compareTo(ObjectTarget o) {
return toString().compareTo(o.toString()) return toString() <=> o.toString()
} }
} }
@@ -16,7 +16,7 @@ abstract class SetupCheckJarCompatibility extends DefaultTask {
SetupCheckJarCompatibility() { SetupCheckJarCompatibility() {
group = 'jar compatibility' group = 'jar compatibility'
onlyIf { onlyIf {
inputVersion.getOrNull() != null inputVersion.getOrNull() !== null
} }
outputs.upToDateWhen { false } // Never up to date, because this setup task should always run outputs.upToDateWhen { false } // Never up to date, because this setup task should always run
@@ -2,35 +2,47 @@ package net.minecraftforge.forge.tasks
import groovy.json.JsonBuilder import groovy.json.JsonBuilder
import groovy.json.JsonSlurper import groovy.json.JsonSlurper
import groovy.transform.CompileStatic
import groovy.transform.stc.ClosureParams
import groovy.transform.stc.SimpleType
import org.gradle.api.Project
import org.gradle.api.Task
import org.gradle.api.artifacts.Configuration
import org.gradle.api.artifacts.ResolvedArtifact
import org.gradle.api.tasks.bundling.AbstractArchiveTask
import org.objectweb.asm.ClassReader import org.objectweb.asm.ClassReader
import org.objectweb.asm.Opcodes import org.objectweb.asm.Opcodes
import org.objectweb.asm.tree.ClassNode import org.objectweb.asm.tree.ClassNode
import java.io.File import java.net.http.HttpClient
import java.net.http.HttpRequest
import java.net.http.HttpResponse
import java.security.MessageDigest import java.security.MessageDigest
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
import java.util.Date import java.util.concurrent.ConcurrentHashMap
import java.util.concurrent.Semaphore
import java.util.zip.ZipEntry import java.util.zip.ZipEntry
import java.util.zip.ZipInputStream import java.util.zip.ZipInputStream
public class Util { final class Util {
static final ASM_LEVEL = Opcodes.ASM9 public static final int ASM_LEVEL = Opcodes.ASM9
private static final HttpClient HTTP = HttpClient.newBuilder().build()
static void init() { static void init() {
File.metaClass.sha1 = { -> File.metaClass.sha1 = { ->
MessageDigest md = MessageDigest.getInstance('SHA-1') MessageDigest md = MessageDigest.getInstance('SHA-1')
delegate.eachByte 4096, {bytes, size -> delegate.eachByte(4096) { byte[] bytes, int size ->
md.update(bytes, 0, size) md.update(bytes, 0, size)
} }
return md.digest().collect {String.format "%02x", it}.join() return md.digest().collect(this.&toHex).join('')
} }
File.metaClass.getSha1 = { !delegate.exists() ? null : delegate.sha1() } File.metaClass.getSha1 = { !delegate.exists() ? null : delegate.sha1() }
File.metaClass.sha256 = { -> File.metaClass.sha256 = { ->
MessageDigest md = MessageDigest.getInstance('SHA-256') MessageDigest md = MessageDigest.getInstance('SHA-256')
delegate.eachByte 4096, {bytes, size -> delegate.eachByte(4096) { byte[] bytes, int size ->
md.update(bytes, 0, size) md.update(bytes, 0, size)
} }
return md.digest().collect {String.format "%02x", it}.join() return md.digest().collect(this.&toHex).join('')
} }
File.metaClass.getSha256 = { !delegate.exists() ? null : delegate.sha256() } File.metaClass.getSha256 = { !delegate.exists() ? null : delegate.sha256() }
@@ -39,16 +51,17 @@ public class Util {
File.metaClass.setJson = { json -> delegate.text = new JsonBuilder(json).toPrettyString() } File.metaClass.setJson = { json -> delegate.text = new JsonBuilder(json).toPrettyString() }
Date.metaClass.iso8601 = { -> Date.metaClass.iso8601 = { ->
def format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ") var format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ")
def result = format.format(delegate) var result = format.format(delegate)
return result[0..21] + ':' + result[22..-1] return result[0..21] + ':' + result[22..-1]
} }
String.metaClass.rsplit = { String del, int limit = -1 -> String.metaClass.rsplit = { String del, int limit = -1 ->
def lst = new ArrayList() var lst = new ArrayList<String>()
def x = 0, idx int x = 0
def tmp = delegate int idx
while ((idx = tmp.lastIndexOf(del)) != -1 && (limit == -1 || x++ < limit)) { String tmp = delegate
while ((idx = tmp.lastIndexOf(del)) != -1 && (limit === -1 || x++ < limit)) {
lst.add(0, tmp.substring(idx + del.length(), tmp.length())) lst.add(0, tmp.substring(idx + del.length(), tmp.length()))
tmp = tmp.substring(0, idx) tmp = tmp.substring(0, idx)
} }
@@ -57,7 +70,7 @@ public class Util {
} }
} }
public static String[] getClasspath(project, libs, artifact) { static String[] getClasspath(Project project, Map libs, String artifact) {
def ret = [] def ret = []
artifactTree(project, artifact).each { key, lib -> artifactTree(project, artifact).each { key, lib ->
libs[lib.name] = lib libs[lib.name] = lib
@@ -67,30 +80,38 @@ public class Util {
return ret return ret
} }
public static def getArtifacts(project, config) { @CompileStatic
def ret = [:] static Map getArtifacts(Configuration config) {
config.resolvedConfiguration.resolvedArtifacts.each { dep -> var ret = [:]
def info = getMavenInfoFromDep(dep) var semaphore = new Semaphore(1, true)
def url = "https://libraries.minecraft.net/$info.path" config.resolvedConfiguration.resolvedArtifacts.parallelStream().forEachOrdered(dep -> {
var info = getMavenInfoFromDep(dep)
var domain = 'libraries.minecraft.net'
var url = "https://$domain/$info.path"
if (!checkExists(url)) if (!checkExists(url))
url = "https://maven.minecraftforge.net/$info.path" url.values[0] = 'maven.minecraftforge.net'
var sha1 = sha1(dep.file)
semaphore.acquire()
ret[info.key] = [ ret[info.key] = [
name: info.name, name: info.name,
downloads: [ downloads: [
artifact: [ artifact: [
path: info.path, path: info.path,
url: url, url: url.toString(),
sha1: dep.file.sha1(), sha1: sha1,
size: dep.file.length() size: dep.file.length()
] ]
] ]
] ]
} semaphore.release()
})
return ret return ret
} }
public static Map getMavenInfoFromDep(dep) { @CompileStatic
static Map getMavenInfoFromDep(ResolvedArtifact dep) {
return getMavenInfoFromMap([ return getMavenInfoFromMap([
group: dep.moduleVersion.id.group, group: dep.moduleVersion.id.group,
name: dep.moduleVersion.id.name, name: dep.moduleVersion.id.name,
@@ -99,49 +120,69 @@ public class Util {
extension: dep.extension extension: dep.extension
]) ])
} }
public static Map getMavenInfoFromTask(task) {
@CompileStatic
static Map getMavenInfoFromTask(AbstractArchiveTask task) {
return getMavenInfoFromMap([ return getMavenInfoFromMap([
group: task.project.group, group: task.project.group.toString(),
name: task.project.name, name: task.project.name,
version: task.project.version, version: task.project.version.toString(),
classifier: task.archiveClassifier.get(), classifier: task.archiveClassifier.get(),
extension: task.archiveExtension.get() extension: task.archiveExtension.get()
]) ])
} }
private static Map getMavenInfoFromMap(art) { @CompileStatic
def key = "$art.group:$art.name" static Map getMavenInfoFromTask(Task task, String classifier) {
def name = "$art.group:$art.name:$art.version" return getMavenInfoFromMap([
def path = "${art.group.replace('.', '/')}/$art.name/$art.version/$art.name-$art.version" group: task.project.group.toString(),
if (art.classifier != null) { name: task.project.name,
version: task.project.version.toString(),
classifier: classifier,
extension: 'jar'
])
}
@CompileStatic
private static Map getMavenInfoFromMap(Map<String, String> art) {
var key = "$art.group:$art.name"
var name = "$art.group:$art.name:$art.version"
var path = "${art.group.replace('.', '/')}/$art.name/$art.version/$art.name-$art.version"
if (art.classifier !== null) {
name += ":$art.classifier" name += ":$art.classifier"
path += "-$art.classifier" path += "-$art.classifier"
} }
if (!'jar'.equals(art.extension)) { if ('jar' != art.extension) {
name += "@$art.extension" name += "@$art.extension"
path += ".$art.extension" path += ".$art.extension"
} else { } else {
path += ".jar" path += ".jar"
} }
return [ return [
key: key, key: key.toString(),
name: name, name: name.toString(),
path: path, path: path.toString(),
art: art art: art
] ]
} }
public static def iso8601Now() { new Date().iso8601() } static String iso8601Now() { new Date().iso8601() }
public static def sha1(file) { @CompileStatic
static String sha1(File file) {
MessageDigest md = MessageDigest.getInstance('SHA-1') MessageDigest md = MessageDigest.getInstance('SHA-1')
file.eachByte 4096, {bytes, size -> file.eachByte(4096) { byte[] bytes, int size ->
md.update(bytes, 0, size) md.update(bytes, 0, size)
} }
return md.digest().collect {String.format "%02x", it}.join() return md.digest().collect(this.&toHex).join('')
} }
private static def artifactTree(project, artifact, transitive = true) { @CompileStatic
private static String toHex(byte bite) {
return String.format('%02x', bite)
}
private static Map artifactTree(Project project, String artifact, boolean transitive = true) {
if (!project.ext.has('tree_resolver')) if (!project.ext.has('tree_resolver'))
project.ext.tree_resolver = 1 project.ext.tree_resolver = 1
def cfg = project.configurations.create('tree_resolver_' + project.ext.tree_resolver++) def cfg = project.configurations.create('tree_resolver_' + project.ext.tree_resolver++)
@@ -149,37 +190,36 @@ public class Util {
def dep = project.dependencies.create(artifact) def dep = project.dependencies.create(artifact)
cfg.dependencies.add(dep) cfg.dependencies.add(dep)
def files = cfg.resolve() def files = cfg.resolve()
return getArtifacts(project, cfg) return getArtifacts(cfg)
} }
static boolean checkExists(url) { @CompileStatic
static boolean checkExists(String url) {
try { try {
def code = new URL(url).openConnection().with { return HTTP.send(HttpRequest.newBuilder(new URI(url))
requestMethod = 'HEAD' .method('HEAD', HttpRequest.BodyPublishers.noBody()).build(), HttpResponse.BodyHandlers.discarding()
connect() ).statusCode() === 200
responseCode
}
return code == 200
} catch (Exception e) { } catch (Exception e) {
if (e.toString().contains('unable to find valid certification path to requested target')) if (e.toString().contains('unable to find valid certification path to requested target'))
throw new RuntimeException('Failed to connect to ' + url + ': Missing certificate root authority, try updating java') throw new RuntimeException("Failed to connect to $url: Missing certificate root authority, try updating Java")
throw e throw e
} }
} }
static String getLatestForgeVersion(mcVersion) { static String getLatestForgeVersion(String mcVersion) {
final json = new JsonSlurper().parseText(new URL('https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json').getText('UTF-8')) final json = new JsonSlurper().parseText(new URL('https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json').getText('UTF-8'))
final ver = json.promos["$mcVersion-latest"] final ver = json.promos["$mcVersion-latest"]
ver === null ? null : (mcVersion + '-' + ver) ver === null ? null : (mcVersion + '-' + ver)
} }
static void processClassNodes(File file, Closure process) { @CompileStatic
static void processClassNodes(File file, @ClosureParams(value = SimpleType, options = 'org.objectweb.asm.tree.ClassNode') Closure process) {
file.withInputStream { i -> file.withInputStream { i ->
new ZipInputStream(i).withCloseable { zin -> new ZipInputStream(i).withCloseable { zin ->
ZipEntry zein ZipEntry zein
while ((zein = zin.nextEntry) != null) { while ((zein = zin.nextEntry) !== null) {
if (zein.name.endsWith('.class')) { if (zein.name.endsWith('.class')) {
def node = new ClassNode(ASM_LEVEL) var node = new ClassNode(ASM_LEVEL)
new ClassReader(zin).accept(node, 0) new ClassReader(zin).accept(node, 0)
process(node) process(node)
} }
@@ -187,4 +227,4 @@ public class Util {
} }
} }
} }
} }
@@ -5,6 +5,7 @@
package net.minecraftforge.forge.tasks package net.minecraftforge.forge.tasks
import groovy.transform.CompileStatic
import net.minecraftforge.srgutils.MinecraftVersion import net.minecraftforge.srgutils.MinecraftVersion
import org.gradle.api.DefaultTask import org.gradle.api.DefaultTask
import org.gradle.api.file.RegularFileProperty import org.gradle.api.file.RegularFileProperty
@@ -28,8 +29,8 @@ abstract class ValidateDeprecations extends DefaultTask {
@TaskAction @TaskAction
protected void exec() { protected void exec() {
def mcVer = MinecraftVersion.from(mcVersion.get()) var mcVer = MinecraftVersion.from(mcVersion.get())
def errors = [] List<String> errors = []
Util.processClassNodes(input.get().asFile) { Util.processClassNodes(input.get().asFile) {
processNode(mcVer, errors, it) processNode(mcVer, errors, it)
@@ -65,7 +66,7 @@ abstract class ValidateDeprecations extends DefaultTask {
} }
} }
private static void processAnnotations(AnnotationNode annotation, MinecraftVersion mcVer, List<String> errors, Closure context) { private static void processAnnotations(AnnotationNode annotation, MinecraftVersion mcVer, List<String> errors, Closure<String> context) {
def values = annotation.values def values = annotation.values
if (values === null) if (values === null)
return return
@@ -73,7 +74,7 @@ abstract class ValidateDeprecations extends DefaultTask {
int since = values.indexOf('since') int since = values.indexOf('since')
if (annotation.desc == 'Ljava/lang/Deprecated;' && forRemoval !== -1 && since !== -1 && values.size() >= 4 && values[forRemoval + 1] === true) { if (annotation.desc == 'Ljava/lang/Deprecated;' && forRemoval !== -1 && since !== -1 && values.size() >= 4 && values[forRemoval + 1] === true) {
def oldVersion = MinecraftVersion.from(values[since + 1]) def oldVersion = MinecraftVersion.from(values[since + 1])
def split = ValidateDeprecations.splitDots(oldVersion.toString()) int[] split = ValidateDeprecations.splitDots(oldVersion.toString())
if (split.length < 2) if (split.length < 2)
return return
def removeVersion = MinecraftVersion.from("${split[0]}.${split[1] + 1}") def removeVersion = MinecraftVersion.from("${split[0]}.${split[1] + 1}")
@@ -82,6 +83,7 @@ abstract class ValidateDeprecations extends DefaultTask {
} }
} }
@CompileStatic
private static int[] splitDots(String version) { private static int[] splitDots(String version) {
String[] pts = version.split('\\.') String[] pts = version.split('\\.')
int[] values = new int[pts.length] int[] values = new int[pts.length]
@@ -26,12 +26,12 @@ abstract class CheckExcs extends CheckTask {
excs.each { f -> excs.each { f ->
final lines = [] final lines = []
f.eachLine { line -> f.eachLine { line ->
def idx = line.indexOf('#') int idx = line.indexOf('#')
if (idx == 0 || line.isEmpty()) { if (idx === 0 || line.isEmpty()) {
return return
} }
if (idx != -1) line = line.substring(0, idx - 1) if (idx !== -1) line = line.substring(0, idx - 1)
if (!line.contains('=')) { if (!line.contains('=')) {
reporter.report("Invalid: $line") reporter.report("Invalid: $line")
@@ -58,6 +58,8 @@ abstract class CheckExcs extends CheckTask {
return return
} }
lines.add(line) lines.add(line)
return
} }
if (fix) f.text = lines.sort().join('\n') if (fix) f.text = lines.sort().join('\n')
@@ -6,4 +6,6 @@ import groovy.transform.CompileStatic
enum CheckMode { enum CheckMode {
CHECK, CHECK,
FIX FIX
CheckMode() {}
} }
@@ -36,13 +36,13 @@ abstract class CheckPatches extends CheckTask {
} }
} }
def accessChange(previous, current) { static boolean accessChange(String previous, String current) {
//return ACCESS_MAP[previous] < ACCESS_MAP[current] //return ACCESS_MAP[previous] < ACCESS_MAP[current]
return previous != current return previous != current
} }
void verifyPatch(Path patch, Reporter reporter, boolean fix, String patchPath, boolean hasS2SArtifact) { void verifyPatch(Path patch, Reporter reporter, boolean fix, String patchPath, boolean hasS2SArtifact) {
final oldFixedErrors = reporter.fixed.size() int oldFixedErrors = reporter.fixed.size()
final lines = Files.readAllLines(patch) final lines = Files.readAllLines(patch)
@@ -140,7 +140,7 @@ abstract class CheckPatches extends CheckTask {
final nextLineChange = i + 1 < lines.size() && lines[i + 1].startsWithAny('+','-') final nextLineChange = i + 1 < lines.size() && lines[i + 1].startsWithAny('+','-')
if (!prevLineChange && !nextLineChange) { if (!prevLineChange && !nextLineChange) {
reporter.report("Patch contains white space change in valid hunk at line ${i + 1}, file: $patchPath", false) reporter.report("Patch contains white space change in valid hunk at line ${i + 1}, file: $patchPath \n$prevLine\n$line\n${lines[i+1]}", false)
} }
} }
@@ -94,7 +94,7 @@ abstract class CheckSAS extends CheckTask {
} }
} }
protected static isSided(Annotatable annotatable) { protected static boolean isSided(Annotatable annotatable) {
if (annotatable === null) return false if (annotatable === null) return false
for (ann in annotatable.annotations) { for (ann in annotatable.annotations) {
if ('Lnet/minecraftforge/api/distmarker/OnlyIn;' == ann.desc) if ('Lnet/minecraftforge/api/distmarker/OnlyIn;' == ann.desc)
@@ -104,7 +104,7 @@ abstract class CheckSAS extends CheckTask {
} }
protected static findChildMethods(Map<String, InheritanceData> json, String cls, String desc) { protected static findChildMethods(Map<String, InheritanceData> json, String cls, String desc) {
return json.values().findAll{ it.methods != null && it.methods[desc] != null && it.methods[desc].override == cls && isSided(it.methods[desc]) } return json.values().findAll{ it.methods !== null && it.methods[desc] !== null && it.methods[desc].override == cls && isSided(it.methods[desc]) }
.collect { it.name + ' ' + desc.replace(' ', '') } as TreeSet .collect { it.name + ' ' + desc.replace(' ', '') } as TreeSet
} }
} }
@@ -1,6 +1,8 @@
package net.minecraftforge.forge.tasks.checks package net.minecraftforge.forge.tasks.checks
import groovy.transform.CompileStatic import groovy.transform.CompileStatic
import groovy.transform.stc.ClosureParams
import groovy.transform.stc.ThirdParam
import net.minecraftforge.forge.tasks.Util import net.minecraftforge.forge.tasks.Util
import org.gradle.api.Action import org.gradle.api.Action
import org.gradle.api.DefaultTask import org.gradle.api.DefaultTask
@@ -33,7 +35,7 @@ abstract class CheckTask extends DefaultTask implements VerificationTask {
void run() { void run() {
Util.init() Util.init()
final doFix = getMode().get() === CheckMode.FIX boolean doFix = getMode().get() === CheckMode.FIX
final Reporter reporter = new Reporter(doFix) final Reporter reporter = new Reporter(doFix)
check(reporter, doFix) check(reporter, doFix)
@@ -88,7 +90,8 @@ abstract class CheckTask extends DefaultTask implements VerificationTask {
} }
static <T extends CheckTask> void registerTask(TaskContainer tasks, String taskName, @DelegatesTo.Target('type') Class<T> clazz, static <T extends CheckTask> void registerTask(TaskContainer tasks, String taskName, @DelegatesTo.Target('type') Class<T> clazz,
@DelegatesTo(genericTypeIndex = 0, target = 'type') Closure configuration) { @DelegatesTo(genericTypeIndex = 0, target = 'type')
@ClosureParams(ThirdParam.FirstGenericType) Closure configuration) {
taskName = taskName.capitalize() taskName = taskName.capitalize()
tasks.register("check$taskName", clazz) { CheckTask task -> tasks.register("check$taskName", clazz) { CheckTask task ->
def castedTask = task as T def castedTask = task as T
+9 -1
View File
@@ -1,6 +1,5 @@
plugins { plugins {
id 'java-library' id 'java-library'
id 'org.cadixdev.licenser'
id 'net.minecraftforge.gradle.patcher' id 'net.minecraftforge.gradle.patcher'
} }
@@ -62,4 +61,13 @@ eclipse.classpath.file.whenMerged {
def src = entries.find { it.path == 'src/main/java' } def src = entries.find { it.path == 'src/main/java' }
if (src == null) throw new IllegalStateException("You must run `setup` task before importing") if (src == null) throw new IllegalStateException("You must run `setup` task before importing")
src.entryAttributes['ignore_optional_problems'] = 'true' src.entryAttributes['ignore_optional_problems'] = 'true'
}
tasks.named('genPatches').configure {
onlyIf { false }
}
tasks.named('extractRangeMap').configure {
onlyIf { false }
tool = 'net.minecraftforge:Srg2Source:8.1.0:fatjar'
} }
+199 -163
View File
@@ -1,20 +1,20 @@
import de.undercouch.gradle.tasks.download.Download
import net.minecraftforge.forge.tasks.checks.CheckATs import net.minecraftforge.forge.tasks.checks.CheckATs
import net.minecraftforge.forge.tasks.checks.CheckExcs import net.minecraftforge.forge.tasks.checks.CheckExcs
import net.minecraftforge.forge.tasks.checks.CheckPatches import net.minecraftforge.forge.tasks.checks.CheckPatches
import net.minecraftforge.forge.tasks.checks.CheckSAS import net.minecraftforge.forge.tasks.checks.CheckSAS
import net.minecraftforge.forge.tasks.checks.CheckTask import net.minecraftforge.forge.tasks.checks.CheckTask
import java.util.Date import java.nio.file.Files
import java.util.LinkedHashMap
import net.minecraftforge.forge.tasks.* import net.minecraftforge.forge.tasks.*
import static net.minecraftforge.forge.tasks.Util.* import static net.minecraftforge.forge.tasks.Util.*
import net.minecraftforge.gradle.common.tasks.ApplyBinPatches import net.minecraftforge.gradle.common.tasks.ApplyBinPatches
import net.minecraftforge.gradle.common.tasks.CheckJarCompatibility import net.minecraftforge.gradle.common.tasks.CheckJarCompatibility
import net.minecraftforge.gradle.common.tasks.DownloadMavenArtifact import net.minecraftforge.gradle.common.tasks.DownloadMavenArtifact
import net.minecraftforge.gradle.common.tasks.ExtractInheritance import net.minecraftforge.gradle.common.tasks.ExtractInheritance
import net.minecraftforge.gradle.patcher.tasks.FilterNewJar
import net.minecraftforge.gradle.patcher.tasks.GeneratePatches import net.minecraftforge.gradle.patcher.tasks.GeneratePatches
import net.minecraftforge.gradle.userdev.tasks.RenameJar import net.minecraftforge.gradle.userdev.tasks.RenameJar
import net.minecraftforge.gradleutils.PomUtils
import org.apache.tools.ant.filters.ReplaceTokens import org.apache.tools.ant.filters.ReplaceTokens
import org.objectweb.asm.Opcodes import org.objectweb.asm.Opcodes
@@ -23,7 +23,7 @@ plugins {
id 'eclipse' id 'eclipse'
id 'java-library' id 'java-library'
id 'maven-publish' id 'maven-publish'
id 'org.cadixdev.licenser' id 'net.minecraftforge.licenser'
id 'de.undercouch.download' id 'de.undercouch.download'
id 'net.minecraftforge.gradleutils' id 'net.minecraftforge.gradleutils'
id 'net.minecraftforge.gradle.patcher' id 'net.minecraftforge.gradle.patcher'
@@ -46,6 +46,8 @@ jarSigner.autoDetect('forge')
applyPatches { applyPatches {
level 'WARNING' level 'WARNING'
failOnError = UPDATING != 'true'
rejects = rootProject.layout.projectDirectory.dir('rejects').asFile
} }
sourceSets { sourceSets {
@@ -69,27 +71,40 @@ sourceSets {
} }
} }
ext { final String SPEC_VERSION = gradleutils.gitInfo.tag
SPEC_VERSION = gradleutils.gitInfo.tag
// The new versioning sceme is <MCVersion>-<ForgeMC>.<RB>.<CommitsSinceRB>
// ForgeMC is a unique identifier for every MC version we have supported.
// Essentially, the same as the old, except dropping the first number, and the builds are no longer unique.
MCP_ARTIFACT = project(':mcp').mcp.config.get()
EXTRA_TXTS = [ // The new versioning sceme is <MCVersion>-<ForgeMC>.<RB>.<CommitsSinceRB>
// ForgeMC is a unique identifier for every MC version we have supported.
// Essentially, the same as the old, except dropping the first number, and the builds are no longer unique.
final def MCP_ARTIFACT = project(':mcp').mcp.config.get()
final List<File> EXTRA_TXTS = [
rootProject.file('CREDITS.txt'), rootProject.file('CREDITS.txt'),
rootProject.file('LICENSE.txt'), rootProject.file('LICENSE.txt'),
rootProject.tasks.createChangelog.outputFile rootProject.tasks.createChangelog.outputFile
] ]
ext {
MAVEN_PATH = "${group.toString().replace('.', '/')}/${project.name}/${VERSION}".toString()
} }
final String MAVEN_PATH = ext.MAVEN_PATH
final String BINPATCH_TOOL = 'net.minecraftforge:binarypatcher:1.2.0:fatjar'
final String INSTALLER_TOOLS = 'net.minecraftforge:installertools:1.4.3'
final String FART = 'net.minecraftforge:ForgeAutoRenamingTool:1.0.6'
final String S2S_TOOL = 'net.minecraftforge:Srg2Source:8.1.0:fatjar'
configurations { configurations {
// Don't pull all libraries, if we're missing something, add it to the installer list so the installer knows to download it. // Don't pull all libraries, if we're missing something, add it to the installer list so the installer knows to download it.
bootstrap { transitive = false } bootstrap { transitive = false }
installer { installer {
extendsFrom(bootstrap) extendsFrom(bootstrap)
transitive = false transitive = false
} }
installerextra {
extendsFrom(bootstrap)
transitive = false
}
api.extendsFrom(installer) api.extendsFrom(installer)
} }
@@ -103,10 +118,11 @@ dependencies {
bootstrap(libs.unsafe) // Needed by securemodules bootstrap(libs.unsafe) // Needed by securemodules
bootstrap(libs.bundles.asm) // Needed by securemodules bootstrap(libs.bundles.asm) // Needed by securemodules
implementation(libs.jopt.simple)
installer(libs.bootstrap) installer(libs.bootstrap)
installer(libs.bootstrap.api) // Needed by securemodules installer(libs.bootstrap.api) // Needed by securemodules
installer(libs.accesstransformers) installer(libs.accesstransformers)
installer(libs.antlr.runtime) // Dep of AccessTransformer
installer(libs.eventbus) installer(libs.eventbus)
installer(libs.typetools) // Dep of EventBus installer(libs.typetools) // Dep of EventBus
installer(libs.forgespi) installer(libs.forgespi)
@@ -127,7 +143,14 @@ dependencies {
installer(project(':lowcodelanguage')) installer(project(':lowcodelanguage'))
installer(project(':mclanguage')) installer(project(':mclanguage'))
installerextra("${MCP_ARTIFACT.group}:${MCP_ARTIFACT.name}:${MCP_ARTIFACT.version}:srg2off")
runtimeOnly(libs.bootstrap) runtimeOnly(libs.bootstrap)
runtimeOnly(libs.bootstrap.dev)
}
tasks.named('extractRangeMap').configure {
tool = S2S_TOOL
} }
patcher { patcher {
@@ -158,6 +181,7 @@ patcher {
forge_client_test { forge_client_test {
parent runs.forge_client parent runs.forge_client
source sourceSets.test
} }
forge_server { forge_server {
@@ -166,14 +190,17 @@ patcher {
forge_server_test { forge_server_test {
parent runs.forge_server parent runs.forge_server
source sourceSets.test
} }
forge_server_gametest { forge_server_gametest {
args '--launchTarget', 'forge_dev_server_gametest' args '--launchTarget', 'forge_dev_server_gametest'
args '--uniqueWorld' // Unique world is used so that the world regenerates, as well as the world config isn't influenced by other runs
} }
forge_server_gametest_test { forge_server_gametest_test {
parent runs.forge_server_gametest parent runs.forge_server_gametest
source sourceSets.test
} }
forge_data { forge_data {
@@ -189,6 +216,7 @@ patcher {
} }
forge_data_test { forge_data_test {
source sourceSets.test
args '--launchTarget', 'forge_dev_data', args '--launchTarget', 'forge_dev_data',
'--mod', '.+', '--mod', '.+',
'--all', '--all',
@@ -199,7 +227,6 @@ patcher {
'--assetsDir', downloadAssets.output, '--assetsDir', downloadAssets.output,
'--assetIndex', "{asset_index}" '--assetIndex', "{asset_index}"
} }
} }
} }
@@ -277,7 +304,7 @@ tasks.userdevConfig.configure {
} }
} }
for (def run : patcher.runs + tasks.userdevConfig.runs) { for (def run in patcher.runs + tasks.userdevConfig.runs) {
if (run.parents) continue // We already added this to the parent run config if (run.parents) continue // We already added this to the parent run config
//run.property 'bsl.debug', 'true' //run.property 'bsl.debug', 'true'
run.args '--gameDir', '.' run.args '--gameDir', '.'
@@ -309,7 +336,7 @@ tasks.register('downloadVersionManifest', Download) {
tasks.register('downloadJson', Download) { tasks.register('downloadJson', Download) {
dependsOn downloadVersionManifest dependsOn downloadVersionManifest
inputs.file downloadVersionManifest.dest inputs.file downloadVersionManifest.dest
src { downloadVersionManifest.dest.json.versions.find{ it.id == MC_VERSION }.url } src { downloadVersionManifest.dest.json.versions.find { it.id == MC_VERSION }.url }
dest file("build/versions/$MC_VERSION/version.json") dest file("build/versions/$MC_VERSION/version.json")
useETag 'all' useETag 'all'
onlyIfModified true onlyIfModified true
@@ -349,44 +376,28 @@ tasks.register('extractInheritance', ExtractInheritance) {
tool = INSTALLER_TOOLS + ':fatjar' tool = INSTALLER_TOOLS + ':fatjar'
args.add '--annotations' args.add '--annotations'
input = genJoinedBinPatches.cleanJar input = genJoinedBinPatches.cleanJar
libraries.addAll downloadLibraries.librariesOutput.map { rf -> libraries.addAll downloadLibraries.librariesOutput.map { rf ->
java.nio.file.Files.readAllLines(rf.asFile.toPath()).stream().map(File::new).collect(java.util.stream.Collectors.toList()) Files.readAllLines(rf.asFile.toPath()).stream().map(File::new).toList()
}
}
tasks.register("findFieldInstanceChecks", FieldCompareFinder) {
jar = createJoinedSRG.output
output = rootProject.file('src/main/resources/coremods/field_to_instanceof.json')
fields {
/* 1.17 changed most things to use Tags. So this isn't nessasary anymore so just make an empty list
bows {
cls = 'net/minecraft/world/item/Items'
name = 'f_42411_'
replacement = 'net/minecraft/world/item/BowItem'
}
crossbows {
cls = 'net/minecraft/world/item/Items'
name = 'f_42717_'
replacement = 'net/minecraft/world/item/CrossbowItem'
}
*/
} }
} }
tasks.register("findFinalizeSpawnTargets", BytecodePredicateFinder) { tasks.register("findFinalizeSpawnTargets", BytecodePredicateFinder) {
jar = createJoinedSRG.output jar = createClientOfficial.output
output = rootProject.file('src/main/resources/coremods/finalize_spawn_targets.json') output = rootProject.file('src/main/resources/coremods/finalize_spawn_targets.json')
predicate = { predicate = {
parent, node, insn -> parent, node, insn ->
'net/minecraft/world/level/BaseSpawner' != parent.name // Ignore this class as we special case it. return 'net/minecraft/world/level/BaseSpawner' != parent.name // Ignore this class as we special case it.
&& insn.getOpcode() == Opcodes.INVOKEVIRTUAL && insn.getOpcode().equals(Opcodes.INVOKEVIRTUAL)
&& insn.name.equals('m_6518_') && insn.name == 'finalizeSpawn'
&& insn.desc.equals('(Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/world/DifficultyInstance;Lnet/minecraft/world/entity/MobSpawnType;Lnet/minecraft/world/entity/SpawnGroupData;Lnet/minecraft/nbt/CompoundTag;)Lnet/minecraft/world/entity/SpawnGroupData;') && insn.desc == '(Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/world/DifficultyInstance;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/world/entity/SpawnGroupData;)Lnet/minecraft/world/entity/SpawnGroupData;';
} }
} }
tasks.register('validateDeprecations', ValidateDeprecations) { tasks.register('validateDeprecations', ValidateDeprecations) {
input = tasks.jar.archiveFile input = tasks.jar.archiveFile
mcVersion = MC_VERSION mcVersion = MC_VERSION
} }
tasks.jar.finalizedBy 'validateDeprecations' tasks.named('jar', Jar).configure {
finalizedBy 'validateDeprecations'
}
tasks.register("downloadInstaller", DownloadMavenArtifact) { tasks.register("downloadInstaller", DownloadMavenArtifact) {
artifact = "net.minecraftforge:installer:2.2.+:fatjar" artifact = "net.minecraftforge:installer:2.2.+:fatjar"
changing = true changing = true
@@ -395,16 +406,6 @@ tasks.register("downloadServerShim", DownloadMavenArtifact) {
artifact = libs.bootstrap.shim.get().toString() artifact = libs.bootstrap.shim.get().toString()
changing = true changing = true
} }
tasks.register("downloadMCPConfig", DownloadMavenArtifact) {
artifact = MCP_ARTIFACT
}
tasks.register('extractMCPConfigMappings', net.minecraftforge.gradle.common.tasks.JarExec) {
ext.output = file('build/mcp_mappings.tsrg')
tool = INSTALLER_TOOLS + ':fatjar'
args = ['--task', 'MCP_DATA', '--key', 'mappings', '--input', downloadMCPConfig.output.get().asFile.absolutePath, '--output', output.absolutePath]
outputs.file(output)
inputs.file(downloadMCPConfig.output)
}
tasks.register('downloadClientMappings', net.minecraftforge.gradle.common.tasks.JarExec) { tasks.register('downloadClientMappings', net.minecraftforge.gradle.common.tasks.JarExec) {
ext.output = file('build/client_mappings.tsrg') ext.output = file('build/client_mappings.tsrg')
tool = INSTALLER_TOOLS + ':fatjar' tool = INSTALLER_TOOLS + ':fatjar'
@@ -417,43 +418,34 @@ tasks.register('downloadServerMappings', net.minecraftforge.gradle.common.tasks.
args = ['--task', 'DOWNLOAD_MOJMAPS', '--sanitize', '--version', MC_VERSION, '--side', 'server', '--output', output.absolutePath] args = ['--task', 'DOWNLOAD_MOJMAPS', '--sanitize', '--version', MC_VERSION, '--side', 'server', '--output', output.absolutePath]
outputs.file(output) outputs.file(output)
} }
tasks.register('mergeClientMappings', net.minecraftforge.gradle.common.tasks.JarExec) {
ext.output = file('build/client_mappings_merged.tsrg')
tool = INSTALLER_TOOLS + ':fatjar'
args = ['--task', 'MERGE_MAPPING', '--classes', '--reverse-right', '--left', extractMCPConfigMappings.output.absolutePath, '--right', downloadClientMappings.output.absolutePath, '--output', output.absolutePath]
outputs.file(output)
}
tasks.register('mergeServerMappings', net.minecraftforge.gradle.common.tasks.JarExec) {
ext.output = file('build/server_mappings_merged.tsrg')
tool = INSTALLER_TOOLS + ':fatjar'
args = ['--task', 'MERGE_MAPPING', '--classes', '--reverse-right', '--left', extractMCPConfigMappings.output.absolutePath, '--right', downloadServerMappings.output.absolutePath, '--output', output.absolutePath]
outputs.file(output)
}
tasks.register("createJoinedSRG", DownloadMavenArtifact) { tasks.register("createJoinedSRG", DownloadMavenArtifact) {
artifact = "net.minecraft:joined:${MC_VERSION}-${MCP_VERSION}:srg" artifact = "net.minecraft:joined:${MC_VERSION}-${MCP_VERSION}:srg"
} }
tasks.register("createClientSRG", RenameJar) { tasks.register("createClientOfficial", RenameJar) {
tool = FART + ':all' tool = FART + ':all'
args = ['--input', '{input}', '--output', '{output}', '--names', '{mappings}', '--ann-fix', '--ids-fix', '--src-fix', '--record-fix', '--strip-sigs'] args = ['--input', '{input}', '--output', '{output}', '--names', '{mappings}', '--ann-fix', '--ids-fix', '--src-fix', '--record-fix', '--strip-sigs', '--reverse']
mappings = createMcp2Srg.srg mappings = downloadClientMappings.output
dependsOn(downloadClientRaw) dependsOn(downloadClientRaw, downloadClientMappings)
input = downloadClientRaw.dest input = downloadClientRaw.dest
output = file("build/createClientSRG/output.jar") output = file("build/createClientOfficial/output.jar")
} }
tasks.register("createServerSRG", RenameJar) { tasks.register("createServerOfficial", RenameJar) {
tool = FART + ':all' tool = FART + ':all'
args = ['--input', '{input}', '--output', '{output}', '--names', '{mappings}', '--ann-fix', '--ids-fix', '--src-fix', '--record-fix', '--strip-sigs'] args = ['--input', '{input}', '--output', '{output}', '--names', '{mappings}', '--ann-fix', '--ids-fix', '--src-fix', '--record-fix', '--strip-sigs', '--reverse']
mappings = createMcp2Srg.srg mappings = downloadServerMappings.output
dependsOn(downloadServerMappings)
input = extractServer.output input = extractServer.output
output = file("build/createServerSRG/output.jar") output = file("build/createServerOfficial/output.jar")
} }
tasks.named('genClientBinPatches').configure { tasks.named('genClientBinPatches').configure {
tool = BINPATCH_TOOL tool = BINPATCH_TOOL
cleanJar = createClientSRG.output cleanJar = createClientOfficial.output
dirtyJar = jar.archiveFile
} }
tasks.named('genServerBinPatches').configure { tasks.named('genServerBinPatches').configure {
tool = BINPATCH_TOOL tool = BINPATCH_TOOL
cleanJar = createServerSRG.output cleanJar = createServerOfficial.output
dirtyJar = jar.archiveFile
} }
tasks.named('genJoinedBinPatches').configure { tasks.named('genJoinedBinPatches').configure {
tool = BINPATCH_TOOL tool = BINPATCH_TOOL
@@ -461,13 +453,13 @@ tasks.named('genJoinedBinPatches').configure {
} }
tasks.register('applyClientBinPatches', ApplyBinPatches) { tasks.register('applyClientBinPatches', ApplyBinPatches) {
tool = BINPATCH_TOOL tool = BINPATCH_TOOL
clean = createClientSRG.output clean = createClientOfficial.output
patch = genClientBinPatches.output patch = genClientBinPatches.output
args.addAll(['--data', '--unpatched']) args.addAll(['--data', '--unpatched'])
} }
tasks.register('applyServerBinPatches', ApplyBinPatches) { tasks.register('applyServerBinPatches', ApplyBinPatches) {
tool = BINPATCH_TOOL tool = BINPATCH_TOOL
clean = createServerSRG.output clean = createServerOfficial.output
patch = genServerBinPatches.output patch = genServerBinPatches.output
args.addAll(['--data', '--unpatched']) args.addAll(['--data', '--unpatched'])
} }
@@ -483,10 +475,10 @@ tasks.register('createServerShimClasspath', BundleList) {
tasks.register('createServerShimConfig') { tasks.register('createServerShimConfig') {
ext.output = file('build/libs/bootstrap-shim.properties') ext.output = file('build/libs/bootstrap-shim.properties')
doLast { doLast {
def cfg = new CleanProperties() var cfg = new CleanProperties()
cfg."Main-Class" = 'net.minecraftforge.bootstrap.ForgeBootstrap' cfg['Main-Class'] = 'net.minecraftforge.bootstrap.ForgeBootstrap'
cfg."Java-Version" = '17' cfg['Java-Version'] = '21'
cfg."Arguments" = "--launchTarget forge_server" cfg['Arguments'] = '--launchTarget forge_server'
cfg.store(output) cfg.store(output)
} }
} }
@@ -512,7 +504,7 @@ tasks.register('checkAll') {
group = 'checks' group = 'checks'
} }
tasks.register('checkAllAndFix') { tasks.register('checkAllAndFix') {
dependsOn 'findFinalizeSpawnTargets', 'findFieldInstanceChecks', 'checkLicenses' dependsOn 'findFinalizeSpawnTargets', 'checkLicenses'
group = 'checks' group = 'checks'
} }
@@ -536,7 +528,7 @@ CheckTask.registerTask(tasks, 'Excs', CheckExcs) {
} }
CheckTask.registerTask(tasks, 'Patches', CheckPatches) { CheckTask.registerTask(tasks, 'Patches', CheckPatches) {
dependsOn genPatches dependsOn 'genPatches'
patchDir = file("$rootDir/patches") patchDir = file("$rootDir/patches")
patchesWithS2SArtifact = [ patchesWithS2SArtifact = [
'minecraft/net/minecraft/client/renderer/ViewArea.java.patch', 'minecraft/net/minecraft/client/renderer/ViewArea.java.patch',
@@ -544,7 +536,7 @@ CheckTask.registerTask(tasks, 'Patches', CheckPatches) {
] ]
} }
genPatches { tasks.named('genPatches', GeneratePatches).configure {
finalizedBy checkAndFixPatches finalizedBy checkAndFixPatches
autoHeader true autoHeader true
lineEnding = '\n' lineEnding = '\n'
@@ -553,10 +545,10 @@ genPatches {
def baseForgeVersionProperty = project.objects.property(String) def baseForgeVersionProperty = project.objects.property(String)
baseForgeVersionProperty.set(project.provider { TeamcityRequests.attemptFindBase(rootDir) ?: getLatestForgeVersion(MC_VERSION) }) baseForgeVersionProperty.set(project.provider { TeamcityRequests.attemptFindBase(rootDir) ?: getLatestForgeVersion(MC_VERSION) })
baseForgeVersionProperty.finalizeValueOnRead() baseForgeVersionProperty.finalizeValueOnRead()
def jarCompatibilityTaskSetup = { task -> final jarCompatibilityTaskSetup = { Task task ->
task.group = 'jar compatibility' task.group = 'jar compatibility'
task.onlyIf { task.onlyIf {
baseForgeVersionProperty.getOrNull() != null baseForgeVersionProperty.getOrNull() !== null
} }
} }
@@ -620,28 +612,22 @@ tasks.register('installerJson', InstallerJson) {
dependsOn(launcherJson) dependsOn(launcherJson)
input.from(launcherJson.output) input.from(launcherJson.output)
// Extract MCP Mappings
dependsOn(extractMCPConfigMappings)
input.from(extractMCPConfigMappings.output)
// Download Official Mappings // Download Official Mappings
dependsOn(downloadClientMappings, downloadServerMappings) dependsOn(downloadClientMappings, downloadServerMappings)
input.from(downloadClientMappings.output, downloadServerMappings.output) input.from(downloadClientMappings.output, downloadServerMappings.output)
// Merge MCP and Official Mappings
dependsOn(mergeClientMappings, mergeServerMappings)
input.from(mergeClientMappings.output, mergeServerMappings.output)
// Get 'base' MC jar, Client is straight download, server is extracted from the bundle // Get 'base' MC jar, Client is straight download, server is extracted from the bundle
dependsOn(downloadClientRaw, extractServer) dependsOn(downloadClientRaw, extractServer)
input.from(downloadClientRaw.dest, extractServer.output) input.from(downloadClientRaw.dest, extractServer.output)
// Rename MC Jar // Rename MC Jar
dependsOn(createClientSRG, createServerSRG) dependsOn(createClientOfficial, createServerOfficial)
input.from(createClientSRG.output, createServerSRG.output) input.from(createClientOfficial.output, createServerOfficial.output)
// Apply Binary patches to vanilla jar // Apply Binary patches to vanilla jar
dependsOn(applyClientBinPatches, applyServerBinPatches) dependsOn(applyClientBinPatches, applyServerBinPatches)
input.from(applyClientBinPatches.output, applyServerBinPatches.output, genClientBinPatches.toolJar) input.from(applyClientBinPatches.output, applyServerBinPatches.output, genClientBinPatches.toolJar)
doFirst { doFirst {
def libs = libraries var libs = libraries
def INSTALLER_TOOLS_CLASSPATH = getClasspath(project, libs, INSTALLER_TOOLS) String[] INSTALLER_TOOLS_CLASSPATH = getClasspath(project, libs, INSTALLER_TOOLS)
json.putAll([ json.putAll([
_comment: launcherJson.json._comment, _comment: launcherJson.json._comment,
hideExtract: true, hideExtract: true,
@@ -652,30 +638,14 @@ tasks.register('installerJson', InstallerJson) {
minecraft: MC_VERSION, minecraft: MC_VERSION,
serverJarPath: '{LIBRARY_DIR}/net/minecraft/server/{MINECRAFT_VERSION}/server-{MINECRAFT_VERSION}-bundled.jar', serverJarPath: '{LIBRARY_DIR}/net/minecraft/server/{MINECRAFT_VERSION}/server-{MINECRAFT_VERSION}-bundled.jar',
data: [ data: [
MAPPINGS: [
client: "[${MCP_ARTIFACT.group}:${MCP_ARTIFACT.name}:${MCP_ARTIFACT.version}:mappings@tsrg]",
server: "[${MCP_ARTIFACT.group}:${MCP_ARTIFACT.name}:${MCP_ARTIFACT.version}:mappings@tsrg]"
],
MAPPINGS_SHA: [
client: "'${extractMCPConfigMappings.output.sha1}'",
server: "'${extractMCPConfigMappings.output.sha1}'"
],
MOJMAPS: [ MOJMAPS: [
client: "[net.minecraft:client:${MC_VERSION}-${MCP_VERSION}:mappings@tsrg]", client: "[net.minecraft:client:${MC_VERSION}:mappings@tsrg]",
server: "[net.minecraft:server:${MC_VERSION}-${MCP_VERSION}:mappings@tsrg]" server: "[net.minecraft:server:${MC_VERSION}:mappings@tsrg]"
], ],
MOJMAPS_SHA: [ MOJMAPS_SHA: [
client: "'${downloadClientMappings.output.sha1}'", client: "'${downloadClientMappings.output.sha1}'",
server: "'${downloadServerMappings.output.sha1}'" server: "'${downloadServerMappings.output.sha1}'"
], ],
MERGED_MAPPINGS: [
client: "[${MCP_ARTIFACT.group}:${MCP_ARTIFACT.name}:${MCP_ARTIFACT.version}:mappings-merged@tsrg]",
server: "[${MCP_ARTIFACT.group}:${MCP_ARTIFACT.name}:${MCP_ARTIFACT.version}:mappings-merged@tsrg]"
],
MERGED_MAPPINGS_SHA: [
client: "'${mergeClientMappings.output.sha1}'",
server: "'${mergeServerMappings.output.sha1}'"
],
MC_UNPACKED: [ MC_UNPACKED: [
client: "[net.minecraft:client:${MC_VERSION}]", client: "[net.minecraft:client:${MC_VERSION}]",
server: "[net.minecraft:server:${MC_VERSION}:unpacked]" server: "[net.minecraft:server:${MC_VERSION}:unpacked]"
@@ -684,13 +654,13 @@ tasks.register('installerJson', InstallerJson) {
client: "'${downloadClientRaw.dest.sha1}'", client: "'${downloadClientRaw.dest.sha1}'",
server: "'${extractServer.output.get().asFile.sha1}'" server: "'${extractServer.output.get().asFile.sha1}'"
], ],
MC_SRG: [ MC_OFF: [
client: "[net.minecraft:client:${MC_VERSION}-${MCP_VERSION}:srg]", client: "[net.minecraft:client:${MC_VERSION}:official]",
server: "[net.minecraft:server:${MC_VERSION}-${MCP_VERSION}:srg]" server: "[net.minecraft:server:${MC_VERSION}:official]"
], ],
MC_SRG_SHA: [ MC_OFF_SHA: [
client: "'${createClientSRG.output.get().asFile.sha1}'", client: "'${createClientOfficial.output.get().asFile.sha1}'",
server: "'${createServerSRG.output.get().asFile.sha1}'" server: "'${createServerOfficial.output.get().asFile.sha1}'"
], ],
BINPATCH: [ BINPATCH: [
client: '/data/client.lzma', client: '/data/client.lzma',
@@ -707,6 +677,34 @@ tasks.register('installerJson', InstallerJson) {
], ],
processors: [ processors: [
[ [
sides: ['server'],
jar: INSTALLER_TOOLS,
classpath: INSTALLER_TOOLS_CLASSPATH,
args: [
'--task', 'EXTRACT_FILES',
'--archive', '{INSTALLER}',
'--from', 'data/README.txt',
'--to', '{ROOT}/README.txt',
'--from', 'data/run.sh',
'--to', '{ROOT}/run.sh',
'--exec', '{ROOT}/run.sh',
'--from', 'data/run.bat',
'--to', '{ROOT}/run.bat',
'--from', 'data/user_jvm_args.txt',
'--to', '{ROOT}/user_jvm_args.txt',
'--optional', '{ROOT}/user_jvm_args.txt',
'--from', 'data/unix_args.txt',
'--to', "{ROOT}/libraries/${MAVEN_PATH}/unix_args.txt",
'--from', 'data/win_args.txt',
'--to', "{ROOT}/libraries/${MAVEN_PATH}/win_args.txt"
]
], [
sides: ['server'], sides: ['server'],
jar: INSTALLER_TOOLS, jar: INSTALLER_TOOLS,
classpath: INSTALLER_TOOLS_CLASSPATH, classpath: INSTALLER_TOOLS_CLASSPATH,
@@ -729,18 +727,6 @@ tasks.register('installerJson', InstallerJson) {
outputs: [ outputs: [
'{MC_UNPACKED}': '{MC_UNPACKED_SHA}' '{MC_UNPACKED}': '{MC_UNPACKED_SHA}'
] ]
], [
jar: INSTALLER_TOOLS,
classpath: INSTALLER_TOOLS_CLASSPATH,
args: [
'--task', 'MCP_DATA',
'--input', "[${MCP_ARTIFACT.descriptor}]",
'--output', '{MAPPINGS}',
'--key', 'mappings'
],
outputs: [
'{MAPPINGS}': '{MAPPINGS_SHA}'
]
], [ ], [
jar: INSTALLER_TOOLS, jar: INSTALLER_TOOLS,
classpath: INSTALLER_TOOLS_CLASSPATH, classpath: INSTALLER_TOOLS_CLASSPATH,
@@ -754,31 +740,18 @@ tasks.register('installerJson', InstallerJson) {
outputs: [ outputs: [
'{MOJMAPS}': '{MOJMAPS_SHA}' '{MOJMAPS}': '{MOJMAPS_SHA}'
] ]
], [
jar: INSTALLER_TOOLS,
classpath: INSTALLER_TOOLS_CLASSPATH,
args: [
'--task', 'MERGE_MAPPING',
'--left', '{MAPPINGS}',
'--right', '{MOJMAPS}',
'--output', '{MERGED_MAPPINGS}',
'--classes', '--reverse-right'
],
outputs: [
'{MERGED_MAPPINGS}': '{MERGED_MAPPINGS_SHA}'
]
], [ ], [
sides: ['server'], sides: ['server'],
jar: FART, jar: FART,
classpath: getClasspath(project, libs, FART), classpath: getClasspath(project, libs, FART),
args: [ args: [
'--input', '{MC_UNPACKED}', '--input', '{MC_UNPACKED}',
'--output', '{MC_SRG}', '--output', '{MC_OFF}',
'--names', '{MERGED_MAPPINGS}', '--names', '{MOJMAPS}',
'--ann-fix', '--ids-fix', '--src-fix', '--record-fix', '--strip-sigs' '--ann-fix', '--ids-fix', '--src-fix', '--record-fix', '--strip-sigs', '--reverse'
], ],
outputs: [ outputs: [
'{MC_SRG}': '{MC_SRG_SHA}' '{MC_OFF}': '{MC_OFF_SHA}'
] ]
], [ ], [
sides: ['client'], sides: ['client'],
@@ -786,18 +759,18 @@ tasks.register('installerJson', InstallerJson) {
classpath: getClasspath(project, libs, FART), classpath: getClasspath(project, libs, FART),
args: [ args: [
'--input', '{MINECRAFT_JAR}', '--input', '{MINECRAFT_JAR}',
'--output', '{MC_SRG}', '--output', '{MC_OFF}',
'--names', '{MERGED_MAPPINGS}', '--names', '{MOJMAPS}',
'--ann-fix', '--ids-fix', '--src-fix', '--record-fix', '--strip-sigs' '--ann-fix', '--ids-fix', '--src-fix', '--record-fix', '--strip-sigs', '--reverse'
], ],
outputs: [ outputs: [
'{MC_SRG}': '{MC_SRG_SHA}' '{MC_OFF}': '{MC_OFF_SHA}'
] ]
], [ ], [
jar: BINPATCH_TOOL.rsplit(':', 1)[0], // remove :fatjar jar: BINPATCH_TOOL.rsplit(':', 1)[0], // remove :fatjar
classpath: getClasspath(project, libs, BINPATCH_TOOL.rsplit(':', 1)[0]), classpath: getClasspath(project, libs, BINPATCH_TOOL.rsplit(':', 1)[0]),
args: [ args: [
'--clean', '{MC_SRG}', '--clean', '{MC_OFF}',
'--output', '{PATCHED}', '--output', '{PATCHED}',
'--apply', '{BINPATCH}', '--apply', '{BINPATCH}',
'--data', '--unpatched' '--data', '--unpatched'
@@ -812,17 +785,41 @@ tasks.register('installerJson', InstallerJson) {
} }
} }
tasks.register('officialClassesOnly', Zip).configure {
dependsOn(jar)
destinationDirectory = file('build/libs')
archiveClassifier = 'official-classes'
from zipTree(jar.archiveFile).matching {
include '**/*.class'
exclude 'mcp/**'
}
}
tasks.named('filterJarNew').configure {
dependsOn('officialClassesOnly')
input = officialClassesOnly.archiveFile
}
tasks.register('filterJarNewSRG', FilterNewJar).configure {
input = reobfJar.output
srg = filterJarNew.srg
blacklist = filterJarNew.blacklist
}
tasks.named('universalJar').configure { tasks.named('universalJar').configure {
dependsOn downloadCrowdin dependsOn downloadCrowdin
from zipTree(downloadCrowdin.dest).matching { from zipTree(downloadCrowdin.dest).matching {
include 'assets/forge/lang/*.json' include 'assets/forge/lang/*.json'
} }
from(EXTRA_TXTS) from(EXTRA_TXTS)
duplicatesStrategy = 'exclude' duplicatesStrategy = DuplicatesStrategy.EXCLUDE
exclude '.cache' exclude '.cache'
manifest { manifest {
attributes([
'Automatic-Module-Name': 'net.minecraftforge.forge'
] as LinkedHashMap)
attributes([ attributes([
'Specification-Title': 'Forge', 'Specification-Title': 'Forge',
'Specification-Vendor': 'Forge Development LLC', 'Specification-Vendor': 'Forge Development LLC',
@@ -843,6 +840,20 @@ tasks.named('universalJar').configure {
jarSigner.sign(it) jarSigner.sign(it)
} }
tasks.register('universalJarSrg', Jar).configure {
from zipTree(filterJarNewSRG.output)
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
from zipTree(universalJar.archiveFile)
destinationDirectory = file('build/libs')
archiveClassifier = 'universal-srg'
manifest.from(universalJar.manifest)
jarSigner.sign(it)
}
tasks.named('userdevConfig').configure {
universal = "$project.group:$project.name:$project.version:universal-srg@jar"
}
tasks.register('installerJar', InstallerJar) { tasks.register('installerJar', InstallerJar) {
fat = !System.env.TEAMCITY_VERSION fat = !System.env.TEAMCITY_VERSION
//offline = true //offline = true
@@ -856,6 +867,29 @@ tasks.register('installerJar', InstallerJar) {
from(genServerBinPatches.output) { from(genServerBinPatches.output) {
rename { 'data/server.lzma' } rename { 'data/server.lzma' }
} }
final var argsFile = rootProject.file('server_files/args.txt')
final Map<String, Map<String, String>> tokens = [tokens: [
SHIM_JAR_FILE: serverShimJar.archiveFileName.get(),
MAVEN_PATH: MAVEN_PATH
]]
from(argsFile) {
filter(tokens, ReplaceTokens)
into 'data'
rename { 'unix_args.txt' }
}
from(argsFile) {
filter(tokens, ReplaceTokens)
into 'data'
rename { 'win_args.txt' }
}
from(rootProject.file('server_files')) {
filter(tokens, ReplaceTokens)
into 'data'
exclude 'args.txt'
}
jarSigner.sign(it) jarSigner.sign(it)
} }
@@ -889,6 +923,9 @@ tasks.register('mdkZip', Zip) {
rename 'gitignore\\.txt', '.gitignore' rename 'gitignore\\.txt', '.gitignore'
rename 'gitattributes\\.txt', '.gitattributes' rename 'gitattributes\\.txt', '.gitattributes'
} }
from(rootProject.file('src/test/java/com/example/examplemod/')) {
into('src/main/java/com/example/examplemod/')
}
from(rootProject.file('src/test/generated/mdk_datagen/')) { from(rootProject.file('src/test/generated/mdk_datagen/')) {
into('src/main/resources/') into('src/main/resources/')
exclude '**/.cache/' exclude '**/.cache/'
@@ -1006,6 +1043,7 @@ tasks.named('javadoc', Javadoc).configure {
publishing { publishing {
publications.register('mavenJava', MavenPublication).configure { publications.register('mavenJava', MavenPublication).configure {
artifact universalJar artifact universalJar
artifact universalJarSrg
artifact installerJar artifact installerJar
artifact mdkZip artifact mdkZip
artifact userdevJar artifact userdevJar
@@ -1017,8 +1055,8 @@ publishing {
name = project.name name = project.name
description = 'Modifactions to Minecraft to enable mod developers.' description = 'Modifactions to Minecraft to enable mod developers.'
url = 'https://github.com/MinecraftForge/MinecraftForge' url = 'https://github.com/MinecraftForge/MinecraftForge'
PomUtils.setGitHubDetails(pom, 'MinecraftForge') gradleutils.pom.setGitHubDetails(pom, 'MinecraftForge')
license PomUtils.Licenses.LGPLv2_1 license gradleutils.pom.Licenses.LGPLv2_1
} }
} }
@@ -1028,7 +1066,5 @@ publishing {
} }
// Make sure we run bin compat checking during local testing. // Make sure we run bin compat checking during local testing.
if (!System.env.MAVEN_USER || !System.env.MAVEN_PASSWORD) if ((!System.env.MAVEN_USER || !System.env.MAVEN_PASSWORD) && CHECK_COMPATIBILITY == "true")
publish.dependsOn(':forge:checkJarCompatibility') tasks.named('publish').configure { dependsOn(':forge:checkJarCompatibility') }
apply from: rootProject.file('build_forge_eclipse.gradle')
-44
View File
@@ -1,44 +0,0 @@
apply plugin: 'eclipse'
eclipse {
classpath.file.whenMerged {
def minecraft = entries.find { it.path == 'src/main/java' }
if (minecraft == null) throw new IllegalStateException("You must run `setup` task before importing")
// Disable optional warnings on the minecraft decompiled source code. It just muddies the warning window and hides warnings in our own codebase
minecraft.entryAttributes['ignore_optional_problems'] = 'true'
def mods = [
'src/main/java': 'minecraft',
'src/main/resources': 'minecraft',
'src/test/java': 'minecraft-test',
'src/test/resources': 'minecraft-test',
'main-java': 'forge',
'main-resources': 'forge',
'generated': 'forge',
'test-java': 'forge-test',
'test-resources': 'forge-test',
'test-generated': 'forge-test',
]
entries.forEach { e ->
if ('src'.equals(e.kind) && e.hasProperty('output')) {
if (mods.containsKey(e.path))
e.output = 'bin/' + mods[e.path]
//else
// throw new IllegalStateException('Unknown path: ' + e.toString())
}
}
}
// Filter out the run directory
project.resourceFilter {
appliesTo = 'FOLDERS'
type = 'EXCLUDE_ALL'
matcher {
id = 'org.eclipse.ui.ide.multiFilter'
arguments = '1.0-name-matches-false-true-run'
}
}
}
+13 -4
View File
@@ -40,10 +40,11 @@ tasks.register('generateResources') {
// Make sure out manifests get written before compiling the code, IDEA calls this task if you tell it to use the gradle build. // Make sure out manifests get written before compiling the code, IDEA calls this task if you tell it to use the gradle build.
tasks.withType(JavaCompile).configureEach { tasks.withType(JavaCompile).configureEach {
dependsOn(generateResources) dependsOn 'generateResources'
dependsOn(processResources) // Needed because we merge the output of this with the output of the compile task. And gradle detects downstream tasks using the output without a hard dep dependsOn 'processResources' // Needed because we merge the output of this with the output of the compile task. And gradle detects downstream tasks using the output without a hard dep
options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
options.warnings = false // Shutup deprecated for removal warnings options.warnings = false // Shutup deprecated for removal warnings
options.forkOptions.jvmArgs += '-Xmx3G' // Needed to make compiling faster, and not run out of heap space in some cases.
} }
// Merge the resources and classes into the same directory. We'll need to split them at runtime because // Merge the resources and classes into the same directory. We'll need to split them at runtime because
@@ -61,7 +62,7 @@ tasks.register('copyEclipseSettings') {
def temp = new CleanProperties().load(file) def temp = new CleanProperties().load(file)
def exst = new CleanProperties().load(target) def exst = new CleanProperties().load(target)
exst.put('eclipse.preferences.version', '1') exst.put('eclipse.preferences.version', '1')
temp.forEach(exst::put) exst.putAll(temp)
exst.store(target) exst.store(target)
} }
} }
@@ -73,4 +74,12 @@ eclipse {
//autoBuildTasks writeManifest //autoBuildTasks writeManifest
// Run when importing the project // Run when importing the project
synchronizationTasks generateResources, copyEclipseSettings, eclipseClasspath, eclipseProject synchronizationTasks generateResources, copyEclipseSettings, eclipseClasspath, eclipseProject
} }
idea {
module {
// IntelliJ IDEA does not do this by itself anymore...
downloadJavadoc = true
downloadSources = true
}
}
+25 -6
View File
@@ -2,16 +2,15 @@
MinecraftForge MinecraftForge
============= =============
[![Stable Release](https://img.shields.io/badge/dynamic/json?url=https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json&label=Stable&prefix=1.20.2&query=$.promos["1.20.2-recommended"]&color=brightgreen&logo=data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyBjbGFzcz0ic3ZnLWlubGluZS0tZmEgZmEtc3RhciBmYS13LTE4IiBhcmlhLWhpZGRlbj0idHJ1ZSIgZGF0YS1pY29uPSJzdGFyIiBkYXRhLXByZWZpeD0iZmFzIiBmb2N1c2FibGU9ImZhbHNlIiByb2xlPSJpbWciIHZpZXdCb3g9IjAgMCA1NzYgNTEyIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgo8cGF0aCBkPSJNMjU5LjMgMTcuOEwxOTQgMTUwLjIgNDcuOSAxNzEuNWMtMjYuMiAzLjgtMzYuNyAzNi4xLTE3LjcgNTQuNmwxMDUuNyAxMDMtMjUgMTQ1LjVjLTQuNSAyNi4zIDIzLjIgNDYgNDYuNCAzMy43TDI4OCA0MzkuNmwxMzAuNyA2OC43YzIzLjIgMTIuMiA1MC45LTcuNCA0Ni40LTMzLjdsLTI1LTE0NS41IDEwNS43LTEwM2MxOS0xOC41IDguNS01MC44LTE3LjctNTQuNkwzODIgMTUwLjIgMzE2LjcgMTcuOGMtMTEuNy0yMy42LTQ1LjYtMjMuOS01Ny40IDB6IiBmaWxsPSJ3aGl0ZSIvPgo8L3N2Zz4K)][Download] [![Stable Release](https://img.shields.io/badge/dynamic/json?url=https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json&label=Stable&prefix=1.21.3-&query=$.promos["1.21.3-recommended"]&color=brightgreen&logo=data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyBjbGFzcz0ic3ZnLWlubGluZS0tZmEgZmEtc3RhciBmYS13LTE4IiBhcmlhLWhpZGRlbj0idHJ1ZSIgZGF0YS1pY29uPSJzdGFyIiBkYXRhLXByZWZpeD0iZmFzIiBmb2N1c2FibGU9ImZhbHNlIiByb2xlPSJpbWciIHZpZXdCb3g9IjAgMCA1NzYgNTEyIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgo8cGF0aCBkPSJNMjU5LjMgMTcuOEwxOTQgMTUwLjIgNDcuOSAxNzEuNWMtMjYuMiAzLjgtMzYuNyAzNi4xLTE3LjcgNTQuNmwxMDUuNyAxMDMtMjUgMTQ1LjVjLTQuNSAyNi4zIDIzLjIgNDYgNDYuNCAzMy43TDI4OCA0MzkuNmwxMzAuNyA2OC43YzIzLjIgMTIuMiA1MC45LTcuNCA0Ni40LTMzLjdsLTI1LTE0NS41IDEwNS43LTEwM2MxOS0xOC41IDguNS01MC44LTE3LjctNTQuNkwzODIgMTUwLjIgMzE2LjcgMTcuOGMtMTEuNy0yMy42LTQ1LjYtMjMuOS01Ny40IDB6IiBmaWxsPSJ3aGl0ZSIvPgo8L3N2Zz4K)][Download]
[![Latest Release](https://img.shields.io/badge/dynamic/json?url=https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json&label=Latest&prefix=1.20.2-&query=$.promos["1.20.2-latest"]&color=blue&logo=data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyBjbGFzcz0ic3ZnLWlubGluZS0tZmEgZmEtYnVnIGZhLXctMTYiIGFyaWEtaGlkZGVuPSJ0cnVlIiBkYXRhLWljb249ImJ1ZyIgZGF0YS1wcmVmaXg9ImZhcyIgZm9jdXNhYmxlPSJmYWxzZSIgcm9sZT0iaW1nIiB2aWV3Qm94PSIwIDAgNTEyIDUxMiIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTUxMS45ODggMjg4LjljLS40NzggMTcuNDMtMTUuMjE3IDMxLjEtMzIuNjUzIDMxLjFINDI0djE2YzAgMjEuODY0LTQuODgyIDQyLjU4NC0xMy42IDYxLjE0NWw2MC4yMjggNjAuMjI4YzEyLjQ5NiAxMi40OTcgMTIuNDk2IDMyLjc1OCAwIDQ1LjI1NS0xMi40OTggMTIuNDk3LTMyLjc1OSAxMi40OTYtNDUuMjU2IDBsLTU0LjczNi01NC43MzZDMzQ1Ljg4NiA0NjcuOTY1IDMxNC4zNTEgNDgwIDI4MCA0ODBWMjM2YzAtNi42MjctNS4zNzMtMTItMTItMTJoLTI0Yy02LjYyNyAwLTEyIDUuMzczLTEyIDEydjI0NGMtMzQuMzUxIDAtNjUuODg2LTEyLjAzNS05MC42MzYtMzIuMTA4bC01NC43MzYgNTQuNzM2Yy0xMi40OTggMTIuNDk3LTMyLjc1OSAxMi40OTYtNDUuMjU2IDAtMTIuNDk2LTEyLjQ5Ny0xMi40OTYtMzIuNzU4IDAtNDUuMjU1bDYwLjIyOC02MC4yMjhDOTIuODgyIDM3OC41ODQgODggMzU3Ljg2NCA4OCAzMzZ2LTE2SDMyLjY2NkMxNS4yMyAzMjAgLjQ5MSAzMDYuMzMuMDEzIDI4OC45LS40ODQgMjcwLjgxNiAxNC4wMjggMjU2IDMyIDI1Nmg1NnYtNTguNzQ1bC00Ni42MjgtNDYuNjI4Yy0xMi40OTYtMTIuNDk3LTEyLjQ5Ni0zMi43NTggMC00NS4yNTUgMTIuNDk4LTEyLjQ5NyAzMi43NTgtMTIuNDk3IDQ1LjI1NiAwTDE0MS4yNTUgMTYwaDIyOS40ODlsNTQuNjI3LTU0LjYyN2MxMi40OTgtMTIuNDk3IDMyLjc1OC0xMi40OTcgNDUuMjU2IDAgMTIuNDk2IDEyLjQ5NyAxMi40OTYgMzIuNzU4IDAgNDUuMjU1TDQyNCAxOTcuMjU1VjI1Nmg1NmMxNy45NzIgMCAzMi40ODQgMTQuODE2IDMxLjk4OCAzMi45ek0yNTcgMGMtNjEuODU2IDAtMTEyIDUwLjE0NC0xMTIgMTEyaDIyNEMzNjkgNTAuMTQ0IDMxOC44NTYgMCAyNTcgMHoiIGZpbGw9IndoaXRlIi8+Cjwvc3ZnPgo= [![Latest Release](https://img.shields.io/badge/dynamic/json?url=https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json&label=Latest&prefix=1.21.3-&query=$.promos["1.21.3-latest"]&color=blue&logo=data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyBjbGFzcz0ic3ZnLWlubGluZS0tZmEgZmEtYnVnIGZhLXctMTYiIGFyaWEtaGlkZGVuPSJ0cnVlIiBkYXRhLWljb249ImJ1ZyIgZGF0YS1wcmVmaXg9ImZhcyIgZm9jdXNhYmxlPSJmYWxzZSIgcm9sZT0iaW1nIiB2aWV3Qm94PSIwIDAgNTEyIDUxMiIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTUxMS45ODggMjg4LjljLS40NzggMTcuNDMtMTUuMjE3IDMxLjEtMzIuNjUzIDMxLjFINDI0djE2YzAgMjEuODY0LTQuODgyIDQyLjU4NC0xMy42IDYxLjE0NWw2MC4yMjggNjAuMjI4YzEyLjQ5NiAxMi40OTcgMTIuNDk2IDMyLjc1OCAwIDQ1LjI1NS0xMi40OTggMTIuNDk3LTMyLjc1OSAxMi40OTYtNDUuMjU2IDBsLTU0LjczNi01NC43MzZDMzQ1Ljg4NiA0NjcuOTY1IDMxNC4zNTEgNDgwIDI4MCA0ODBWMjM2YzAtNi42MjctNS4zNzMtMTItMTItMTJoLTI0Yy02LjYyNyAwLTEyIDUuMzczLTEyIDEydjI0NGMtMzQuMzUxIDAtNjUuODg2LTEyLjAzNS05MC42MzYtMzIuMTA4bC01NC43MzYgNTQuNzM2Yy0xMi40OTggMTIuNDk3LTMyLjc1OSAxMi40OTYtNDUuMjU2IDAtMTIuNDk2LTEyLjQ5Ny0xMi40OTYtMzIuNzU4IDAtNDUuMjU1bDYwLjIyOC02MC4yMjhDOTIuODgyIDM3OC41ODQgODggMzU3Ljg2NCA4OCAzMzZ2LTE2SDMyLjY2NkMxNS4yMyAzMjAgLjQ5MSAzMDYuMzMuMDEzIDI4OC45LS40ODQgMjcwLjgxNiAxNC4wMjggMjU2IDMyIDI1Nmg1NnYtNTguNzQ1bC00Ni42MjgtNDYuNjI4Yy0xMi40OTYtMTIuNDk3LTEyLjQ5Ni0zMi43NTggMC00NS4yNTUgMTIuNDk4LTEyLjQ5NyAzMi43NTgtMTIuNDk3IDQ1LjI1NiAwTDE0MS4yNTUgMTYwaDIyOS40ODlsNTQuNjI3LTU0LjYyN2MxMi40OTgtMTIuNDk3IDMyLjc1OC0xMi40OTcgNDUuMjU2IDAgMTIuNDk2IDEyLjQ5NyAxMi40OTYgMzIuNzU4IDAgNDUuMjU1TDQyNCAxOTcuMjU1VjI1Nmg1NmMxNy45NzIgMCAzMi40ODQgMTQuODE2IDMxLjk4OCAzMi45ek0yNTcgMGMtNjEuODU2IDAtMTEyIDUwLjE0NC0xMTIgMTEyaDIyNEMzNjkgNTAuMTQ0IDMxOC44NTYgMCAyNTcgMHoiIGZpbGw9IndoaXRlIi8+Cjwvc3ZnPgo=
)][Download] [![Discord](https://img.shields.io/discord/313125603924639766.svg?color=%237289da&label=Discord&logo=discord&logoColor=%237289da)][Discord] [![Support](https://img.shields.io/badge/Patreon-Support-orange.svg?logo=Patreon)][Patreon] )][Download] [![Discord](https://img.shields.io/discord/313125603924639766.svg?color=%237289da&label=Discord&logo=discord&logoColor=%237289da)][Discord] [![Support](https://img.shields.io/badge/Patreon-Support-orange.svg?logo=Patreon)][Patreon]
Forge is a free, open-source modding API all of your favourite mods use! Forge is a free, open-source modding API all of your favourite mods use!
| Version | Support | | Version | Support |
|---------| ------------- | |--------------|-----------------------------|
| 1.20.x | Active | | All versions | [Supported][Support-Policy] |
| 1.19.x | Legacy |
* [Download] * [Download]
* [Forum] * [Forum]
@@ -31,6 +30,19 @@ You can download the installer for the *Recommended Build* or the
For support and questions, visit [the Support Forum][Support-Forum] or [the Forge Discord server][Discord]. For support and questions, visit [the Support Forum][Support-Forum] or [the Forge Discord server][Discord].
## Required Java Versions
We require the version of Java that Minecraft requires, which is currently:
| Minecraft | Java |
|---------------|-------------------|
| 1.20.6+ | [21][Adoptium-21] |
| 1.18 - 1.20.4 | [17][Adoptium-17] |
| 1.17.1 | [16][Adoptium-16] |
| 1.16.5- | [8][Adoptium-8] |
**If you are on Windows and have difficulty using Java to launch JAR files, consider using [Jarfix by Johann Löfflmann][Jarfix].**
# Creating Mods # Creating Mods
[See the "Getting Started" section in the Forge Documentation][Getting-Started]. [See the "Getting Started" section in the Forge Documentation][Getting-Started].
@@ -63,8 +75,15 @@ Please ensure you have a valid email address associated with your GitHub account
[Download]: https://files.minecraftforge.net/ [Download]: https://files.minecraftforge.net/
[Adoptium-21]: https://adoptium.net/temurin/releases/?version=21
[Adoptium-17]: https://adoptium.net/temurin/releases/?version=17
[Adoptium-16]: https://adoptium.net/temurin/releases/?version=16
[Adoptium-8]: https://adoptium.net/temurin/releases/?version=8
[Jarfix]: https://johann.loefflmann.net/en/software/jarfix/index.html
[Forum]: https://forums.minecraftforge.net/ [Forum]: https://forums.minecraftforge.net/
[Support-Forum]: https://forums.minecraftforge.net/forum/18-support-bug-reports/ [Support-Forum]: https://forums.minecraftforge.net/forum/18-support-bug-reports/
[Support-Policy]: https://forums.minecraftforge.net/topic/144690-new-tiered-support-policy
[Discord]: https://discord.minecraftforge.net/ [Discord]: https://discord.minecraftforge.net/
+3 -3
View File
@@ -3,7 +3,7 @@ import net.minecraftforge.gradleutils.PomUtils
plugins { plugins {
id 'java-library' id 'java-library'
id 'maven-publish' id 'maven-publish'
id 'org.cadixdev.licenser' id 'net.minecraftforge.licenser'
id 'net.minecraftforge.gradleutils' id 'net.minecraftforge.gradleutils'
} }
@@ -40,7 +40,7 @@ tasks.named('jar', Jar).configure {
} }
} }
tasks.withType(JavaCompile) { tasks.withType(JavaCompile).configureEach {
options.compilerArgs << '-Xlint:-unchecked' options.compilerArgs << '-Xlint:-unchecked'
} }
@@ -64,4 +64,4 @@ publishing {
repositories { repositories {
maven gradleutils.publishingForgeMaven maven gradleutils.publishingForgeMaven
} }
} }
@@ -9,41 +9,35 @@ import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.fml.config.IConfigEvent; import net.minecraftforge.fml.config.IConfigEvent;
import net.minecraftforge.fml.loading.FMLLoader; import net.minecraftforge.fml.loading.FMLLoader;
import java.util.ArrayList;
import java.util.ServiceConfigurationError; import java.util.ServiceConfigurationError;
import java.util.ServiceLoader; import java.util.ServiceLoader;
import java.util.function.Supplier; import java.util.function.Supplier;
/**
* Used to allow access to certain things from the game layer
*/
public class Bindings { public class Bindings {
private static final Bindings INSTANCE = new Bindings(); private Bindings() {}
private final IBindingsProvider provider; /**
* The provider of the bindings
private Bindings() { * @implNote May also throw a {@link ServiceConfigurationError}
var providers = new ArrayList<IBindingsProvider>(1); */
for (var itr = ServiceLoader.load(FMLLoader.getGameLayer(), IBindingsProvider.class).iterator(); itr.hasNext(); ) { private static final IBindingsProvider PROVIDER = ServiceLoader.load(FMLLoader.getGameLayer(), IBindingsProvider.class)
try { .findFirst().orElseThrow(() -> new IllegalStateException("Could not find bindings provider"));
providers.add(itr.next());
} catch (ServiceConfigurationError sce) {
sce.printStackTrace();
}
}
if (providers.size() != 1)
throw new IllegalStateException("Could not find bindings provider: " + providers);
this.provider = providers.get(0);
}
/**
* @return A supplier of net.minecraftforge.common.MinecraftForge#EVENT_BUS
*/
public static Supplier<IEventBus> getForgeBus() { public static Supplier<IEventBus> getForgeBus() {
return INSTANCE.provider.getForgeBusSupplier(); return PROVIDER.getForgeBusSupplier();
} }
public static Supplier<I18NParser> getMessageParser() { public static Supplier<I18NParser> getMessageParser() {
return INSTANCE.provider.getMessageParser(); return PROVIDER.getMessageParser();
} }
public static Supplier<IConfigEvent.ConfigConfig> getConfigConfiguration() { public static Supplier<IConfigEvent.ConfigConfig> getConfigConfiguration() {
return INSTANCE.provider.getConfigConfiguration(); return PROVIDER.getConfigConfiguration();
} }
} }
@@ -57,7 +57,9 @@ public class DeferredWorkQueue
LOGGER.debug(LOADING, "Dispatching synchronous work for work queue {}: {} jobs", modLoadingStage, tasks.size()); LOGGER.debug(LOADING, "Dispatching synchronous work for work queue {}: {} jobs", modLoadingStage, tasks.size());
RuntimeException aggregate = new RuntimeException(); RuntimeException aggregate = new RuntimeException();
Stopwatch timer = Stopwatch.createStarted(); Stopwatch timer = Stopwatch.createStarted();
tasks.forEach(t -> makeRunnable(t, Runnable::run, aggregate)); for (TaskInfo t : tasks) {
makeRunnable(t, Runnable::run, aggregate);
}
timer.stop(); timer.stop();
if (aggregate.getSuppressed().length > 0) { if (aggregate.getSuppressed().length > 0) {
LOGGER.fatal( LOGGER.fatal(
@@ -114,7 +116,7 @@ public class DeferredWorkQueue
return future; return future;
} }
private static class TaskInfo { private static final class TaskInfo {
private final ModContainer owner; private final ModContainer owner;
private Runnable task; private Runnable task;
private CompletableFuture<?> future; private CompletableFuture<?> future;
@@ -96,5 +96,26 @@ public interface IExtensionPoint<T extends Record>
@SuppressWarnings("JavadocReference") // reference to NetworkConstants, ForgeHooksClient @SuppressWarnings("JavadocReference") // reference to NetworkConstants, ForgeHooksClient
record DisplayTest(Supplier<String> suppliedVersion, BiPredicate<String, Boolean> remoteVersionTest) implements IExtensionPoint<DisplayTest> { record DisplayTest(Supplier<String> suppliedVersion, BiPredicate<String, Boolean> remoteVersionTest) implements IExtensionPoint<DisplayTest> {
public static final String IGNORESERVERONLY = "SERVER_ONLY"; public static final String IGNORESERVERONLY = "SERVER_ONLY";
/**
* Ignores any version information coming from the server - use for server only mods
*/
public static final Supplier<DisplayTest> IGNORE_SERVER_VERSION = () -> new DisplayTest(IGNORESERVERONLY, (remoteVersion, isFromServer) -> true);
/**
* Ignores all information and provides no information
* <p>Note: If your mod is purely client-side and has no multiplayer functionality (be it dedicated servers or
* Open to LAN), consider setting {@code clientSideOnly=true} in the root of your mods.toml.</p>
*/
public static final Supplier<DisplayTest> IGNORE_ALL_VERSION = () -> new DisplayTest("", (remoteVersion, isFromServer) -> true);
/**
* An optional alternative to {@link #DisplayTest(Supplier, BiPredicate)} which accepts a constant version string
* instead of a {@link Supplier}.
* <p>Internally, the provided version string is wrapped in a Supplier for you.</p>
*/
public DisplayTest(String version, BiPredicate<String, Boolean> remoteVersionTest) {
this(() -> version, remoteVersionTest);
}
} }
} }
@@ -68,13 +68,15 @@ public interface IModLoadingState {
* @return a transition task for this state * @return a transition task for this state
* @see #buildTransition(Executor, Executor, ProgressMeter, Function, Function) * @see #buildTransition(Executor, Executor, ProgressMeter, Function, Function)
*/ */
default <T extends Event & IModBusEvent> default <T extends Event & IModBusEvent> Optional<CompletableFuture<Void>> buildTransition(
Optional<CompletableFuture<Void>> buildTransition(final Executor syncExecutor, final Executor syncExecutor,
final Executor parallelExecutor, final Executor parallelExecutor,
final ProgressMeter progressBar) { final ProgressMeter progressBar
) {
return buildTransition(syncExecutor, parallelExecutor, progressBar, return buildTransition(syncExecutor, parallelExecutor, progressBar,
e -> CompletableFuture.runAsync(() -> {}, e), e -> CompletableFuture.completedFuture(null),
e -> CompletableFuture.runAsync(() -> {}, e)); e -> CompletableFuture.completedFuture(null)
);
} }
/** /**
@@ -9,8 +9,6 @@ import net.minecraftforge.eventbus.api.Event;
import net.minecraftforge.fml.event.IModBusEvent; import net.minecraftforge.fml.event.IModBusEvent;
import net.minecraftforge.fml.loading.progress.ProgressMeter; import net.minecraftforge.fml.loading.progress.ProgressMeter;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import java.util.function.BiFunction; import java.util.function.BiFunction;
@@ -18,103 +16,67 @@ import java.util.function.Function;
import java.util.function.Supplier; import java.util.function.Supplier;
import java.util.stream.Stream; import java.util.stream.Stream;
@SuppressWarnings("unchecked") import org.jetbrains.annotations.Nullable;
public interface IModStateTransition { public interface IModStateTransition {
/** Magic value to allow me to optimize the futures list by ignoring the default value without making old methods nullable. */
public static final BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> NULL_HOOK = (e, g) -> CompletableFuture.completedFuture(null);
static IModStateTransition buildNoopTransition() { static IModStateTransition buildNoopTransition() {
return new NoopTransition(); return ModStateTransitionHelper.NOOP;
} }
default <T extends Event & IModBusEvent> default CompletableFuture<Void> build(
CompletableFuture<Void> build(final String name, final String name,
final Executor syncExecutor, final Executor syncExecutor,
final Executor parallelExecutor, final Executor parallelExecutor,
final ProgressMeter progressBar, final ProgressMeter progressBar,
final Function<Executor, CompletableFuture<Void>> preSyncTask, final Function<Executor, CompletableFuture<Void>> preSyncTask,
final Function<Executor, CompletableFuture<Void>> postSyncTask) { final Function<Executor, CompletableFuture<Void>> postSyncTask
List<CompletableFuture<Void>> futures = new ArrayList<>(); ) {
return ModStateTransitionHelper.build(this, name, syncExecutor, parallelExecutor, progressBar, preSyncTask, postSyncTask);
this.eventFunctionStream().get()
.map(f -> (EventGenerator<T>) f)
.reduce((head, tail) -> addCompletableFutureTaskForModDispatch(syncExecutor, parallelExecutor, futures, progressBar, head, ModLoadingStage::currentState, tail))
.ifPresent(last -> addCompletableFutureTaskForModDispatch(syncExecutor, parallelExecutor, futures, progressBar, last, nextModLoadingStage(), null));
final CompletableFuture<Void> preSyncTaskCF = preSyncTask.apply(syncExecutor);
final CompletableFuture<Void> eventDispatchCF = ModList.gather(futures).thenCompose(ModList::completableFutureFromExceptionList);
final CompletableFuture<Void> postEventDispatchCF = preSyncTaskCF
.thenApplyAsync(n -> {
progressBar.label(progressBar.name() + ": dispatching "+name);
return null;
}, parallelExecutor)
.thenComposeAsync(n -> eventDispatchCF, parallelExecutor)
.thenApply(r -> {
postSyncTask.apply(syncExecutor);
return null;
});
return this.finalActivityGenerator().apply(syncExecutor, postEventDispatchCF);
} }
default BiFunction<ModLoadingStage, Throwable, ModLoadingStage> nextModLoadingStage() { default BiFunction<ModLoadingStage, Throwable, ModLoadingStage> nextModLoadingStage() {
return ModLoadingStage::nextState; return ModLoadingStage::nextState;
} }
private <T extends Event & IModBusEvent> /**
EventGenerator<T> addCompletableFutureTaskForModDispatch(final Executor syncExecutor, * This used to allow you to fire multiple events during the transition. However, in doing so it would cause issues with the default
final Executor parallelExecutor, * ModContainer's event handlers causing issues such as mod classes being constructed multiple times.
final List<CompletableFuture<Void>> completableFutures, */
final ProgressMeter progressBar, @Deprecated(since = "1.21.3", forRemoval = true)
final EventGenerator<T> eventGenerator, default Supplier<Stream<EventGenerator<?>>> eventFunctionStream() {
final BiFunction<ModLoadingStage, Throwable, ModLoadingStage> nextState, return () -> Stream.ofNullable(eventFunction());
final EventGenerator<T> nextGenerator) { }
final Executor selectedExecutor = threadSelector().apply(syncExecutor, parallelExecutor);
@Nullable
var preDispatchHook = (BiFunction<Executor, EventGenerator<T>, CompletableFuture<Void>>) preDispatchHook(); default <T extends Event & IModBusEvent> EventGenerator<T> eventFunction() {
completableFutures.add(preDispatchHook.apply(selectedExecutor, eventGenerator)); return null;
completableFutures.add(ModList.get().futureVisitor(eventGenerator, progressBar, nextState).apply(threadSelector().apply(syncExecutor, parallelExecutor)));
var postDispatchHook = (BiFunction<Executor, EventGenerator<T>, CompletableFuture<Void>>) postDispatchHook();
completableFutures.add(postDispatchHook.apply(selectedExecutor, eventGenerator));
return nextGenerator;
} }
Supplier<Stream<EventGenerator<?>>> eventFunctionStream();
ThreadSelector threadSelector(); ThreadSelector threadSelector();
BiFunction<Executor, CompletableFuture<Void>, CompletableFuture<Void>> finalActivityGenerator(); BiFunction<Executor, CompletableFuture<Void>, CompletableFuture<Void>> finalActivityGenerator();
BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> preDispatchHook();
BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> postDispatchHook(); /**
* I think this was meant as a way to do some things for each mod container beforge/after the transition had been sent to the container.
* However, the Future returned by this was never linked to the main transition future in any way. Which means that it was run
* in parallel and couldn't guarantee the state of the ModContainer.
* <p>
* Plus all existing code that I could find returned a completedFuture, so I don't think anyone ever used this.
* <p>
* If I were to add this back it would be a CompletableFuture wrap(ModContainer, CompletableFuture)
* <p>
* Added magic value NULL_HOOK to allow me to optimize the futures list by ignoring the default value without making this method nullable.
*/
@Deprecated(since = "1.21.3", forRemoval = true)
default BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> preDispatchHook() { return NULL_HOOK; }
@Deprecated(since = "1.21.3", forRemoval = true)
default BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> postDispatchHook() { return NULL_HOOK; }
interface EventGenerator<T extends Event & IModBusEvent> extends Function<ModContainer, T> { interface EventGenerator<T extends Event & IModBusEvent> extends Function<ModContainer, T> {
static <FN extends Event & IModBusEvent> EventGenerator<FN> fromFunction(Function<ModContainer, FN> fn) { static <FN extends Event & IModBusEvent> EventGenerator<FN> fromFunction(Function<ModContainer, FN> fn) {
return fn::apply; return fn::apply;
} }
} }
}
record NoopTransition() implements IModStateTransition {
@Override
public Supplier<Stream<EventGenerator<?>>> eventFunctionStream() {
return Stream::of;
}
@Override
public ThreadSelector threadSelector() {
return ThreadSelector.SYNC;
}
@Override
public BiFunction<Executor, CompletableFuture<Void>, CompletableFuture<Void>> finalActivityGenerator() {
return (e, t) -> t.thenApplyAsync(Function.identity(), e);
}
@Override
public BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> preDispatchHook() {
return (t, f)-> CompletableFuture.completedFuture(null);
}
@Override
public BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> postDispatchHook() {
return (t, f)-> CompletableFuture.completedFuture(null);
}
} }
@@ -61,7 +61,7 @@ public class InterModComms
} }
} }
private static ConcurrentMap<String, ConcurrentLinkedQueue<IMCMessage>> containerQueues = new ConcurrentHashMap<>(); private static final ConcurrentMap<String, ConcurrentLinkedQueue<IMCMessage>> containerQueues = new ConcurrentHashMap<>();
/** /**
* Send IMC to remote. Sender will default to the active modcontainer, or minecraft if not. * Send IMC to remote. Sender will default to the active modcontainer, or minecraft if not.
@@ -115,16 +115,14 @@ public class InterModComms
return getMessages(modId, s->Boolean.TRUE); return getMessages(modId, s->Boolean.TRUE);
} }
private static class QueueFilteringSpliterator implements Spliterator<IMCMessage> private record QueueFilteringSpliterator(
{ ConcurrentLinkedQueue<IMCMessage> queue,
private final ConcurrentLinkedQueue<IMCMessage> queue; Predicate<String> methodFilter,
private final Predicate<String> methodFilter; Iterator<IMCMessage> iterator
private final Iterator<IMCMessage> iterator; ) implements Spliterator<IMCMessage> {
public QueueFilteringSpliterator(final ConcurrentLinkedQueue<IMCMessage> queue, final Predicate<String> methodFilter) { public QueueFilteringSpliterator(final ConcurrentLinkedQueue<IMCMessage> queue, final Predicate<String> methodFilter) {
this.queue = queue; this(queue, methodFilter, queue.iterator());
this.iterator = queue.iterator();
this.methodFilter = methodFilter;
} }
@Override @Override
@@ -16,8 +16,7 @@ import net.minecraftforge.api.distmarker.Dist;
* *
* @see Dist * @see Dist
*/ */
public enum LogicalSide public enum LogicalSide {
{
/** /**
* The logical client of the Minecraft game, which interfaces with the player's inputs and renders the player's * The logical client of the Minecraft game, which interfaces with the player's inputs and renders the player's
* viewpoint. * viewpoint.
@@ -27,6 +26,7 @@ public enum LogicalSide
* @see Dist#CLIENT * @see Dist#CLIENT
*/ */
CLIENT, CLIENT,
/** /**
* The logical server of the Minecraft game, responsible for connecting to clients and running the simulation logic * The logical server of the Minecraft game, responsible for connecting to clients and running the simulation logic
* on the level. * on the level.
@@ -41,16 +41,14 @@ public enum LogicalSide
/** /**
* {@return if this logical side is the server} * {@return if this logical side is the server}
*/ */
public boolean isServer() public boolean isServer() {
{
return !isClient(); return !isClient();
} }
/** /**
* {@return if the logical side is the client} * {@return if the logical side is the client}
*/ */
public boolean isClient() public boolean isClient() {
{
return this == CLIENT; return this == CLIENT;
} }
} }
@@ -9,18 +9,16 @@ import net.minecraftforge.eventbus.api.Event;
import net.minecraftforge.fml.config.IConfigEvent; import net.minecraftforge.fml.config.IConfigEvent;
import net.minecraftforge.fml.config.ModConfig; import net.minecraftforge.fml.config.ModConfig;
import net.minecraftforge.fml.event.IModBusEvent; import net.minecraftforge.fml.event.IModBusEvent;
import net.minecraftforge.fml.loading.progress.ProgressMeter;
import net.minecraftforge.forgespi.language.IModInfo; import net.minecraftforge.forgespi.language.IModInfo;
import java.util.EnumMap; import java.util.EnumMap;
import java.util.HashMap; import java.util.HashSet;
import java.util.IdentityHashMap; import java.util.IdentityHashMap;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.Optional; import java.util.Optional;
import java.util.concurrent.CompletableFuture; import java.util.Set;
import java.util.concurrent.Executor; import java.util.function.BiPredicate;
import java.util.function.BiFunction;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.function.Supplier; import java.util.function.Supplier;
@@ -32,41 +30,40 @@ import java.util.function.Supplier;
* a mechanism by which we can wrap actual mod code so that the loader and other * a mechanism by which we can wrap actual mod code so that the loader and other
* facilities can treat mods at arms length. * facilities can treat mods at arms length.
* </p> * </p>
*
* @author cpw
*
*/ */
public abstract class ModContainer {
public abstract class ModContainer
{
protected final String modId; protected final String modId;
protected final String namespace; protected final String namespace;
protected final IModInfo modInfo; protected final IModInfo modInfo;
protected ModLoadingStage modLoadingStage; protected ModLoadingStage modLoadingStage;
protected Supplier<?> contextExtension; protected Supplier<?> contextExtension;
protected final Map<ModLoadingStage, Runnable> activityMap = new HashMap<>(); protected final Map<ModLoadingStage, Runnable> activityMap = new EnumMap<>(ModLoadingStage.class);
protected final Map<Class<? extends IExtensionPoint<?>>, Supplier<?>> extensionPoints = new IdentityHashMap<>(); protected final Map<Class<? extends IExtensionPoint<?>>, Supplier<?>> extensionPoints = new IdentityHashMap<>();
protected final EnumMap<ModConfig.Type, ModConfig> configs = new EnumMap<>(ModConfig.Type.class); protected final EnumMap<ModConfig.Type, ModConfig> configs = new EnumMap<>(ModConfig.Type.class);
@SuppressWarnings("OptionalUsedAsFieldOrParameterType") final Set<ModContainer> dependencies = new HashSet<>();
/**
* If you want to handle the event, override {@link #dispatchConfigEvent(IConfigEvent)}
*/
@Deprecated(since = "1.21.3", forRemoval = true)
protected Optional<Consumer<IConfigEvent>> configHandler = Optional.empty(); protected Optional<Consumer<IConfigEvent>> configHandler = Optional.empty();
public ModContainer(IModInfo info) public ModContainer(IModInfo info) {
{
this.modId = info.getModId(); this.modId = info.getModId();
// TODO: Currently not reading namespace from configuration.. // TODO: Currently not reading namespace from configuration..
this.namespace = this.modId; this.namespace = this.modId;
this.modInfo = info; this.modInfo = info;
this.modLoadingStage = ModLoadingStage.CONSTRUCT; this.modLoadingStage = ModLoadingStage.CONSTRUCT;
final String displayTestString = info.getConfig().<String>getConfigElement("displayTest").orElse("MATCH_VERSION"); // missing defaults to DEFAULT type final String displayTestString = info.getConfig().<String>getConfigElement("displayTest")
.orElseGet(() -> info.getOwningFile().isClientSideOnly() ? "IGNORE_ALL_VERSION" : "MATCH_VERSION");
Supplier<IExtensionPoint.DisplayTest> displayTestSupplier = switch (displayTestString) { Supplier<IExtensionPoint.DisplayTest> displayTestSupplier = switch (displayTestString) {
case "MATCH_VERSION" -> // default displaytest checks for version string match case "MATCH_VERSION" -> // default displaytest checks for version string match
() -> new IExtensionPoint.DisplayTest(() -> this.modInfo.getVersion().toString(), () -> new IExtensionPoint.DisplayTest(() -> this.modInfo.getVersion().toString(),
(incoming, isNetwork) -> Objects.equals(incoming, this.modInfo.getVersion().toString())); (incoming, isNetwork) -> Objects.equals(incoming, this.modInfo.getVersion().toString()));
case "IGNORE_SERVER_VERSION" -> // Ignores any version information coming from the server - use for server only mods case "IGNORE_SERVER_VERSION" -> // Ignores any version information coming from the server - use for server only mods
() -> new IExtensionPoint.DisplayTest(() -> IExtensionPoint.DisplayTest.IGNORESERVERONLY, (incoming, isNetwork) -> true); IExtensionPoint.DisplayTest.IGNORE_SERVER_VERSION;
case "IGNORE_ALL_VERSION" -> // Ignores all information and provides no information case "IGNORE_ALL_VERSION" -> // Ignores all information and provides no information
() -> new IExtensionPoint.DisplayTest(() -> "", (incoming, isNetwork) -> true); IExtensionPoint.DisplayTest.IGNORE_ALL_VERSION;
case "NONE" -> null; // NO display test at all - use this if you're going to do your own display test case "NONE" -> null; // NO display test at all - use this if you're going to do your own display test
default -> // any other value throws an exception default -> // any other value throws an exception
throw new IllegalArgumentException("Invalid displayTest value supplied in mods.toml"); throw new IllegalArgumentException("Invalid displayTest value supplied in mods.toml");
@@ -80,58 +77,35 @@ public abstract class ModContainer
/** /**
* Errored container state, used for filtering. Does nothing. * Errored container state, used for filtering. Does nothing.
*/ */
ModContainer() ModContainer() {
{
this.modLoadingStage = ModLoadingStage.ERROR; this.modLoadingStage = ModLoadingStage.ERROR;
modId = "BROKEN"; modId = "BROKEN";
namespace = "BROKEN"; namespace = "BROKEN";
modInfo = null; modInfo = null;
} }
/** /**
* @return the modid for this mod * @return the modid for this mod
*/ */
public final String getModId() public final String getModId() {
{
return modId; return modId;
} }
/** /**
* @return the resource prefix for the mod * @return the resource prefix for the mod
*/ */
public final String getNamespace() public final String getNamespace() {
{
return namespace; return namespace;
} }
/** /**
* @return The current loading stage for this mod * @return The current loading stage for this mod
*/ */
public ModLoadingStage getCurrentState() public ModLoadingStage getCurrentState() {
{
return modLoadingStage; return modLoadingStage;
} }
public static <T extends Event & IModBusEvent> CompletableFuture<Void> buildTransitionHandler( public IModInfo getModInfo() {
final ModContainer target,
final IModStateTransition.EventGenerator<T> eventGenerator,
final ProgressMeter progressBar,
final BiFunction<ModLoadingStage, Throwable, ModLoadingStage> stateChangeHandler,
final Executor executor) {
return CompletableFuture
.runAsync(() -> {
ModLoadingContext.get().setActiveContainer(target);
target.activityMap.getOrDefault(target.modLoadingStage, ()->{}).run();
target.acceptEvent(eventGenerator.apply(target));
}, executor)
.whenComplete((mc, exception) -> {
target.modLoadingStage = stateChangeHandler.apply(target.modLoadingStage, exception);
progressBar.increment();
ModLoadingContext.get().setActiveContainer(null);
});
}
public IModInfo getModInfo()
{
return modInfo; return modInfo;
} }
@@ -140,17 +114,35 @@ public abstract class ModContainer
return Optional.ofNullable((T)extensionPoints.getOrDefault(point,()-> null).get()); return Optional.ofNullable((T)extensionPoints.getOrDefault(point,()-> null).get());
} }
public <T extends Record & IExtensionPoint<T>> void registerExtensionPoint(Class<? extends IExtensionPoint<T>> point, Supplier<T> extension) public <T extends Record & IExtensionPoint<T>> void registerExtensionPoint(Class<? extends IExtensionPoint<T>> point, Supplier<T> extension) {
{
extensionPoints.put(point, extension); extensionPoints.put(point, extension);
} }
public void registerDisplayTest(IExtensionPoint.DisplayTest displayTest) {
registerExtensionPoint(IExtensionPoint.DisplayTest.class, () -> displayTest);
}
public void registerDisplayTest(Supplier<IExtensionPoint.DisplayTest> displayTest) {
registerExtensionPoint(IExtensionPoint.DisplayTest.class, displayTest);
}
public void registerDisplayTest(String version, BiPredicate<String, Boolean> remoteVersionTest) {
registerDisplayTest(new IExtensionPoint.DisplayTest(version, remoteVersionTest));
}
public void registerDisplayTest(Supplier<String> suppliedVersion, BiPredicate<String, Boolean> remoteVersionTest) {
registerDisplayTest(new IExtensionPoint.DisplayTest(suppliedVersion, remoteVersionTest));
}
public void addConfig(final ModConfig modConfig) { public void addConfig(final ModConfig modConfig) {
configs.put(modConfig.getType(), modConfig); configs.put(modConfig.getType(), modConfig);
} }
public void dispatchConfigEvent(IConfigEvent event) { public void dispatchConfigEvent(IConfigEvent event) {
configHandler.ifPresent(configHandler->configHandler.accept(event)); var handler = configHandler.orElse(null);
if (handler != null) {
handler.accept(event);
}
} }
/** /**
@@ -5,9 +5,6 @@
package net.minecraftforge.fml; package net.minecraftforge.fml;
import net.minecraftforge.eventbus.api.Event;
import net.minecraftforge.fml.event.IModBusEvent;
import net.minecraftforge.fml.loading.progress.ProgressMeter;
import net.minecraftforge.forgespi.language.IModFileInfo; import net.minecraftforge.forgespi.language.IModFileInfo;
import net.minecraftforge.forgespi.language.IModInfo; import net.minecraftforge.forgespi.language.IModInfo;
import net.minecraftforge.forgespi.language.ModFileScanData; import net.minecraftforge.forgespi.language.ModFileScanData;
@@ -15,27 +12,15 @@ import net.minecraftforge.fml.loading.moddiscovery.ModFile;
import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo; import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
import net.minecraftforge.fml.loading.moddiscovery.ModInfo; import net.minecraftforge.fml.loading.moddiscovery.ModInfo;
import net.minecraftforge.forgespi.locating.IModFile; import net.minecraftforge.forgespi.locating.IModFile;
import org.apache.logging.log4j.LogManager; import java.util.Collections;
import org.apache.logging.log4j.Logger;
import java.util.AbstractMap;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Comparator; import java.util.Comparator;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.Optional; import java.util.Optional;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionException;
import java.util.concurrent.CompletionStage;
import java.util.concurrent.Executor;
import java.util.concurrent.ForkJoinPool;
import java.util.concurrent.ForkJoinWorkerThread;
import java.util.function.BiConsumer; import java.util.function.BiConsumer;
import java.util.function.BiFunction;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.function.Function; import java.util.function.Function;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@@ -45,27 +30,25 @@ import java.util.stream.Stream;
* Master list of all mods - game-side version. This is classloaded in the game scope and * Master list of all mods - game-side version. This is classloaded in the game scope and
* can dispatch game level events as a result. * can dispatch game level events as a result.
*/ */
public class ModList public class ModList {
{
private static Logger LOGGER = LogManager.getLogger();
private static ModList INSTANCE; private static ModList INSTANCE;
private final List<IModFileInfo> modFiles; private final List<IModFileInfo> modFiles;
private final List<IModInfo> sortedList; private final List<IModInfo> sortedList;
private final Map<String, ModFileInfo> fileById; private final Map<String, IModFileInfo> fileById;
private List<ModContainer> mods; private List<ModContainer> mods;
private Map<String, ModContainer> indexedMods; private Map<String, ModContainer> indexedMods;
private List<ModFileScanData> modFileScanData; private List<ModFileScanData> modFileScanData;
private List<ModContainer> sortedContainers; private List<ModContainer> sortedContainers;
private ModList(final List<ModFile> modFiles, final List<ModInfo> sortedList) private ModList(final List<ModFile> modFiles, final List<ModInfo> sortedList) {
{ this.modFiles = modFiles.stream().map(ModFile::getModFileInfo).toList();
this.modFiles = modFiles.stream().map(ModFile::getModFileInfo).map(ModFileInfo.class::cast).collect(Collectors.toList()); this.sortedList = sortedList.stream().map(IModInfo.class::cast).toList();
this.sortedList = sortedList.stream(). var byId = new HashMap<String, IModFileInfo>();
map(ModInfo.class::cast). for (var file : this.modFiles) {
collect(Collectors.toList()); for (var mod : file.getMods())
this.fileById = this.modFiles.stream().map(IModFileInfo::getMods).flatMap(Collection::stream). byId.put(mod.getModId(), mod.getOwningFile());
map(ModInfo.class::cast). }
collect(Collectors.toMap(ModInfo::getModId, ModInfo::getOwningFile)); this.fileById = Collections.unmodifiableMap(byId);
CrashReportCallables.registerCrashCallable("Mod List", this::crashReport); CrashReportCallables.registerCrashCallable("Mod List", this::crashReport);
} }
@@ -74,19 +57,20 @@ public class ModList
} }
private String fileToLine(IModFile mf) { private String fileToLine(IModFile mf) {
var mainMod = mf.getModInfos().getFirst();
return String.format(Locale.ENGLISH, "%-50.50s|%-30.30s|%-30.30s|%-20.20s|%-10.10s|Manifest: %s", mf.getFileName(), return String.format(Locale.ENGLISH, "%-50.50s|%-30.30s|%-30.30s|%-20.20s|%-10.10s|Manifest: %s", mf.getFileName(),
mf.getModInfos().get(0).getDisplayName(), mainMod.getDisplayName(),
mf.getModInfos().get(0).getModId(), mainMod.getModId(),
mf.getModInfos().get(0).getVersion(), mainMod.getVersion(),
getModContainerState(mf.getModInfos().get(0).getModId()), getModContainerState(mainMod.getModId()),
((ModFileInfo)mf.getModFileInfo()).getCodeSigningFingerprint().orElse("NOSIGNATURE")); ((ModFileInfo)mf.getModFileInfo()).getCodeSigningFingerprint().orElse("NOSIGNATURE"));
} }
private String crashReport() { private String crashReport() {
return "\n"+applyForEachModFile(this::fileToLine).collect(Collectors.joining("\n\t\t", "\t\t", "")); return "\n"+applyForEachModFile(this::fileToLine).collect(Collectors.joining("\n\t\t", "\t\t", ""));
} }
public static ModList of(List<ModFile> modFiles, List<ModInfo> sortedList) public static ModList of(List<ModFile> modFiles, List<ModInfo> sortedList) {
{
INSTANCE = new ModList(modFiles, sortedList); INSTANCE = new ModList(modFiles, sortedList);
return INSTANCE; return INSTANCE;
} }
@@ -95,109 +79,47 @@ public class ModList
return INSTANCE; return INSTANCE;
} }
private static ForkJoinWorkerThread newForkJoinWorkerThread(ForkJoinPool pool) { public List<IModFileInfo> getModFiles() {
ForkJoinWorkerThread thread = ForkJoinPool.defaultForkJoinWorkerThreadFactory.newThread(pool);
thread.setName("modloading-worker-" + thread.getPoolIndex());
// The default sets it to the SystemClassloader, so copy the current one.
thread.setContextClassLoader(Thread.currentThread().getContextClassLoader());
return thread;
}
public List<IModFileInfo> getModFiles()
{
return modFiles; return modFiles;
} }
public IModFileInfo getModFileById(String modid) public IModFileInfo getModFileById(String modid) {
{
return this.fileById.get(modid); return this.fileById.get(modid);
} }
<T extends Event & IModBusEvent> Function<Executor, CompletableFuture<Void>> futureVisitor( void setLoadedMods(final List<ModContainer> modContainers) {
final IModStateTransition.EventGenerator<T> eventGenerator,
final ProgressMeter progressBar,
final BiFunction<ModLoadingStage, Throwable, ModLoadingStage> stateChange) {
return executor -> gather(
this.mods.stream()
.map(mod -> ModContainer.buildTransitionHandler(mod, eventGenerator, progressBar, stateChange, executor))
.collect(Collectors.toList()))
.thenComposeAsync(ModList::completableFutureFromExceptionList, executor);
}
static CompletionStage<Void> completableFutureFromExceptionList(List<? extends Map.Entry<?, Throwable>> t) {
if (t.stream().noneMatch(e->e.getValue()!=null)) {
return CompletableFuture.completedFuture(null);
} else {
final List<Throwable> throwables = t.stream().filter(e -> e.getValue() != null).map(Map.Entry::getValue).collect(Collectors.toList());
CompletableFuture<Void> cf = new CompletableFuture<>();
final RuntimeException accumulator = new RuntimeException();
cf.completeExceptionally(accumulator);
throwables.forEach(exception -> {
if (exception instanceof CompletionException) {
exception = exception.getCause();
}
if (exception.getSuppressed().length!=0) {
Arrays.stream(exception.getSuppressed()).forEach(accumulator::addSuppressed);
} else {
accumulator.addSuppressed(exception);
}
});
return cf;
}
}
static <V> CompletableFuture<List<Map.Entry<V, Throwable>>> gather(List<? extends CompletableFuture<? extends V>> futures) {
List<Map.Entry<V, Throwable>> list = new ArrayList<>(futures.size());
CompletableFuture<?>[] results = new CompletableFuture[futures.size()];
futures.forEach(future -> {
int i = list.size();
list.add(null);
results[i] = future.whenComplete((result, exception) -> list.set(i, new AbstractMap.SimpleImmutableEntry<>(result, exception)));
});
return CompletableFuture.allOf(results).handle((r, th)->null).thenApply(res -> list);
}
void setLoadedMods(final List<ModContainer> modContainers)
{
this.mods = modContainers; this.mods = modContainers;
this.sortedContainers = modContainers.stream().sorted(Comparator.comparingInt(c->sortedList.indexOf(c.getModInfo()))).toList(); this.sortedContainers = modContainers.stream().sorted(Comparator.comparingInt(c -> sortedList.indexOf(c.getModInfo()))).toList();
this.indexedMods = modContainers.stream().collect(Collectors.toMap(ModContainer::getModId, Function.identity())); this.indexedMods = modContainers.stream().collect(Collectors.toMap(ModContainer::getModId, Function.identity()));
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public <T> Optional<T> getModObjectById(String modId) public <T> Optional<T> getModObjectById(String modId) {
{
return getModContainerById(modId).map(ModContainer::getMod).map(o -> (T) o); return getModContainerById(modId).map(ModContainer::getMod).map(o -> (T) o);
} }
public Optional<? extends ModContainer> getModContainerById(String modId) public Optional<? extends ModContainer> getModContainerById(String modId) {
{
return Optional.ofNullable(this.indexedMods.get(modId)); return Optional.ofNullable(this.indexedMods.get(modId));
} }
public Optional<? extends ModContainer> getModContainerByObject(Object obj) public Optional<? extends ModContainer> getModContainerByObject(Object obj) {
{
return mods.stream().filter(mc -> mc.getMod() == obj).findFirst(); return mods.stream().filter(mc -> mc.getMod() == obj).findFirst();
} }
public List<IModInfo> getMods() public List<IModInfo> getMods() {
{
return this.sortedList; return this.sortedList;
} }
public boolean isLoaded(String modTarget) public boolean isLoaded(String modTarget) {
{
return this.indexedMods.containsKey(modTarget); return this.indexedMods.containsKey(modTarget);
} }
public int size() public int size() {
{
return mods.size(); return mods.size();
} }
public List<ModFileScanData> getAllScanData() public List<ModFileScanData> getAllScanData() {
{ if (modFileScanData == null) {
if (modFileScanData == null)
{
modFileScanData = this.sortedList.stream(). modFileScanData = this.sortedList.stream().
map(IModInfo::getOwningFile). map(IModInfo::getOwningFile).
filter(Objects::nonNull). filter(Objects::nonNull).
@@ -210,8 +132,7 @@ public class ModList
} }
public void forEachModFile(Consumer<IModFile> fileConsumer) public void forEachModFile(Consumer<IModFile> fileConsumer) {
{
modFiles.stream().map(IModFileInfo::getFile).forEach(fileConsumer); modFiles.stream().map(IModFileInfo::getFile).forEach(fileConsumer);
} }
@@ -227,13 +148,11 @@ public class ModList
this.sortedContainers.forEach(containerConsumer); this.sortedContainers.forEach(containerConsumer);
} }
public List<ModContainer> getLoadedMods() {
return this.sortedContainers;
}
public <T> Stream<T> applyForEachModContainer(Function<ModContainer, T> function) { public <T> Stream<T> applyForEachModContainer(Function<ModContainer, T> function) {
return indexedMods.values().stream().map(function); return indexedMods.values().stream().map(function);
} }
private static class UncaughtModLoadingException extends ModLoadingException {
public UncaughtModLoadingException(ModLoadingStage stage, Throwable originalException) {
super(null, stage, "fml.modloading.uncaughterror", originalException);
}
}
} }
@@ -32,7 +32,6 @@ import java.util.function.BiConsumer;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.function.Function; import java.util.function.Function;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static net.minecraftforge.fml.Logging.CORE; import static net.minecraftforge.fml.Logging.CORE;
import static net.minecraftforge.fml.Logging.LOADING; import static net.minecraftforge.fml.Logging.LOADING;
@@ -72,49 +71,53 @@ import static net.minecraftforge.fml.Logging.LOADING;
* and completes the mod loading sequence.</dd> * and completes the mod loading sequence.</dd>
* </dl> * </dl>
*/ */
public class ModLoader public class ModLoader {
{
private static final Logger LOGGER = LogManager.getLogger(); private static final Logger LOGGER = LogManager.getLogger();
private static ModLoader INSTANCE;
private final LoadingModList loadingModList; private final LoadingModList loadingModList;
private final List<ModLoadingException> loadingExceptions; private final List<ModLoadingException> loadingExceptions;
private final Set<IModInfo> erroredModInfos;
private final List<ModLoadingWarning> loadingWarnings; private final List<ModLoadingWarning> loadingWarnings;
private final ModStateManager stateManager; private final ModStateManager stateManager;
private boolean loadingStateValid; private static boolean loadingStateValid;
@SuppressWarnings("OptionalUsedAsFieldOrParameterType") private final Consumer<String> statusConsumer = StartupNotificationManager.modLoaderConsumer().orElse(msg -> {});
private final Optional<Consumer<String>> statusConsumer = StartupNotificationManager.modLoaderConsumer();
private final Set<IModLoadingState> completedStates = new HashSet<>(); private final Set<IModLoadingState> completedStates = new HashSet<>();
private ModList modList; private ModList modList;
private ModLoader() private ModLoader() {
{
INSTANCE = this;
this.loadingModList = FMLLoader.getLoadingModList(); this.loadingModList = FMLLoader.getLoadingModList();
this.loadingExceptions = FMLLoader.getLoadingModList().getErrors().stream() this.loadingExceptions = this.loadingModList.getErrors().stream()
.flatMap(ModLoadingException::fromEarlyException) .flatMap(ModLoadingException::fromEarlyException)
.collect(Collectors.toList()); .toList();
this.loadingWarnings = FMLLoader.getLoadingModList().getBrokenFiles().stream() this.loadingWarnings = this.loadingModList.getBrokenFiles().stream()
.map(file -> new ModLoadingWarning(null, ModLoadingStage.VALIDATE, InvalidModIdentifier.identifyJarProblem(file.getFilePath()).orElse("fml.modloading.brokenfile"), file.getFileName())) .map(file -> new ModLoadingWarning(null, ModLoadingStage.VALIDATE, InvalidModIdentifier.identifyJarProblem(file.getFilePath()).orElse("fml.modloading.brokenfile"), file.getFileName()))
.collect(Collectors.toList()); .collect(Collectors.toList());
FMLLoader.getLoadingModList().getModFiles().stream() if (this.loadingExceptions.isEmpty()) {
this.erroredModInfos = Collections.emptySet();
} else {
this.erroredModInfos = Collections.newSetFromMap(new IdentityHashMap<>());
this.erroredModInfos.addAll(this.loadingExceptions.stream().map(ModLoadingException::getModInfo).toList());
}
this.loadingModList.getModFiles().stream()
.filter(ModFileInfo::missingLicense) .filter(ModFileInfo::missingLicense)
.filter(modFileInfo -> modFileInfo.getMods().stream().noneMatch(thisModInfo -> this.loadingExceptions.stream().map(ModLoadingException::getModInfo).anyMatch(otherInfo -> otherInfo == thisModInfo))) //Ignore files where any other mod already encountered an error .filter(modFileInfo -> modFileInfo.getMods().stream().noneMatch(this.erroredModInfos::contains)) //Ignore files where any other mod already encountered an error
.map(modFileInfo -> new ModLoadingException(null, ModLoadingStage.VALIDATE, "fml.modloading.missinglicense", null, modFileInfo.getFile())) .map(modFileInfo -> new ModLoadingException(null, ModLoadingStage.VALIDATE, "fml.modloading.missinglicense", null, modFileInfo.getFile()))
.forEach(this.loadingExceptions::add); .forEach(this.loadingExceptions::add);
this.stateManager = new ModStateManager(); this.stateManager = new ModStateManager();
CrashReportCallables.registerCrashCallable("ModLauncher", FMLLoader::getLauncherInfo); CrashReportCallables.registerCrashCallable("ModLauncher", FMLLoader::getLauncherInfo);
CrashReportCallables.registerCrashCallable("ModLauncher launch target", FMLLoader::launcherHandlerName); CrashReportCallables.registerCrashCallable("ModLauncher launch target", FMLLoader::launcherHandlerName);
CrashReportCallables.registerCrashCallable("ModLauncher naming", FMLLoader::getNaming); CrashReportCallables.registerCrashCallable("ModLauncher naming", FMLLoader::getNaming);
CrashReportCallables.registerCrashCallable("ModLauncher services", this::computeModLauncherServiceList); CrashReportCallables.registerCrashCallable("ModLauncher services", ModLoader::computeModLauncherServiceList);
CrashReportCallables.registerCrashCallable("FML Language Providers", this::computeLanguageList); CrashReportCallables.registerCrashCallable("FML Language Providers", ModLoader::computeLanguageList);
} }
private String computeLanguageList() { private static String computeLanguageList() {
return "\n"+FMLLoader.getLanguageLoadingProvider().applyForEach(lp->lp.name() +"@"+ lp.getClass().getPackage().getImplementationVersion()).collect(Collectors.joining("\n\t\t", "\t\t", "")); return "\n" + FMLLoader.getLanguageLoadingProvider()
.applyForEach(lp -> lp.name() + "@" + lp.getClass().getPackage().getImplementationVersion())
.collect(Collectors.joining("\n\t\t", "\t\t", ""));
} }
private String computeModLauncherServiceList() { private static String computeModLauncherServiceList() {
final List<Map<String, String>> mods = FMLLoader.modLauncherModList(); final List<Map<String, String>> mods = FMLLoader.modLauncherModList();
return "\n"+mods.stream().map(mod->mod.getOrDefault("file","nofile")+ return "\n"+mods.stream().map(mod->mod.getOrDefault("file","nofile")+
" "+mod.getOrDefault("name", "missing")+ " "+mod.getOrDefault("name", "missing")+
@@ -123,9 +126,13 @@ public class ModLoader
collect(Collectors.joining("\n\t\t","\t\t","")); collect(Collectors.joining("\n\t\t","\t\t",""));
} }
public static ModLoader get() public static ModLoader get() {
{ return LazyInit.INSTANCE;
return INSTANCE == null ? INSTANCE = new ModLoader() : INSTANCE; }
private static final class LazyInit {
private static final ModLoader INSTANCE = new ModLoader();
private LazyInit() {}
} }
/** /**
@@ -142,21 +149,21 @@ public class ModLoader
final ModList modList = ModList.of(loadingModList.getModFiles().stream().map(ModFileInfo::getFile).toList(), final ModList modList = ModList.of(loadingModList.getModFiles().stream().map(ModFileInfo::getFile).toList(),
loadingModList.getMods()); loadingModList.getMods());
if (!this.loadingExceptions.isEmpty()) { if (!this.loadingExceptions.isEmpty()) {
LOGGER.fatal(CORE, "Error during pre-loading phase", loadingExceptions.get(0)); LOGGER.fatal(CORE, "Error during pre-loading phase", loadingExceptions.getFirst());
statusConsumer.ifPresent(c->c.accept("ERROR DURING MOD LOADING")); statusConsumer.accept("ERROR DURING MOD LOADING");
modList.setLoadedMods(Collections.emptyList()); modList.setLoadedMods(Collections.emptyList());
loadingStateValid = false; loadingStateValid = false;
throw new LoadingFailedException(loadingExceptions); throw new LoadingFailedException(loadingExceptions);
} }
List<? extends ForgeFeature.Bound> failedBounds = loadingModList.getMods().stream() List<? extends ForgeFeature.Bound> failedBounds = loadingModList.getMods().stream()
.map(ModInfo::getForgeFeatures) .map(ModInfo::getForgeFeatures)
.flatMap(Collection::stream) .flatMap(List::stream)
.filter(bound -> !ForgeFeature.testFeature(FMLEnvironment.dist, bound)) .filter(bound -> !ForgeFeature.testFeature(FMLEnvironment.dist, bound))
.toList(); .toList();
if (!failedBounds.isEmpty()) { if (!failedBounds.isEmpty()) {
LOGGER.fatal(CORE, "Failed to validate feature bounds for mods: {}", failedBounds); LOGGER.fatal(CORE, "Failed to validate feature bounds for mods: {}", failedBounds);
statusConsumer.ifPresent(c->c.accept("ERROR DURING MOD LOADING")); statusConsumer.accept("ERROR DURING MOD LOADING");
modList.setLoadedMods(Collections.emptyList()); modList.setLoadedMods(Collections.emptyList());
loadingStateValid = false; loadingStateValid = false;
throw new LoadingFailedException(failedBounds.stream() throw new LoadingFailedException(failedBounds.stream()
@@ -164,38 +171,67 @@ public class ModLoader
.toList()); .toList());
} }
final List<ModContainer> modContainers = loadingModList.getModFiles().stream() final var modContainers = new HashMap<String, ModContainer>();
.map(ModFileInfo::getFile) for (var file : loadingModList.getModFiles()) {
.map(this::buildMods) var containers = this.buildMods(file.getFile());
.<ModContainer>mapMulti(Iterable::forEach) for (var container : containers)
.toList(); modContainers.put(container.getModId(), container);
}
if (!loadingExceptions.isEmpty()) { if (!loadingExceptions.isEmpty()) {
LOGGER.fatal(CORE, "Failed to initialize mod containers", loadingExceptions.get(0)); LOGGER.fatal(CORE, "Failed to initialize mod containers", loadingExceptions.getFirst());
statusConsumer.ifPresent(c->c.accept("ERROR DURING MOD LOADING")); statusConsumer.accept("ERROR DURING MOD LOADING");
modList.setLoadedMods(Collections.emptyList()); modList.setLoadedMods(Collections.emptyList());
loadingStateValid = false; loadingStateValid = false;
throw new LoadingFailedException(loadingExceptions); throw new LoadingFailedException(loadingExceptions);
} }
modList.setLoadedMods(modContainers);
// Gather all dependencies, so we can make sure they have finished their transition events before we fire ours
for (var mod : modContainers.values()) {
for (var dep : mod.getModInfo().getDependencies()) {
var target = modContainers.get(dep.getModId());
if (target == null)
continue;
switch (dep.getOrdering()) {
case AFTER:
mod.dependencies.add(target);
break;
case BEFORE:
target.dependencies.add(mod);
break;
default:
break;
}
}
}
modList.setLoadedMods(modContainers.values().stream().toList());
this.modList = modList; this.modList = modList;
var stateList = stateManager.getStates(ModLoadingPhase.GATHER); var stateList = stateManager.getStates(ModLoadingPhase.GATHER);
var progress = StartupMessageManager.addProgressBar("Mod Gather", stateList.stream().mapToInt(mls -> mls.size().applyAsInt(modList)).sum()); var progress = StartupMessageManager.addProgressBar("Mod Gather", stateList.stream().mapToInt(mls -> mls.size().applyAsInt(this.modList)).sum());
stateList.forEach(mls->dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask, progress)); for (IModLoadingState mls : stateList) {
dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask, progress);
}
progress.complete(); progress.complete();
} }
public void loadMods(final ModWorkManager.DrivenExecutor syncExecutor, final Executor parallelExecutor, final Runnable periodicTask) { public void loadMods(final ModWorkManager.DrivenExecutor syncExecutor, final Executor parallelExecutor, final Runnable periodicTask) {
var stateList = stateManager.getStates(ModLoadingPhase.LOAD); var stateList = stateManager.getStates(ModLoadingPhase.LOAD);
var progress = StartupMessageManager.addProgressBar("Mod Loading", stateList.stream().mapToInt(mls -> mls.size().applyAsInt(modList)).sum()); var progress = StartupMessageManager.addProgressBar("Mod Loading", stateList.stream().mapToInt(mls -> mls.size().applyAsInt(modList)).sum());
stateList.forEach(mls->dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask, progress)); for (IModLoadingState mls : stateList) {
dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask, progress);
}
progress.complete(); progress.complete();
} }
public void finishMods(final ModWorkManager.DrivenExecutor syncExecutor, final Executor parallelExecutor, final Runnable periodicTask) { public void finishMods(final ModWorkManager.DrivenExecutor syncExecutor, final Executor parallelExecutor, final Runnable periodicTask) {
var stateList = stateManager.getStates(ModLoadingPhase.COMPLETE); var stateList = stateManager.getStates(ModLoadingPhase.COMPLETE);
var progress = StartupMessageManager.addProgressBar("Mod Complete", stateList.stream().mapToInt(mls -> mls.size().applyAsInt(modList)).sum()); var progress = StartupMessageManager.addProgressBar("Mod Complete", stateList.stream().mapToInt(mls -> mls.size().applyAsInt(modList)).sum());
stateList.forEach(mls->dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask, progress)); for (IModLoadingState mls : stateList) {
statusConsumer.ifPresent(c->c.accept(String.format("Mod loading complete - %d mods loaded", this.modList.size()))); dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask, progress);
}
statusConsumer.accept(String.format("Mod loading complete - %d mods loaded", this.modList.size()));
progress.complete(); progress.complete();
} }
@@ -204,10 +240,15 @@ public class ModLoader
LOGGER.error("Cowardly refusing to process mod state change request from {}", state); LOGGER.error("Cowardly refusing to process mod state change request from {}", state);
return; return;
} }
progressBar.label(progressBar.name()+ " working"); progressBar.label(progressBar.name() + " working");
syncExecutor.drive(ticker); syncExecutor.drive(ticker);
state.inlineRunnable().ifPresent(a->this.handleInlineTransition(a, state, syncExecutor, ticker));
state.buildTransition(syncExecutor, parallelExecutor, progressBar).ifPresent(t->waitForTransition(state, syncExecutor, ticker, t)); var inlineRunnable = state.inlineRunnable().orElse(null);
if (inlineRunnable != null) handleInlineTransition(inlineRunnable, state, syncExecutor, ticker);
var transition = state.buildTransition(syncExecutor, parallelExecutor, progressBar).orElse(null);
if (transition != null) waitForTransition(state, syncExecutor, ticker, transition);
completedStates.add(state); completedStates.add(state);
} }
@@ -219,50 +260,53 @@ public class ModLoader
pb.complete(); pb.complete();
syncExecutor.drive(ticker); syncExecutor.drive(ticker);
} }
private void waitForTransition(final IModLoadingState state, final ModWorkManager.DrivenExecutor syncExecutor, final Runnable ticker, final CompletableFuture<Void> transition) { private void waitForTransition(final IModLoadingState state, final ModWorkManager.DrivenExecutor syncExecutor, final Runnable ticker, final CompletableFuture<Void> transition) {
while (!transition.isDone()) { while (!transition.isDone()) {
syncExecutor.drive(ticker); syncExecutor.drive(ticker);
} }
try { try {
transition.join(); transition.join();
} catch (CompletionException e) { } catch (CompletionException e) {
loadingStateValid = false; loadingStateValid = false;
Throwable t = e.getCause(); Throwable t = e.getCause();
final List<Throwable> notModLoading = Arrays.stream(t.getSuppressed()) boolean hasNotModLoadingEx = Arrays.stream(t.getSuppressed())
.filter(obj -> !(obj instanceof ModLoadingException)) .anyMatch(obj -> !(obj instanceof ModLoadingException));
.collect(Collectors.toList()); if (hasNotModLoadingEx) {
if (!notModLoading.isEmpty()) {
LOGGER.fatal("Encountered non-modloading exceptions!", e); LOGGER.fatal("Encountered non-modloading exceptions!", e);
statusConsumer.ifPresent(c->c.accept("ERROR DURING MOD LOADING")); statusConsumer.accept("ERROR DURING MOD LOADING");
throw e; throw e;
} }
final List<ModLoadingException> modLoadingExceptions = Arrays.stream(t.getSuppressed()) final List<ModLoadingException> modLoadingExceptions = Arrays.stream(t.getSuppressed())
.filter(ModLoadingException.class::isInstance) .filter(ModLoadingException.class::isInstance)
.map(ModLoadingException.class::cast) .map(ModLoadingException.class::cast)
.collect(Collectors.toList()); .toList();
LOGGER.fatal(LOADING,"Failed to complete lifecycle event {}, {} errors found", state.name(), modLoadingExceptions.size()); LOGGER.fatal(LOADING,"Failed to complete lifecycle event {}, {} errors found", state.name(), modLoadingExceptions.size());
statusConsumer.ifPresent(c->c.accept("ERROR DURING MOD LOADING")); statusConsumer.accept("ERROR DURING MOD LOADING");
throw new LoadingFailedException(modLoadingExceptions); throw new LoadingFailedException(modLoadingExceptions);
} }
} }
private List<ModContainer> buildMods(final IModFile modFile) private List<ModContainer> buildMods(final IModFile modFile) {
{ final Map<String, IModInfo> modInfoMap = new HashMap<>();
final Map<String, IModInfo> modInfoMap = modFile.getModFileInfo().getMods().stream().collect(Collectors.toMap(IModInfo::getModId, Function.identity())); for (var mod : modFile.getModFileInfo().getMods())
modInfoMap.put(mod.getModId(), mod);
LOGGER.trace(LOADING, "ModContainer is {}", ModContainer.class.getClassLoader()); LOGGER.trace(LOADING, "ModContainer is {}", ModContainer.class.getClassLoader());
final List<ModContainer> containers = modFile.getScanResult().getTargets() final List<ModContainer> containers = new ArrayList<>();
.entrySet() for (var entry : modFile.getScanResult().getTargets().entrySet()) {
.stream() var container = buildModContainerFromTOML(modFile, modInfoMap, entry.getKey(), entry.getValue());
.map(e -> buildModContainerFromTOML(modFile, modInfoMap, e)) if (container != null)
.filter(Objects::nonNull) containers.add(container);
.collect(Collectors.toList()); }
if (containers.size() != modInfoMap.size()) {
var modIds = modInfoMap.values().stream().map(IModInfo::getModId).sorted().collect(Collectors.toList());
var containerIds = containers.stream().map(c -> c != null ? c.getModId() : "(null)").sorted().collect(Collectors.toList());
LOGGER.fatal(LOADING,"File {} constructed {} mods: {}, but had {} mods specified: {}", if (containers.size() != modInfoMap.size()) {
var modIds = modInfoMap.values().stream().map(IModInfo::getModId).sorted().toList();
var containerIds = containers.stream().map(c -> c != null ? c.getModId() : "(null)").sorted().toList();
LOGGER.fatal(LOADING, "File {} constructed {} mods: {}, but had {} mods specified: {}",
modFile.getFilePath(), modFile.getFilePath(),
containers.size(), containerIds, containers.size(), containerIds,
modInfoMap.size(), modIds); modInfoMap.size(), modIds);
@@ -277,17 +321,20 @@ public class ModLoader
loadingExceptions.add(new ModLoadingException(null, ModLoadingStage.CONSTRUCT, "fml.modloading.missingclasses", null, modFile.getFilePath())); loadingExceptions.add(new ModLoadingException(null, ModLoadingStage.CONSTRUCT, "fml.modloading.missingclasses", null, modFile.getFilePath()));
} }
// remove errored mod containers // remove errored mod containers
return containers.stream().filter(mc -> mc.modLoadingStage != ModLoadingStage.ERROR).collect(Collectors.toList()); return containers.stream().filter(mc -> mc.modLoadingStage != ModLoadingStage.ERROR).toList();
} }
private ModContainer buildModContainerFromTOML(final IModFile modFile, final Map<String, IModInfo> modInfoMap, final Map.Entry<String, ? extends IModLanguageProvider.IModLanguageLoader> idToProviderEntry) { private ModContainer buildModContainerFromTOML(final IModFile modFile, final Map<String, IModInfo> modInfoMap,
final String modId, final IModLanguageProvider.IModLanguageLoader languageLoader
) {
try { try {
final String modId = idToProviderEntry.getKey(); IModInfo info = modInfoMap.get(modId);
final IModLanguageProvider.IModLanguageLoader languageLoader = idToProviderEntry.getValue(); // throw a missing metadata error if there is no matching modid in the modInfoMap from the mods.toml file
IModInfo info = Optional.ofNullable(modInfoMap.get(modId)). if (info == null)
// throw a missing metadata error if there is no matching modid in the modInfoMap from the mods.toml file throw new ModLoadingException(null, ModLoadingStage.CONSTRUCT, "fml.modloading.missingmetadata", null, modId);
orElseThrow(()->new ModLoadingException(null, ModLoadingStage.CONSTRUCT, "fml.modloading.missingmetadata", null, modId));
return languageLoader.loadMod(info, modFile.getScanResult(), FMLLoader.getGameLayer()); return languageLoader.loadMod(info, modFile.getScanResult(), FMLLoader.getGameLayer());
} catch (ModLoadingException mle) { } catch (ModLoadingException mle) {
// exceptions are caught and added to the error list for later handling // exceptions are caught and added to the error list for later handling
@@ -302,7 +349,7 @@ public class ModLoader
* and don't want to cause extraneous crashes due to trying to do things that aren't possible in a "broken load" * and don't want to cause extraneous crashes due to trying to do things that aren't possible in a "broken load"
*/ */
public static boolean isLoadingStateValid() { public static boolean isLoadingStateValid() {
return get().loadingStateValid; return loadingStateValid;
} }
public boolean hasCompletedState(final String stateName) { public boolean hasCompletedState(final String stateName) {
@@ -325,6 +372,7 @@ public class ModLoader
} }
ModList.get().forEachModInOrder(mc -> mc.acceptEvent(e)); ModList.get().forEachModInOrder(mc -> mc.acceptEvent(e));
} }
public <T extends Event & IModBusEvent> T postEventWithReturn(T e) { public <T extends Event & IModBusEvent> T postEventWithReturn(T e) {
if (!loadingStateValid) { if (!loadingStateValid) {
LOGGER.error("Cowardly refusing to send event {} to a broken mod state", e.getClass().getName()); LOGGER.error("Cowardly refusing to send event {} to a broken mod state", e.getClass().getName());
@@ -333,9 +381,15 @@ public class ModLoader
ModList.get().forEachModInOrder(mc -> mc.acceptEvent(e)); ModList.get().forEachModInOrder(mc -> mc.acceptEvent(e));
return e; return e;
} }
@SuppressWarnings("removal")
public <T extends Event & IModBusEvent> void postEventWrapContainerInModOrder(T event) { public <T extends Event & IModBusEvent> void postEventWrapContainerInModOrder(T event) {
postEventWithWrapInModOrder(event, (mc, e) -> ModLoadingContext.get().setActiveContainer(mc), (mc, e) -> ModLoadingContext.get().setActiveContainer(null)); postEventWithWrapInModOrder(event,
(mc, e) -> ModLoadingContext.get().setActiveContainer(mc),
(mc, e) -> ModLoadingContext.get().setActiveContainer(null)
);
} }
public <T extends Event & IModBusEvent> void postEventWithWrapInModOrder(T e, BiConsumer<ModContainer, T> pre, BiConsumer<ModContainer, T> post) { public <T extends Event & IModBusEvent> void postEventWithWrapInModOrder(T e, BiConsumer<ModContainer, T> pre, BiConsumer<ModContainer, T> post) {
if (!loadingStateValid) { if (!loadingStateValid) {
LOGGER.error("Cowardly refusing to send event {} to a broken mod state", e.getClass().getName()); LOGGER.error("Cowardly refusing to send event {} to a broken mod state", e.getClass().getName());
@@ -348,13 +402,11 @@ public class ModLoader
}); });
} }
public List<ModLoadingWarning> getWarnings() public List<ModLoadingWarning> getWarnings() {
{
return ImmutableList.copyOf(this.loadingWarnings); return ImmutableList.copyOf(this.loadingWarnings);
} }
public void addWarning(ModLoadingWarning warning) public void addWarning(ModLoadingWarning warning) {
{
this.loadingWarnings.add(warning); this.loadingWarnings.add(warning);
} }
@@ -8,38 +8,57 @@ package net.minecraftforge.fml;
import com.mojang.logging.LogUtils; import com.mojang.logging.LogUtils;
import net.minecraftforge.fml.config.IConfigSpec; import net.minecraftforge.fml.config.IConfigSpec;
import net.minecraftforge.fml.config.ModConfig; import net.minecraftforge.fml.config.ModConfig;
import net.minecraftforge.fml.loading.FMLLoader;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import java.util.function.BiPredicate;
import java.util.function.Supplier; import java.util.function.Supplier;
public class ModLoadingContext public class ModLoadingContext {
{
private static final Logger LOGGER = LogUtils.getLogger(); private static final Logger LOGGER = LogUtils.getLogger();
private static final ThreadLocal<ModLoadingContext> context = ThreadLocal.withInitial(ModLoadingContext::new); private static final ThreadLocal<ModLoadingContext> context = ThreadLocal.withInitial(ModLoadingContext::new);
private ModContainer activeContainer;
private Object languageExtension; private Object languageExtension;
private ModLoadingStage stage;
/**
* @deprecated Use the context provided by your language loader in your mod's constructor
*/
@Deprecated(forRemoval = true, since="1.21.1")
public static ModLoadingContext get() { public static ModLoadingContext get() {
return context.get(); return context.get();
} }
private ModContainer activeContainer; /**
* @deprecated Going to be moved to ForgeHooks for Internal use.
*/
@Deprecated(forRemoval = true, since="1.21.1")
public void setActiveContainer(final ModContainer container) { public void setActiveContainer(final ModContainer container) {
this.activeContainer = container; this.activeContainer = container;
this.languageExtension = container == null ? null : container.contextExtension.get(); this.languageExtension = container == null ? null : container.contextExtension.get();
} }
/**
* Going to be moved to ForgeHooks for Internal use.
* @deprecated Override/Use {@link ModLoadingContext#getContainer()}
*/
@Deprecated(forRemoval = true, since="1.21.1")
public ModContainer getActiveContainer() { public ModContainer getActiveContainer() {
return activeContainer == null ? ModList.get().getModContainerById("minecraft").orElseThrow(()->new RuntimeException("Where is minecraft???!")) : activeContainer; return activeContainer == null ? ModList.get().getModContainerById("minecraft").orElseThrow(()->new RuntimeException("Where is minecraft???!")) : activeContainer;
} }
/**
* @deprecated Going to be moved to ForgeHooks for Internal use.
*/
@Deprecated(forRemoval = true, since="1.21.1")
public String getActiveNamespace() { public String getActiveNamespace() {
return activeContainer == null ? "minecraft" : activeContainer.getNamespace(); return activeContainer == null ? "minecraft" : activeContainer.getNamespace();
} }
/**
* @return {@link ModLoadingContext#getActiveContainer()} by default.
*/
public ModContainer getContainer() {
return getActiveContainer();
}
/** /**
* Register an {@link IExtensionPoint} with the mod container. * Register an {@link IExtensionPoint} with the mod container.
* @param point The extension point to register * @param point The extension point to register
@@ -47,29 +66,67 @@ public class ModLoadingContext
* @param <T> The type signature of the extension operator * @param <T> The type signature of the extension operator
*/ */
public <T extends Record & IExtensionPoint<T>> void registerExtensionPoint(Class<? extends IExtensionPoint<T>> point, Supplier<T> extension) { public <T extends Record & IExtensionPoint<T>> void registerExtensionPoint(Class<? extends IExtensionPoint<T>> point, Supplier<T> extension) {
getActiveContainer().registerExtensionPoint(point, extension); getContainer().registerExtensionPoint(point, extension);
}
/**
* Register a {@link IExtensionPoint.DisplayTest} with the mod container.
* <p>A shorthand for registering a DisplayTest with {@link #registerExtensionPoint(Class, Supplier)}.</p>
* @param displayTest The {@link IExtensionPoint.DisplayTest} to register
*/
public void registerDisplayTest(IExtensionPoint.DisplayTest displayTest) {
getContainer().registerDisplayTest(() -> displayTest);
}
/**
* Register a {@link IExtensionPoint.DisplayTest} with the mod container.
* <p>A shorthand for registering a DisplayTest supplier with {@link #registerExtensionPoint(Class, Supplier)}.</p>
* @param displayTest The {@link Supplier<IExtensionPoint.DisplayTest>} to register
*/
public void registerDisplayTest(Supplier<IExtensionPoint.DisplayTest> displayTest) {
getContainer().registerDisplayTest(displayTest);
}
/**
* Register a {@link IExtensionPoint.DisplayTest} with the mod container.
* <p>A shorthand for registering a DisplayTest with {@link #registerExtensionPoint(Class, Supplier)} that also
* creates the DisplayTest instance for you using the provided parameters.</p>
* @see IExtensionPoint.DisplayTest#DisplayTest(String, BiPredicate)
*/
public void registerDisplayTest(String version, BiPredicate<String, Boolean> remoteVersionTest) {
getContainer().registerDisplayTest(new IExtensionPoint.DisplayTest(version, remoteVersionTest));
}
/**
* Register a {@link IExtensionPoint.DisplayTest} with the mod container.
* <p>A shorthand for registering a DisplayTest with {@link #registerExtensionPoint(Class, Supplier)} that also
* creates the DisplayTest instance for you using the provided parameters.</p>
* @see IExtensionPoint.DisplayTest#DisplayTest(Supplier, BiPredicate)
*/
public void registerDisplayTest(Supplier<String> suppliedVersion, BiPredicate<String, Boolean> remoteVersionTest) {
getContainer().registerDisplayTest(new IExtensionPoint.DisplayTest(suppliedVersion, remoteVersionTest));
} }
public void registerConfig(ModConfig.Type type, IConfigSpec<?> spec) { public void registerConfig(ModConfig.Type type, IConfigSpec<?> spec) {
if (spec.isEmpty()) if (spec.isEmpty())
{ {
// This handles the case where a mod tries to register a config, without any options configured inside it. // This handles the case where a mod tries to register a config, without any options configured inside it.
LOGGER.debug("Attempted to register an empty config for type {} on mod {}", type, getActiveContainer().getModId()); LOGGER.debug("Attempted to register an empty config for type {} on mod {}", type, getContainer().getModId());
return; return;
} }
getActiveContainer().addConfig(new ModConfig(type, spec, getActiveContainer())); getContainer().addConfig(new ModConfig(type, spec, getContainer()));
} }
public void registerConfig(ModConfig.Type type, IConfigSpec<?> spec, String fileName) { public void registerConfig(ModConfig.Type type, IConfigSpec<?> spec, String fileName) {
if (spec.isEmpty()) if (spec.isEmpty())
{ {
// This handles the case where a mod tries to register a config, without any options configured inside it. // This handles the case where a mod tries to register a config, without any options configured inside it.
LOGGER.debug("Attempted to register an empty config for type {} on mod {} using file name {}", type, getActiveContainer().getModId(), fileName); LOGGER.debug("Attempted to register an empty config for type {} on mod {} using file name {}", type, getContainer().getModId(), fileName);
return; return;
} }
getActiveContainer().addConfig(new ModConfig(type, spec, getActiveContainer(), fileName)); getContainer().addConfig(new ModConfig(type, spec, getContainer(), fileName));
} }
@@ -26,20 +26,27 @@ import java.util.function.ToIntFunction;
* @param inlineRunnable an optional runnable, which runs before starting the transition from this state to the next * @param inlineRunnable an optional runnable, which runs before starting the transition from this state to the next
* @param transition optional state transition information * @param transition optional state transition information
*/ */
public record ModLoadingState(String name, String previous, public record ModLoadingState(
Function<ModList, String> message, String name,
ToIntFunction<ModList> size, String previous,
ModLoadingPhase phase, Function<ModList, String> message,
Optional<Consumer<ModList>> inlineRunnable, ToIntFunction<ModList> size,
Optional<IModStateTransition> transition) implements IModLoadingState { ModLoadingPhase phase,
Optional<Consumer<ModList>> inlineRunnable,
Optional<IModStateTransition> transition
) implements IModLoadingState {
@Override @Override
public <T extends Event & IModBusEvent> public <T extends Event & IModBusEvent> Optional<CompletableFuture<Void>> buildTransition(
Optional<CompletableFuture<Void>> buildTransition(final Executor syncExecutor, final Executor syncExecutor,
final Executor parallelExecutor, final Executor parallelExecutor,
final ProgressMeter progressBar, final ProgressMeter progressBar,
final Function<Executor, CompletableFuture<Void>> preSyncTask, final Function<Executor, CompletableFuture<Void>> preSyncTask,
final Function<Executor, CompletableFuture<Void>> postSyncTask) { final Function<Executor, CompletableFuture<Void>> postSyncTask
return transition.map(t -> t.build(name, syncExecutor, parallelExecutor, progressBar, preSyncTask, postSyncTask)); ) {
var transition = this.transition.orElse(null);
return transition == null
? Optional.empty()
: Optional.ofNullable(transition.build(name, syncExecutor, parallelExecutor, progressBar, preSyncTask, postSyncTask));
} }
/** /**
@@ -49,9 +56,12 @@ public record ModLoadingState(String name, String previous,
* @param name the name of the state * @param name the name of the state
* @param previous the name of the immediately previous state to this state * @param previous the name of the immediately previous state to this state
* @param phase the mod loading phase the state belongs to * @param phase the mod loading phase the state belongs to
*
* @deprecated Use the builder
*/ */
@Deprecated(since = "1.21.3", forRemoval = true)
public static ModLoadingState empty(final String name, final String previous, final ModLoadingPhase phase) { public static ModLoadingState empty(final String name, final String previous, final ModLoadingPhase phase) {
return new ModLoadingState(name, previous, ml -> "", f->0, phase, Optional.empty(), Optional.empty()); return of(name, phase).after(previous).empty();
} }
/** /**
@@ -62,11 +72,13 @@ public record ModLoadingState(String name, String previous,
* @param previous the name of the immediately previous state to this state * @param previous the name of the immediately previous state to this state
* @param phase the mod loading phase the state belongs to * @param phase the mod loading phase the state belongs to
* @param transition the state transition information * @param transition the state transition information
* @return a mod loading state with state transition information and a default message *
* @deprecated Use the builder
*/ */
@Deprecated(since = "1.21.3", forRemoval = true)
public static ModLoadingState withTransition(final String name, final String previous, final ModLoadingPhase phase, public static ModLoadingState withTransition(final String name, final String previous, final ModLoadingPhase phase,
final IModStateTransition transition) { final IModStateTransition transition) {
return new ModLoadingState(name, previous, ml -> "Processing transition " + name, ModList::size, phase, Optional.empty(), Optional.of(transition)); return of(name, phase).after(previous).withTransition(transition);
} }
/** /**
@@ -78,11 +90,14 @@ public record ModLoadingState(String name, String previous,
* @param phase the mod loading phase the state belongs to * @param phase the mod loading phase the state belongs to
* @param transition the state transition information * @param transition the state transition information
* @return a mod loading state with state transition information and a custom message * @return a mod loading state with state transition information and a custom message
*
* @deprecated Use the builder
*/ */
@Deprecated(since = "1.21.3", forRemoval = true)
public static ModLoadingState withTransition(final String name, final String previous, public static ModLoadingState withTransition(final String name, final String previous,
final Function<ModList, String> message, final ModLoadingPhase phase, final Function<ModList, String> message, final ModLoadingPhase phase,
final IModStateTransition transition) { final IModStateTransition transition) {
return new ModLoadingState(name, previous, message, ModList::size, phase, Optional.empty(), Optional.of(transition)); return of(name, phase).after(previous).message(message).withTransition(transition);
} }
/** /**
@@ -94,9 +109,59 @@ public record ModLoadingState(String name, String previous,
* @param phase the mod loading phase the state belongs to * @param phase the mod loading phase the state belongs to
* @param inline an optional runnable, which runs before starting the transition from this state to the next * @param inline an optional runnable, which runs before starting the transition from this state to the next
* @return a mod loading state with an inline runnable and default message * @return a mod loading state with an inline runnable and default message
*
* @deprecated Use the builder
*/ */
@Deprecated(since = "1.21.3", forRemoval = true)
public static ModLoadingState withInline(final String name, final String previous, final ModLoadingPhase phase, public static ModLoadingState withInline(final String name, final String previous, final ModLoadingPhase phase,
final Consumer<ModList> inline) { final Consumer<ModList> inline) {
return new ModLoadingState(name, previous, ml -> "Processing work " + name, ml->0, phase, Optional.of(inline), Optional.empty()); return of(name, phase).after(previous).withInline(inline);
}
public static Builder of(final String name, final ModLoadingPhase phase) {
return new Builder(name, phase);
}
public static class Builder {
private final String name;
private final ModLoadingPhase phase;
private String after;
private Function<ModList, String> message = null;
private ToIntFunction<ModList> size = null;
private Builder(final String name, final ModLoadingPhase phase) {
this.name = name;
this.phase = phase;
}
public Builder after(final ModLoadingState value) { return after(value.name()); }
public Builder after(final String value) {
this.after = value;
return this;
}
public Builder message(final String value) { return message(ml -> value); }
public Builder message(final Function<ModList, String> value) {
this.message = value;
return this;
}
public Builder size(final int value) { return size(ml -> value); }
public Builder size(final ToIntFunction<ModList> value) {
this.size = value;
return this;
}
public ModLoadingState empty() {
return new ModLoadingState(name, after, message != null ? message : ml -> "", size != null ? size : ml -> 0, phase, Optional.empty(), Optional.empty());
}
public ModLoadingState withTransition(final IModStateTransition transition) {
return new ModLoadingState(name, after, message != null ? message : ml -> "Processing transition " + name, size != null ? size : ModList::size, phase, Optional.empty(), Optional.of(transition));
}
public ModLoadingState withInline(final Consumer<ModList> inline) {
return new ModLoadingState(name, after, message != null ? message : ml -> "Processing work " + name, size != null ? size : ml -> 0, phase, Optional.of(inline), Optional.empty());
}
} }
} }
@@ -12,8 +12,7 @@ import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.stream.Stream; import java.util.stream.Stream;
public class ModLoadingWarning public class ModLoadingWarning {
{
/** /**
* Mod Info for mod with warning * Mod Info for mod with warning
*/ */
@@ -16,15 +16,13 @@ import java.util.stream.Collectors;
@SuppressWarnings("UnstableApiUsage") @SuppressWarnings("UnstableApiUsage")
public class ModStateManager { public class ModStateManager {
static ModStateManager INSTANCE;
private final EnumMap<ModLoadingPhase, List<IModLoadingState>> stateMap; private final EnumMap<ModLoadingPhase, List<IModLoadingState>> stateMap;
public ModStateManager() { public ModStateManager() {
INSTANCE = this;
final var sp = ServiceLoader.load(FMLLoader.getGameLayer(), IModStateProvider.class); final var sp = ServiceLoader.load(FMLLoader.getGameLayer(), IModStateProvider.class);
this.stateMap = ServiceLoaderUtils.streamWithErrorHandling(sp, sce->{}) this.stateMap = ServiceLoaderUtils.streamWithErrorHandling(sp, sce->{})
.map(IModStateProvider::getAllStates) .map(IModStateProvider::getAllStates)
.<IModLoadingState>mapMulti(Iterable::forEach) .flatMap(List::stream)
.collect(Collectors.groupingBy(IModLoadingState::phase, ()->new EnumMap<>(ModLoadingPhase.class), Collectors.toUnmodifiableList())); .collect(Collectors.groupingBy(IModLoadingState::phase, ()->new EnumMap<>(ModLoadingPhase.class), Collectors.toUnmodifiableList()));
} }
@@ -36,14 +34,16 @@ public class ModStateManager {
var dummy = ModLoadingState.empty("", "", phase); var dummy = ModLoadingState.empty("", "", phase);
nodes.forEach(graph::addNode); nodes.forEach(graph::addNode);
graph.addNode(dummy); graph.addNode(dummy);
nodes.forEach(n->graph.putEdge(lookup.getOrDefault(n.previous(), dummy), n)); for (IModLoadingState node : nodes) {
graph.putEdge(lookup.getOrDefault(node.previous(), dummy), node);
}
return TopologicalSort.topologicalSort(graph, Comparator.comparingInt(nodes::indexOf)).stream().filter(st->st!=dummy).toList(); return TopologicalSort.topologicalSort(graph, Comparator.comparingInt(nodes::indexOf)).stream().filter(st->st!=dummy).toList();
} }
public IModLoadingState findState(final String stateName) { public IModLoadingState findState(final String stateName) {
return stateMap.values() return stateMap.values()
.stream() .stream()
.flatMap(Collection::stream) .flatMap(List::stream)
.filter(mls -> mls.name().equals(stateName)) .filter(mls -> mls.name().equals(stateName))
.findFirst() .findFirst()
.orElseThrow(() -> new IllegalArgumentException("Unknown IModLoadingState: " + stateName)); .orElseThrow(() -> new IllegalArgumentException("Unknown IModLoadingState: " + stateName));
@@ -0,0 +1,181 @@
/*
* Copyright (c) Forge Development LLC and contributors
* SPDX-License-Identifier: LGPL-2.1-only
*/
package net.minecraftforge.fml;
import java.util.ArrayList;
import java.util.Collection;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionException;
import java.util.concurrent.CompletionStage;
import java.util.concurrent.Executor;
import java.util.function.BiFunction;
import java.util.function.Function;
import org.jetbrains.annotations.ApiStatus;
import net.minecraftforge.eventbus.api.Event;
import net.minecraftforge.fml.IModStateTransition.EventGenerator;
import net.minecraftforge.fml.event.IModBusEvent;
import net.minecraftforge.fml.loading.progress.ProgressMeter;
@ApiStatus.Internal
class ModStateTransitionHelper {
static final IModStateTransition NOOP = new NoopTransition();
record NoopTransition() implements IModStateTransition {
@Override
public ThreadSelector threadSelector() {
return ThreadSelector.SYNC;
}
@Override
public BiFunction<Executor, CompletableFuture<Void>, CompletableFuture<Void>> finalActivityGenerator() {
return (e, t) -> t.thenApplyAsync(Function.identity(), e);
}
}
static <V> CompletionStage<Void> completableFutureFromExceptionList(List<FutureResult<V>> t) {
if (t.stream().noneMatch(e -> e.exception() != null)) {
return CompletableFuture.completedFuture(null);
} else {
final var throwables = t.stream().map(FutureResult::exception).filter(e -> e != null).toList();
CompletableFuture<Void> cf = new CompletableFuture<>();
final RuntimeException accumulator = new RuntimeException();
cf.completeExceptionally(accumulator);
for (Throwable exception : throwables) {
if (exception instanceof CompletionException) {
exception = exception.getCause();
}
if (exception.getSuppressed().length != 0) {
for (Throwable throwable : exception.getSuppressed()) {
accumulator.addSuppressed(throwable);
}
} else {
accumulator.addSuppressed(exception);
}
}
return cf;
}
}
record FutureResult<V>(V value, Throwable exception){}
static <V> CompletableFuture<List<FutureResult<V>>> gather(Collection<? extends CompletableFuture<? extends V>> futures) {
var list = new ArrayList<FutureResult<V>>(futures.size());
var results = new CompletableFuture[futures.size()];
for (var future : futures) {
int i = list.size();
list.add(null);
results[i] = future.whenComplete((result, exception) -> list.set(i, new FutureResult<>(result, exception)));
}
return CompletableFuture.allOf(results).handle((r, th)->null).thenApply(res -> list);
}
private static <T extends Event & IModBusEvent> void addCompletableFutureTaskForModDispatch(
final IModStateTransition transition,
final Executor executor,
final List<CompletableFuture<Void>> completableFutures,
final ProgressMeter progressBar,
final EventGenerator<T> eventGenerator,
final BiFunction<ModLoadingStage, Throwable, ModLoadingStage> nextState
) {
@SuppressWarnings("removal")
var preDispatchHook = getHook(transition.preDispatchHook(), executor, eventGenerator);
if (preDispatchHook != null)
completableFutures.add(preDispatchHook);
var modFutures = new LinkedHashMap<String, CompletableFuture<Void>>();
for (var mod : ModList.get().getLoadedMods()) {
CompletableFuture<Void> parent = null;
if (mod.dependencies.isEmpty()) {
parent = CompletableFuture.allOf();
} else {
var deps = new CompletableFuture[mod.dependencies.size()];
int idx = 0;
for (var depContainer : mod.dependencies) {
var future = modFutures.get(depContainer.getModId());
if (future == null)
throw new IllegalStateException("Could not find dependency future " + depContainer.getModId() + " for " + mod.getModId());
deps[idx++] = future;
}
parent = CompletableFuture.allOf(deps);
}
@SuppressWarnings("removal")
var dispatch = parent
.thenRunAsync(() -> {
ModLoadingContext.get().setActiveContainer(mod);
var handler = mod.activityMap.get(mod.modLoadingStage);
if (handler != null)
handler.run();
mod.acceptEvent(eventGenerator.apply(mod));
}, executor)
.whenComplete((mc, exception) -> {
mod.modLoadingStage = nextState.apply(mod.modLoadingStage, exception);
progressBar.increment();
ModLoadingContext.get().setActiveContainer(null);
});
modFutures.put(mod.getModId(), dispatch);
}
var dispatch = gather(modFutures.values()).thenComposeAsync(ModStateTransitionHelper::completableFutureFromExceptionList, executor);
completableFutures.add(dispatch);
@SuppressWarnings("removal")
var postDispatchHook = getHook(transition.preDispatchHook(), executor, eventGenerator);
if (postDispatchHook != null)
completableFutures.add(postDispatchHook);
}
private static <T extends Event & IModBusEvent> CompletableFuture<Void> getHook(BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> hook, Executor executor, EventGenerator<T> eventGenerator) {
if (hook == null || hook == IModStateTransition.NULL_HOOK) return null;
@SuppressWarnings("unchecked")
var hookTyped = (BiFunction<Executor, EventGenerator<T>, CompletableFuture<Void>>)hook;
return hookTyped.apply(executor, eventGenerator);
}
static <T extends Event & IModBusEvent> CompletableFuture<Void> build(
final IModStateTransition transition,
final String name,
final Executor syncExecutor,
final Executor parallelExecutor,
final ProgressMeter progressBar,
final Function<Executor, CompletableFuture<Void>> preSyncTask,
final Function<Executor, CompletableFuture<Void>> postSyncTask
) {
List<CompletableFuture<Void>> futures = new ArrayList<>();
final var executor = transition.threadSelector().apply(syncExecutor, parallelExecutor);
@SuppressWarnings({ "removal", "unchecked" })
var events = transition.eventFunctionStream().get().map(f -> (EventGenerator<T>)f).toList();
for (int x = 0; x < events.size(); x++) {
var gen = events.get(x);
BiFunction<ModLoadingStage, Throwable, ModLoadingStage> state = x == events.size() - 1
? transition.nextModLoadingStage()
: ModLoadingStage::currentState;
addCompletableFutureTaskForModDispatch(transition, executor, futures, progressBar, gen, state);
}
final CompletableFuture<Void> preSyncTaskCF = preSyncTask.apply(syncExecutor);
final CompletableFuture<Void> eventDispatchCF = gather(futures).thenCompose(ModStateTransitionHelper::completableFutureFromExceptionList);
final CompletableFuture<Void> postEventDispatchCF = preSyncTaskCF
.thenApplyAsync(n -> {
progressBar.label(progressBar.name() + ": dispatching " + name);
return null;
}, parallelExecutor)
.thenComposeAsync(n -> eventDispatchCF, parallelExecutor)
.thenApply(r -> {
postSyncTask.apply(syncExecutor);
return null;
});
return transition.finalActivityGenerator().apply(syncExecutor, postEventDispatchCF);
}
}
@@ -17,6 +17,7 @@ import static net.minecraftforge.fml.Logging.LOADING;
public class ModWorkManager { public class ModWorkManager {
private static final Logger LOGGER = LogManager.getLogger(); private static final Logger LOGGER = LogManager.getLogger();
private static final long PARK_TIME = TimeUnit.MILLISECONDS.toNanos(1); private static final long PARK_TIME = TimeUnit.MILLISECONDS.toNanos(1);
public interface DrivenExecutor extends Executor { public interface DrivenExecutor extends Executor {
boolean selfDriven(); boolean selfDriven();
boolean driveOne(); boolean driveOne();
@@ -33,8 +34,11 @@ public class ModWorkManager {
} }
} }
} }
private static class SyncExecutor implements DrivenExecutor {
private ConcurrentLinkedDeque<Runnable> tasks = new ConcurrentLinkedDeque<>(); private record SyncExecutor(ConcurrentLinkedDeque<Runnable> tasks) implements DrivenExecutor {
public SyncExecutor() {
this(new ConcurrentLinkedDeque<>());
}
@Override @Override
public boolean driveOne() { public boolean driveOne() {
@@ -56,13 +60,7 @@ public class ModWorkManager {
} }
} }
private static class WrappingExecutor implements DrivenExecutor { private record WrappingExecutor(Executor wrapped) implements DrivenExecutor {
private final Executor wrapped;
public WrappingExecutor(final Executor executor) {
this.wrapped = executor;
}
@Override @Override
public boolean selfDriven() { public boolean selfDriven() {
return true; return true;
@@ -79,11 +77,9 @@ public class ModWorkManager {
} }
} }
private static SyncExecutor syncExecutor; private static final SyncExecutor syncExecutor = new SyncExecutor();
public static DrivenExecutor syncExecutor() { public static DrivenExecutor syncExecutor() {
if (syncExecutor == null)
syncExecutor = new SyncExecutor();
return syncExecutor; return syncExecutor;
} }
@@ -91,14 +87,8 @@ public class ModWorkManager {
return new WrappingExecutor(executor); return new WrappingExecutor(executor);
} }
private static ForkJoinPool parallelThreadPool;
public static Executor parallelExecutor() { public static Executor parallelExecutor() {
if (parallelThreadPool == null) { return LazyInit.PARALLEL_EXECUTOR;
final int loadingThreadCount = FMLConfig.getIntConfigValue(FMLConfig.ConfigValue.MAX_THREADS);
LOGGER.debug(LOADING, "Using {} threads for parallel mod-loading", loadingThreadCount);
parallelThreadPool = new ForkJoinPool(loadingThreadCount, ModWorkManager::newForkJoinWorkerThread, null, false);
}
return parallelThreadPool;
} }
private static ForkJoinWorkerThread newForkJoinWorkerThread(ForkJoinPool pool) { private static ForkJoinWorkerThread newForkJoinWorkerThread(ForkJoinPool pool) {
@@ -109,4 +99,14 @@ public class ModWorkManager {
return thread; return thread;
} }
private static final class LazyInit {
private LazyInit() {}
private static final ForkJoinPool PARALLEL_EXECUTOR;
static {
final int loadingThreadCount = FMLConfig.getIntConfigValue(FMLConfig.ConfigValue.MAX_THREADS);
LOGGER.debug(LOADING, "Using {} threads for parallel mod-loading", loadingThreadCount);
PARALLEL_EXECUTOR = new ForkJoinPool(loadingThreadCount, ModWorkManager::newForkJoinWorkerThread, null, false);
}
}
} }
@@ -23,7 +23,7 @@ public final class OptionalMod<T>
return new OptionalMod<>(modId); return new OptionalMod<>(modId);
} }
private static OptionalMod<?> EMPTY = new OptionalMod<>(true); private static final OptionalMod<?> EMPTY = new OptionalMod<>(true);
private static <T> OptionalMod<T> empty() { private static <T> OptionalMod<T> empty() {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
OptionalMod<T> t = (OptionalMod<T>) EMPTY; OptionalMod<T> t = (OptionalMod<T>) EMPTY;
@@ -213,8 +213,8 @@ public final class OptionalMod<T>
public boolean equals(Object obj) public boolean equals(Object obj)
{ {
if (this == obj) return true; if (this == obj) return true;
if (obj instanceof OptionalMod) { if (obj instanceof OptionalMod<?> optionalMod) {
return Objects.equals(((OptionalMod)obj).modId, modId); return Objects.equals(optionalMod.modId, modId);
} }
return false; return false;
} }
@@ -48,8 +48,8 @@ public class VersionChecker {
BETA(), BETA(),
BETA_OUTDATED(6, true, true); BETA_OUTDATED(6, true, true);
final int sheetOffset; private final int sheetOffset;
final boolean draw, animated; private final boolean draw, animated;
Status() { Status() {
this(0, false, false); this(0, false, false);
@@ -72,6 +72,10 @@ public class VersionChecker {
public boolean isAnimated() { public boolean isAnimated() {
return animated; return animated;
} }
public boolean isOutdated() {
return this == OUTDATED || this == BETA_OUTDATED;
}
} }
public record CheckResult(VersionChecker.Status status, ComparableVersion target, Map<ComparableVersion, String> changes, String url) {} public record CheckResult(VersionChecker.Status status, ComparableVersion target, Map<ComparableVersion, String> changes, String url) {}
@@ -211,7 +215,7 @@ public class VersionChecker {
LOGGER.warn("Failed to process update information", e); LOGGER.warn("Failed to process update information", e);
status = FAILED; status = FAILED;
} }
results.put(mod, new CheckResult(status, target, changes, display_url)); RESULTS.put(mod, new CheckResult(status, target, changes, display_url));
} }
}.start(); }.start();
} }
@@ -226,10 +230,10 @@ public class VersionChecker {
return ret; return ret;
} }
private static Map<IModInfo, CheckResult> results = new ConcurrentHashMap<>(); private static final Map<IModInfo, CheckResult> RESULTS = new ConcurrentHashMap<>();
private static final CheckResult PENDING_CHECK = new CheckResult(PENDING, null, null, null); private static final CheckResult PENDING_CHECK = new CheckResult(PENDING, null, null, null);
public static CheckResult getResult(IModInfo mod) { public static CheckResult getResult(IModInfo mod) {
return results.getOrDefault(mod, PENDING_CHECK); return RESULTS.getOrDefault(mod, PENDING_CHECK);
} }
} }
@@ -14,6 +14,7 @@ import com.mojang.logging.LogUtils;
import net.minecraftforge.fml.loading.FMLConfig; import net.minecraftforge.fml.loading.FMLConfig;
import net.minecraftforge.fml.loading.FMLPaths; import net.minecraftforge.fml.loading.FMLPaths;
import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.FilenameUtils;
import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger; import org.slf4j.Logger;
import java.io.IOException; import java.io.IOException;
@@ -25,9 +26,66 @@ import static net.minecraftforge.fml.config.ConfigTracker.CONFIG;
public class ConfigFileTypeHandler { public class ConfigFileTypeHandler {
private static final Logger LOGGER = LogUtils.getLogger(); private static final Logger LOGGER = LogUtils.getLogger();
static ConfigFileTypeHandler TOML = new ConfigFileTypeHandler();
private static final Path defaultConfigPath = FMLPaths.GAMEDIR.get().resolve(FMLConfig.getConfigValue(FMLConfig.ConfigValue.DEFAULT_CONFIG_PATH)); private static final Path defaultConfigPath = FMLPaths.GAMEDIR.get().resolve(FMLConfig.getConfigValue(FMLConfig.ConfigValue.DEFAULT_CONFIG_PATH));
private static final ConfigFileTypeHandler CLIENT = new ConfigFileTypeHandler(ModConfig.Type.CLIENT);
private static final ConfigFileTypeHandler COMMON = new ConfigFileTypeHandler(ModConfig.Type.COMMON);
private static final ConfigFileTypeHandler SERVER = new ConfigFileTypeHandler(ModConfig.Type.SERVER);
private final @Nullable ModConfig.Type type;
private @Nullable FileWatcher watcher;
// exists for bin compat
public ConfigFileTypeHandler() {
this(null);
}
private ConfigFileTypeHandler(@Nullable ModConfig.Type type) {
this.type = type;
}
/**
* Gets the handler for the given {@link ModConfig.Type}.
*
* @param type The type to get the handler for
* @return The handler
*/
static ConfigFileTypeHandler get(ModConfig.Type type) {
return switch (type) {
case CLIENT -> CLIENT;
case COMMON -> COMMON;
case SERVER -> SERVER;
};
}
/**
* Gets the {@link FileWatcher} for this handler, creating it if it doesn't exist and/or has been stopped.
*
* @return The watcher
*
* @apiNote This is package-private so modders can't just call {@link FileWatcher#stop()} and fuck up everything.
*/
FileWatcher getWatcher() {
if (this.watcher == null) {
LOGGER.debug(CONFIG, "Starting watcher for handler: {}", this);
this.watcher = new FileWatcher();
}
return this.watcher;
}
/**
* Stops the {@link FileWatcher} for this handler, and sets it to null afterward. Use this instead of
* {@link FileWatcher#stop()}.
*/
void stopWatcher() {
if (this.watcher == null) return;
LOGGER.debug(CONFIG, "Stopping watcher for hander: {}", this);
this.watcher.stop();
this.watcher = null;
}
public Function<ModConfig, CommentedFileConfig> reader(Path configBasePath) { public Function<ModConfig, CommentedFileConfig> reader(Path configBasePath) {
return (c) -> { return (c) -> {
final Path configPath = configBasePath.resolve(c.getFileName()); final Path configPath = configBasePath.resolve(c.getFileName());
@@ -37,7 +95,7 @@ public class ConfigFileTypeHandler {
onFileNotFound((newfile, configFormat)-> setupConfigFile(c, newfile, configFormat)). onFileNotFound((newfile, configFormat)-> setupConfigFile(c, newfile, configFormat)).
writingMode(WritingMode.REPLACE). writingMode(WritingMode.REPLACE).
build(); build();
LOGGER.debug(CONFIG, "Built TOML config for {}", configPath.toString()); LOGGER.debug(CONFIG, "Built TOML config for {}", configPath);
try try
{ {
configData.load(); configData.load();
@@ -46,13 +104,9 @@ public class ConfigFileTypeHandler {
{ {
throw new ConfigLoadingException(c, ex); throw new ConfigLoadingException(c, ex);
} }
LOGGER.debug(CONFIG, "Loaded TOML config file {}", configPath.toString()); LOGGER.debug(CONFIG, "Loaded TOML config file {}", configPath);
try { this.getWatcher().addWatch(configPath, new ConfigWatcher(c, configData, Thread.currentThread().getContextClassLoader()));
FileWatcher.defaultInstance().addWatch(configPath, new ConfigWatcher(c, configData, Thread.currentThread().getContextClassLoader())); LOGGER.debug(CONFIG, "Watching TOML config file {} for changes", configPath);
LOGGER.debug(CONFIG, "Watching TOML config file {} for changes", configPath.toString());
} catch (IOException e) {
throw new RuntimeException("Couldn't watch config file", e);
}
return configData; return configData;
}; };
} }
@@ -60,14 +114,16 @@ public class ConfigFileTypeHandler {
public void unload(Path configBasePath, ModConfig config) { public void unload(Path configBasePath, ModConfig config) {
Path configPath = configBasePath.resolve(config.getFileName()); Path configPath = configBasePath.resolve(config.getFileName());
try { try {
FileWatcher.defaultInstance().removeWatch(configBasePath.resolve(config.getFileName())); this.getWatcher().removeWatch(configPath);
} catch (RuntimeException e) { } catch (RuntimeException e) {
LOGGER.error("Failed to remove config {} from tracker!", configPath.toString(), e); LOGGER.error("Failed to remove config {} from tracker!", configPath, e);
} }
} }
private boolean setupConfigFile(final ModConfig modConfig, final Path file, final ConfigFormat<?> conf) throws IOException { private static boolean setupConfigFile(final ModConfig modConfig, final Path file, final ConfigFormat<?> conf) throws IOException {
Files.createDirectories(file.getParent()); if (!Files.isDirectory(file.getParent())) {
Files.createDirectories(file.getParent());
}
Path p = defaultConfigPath.resolve(modConfig.getFileName()); Path p = defaultConfigPath.resolve(modConfig.getFileName());
if (Files.exists(p)) { if (Files.exists(p)) {
LOGGER.info(CONFIG, "Loading default config file from path {}", p); LOGGER.info(CONFIG, "Loading default config file from path {}", p);
@@ -111,17 +167,16 @@ public class ConfigFileTypeHandler {
} }
} }
private static class ConfigWatcher implements Runnable { @Override
private final ModConfig modConfig; public String toString() {
private final CommentedFileConfig commentedFileConfig; return "ConfigFileTypeHandler[" + (type != null ? type : "UNKNOWN") + "]";
private final ClassLoader realClassLoader; }
ConfigWatcher(final ModConfig modConfig, final CommentedFileConfig commentedFileConfig, final ClassLoader classLoader) {
this.modConfig = modConfig;
this.commentedFileConfig = commentedFileConfig;
this.realClassLoader = classLoader;
}
private record ConfigWatcher(
ModConfig modConfig,
CommentedFileConfig commentedFileConfig,
ClassLoader realClassLoader
) implements Runnable {
@Override @Override
public void run() { public void run() {
// Force the regular classloader onto the special thread // Force the regular classloader onto the special thread
@@ -8,6 +8,9 @@ package net.minecraftforge.fml.config;
import com.electronwill.nightconfig.core.CommentedConfig; import com.electronwill.nightconfig.core.CommentedConfig;
import com.electronwill.nightconfig.core.file.CommentedFileConfig; import com.electronwill.nightconfig.core.file.CommentedFileConfig;
import com.mojang.logging.LogUtils; import com.mojang.logging.LogUtils;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.fml.DistExecutor;
import net.minecraftforge.fml.loading.FMLPaths;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.Marker; import org.slf4j.Marker;
import org.slf4j.MarkerFactory; import org.slf4j.MarkerFactory;
@@ -47,15 +50,32 @@ public class ConfigTracker {
public void loadConfigs(ModConfig.Type type, Path configBasePath) { public void loadConfigs(ModConfig.Type type, Path configBasePath) {
LOGGER.debug(CONFIG, "Loading configs type {}", type); LOGGER.debug(CONFIG, "Loading configs type {}", type);
this.configSets.get(type).forEach(config -> openConfig(config, configBasePath)); for (ModConfig config : this.configSets.get(type)) {
openConfig(config, configBasePath);
}
} }
// TODO: [FML] This is only called for the server (outside of forceUnload)
// rethink config implementation for eventual FML rewrite
public void unloadConfigs(ModConfig.Type type, Path configBasePath) { public void unloadConfigs(ModConfig.Type type, Path configBasePath) {
LOGGER.debug(CONFIG, "Unloading configs type {}", type); LOGGER.debug(CONFIG, "Unloading configs type {}", type);
this.configSets.get(type).forEach(config -> closeConfig(config, configBasePath)); for (ModConfig config : this.configSets.get(type)) {
closeConfig(config, configBasePath);
}
ConfigFileTypeHandler.get(type).stopWatcher();
} }
private void openConfig(final ModConfig config, final Path configBasePath) { // If there is a better way to do this, please tell me. Because this is FUCKED
public void forceUnload() {
// This is how ModStateProvider handles loading configs. So we're doing the same but with unloadConfigs instead
DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> this.unloadConfigs(ModConfig.Type.CLIENT, FMLPaths.CONFIGDIR.get()));
this.unloadConfigs(ModConfig.Type.COMMON, FMLPaths.CONFIGDIR.get());
// just in case server watcher is still alive somehow...
ConfigFileTypeHandler.get(ModConfig.Type.SERVER).stopWatcher();
}
private static void openConfig(final ModConfig config, final Path configBasePath) {
LOGGER.trace(CONFIG, "Loading config file type {} at {} for {}", config.getType(), config.getFileName(), config.getModId()); LOGGER.trace(CONFIG, "Loading config file type {} at {} for {}", config.getType(), config.getFileName(), config.getModId());
final CommentedFileConfig configData = config.getHandler().reader(configBasePath).apply(config); final CommentedFileConfig configData = config.getHandler().reader(configBasePath).apply(config);
config.setConfigData(configData); config.setConfigData(configData);
@@ -63,7 +83,7 @@ public class ConfigTracker {
config.save(); config.save();
} }
private void closeConfig(final ModConfig config, final Path configBasePath) { private static void closeConfig(final ModConfig config, final Path configBasePath) {
if (config.getConfigData() != null) { if (config.getConfigData() != null) {
LOGGER.trace(CONFIG, "Closing config file type {} at {} for {}", config.getType(), config.getFileName(), config.getModId()); LOGGER.trace(CONFIG, "Closing config file type {} at {} for {}", config.getType(), config.getFileName(), config.getModId());
// stop the filewatcher before we save the file and close it, so reload doesn't fire // stop the filewatcher before we save the file and close it, so reload doesn't fire
@@ -24,14 +24,13 @@ public class ModConfig
private final ModContainer container; private final ModContainer container;
private final ConfigFileTypeHandler configHandler; private final ConfigFileTypeHandler configHandler;
private CommentedConfig configData; private CommentedConfig configData;
private Callable<Void> saveHandler;
public ModConfig(final Type type, final IConfigSpec<?> spec, final ModContainer container, final String fileName) { public ModConfig(final Type type, final IConfigSpec<?> spec, final ModContainer container, final String fileName) {
this.type = type; this.type = type;
this.spec = spec; this.spec = spec;
this.fileName = fileName; this.fileName = fileName;
this.container = container; this.container = container;
this.configHandler = ConfigFileTypeHandler.TOML; this.configHandler = ConfigFileTypeHandler.get(type);
ConfigTracker.INSTANCE.trackConfig(this); ConfigTracker.INSTANCE.trackConfig(this);
} }
+5 -5
View File
@@ -3,7 +3,7 @@ import net.minecraftforge.gradleutils.PomUtils
plugins { plugins {
id 'java-library' id 'java-library'
id 'maven-publish' id 'maven-publish'
id 'org.cadixdev.licenser' id 'net.minecraftforge.licenser'
id 'net.minecraftforge.gradleutils' id 'net.minecraftforge.gradleutils'
} }
@@ -44,11 +44,11 @@ dependencies {
testRuntimeOnly("org.lwjgl:lwjgl-stb::$lwjglNatives") testRuntimeOnly("org.lwjgl:lwjgl-stb::$lwjglNatives")
} }
test { tasks.named('test', Test).configure {
useJUnitPlatform() useJUnitPlatform()
} }
jar { tasks.named('jar', Jar).configure {
manifest { manifest {
attributes([ attributes([
'Automatic-Module-Name': 'net.minecraftforge.earlydisplay', 'Automatic-Module-Name': 'net.minecraftforge.earlydisplay',
@@ -65,7 +65,7 @@ jar {
} }
} }
tasks.withType(JavaCompile) { tasks.withType(JavaCompile).configureEach {
options.compilerArgs << '-Xlint:unchecked' options.compilerArgs << '-Xlint:unchecked'
} }
@@ -89,4 +89,4 @@ publishing {
repositories { repositories {
maven gradleutils.publishingForgeMaven maven gradleutils.publishingForgeMaven
} }
} }
@@ -14,9 +14,7 @@ import net.minecraftforge.fml.loading.ImmediateWindowProvider;
import net.minecraftforge.fml.loading.progress.StartupNotificationManager; import net.minecraftforge.fml.loading.progress.StartupNotificationManager;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.lwjgl.PointerBuffer; import org.lwjgl.PointerBuffer;
import org.lwjgl.glfw.GLFWImage;
import org.lwjgl.glfw.GLFWVidMode; import org.lwjgl.glfw.GLFWVidMode;
import org.lwjgl.stb.STBImage;
import org.lwjgl.system.MemoryStack; import org.lwjgl.system.MemoryStack;
import org.lwjgl.system.MemoryUtil; import org.lwjgl.system.MemoryUtil;
import org.lwjgl.util.tinyfd.TinyFileDialogs; import org.lwjgl.util.tinyfd.TinyFileDialogs;
@@ -24,15 +22,12 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import java.awt.Desktop; import java.awt.Desktop;
import java.io.BufferedReader;
import java.io.IOException; import java.io.IOException;
import java.io.InputStreamReader;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.lang.reflect.Modifier; import java.lang.reflect.Modifier;
import java.net.URI; import java.net.URI;
import java.nio.ByteBuffer;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Paths; import java.nio.file.Path;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Calendar; import java.util.Calendar;
@@ -50,7 +45,6 @@ import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.BiConsumer; import java.util.function.BiConsumer;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.function.Function;
import java.util.function.IntConsumer; import java.util.function.IntConsumer;
import java.util.function.IntSupplier; import java.util.function.IntSupplier;
import java.util.function.LongSupplier; import java.util.function.LongSupplier;
@@ -80,7 +74,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
private static final Logger LOGGER = LoggerFactory.getLogger("EARLYDISPLAY"); private static final Logger LOGGER = LoggerFactory.getLogger("EARLYDISPLAY");
private final AtomicBoolean animationTimerTrigger = new AtomicBoolean(true); private final AtomicBoolean animationTimerTrigger = new AtomicBoolean(true);
private ColourScheme colourScheme; private ColourScheme colourScheme = ColourScheme.RED;
private ElementShader elementShader; private ElementShader elementShader;
private RenderElement.DisplayContext context; private RenderElement.DisplayContext context;
@@ -91,6 +85,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
private ScheduledFuture<?> initializationFuture; private ScheduledFuture<?> initializationFuture;
private PerformanceInfo performanceInfo; private PerformanceInfo performanceInfo;
@SuppressWarnings("unused")
private ScheduledFuture<?> performanceTick; private ScheduledFuture<?> performanceTick;
// The GL ID of the window. Used for all operations // The GL ID of the window. Used for all operations
private long window; private long window;
@@ -139,13 +134,17 @@ public class DisplayWindow implements ImmediateWindowProvider {
this.colourScheme = ColourScheme.BLACK; this.colourScheme = ColourScheme.BLACK;
} else { } else {
try { try {
var optionLines = Files.readAllLines(FMLPaths.GAMEDIR.get().resolve(Paths.get("options.txt"))); // check the options file for the colour scheme
var options = optionLines.stream().map(l -> l.split(":")).filter(a -> a.length == 2).collect(Collectors.toMap(a -> a[0], a -> a[1])); var optionLines = Files.readAllLines(FMLPaths.GAMEDIR.get().resolve(Path.of("options.txt")));
var colourScheme = Boolean.parseBoolean(options.getOrDefault("darkMojangStudiosBackground", "false")); var keyName = "darkMojangStudiosBackground:";
this.colourScheme = colourScheme ? ColourScheme.BLACK : ColourScheme.RED; for (String line : optionLines) {
} catch (IOException ioe) { if (line.startsWith(keyName)) {
// No options this.colourScheme = line.startsWith("true", keyName.length()) ? ColourScheme.BLACK : ColourScheme.RED;
this.colourScheme = ColourScheme.RED; // default to red colourscheme break;
}
}
} catch (IOException e) {
this.colourScheme = ColourScheme.RED; // fallback to red colourScheme
} }
} }
this.maximized = parsed.has(maximizedopt) || FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_MAXIMIZED); this.maximized = parsed.has(maximizedopt) || FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_MAXIMIZED);
@@ -229,7 +228,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
LOGGER.error("Crash during font initialization", t); LOGGER.error("Crash during font initialization", t);
crashElegantly("An error occurred initializing a font for rendering. "+t.getMessage()); crashElegantly("An error occurred initializing a font for rendering. "+t.getMessage());
} }
this.elements = new ArrayList<>(Arrays.asList( this.elements = new ArrayList<>(List.of(
RenderElement.anvil(font), RenderElement.anvil(font),
RenderElement.logMessageOverlay(font), RenderElement.logMessageOverlay(font),
RenderElement.forgeVersionOverlay(font, mcVersion + "-" + forgeVersion), RenderElement.forgeVersionOverlay(font, mcVersion + "-" + forgeVersion),
@@ -259,7 +258,11 @@ public class DisplayWindow implements ImmediateWindowProvider {
glEnable(GL_BLEND); glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
this.elements.removeIf(element -> !element.render(context, framecount)); for (var itr = this.elements.iterator(); itr.hasNext(); ) {
var element = itr.next();
if (!element.render(context, framecount))
itr.remove();
}
if (animationTimerTrigger.compareAndSet(true, false)) // we only increment the framecount on a periodic basis if (animationTimerTrigger.compareAndSet(true, false)) // we only increment the framecount on a periodic basis
framecount++; framecount++;
} }
@@ -302,13 +305,6 @@ public class DisplayWindow implements ImmediateWindowProvider {
} }
private void crashElegantly(String errorDetails) { private void crashElegantly(String errorDetails) {
String qrText;
try (var is = new BufferedReader(new InputStreamReader(getClass().getResourceAsStream("/glfailure.txt")))) {
qrText = is.lines().collect(Collectors.joining("\n"));
} catch (IOException ioe) {
qrText = "";
}
StringBuilder msgBuilder = new StringBuilder(2000); StringBuilder msgBuilder = new StringBuilder(2000);
msgBuilder.append("Failed to initialize graphics window with current settings.\n"); msgBuilder.append("Failed to initialize graphics window with current settings.\n");
msgBuilder.append("\n\n"); msgBuilder.append("\n\n");
@@ -364,14 +360,15 @@ public class DisplayWindow implements ImmediateWindowProvider {
glfwWindowHint(GLFW_CONTEXT_CREATION_API, GLFW_NATIVE_CONTEXT_API); glfwWindowHint(GLFW_CONTEXT_CREATION_API, GLFW_NATIVE_CONTEXT_API);
glfwWindowHint(GLFW_VISIBLE, GLFW_FALSE); glfwWindowHint(GLFW_VISIBLE, GLFW_FALSE);
glfwWindowHint(GLFW_RESIZABLE, GLFW_TRUE); glfwWindowHint(GLFW_RESIZABLE, GLFW_TRUE);
if (mcVersion != null) {
// this emulates what we would get without early progress window String vanillaWindowTitle = "Minecraft* ";
// as vanilla never sets these, so GLFW uses the first window title if (mcVersion != null) vanillaWindowTitle += mcVersion;
// set them explicitly to avoid it using "FML early loading progress" as the class
String vanillaWindowTitle = "Minecraft* " + mcVersion; // this emulates what we would get without early progress window
glfwWindowHintString(GLFW_X11_CLASS_NAME, vanillaWindowTitle); // as vanilla never sets these, so GLFW uses the first window title
glfwWindowHintString(GLFW_X11_INSTANCE_NAME, vanillaWindowTitle); // set them explicitly to avoid it using "FML early loading progress" as the class
} glfwWindowHintString(GLFW_X11_CLASS_NAME, vanillaWindowTitle);
glfwWindowHintString(GLFW_X11_INSTANCE_NAME, vanillaWindowTitle);
long primaryMonitor = glfwGetPrimaryMonitor(); long primaryMonitor = glfwGetPrimaryMonitor();
if (primaryMonitor == 0) { if (primaryMonitor == 0) {
@@ -393,7 +390,8 @@ public class DisplayWindow implements ImmediateWindowProvider {
}, 10, TimeUnit.SECONDS); }, 10, TimeUnit.SECONDS);
int versidx = 0; int versidx = 0;
var skipVersions = FMLConfig.<String>getListConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_SKIP_GL_VERSIONS); var skipVersions = FMLConfig.<String>getListConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_SKIP_GL_VERSIONS);
final String[] lastGLError=new String[GL_VERSIONS.length]; boolean showHelpLog = FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_LOG_HELP_MSG);
final String[] lastGLError = new String[GL_VERSIONS.length];
do { do {
final var glVersionToTry = GL_VERSIONS[versidx][0] + "." + GL_VERSIONS[versidx][1]; final var glVersionToTry = GL_VERSIONS[versidx][0] + "." + GL_VERSIONS[versidx][1];
if (skipVersions.contains(glVersionToTry)) { if (skipVersions.contains(glVersionToTry)) {
@@ -402,11 +400,23 @@ public class DisplayWindow implements ImmediateWindowProvider {
continue; continue;
} }
LOGGER.info("Trying GL version " + glVersionToTry); LOGGER.info("Trying GL version " + glVersionToTry);
if (showHelpLog && versidx == 0) {
LOGGER.info("""
If this message is the only thing at the bottom of your log before a crash, you probably have a driver issue.
Possible solutions:
A) Make sure Minecraft is set to prefer high performance graphics in the OS and/or driver control panel
B) Check for driver updates on the graphics brand's website
C) Try reinstalling your graphics drivers
D) If still not working after trying all of the above, ask for further help on the Forge forums or Discord
You can safely ignore this message if the game starts up successfully.""");
}
glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, GL_VERSIONS[versidx][0]); // we try our versions one at a time glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, GL_VERSIONS[versidx][0]); // we try our versions one at a time
glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, GL_VERSIONS[versidx][1]); glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, GL_VERSIONS[versidx][1]);
glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE); glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE); glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE);
window = glfwCreateWindow(winWidth, winHeight, "Minecraft: Forge Loading...", 0L, 0L); window = glfwCreateWindow(winWidth, winHeight, vanillaWindowTitle, 0L, 0L);
var erridx = versidx; var erridx = versidx;
handleLastGLFWError((error, description) -> lastGLError[erridx] = String.format("Trying %d.%d: GLFW error: [0x%X]%s", GL_VERSIONS[erridx][0], GL_VERSIONS[erridx][1], error, description)); handleLastGLFWError((error, description) -> lastGLError[erridx] = String.format("Trying %d.%d: GLFW error: [0x%X]%s", GL_VERSIONS[erridx][0], GL_VERSIONS[erridx][1], error, description));
if (lastGLError[versidx] != null) { if (lastGLError[versidx] != null) {
@@ -434,6 +444,9 @@ public class DisplayWindow implements ImmediateWindowProvider {
this.glVersion = gotVersion; this.glVersion = gotVersion;
this.window = window; this.window = window;
if (showHelpLog)
FMLConfig.updateConfig(FMLConfig.ConfigValue.EARLY_WINDOW_LOG_HELP_MSG, false);
int[] x = new int[1]; int[] x = new int[1];
int[] y = new int[1]; int[] y = new int[1];
glfwGetMonitorPos(primaryMonitor, x, y); glfwGetMonitorPos(primaryMonitor, x, y);
@@ -451,19 +464,19 @@ public class DisplayWindow implements ImmediateWindowProvider {
glfwSetWindowPos(window, (vidmode.width() - this.winWidth) / 2 + monitorX, (vidmode.height() - this.winHeight) / 2 + monitorY); glfwSetWindowPos(window, (vidmode.width() - this.winWidth) / 2 + monitorX, (vidmode.height() - this.winHeight) / 2 + monitorY);
// Attempt setting the icon // Attempt setting the icon
int[] channels = new int[1]; // int[] channels = new int[1];
try (var glfwImgBuffer = GLFWImage.create(MemoryUtil.getAllocator().malloc(GLFWImage.SIZEOF), 1)) { // try (var glfwImgBuffer = GLFWImage.create(MemoryUtil.getAllocator().malloc(GLFWImage.SIZEOF), 1)) {
final ByteBuffer imgBuffer; // final ByteBuffer imgBuffer;
try (GLFWImage glfwImages = GLFWImage.malloc()) { // try (GLFWImage glfwImages = GLFWImage.malloc()) {
imgBuffer = STBHelper.loadImageFromClasspath("forge_logo.png", 20000, x, y, channels); // imgBuffer = STBHelper.loadImageFromClasspath("forge_logo.png", 20000, x, y, channels);
glfwImgBuffer.put(glfwImages.set(x[0], y[0], imgBuffer)); // glfwImgBuffer.put(glfwImages.set(x[0], y[0], imgBuffer));
glfwSetWindowIcon(window, glfwImgBuffer); // glfwSetWindowIcon(window, glfwImgBuffer);
STBImage.stbi_image_free(imgBuffer); // STBImage.stbi_image_free(imgBuffer);
} // }
} catch (NullPointerException e) { // } catch (NullPointerException e) {
System.err.println("Failed to load forge logo"); // System.err.println("Failed to load forge logo");
} // }
handleLastGLFWError((error, description) -> LOGGER.debug(String.format("Suppressing GLFW icon error: [0x%X]%s", error, description))); // handleLastGLFWError((error, description) -> LOGGER.debug(String.format("Suppressing GLFW icon error: [0x%X]%s", error, description)));
glfwSetFramebufferSizeCallback(window, this::fbResize); glfwSetFramebufferSizeCallback(window, this::fbResize);
glfwSetWindowPosCallback(window, this::winMove); glfwSetWindowPosCallback(window, this::winMove);
@@ -480,10 +493,6 @@ public class DisplayWindow implements ImmediateWindowProvider {
glfwPollEvents(); glfwPollEvents();
} }
private void badWindowHandler(final int code, final long desc) {
LOGGER.error("Got error from GLFW window init: "+code+ " "+MemoryUtil.memUTF8(desc));
}
private void winResize(long window, int width, int height) { private void winResize(long window, int width, int height) {
if (window == this.window && width != 0 && height != 0) { if (window == this.window && width != 0 && height != 0) {
this.winWidth = width; this.winWidth = width;
@@ -595,11 +604,25 @@ public class DisplayWindow implements ImmediateWindowProvider {
@Override @Override
public void updateModuleReads(final ModuleLayer layer) { public void updateModuleReads(final ModuleLayer layer) {
var fm = layer.findModule("forge").orElseThrow(); final var FORGE_MODULE = "net.minecraftforge.forge";
getClass().getModule().addReads(fm); var forge_module = layer.findModule(FORGE_MODULE).orElse(null);
var clz = FMLLoader.getGameLayer().findModule("forge").map(l->Class.forName(l, "net.minecraftforge.client.loading.ForgeLoadingOverlay")).orElseThrow(); if (forge_module == null)
var methods = Arrays.stream(clz.getMethods()).filter(m-> Modifier.isStatic(m.getModifiers())).collect(Collectors.toMap(Method::getName, Function.identity())); throw new IllegalStateException("Could not find " + FORGE_MODULE + " in " + layer);
loadingOverlay = methods.get("newInstance");
getClass().getModule().addReads(forge_module);
var clz = Class.forName(forge_module, "net.minecraftforge.client.loading.ForgeLoadingOverlay");
for (var mtd : clz.getDeclaredMethods()) {
if (Modifier.isStatic(mtd.getModifiers()) && "newInstance".equals(mtd.getName())) {
this.loadingOverlay = mtd;
break;
}
}
if (loadingOverlay == null)
throw new IllegalStateException("Could not find static newInstace method in " + clz.getName());
} }
public int getFramebufferTextureId() { public int getFramebufferTextureId() {
@@ -618,7 +641,6 @@ public class DisplayWindow implements ImmediateWindowProvider {
public void addMojangTexture(final int textureId) { public void addMojangTexture(final int textureId) {
this.elements.add(0, RenderElement.mojang(textureId, framecount)); this.elements.add(0, RenderElement.mojang(textureId, framecount));
// this.elements.get(0).retire(framecount + 1);
} }
public void close() { public void close() {
@@ -6,35 +6,44 @@
package net.minecraftforge.fml.earlydisplay; package net.minecraftforge.fml.earlydisplay;
import com.sun.management.OperatingSystemMXBean; import com.sun.management.OperatingSystemMXBean;
import net.minecraftforge.fml.loading.FMLConfig;
import java.lang.management.ManagementFactory; import java.lang.management.ManagementFactory;
import java.lang.management.MemoryMXBean; import java.lang.management.MemoryMXBean;
import java.lang.management.MemoryUsage; import java.lang.management.MemoryUsage;
public class PerformanceInfo { public class PerformanceInfo {
private static final MemoryMXBean MEMORY_BEAN = ManagementFactory.getMemoryMXBean();
private final boolean showCPUUsage;
private final OperatingSystemMXBean osBean; private final OperatingSystemMXBean osBean;
private final MemoryMXBean memoryBean;
float memory; private float memory;
private String text; private String text;
PerformanceInfo() { PerformanceInfo() {
osBean = ManagementFactory.getPlatformMXBean(OperatingSystemMXBean.class); showCPUUsage = FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_SHOW_CPU);
memoryBean = ManagementFactory.getMemoryMXBean(); osBean = showCPUUsage ? ManagementFactory.getPlatformMXBean(OperatingSystemMXBean.class) : null;
} }
void update() { void update() {
final MemoryUsage heapusage = memoryBean.getHeapMemoryUsage(); final MemoryUsage heapusage = MEMORY_BEAN.getHeapMemoryUsage();
memory = (float) heapusage.getUsed() / heapusage.getMax(); memory = (float) heapusage.getUsed() / heapusage.getMax();
if (!showCPUUsage) {
text = "Memory: %d/%dMB (%.1f%%)".formatted(heapusage.getUsed() >>> 20, heapusage.getMax() >>> 20, memory * 100f);
return;
}
var cpuLoad = osBean.getProcessCpuLoad(); var cpuLoad = osBean.getProcessCpuLoad();
String cpuText; String cpuText;
if (cpuLoad == -1) { if (cpuLoad == -1) {
cpuText = String.format("*CPU: %.1f%%", osBean.getCpuLoad() * 100f); cpuText = "*CPU: %.1f%%".formatted(osBean.getCpuLoad() * 100f);
} else { } else {
cpuText = String.format("CPU: %.1f%%", cpuLoad * 100f); cpuText = "CPU: %.1f%%".formatted(cpuLoad * 100f);
} }
text = String.format("Heap: %d/%d MB (%.1f%%) OffHeap: %d MB %s", heapusage.getUsed() >> 20, heapusage.getMax() >> 20, memory * 100.0, memoryBean.getNonHeapMemoryUsage().getUsed() >> 20, cpuText); text = "Memory: %d/%dMB (%.1f%%) %s".formatted(heapusage.getUsed() >>> 20, heapusage.getMax() >>> 20, memory * 100f, cpuText);
} }
String text() { String text() {
@@ -34,11 +34,14 @@ public class RenderElement {
}; };
} }
} }
@FunctionalInterface
interface TextureRenderer { interface TextureRenderer {
void accept(SimpleBufferBuilder bb, DisplayContext context, int[] size, int frame); void accept(SimpleBufferBuilder bb, DisplayContext context, int[] size, int frame);
} }
@FunctionalInterface
interface Initializer extends Supplier<Renderer> {} interface Initializer extends Supplier<Renderer> {}
@FunctionalInterface
interface TextGenerator { interface TextGenerator {
void accept(SimpleBufferBuilder bb, SimpleFont fh, DisplayContext ctx); void accept(SimpleBufferBuilder bb, SimpleFont fh, DisplayContext ctx);
} }
@@ -201,14 +204,17 @@ public class RenderElement {
bar.then(label).accept(buffer, context, frameNumber); bar.then(label).accept(buffer, context, frameNumber);
} }
@FunctionalInterface
interface ColourFunction { interface ColourFunction {
int colour(int frame); int colour(int frame);
} }
@FunctionalInterface
interface ProgressDisplay { interface ProgressDisplay {
float[] progress(int frame); float[] progress(int frame);
} }
@FunctionalInterface
interface BarPosition { interface BarPosition {
int[] location(DisplayContext context); int[] location(DisplayContext context);
} }
@@ -280,7 +286,7 @@ public class RenderElement {
if (num < min) { if (num < min) {
return min; return min;
} else { } else {
return num > max ? max : num; return Math.min(num, max);
} }
} }
@@ -288,7 +294,7 @@ public class RenderElement {
if (num < min) { if (num < min) {
return min; return min;
} else { } else {
return num > max ? max : num; return Math.min(num, max);
} }
} }
@@ -11,8 +11,6 @@ import org.lwjgl.stb.STBTTFontinfo;
import org.lwjgl.stb.STBTTPackContext; import org.lwjgl.stb.STBTTPackContext;
import org.lwjgl.stb.STBTTPackRange; import org.lwjgl.stb.STBTTPackRange;
import org.lwjgl.stb.STBTTPackedchar; import org.lwjgl.stb.STBTTPackedchar;
import org.lwjgl.system.MemoryStack;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
@@ -25,7 +23,7 @@ public class SimpleFont {
private final int lineSpacing; private final int lineSpacing;
private final int descent; private final int descent;
private final int GLYPH_COUNT = 127-32; private final int GLYPH_COUNT = 127-32;
private Glyph[] glyphs; private final Glyph[] glyphs;
private record Glyph(char c, int charwidth, int[] pos, float[] uv) { private record Glyph(char c, int charwidth, int[] pos, float[] uv) {
Pos loadQuad(Pos pos, int colour, SimpleBufferBuilder bb) { Pos loadQuad(Pos pos, int colour, SimpleBufferBuilder bb) {
+7 -7
View File
@@ -3,7 +3,7 @@ import net.minecraftforge.gradleutils.PomUtils
plugins { plugins {
id 'java-library' id 'java-library'
id 'maven-publish' id 'maven-publish'
id 'org.cadixdev.licenser' id 'net.minecraftforge.licenser'
id 'net.minecraftforge.gradleutils' id 'net.minecraftforge.gradleutils'
} }
@@ -37,7 +37,7 @@ dependencies {
implementation(libs.jimfs) implementation(libs.jimfs)
implementation(libs.log4j.core) implementation(libs.log4j.core)
annotationProcessor(libs.log4j.core) annotationProcessor(libs.bundles.log4j)
testCompileOnly(libs.nulls) testCompileOnly(libs.nulls)
testRuntimeOnly(libs.bootstrap) testRuntimeOnly(libs.bootstrap)
@@ -65,7 +65,7 @@ tasks.named('jar', Jar).configure {
} }
} }
tasks.withType(JavaCompile) { tasks.withType(JavaCompile).configureEach {
options.compilerArgs << '-Xlint:unchecked' options.compilerArgs << '-Xlint:unchecked'
} }
@@ -94,10 +94,10 @@ publishing {
tasks.register('writeForgeVersionJson') { tasks.register('writeForgeVersionJson') {
doLast { doLast {
file('src/main/resources/forge_version.json').json = [ file('src/main/resources/forge_version.json').json = [
'forge': FORGE_VERSION, forge: FORGE_VERSION,
'mc': MC_VERSION, mc: MC_VERSION,
'mcp': MCP_VERSION mcp: MCP_VERSION
] as LinkedHashMap ]
} }
} }
@@ -36,9 +36,9 @@ import cpw.mods.modlauncher.serviceapi.ILaunchPluginService;
*/ */
public class CapabilityTokenSubclass implements ILaunchPluginService { public class CapabilityTokenSubclass implements ILaunchPluginService {
private final String FUNC_NAME = "getType"; private static final String FUNC_NAME = "getType";
private final String FUNC_DESC = "()Ljava/lang/String;"; private static final String FUNC_DESC = "()Ljava/lang/String;";
private final String CAP_INJECT = "net/minecraftforge/common/capabilities/CapabilityToken"; //Don't directly reference this to prevent class loading. private static final String CAP_INJECT = "net/minecraftforge/common/capabilities/CapabilityToken"; //Don't directly reference this to prevent class loading.
@Override @Override
public String name() { public String name() {
@@ -49,49 +49,45 @@ public class CapabilityTokenSubclass implements ILaunchPluginService {
private static final EnumSet<Phase> NAY = EnumSet.noneOf(Phase.class); private static final EnumSet<Phase> NAY = EnumSet.noneOf(Phase.class);
@Override @Override
public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty) public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty) {
{ if (isEmpty)
return isEmpty ? NAY : YAY; return NAY;
String internalName = classType.getInternalName();
if (internalName.startsWith("net/minecraft/") || internalName.startsWith("com/mojang/"))
return NAY;
return YAY;
} }
@Override @Override
public int processClassWithFlags(final Phase phase, final ClassNode classNode, final Type classType, final String reason) public int processClassWithFlags(final Phase phase, final ClassNode classNode, final Type classType, final String reason) {
{ if (CAP_INJECT.equals(classNode.name)) {
if (CAP_INJECT.equals(classNode.name)) for (MethodNode mtd : classNode.methods) {
{ if (FUNC_NAME.equals(mtd.name) && FUNC_DESC.equals(mtd.desc)) {
for (MethodNode mtd : classNode.methods)
{
if (FUNC_NAME.equals(mtd.name) && FUNC_DESC.equals(mtd.desc))
{
mtd.access &= ~Opcodes.ACC_FINAL; // We have it final in code so people don't override it, cuz that'd be stupid, and make our transformer more complicated. mtd.access &= ~Opcodes.ACC_FINAL; // We have it final in code so people don't override it, cuz that'd be stupid, and make our transformer more complicated.
} }
} }
return ComputeFlags.SIMPLE_REWRITE; return ComputeFlags.SIMPLE_REWRITE;
} } else if (CAP_INJECT.equals(classNode.superName)) {
else if (CAP_INJECT.equals(classNode.superName))
{
Holder cls = new Holder(); Holder cls = new Holder();
SignatureReader reader = new SignatureReader(classNode.signature); // Having a node version of this would probably be useful. SignatureReader reader = new SignatureReader(classNode.signature); // Having a node version of this would probably be useful.
reader.accept(new SignatureVisitor(Opcodes.ASM9) reader.accept(new SignatureVisitor(Opcodes.ASM9) {
{ final Deque<String> stack = new ArrayDeque<>();
Deque<String> stack = new ArrayDeque<>();
@Override @Override
public void visitClassType(final String name) public void visitClassType(final String name) {
{
stack.push(name); stack.push(name);
} }
@Override @Override
public void visitInnerClassType(final String name) public void visitInnerClassType(final String name) {
{
stack.push(stack.pop() + '$' + name); stack.push(stack.pop() + '$' + name);
} }
@Override @Override
public void visitEnd() public void visitEnd() {
{
var val = stack.pop(); var val = stack.pop();
if (!stack.isEmpty() && CAP_INJECT.equals(stack.peek())) if (!stack.isEmpty() && CAP_INJECT.equals(stack.peek()))
cls.value = val; cls.value = val;
@@ -106,15 +102,12 @@ public class CapabilityTokenSubclass implements ILaunchPluginService {
mtd.visitInsn(Opcodes.ARETURN); mtd.visitInsn(Opcodes.ARETURN);
mtd.visitEnd(); mtd.visitEnd();
return ComputeFlags.COMPUTE_MAXS; return ComputeFlags.COMPUTE_MAXS;
} } else {
else
{
return ComputeFlags.NO_REWRITE; return ComputeFlags.NO_REWRITE;
} }
} }
private static class Holder { private static final class Holder {
String value; String value;
} }
} }
@@ -8,6 +8,7 @@ package net.minecraftforge.fml.common.asm;
import java.util.EnumSet; import java.util.EnumSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.Function; import java.util.function.Function;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@@ -34,8 +35,12 @@ public class ObjectHolderDefinalize implements ILaunchPluginService {
new VanillaObjectHolderData("net.minecraft.world.effect.MobEffects", "mob_effect", "net.minecraft.world.effect.MobEffect"), new VanillaObjectHolderData("net.minecraft.world.effect.MobEffects", "mob_effect", "net.minecraft.world.effect.MobEffect"),
new VanillaObjectHolderData("net.minecraft.core.particles.ParticleTypes", "particle_type", "net.minecraft.core.particles.ParticleType"), new VanillaObjectHolderData("net.minecraft.core.particles.ParticleTypes", "particle_type", "net.minecraft.core.particles.ParticleType"),
new VanillaObjectHolderData("net.minecraft.sounds.SoundEvents", "sound_event", "net.minecraft.sounds.SoundEvent") new VanillaObjectHolderData("net.minecraft.sounds.SoundEvents", "sound_event", "net.minecraft.sounds.SoundEvent")
).collect(Collectors.toMap(VanillaObjectHolderData::holderClass, Function.identity())); ).collect(Collectors.toUnmodifiableMap(VanillaObjectHolderData::holderClass, Function.identity()));
private final String OBJECT_HOLDER = "Lnet/minecraftforge/registries/ObjectHolder;"; //Don't directly reference this to prevent class loading. private static final Set<String> VANILLA_OBJECT_HOLDER_CLASSES = VANILLA_OBJECT_HOLDERS.keySet().stream()
.map(it -> it.replace('.', '/'))
.collect(Collectors.toUnmodifiableSet());
private static final String OBJECT_HOLDER = "Lnet/minecraftforge/registries/ObjectHolder;"; //Don't directly reference this to prevent class loading.
private static final int PUBLIC_STATIC_FINAL_FLAGS = Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC | Opcodes.ACC_FINAL;
@Override @Override
public String name() { public String name() {
@@ -46,13 +51,29 @@ public class ObjectHolderDefinalize implements ILaunchPluginService {
private static final EnumSet<Phase> NAY = EnumSet.noneOf(Phase.class); private static final EnumSet<Phase> NAY = EnumSet.noneOf(Phase.class);
@Override @Override
public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty) public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty) {
{ if (isEmpty)
return isEmpty ? NAY : YAY; return NAY;
// Let's skip processing classes that definitely don't have object holders
String internalName = classType.getInternalName();
// Forge classes that aren't in the debug package (that package is used for tests)
if (internalName.startsWith("net/minecraftforge/") && !internalName.substring(18).contains("debug"))
return NAY;
// Vanilla classes that don't have object holders
if (internalName.startsWith("com/mojang/"))
return NAY;
// ...except specific ones we added to the VANILLA_OBJECT_HOLDERS map
if (internalName.startsWith("net/minecraft/") && !VANILLA_OBJECT_HOLDER_CLASSES.contains(internalName))
return NAY;
return YAY;
} }
private boolean hasHolder(List<AnnotationNode> lst) private static boolean hasHolder(List<AnnotationNode> lst) {
{
return lst != null && lst.stream().anyMatch(n -> n.desc.equals(OBJECT_HOLDER)); return lst != null && lst.stream().anyMatch(n -> n.desc.equals(OBJECT_HOLDER));
} }
@@ -76,10 +97,9 @@ public class ObjectHolderDefinalize implements ILaunchPluginService {
{ {
final AtomicBoolean changes = new AtomicBoolean(); final AtomicBoolean changes = new AtomicBoolean();
//Must be public static finals, and non-array objects //Must be public static finals, and non-array objects
final int flags = Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC | Opcodes.ACC_FINAL;
//Fix Annotated Fields before injecting from class level //Fix Annotated Fields before injecting from class level
classNode.fields.stream().filter(f -> ((f.access & flags) == flags) && f.desc.startsWith("L") && hasHolder(f.visibleAnnotations)).forEach(f -> classNode.fields.stream().filter(f -> ((f.access & PUBLIC_STATIC_FINAL_FLAGS) == PUBLIC_STATIC_FINAL_FLAGS) && f.desc.startsWith("L") && hasHolder(f.visibleAnnotations)).forEach(f ->
{ {
int prev = f.access; int prev = f.access;
f.access &= ~Opcodes.ACC_FINAL; //Strip final f.access &= ~Opcodes.ACC_FINAL; //Strip final
@@ -89,7 +109,7 @@ public class ObjectHolderDefinalize implements ILaunchPluginService {
if (VANILLA_OBJECT_HOLDERS.containsKey(classType.getClassName())) //Class level, de-finalize all fields and add @ObjectHolder to them! if (VANILLA_OBJECT_HOLDERS.containsKey(classType.getClassName())) //Class level, de-finalize all fields and add @ObjectHolder to them!
{ {
classNode.fields.stream().filter(f -> ((f.access & flags) == flags) && f.desc.startsWith("L")).forEach(f -> classNode.fields.stream().filter(f -> ((f.access & PUBLIC_STATIC_FINAL_FLAGS) == PUBLIC_STATIC_FINAL_FLAGS) && f.desc.startsWith("L")).forEach(f ->
{ {
int prev = f.access; int prev = f.access;
f.access &= ~Opcodes.ACC_FINAL; f.access &= ~Opcodes.ACC_FINAL;
@@ -28,15 +28,16 @@ import org.slf4j.Logger;
public class RuntimeEnumExtender implements ILaunchPluginService { public class RuntimeEnumExtender implements ILaunchPluginService {
private static final Logger LOGGER = LogUtils.getLogger(); private static final Logger LOGGER = LogUtils.getLogger();
private final Type STRING = Type.getType(String.class); private static final Type STRING = Type.getType(String.class);
private final Type ENUM = Type.getType(Enum.class); private static final Type ENUM = Type.getType(Enum.class);
private final Type MARKER_IFACE = Type.getType("Lnet/minecraftforge/common/IExtensibleEnum;"); private static final Type MARKER_IFACE = Type.getType("Lnet/minecraftforge/common/IExtensibleEnum;");
private final Type ARRAY_UTILS = Type.getType("Lorg/apache/commons/lang3/ArrayUtils;"); //Don't directly reference this to prevent class loading. private static final Type ARRAY_UTILS = Type.getType("Lorg/apache/commons/lang3/ArrayUtils;"); //Don't directly reference this to prevent class loading.
private final String ADD_DESC = Type.getMethodDescriptor(Type.getType(Object[].class), Type.getType(Object[].class), Type.getType(Object.class)); private static final String ADD_DESC = Type.getMethodDescriptor(Type.getType(Object[].class), Type.getType(Object[].class), Type.getType(Object.class));
private final Type UNSAFE_HACKS = Type.getType("Lnet/minecraftforge/fml/unsafe/UnsafeHacks;"); //Again, not direct reference to prevent class loading. private static final Type UNSAFE_HACKS = Type.getType("Lnet/minecraftforge/fml/unsafe/UnsafeHacks;"); //Again, not direct reference to prevent class loading.
private final String CLEAN_DESC = Type.getMethodDescriptor(Type.VOID_TYPE, Type.getType(Class.class)); private static final String CLEAN_DESC = Type.getMethodDescriptor(Type.VOID_TYPE, Type.getType(Class.class));
private final String NAME_DESC = Type.getMethodDescriptor(STRING); private static final String NAME_DESC = Type.getMethodDescriptor(STRING);
private final String EQUALS_DESC = Type.getMethodDescriptor(Type.BOOLEAN_TYPE, STRING); private static final String EQUALS_DESC = Type.getMethodDescriptor(Type.BOOLEAN_TYPE, STRING);
private static final int FLAGS = Opcodes.ACC_PRIVATE | Opcodes.ACC_STATIC | Opcodes.ACC_FINAL | Opcodes.ACC_SYNTHETIC;
@Override @Override
public String name() { public String name() {
@@ -47,9 +48,15 @@ public class RuntimeEnumExtender implements ILaunchPluginService {
private static final EnumSet<Phase> NAY = EnumSet.noneOf(Phase.class); private static final EnumSet<Phase> NAY = EnumSet.noneOf(Phase.class);
@Override @Override
public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty) public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty) {
{ if (isEmpty)
return isEmpty ? NAY : YAY; return NAY;
String internalName = classType.getInternalName();
if (internalName.startsWith("net/minecraftforge/") || internalName.startsWith("com/mojang/"))
return NAY;
return YAY;
} }
@Override @Override
@@ -58,25 +65,24 @@ public class RuntimeEnumExtender implements ILaunchPluginService {
if ((classNode.access & Opcodes.ACC_ENUM) == 0) if ((classNode.access & Opcodes.ACC_ENUM) == 0)
return ComputeFlags.NO_REWRITE; return ComputeFlags.NO_REWRITE;
Type array = Type.getType("[" + classType.getDescriptor()); if (!classNode.interfaces.contains(MARKER_IFACE.getInternalName()))
final int flags = Opcodes.ACC_PRIVATE | Opcodes.ACC_STATIC | Opcodes.ACC_FINAL | Opcodes.ACC_SYNTHETIC;
FieldNode values = classNode.fields.stream().filter(f -> f.desc.contentEquals(array.getDescriptor()) && ((f.access & flags) == flags)).findFirst().orElse(null);
if (!classNode.interfaces.contains(MARKER_IFACE.getInternalName())) {
return ComputeFlags.NO_REWRITE; return ComputeFlags.NO_REWRITE;
}
Type array = Type.getType("[" + classType.getDescriptor());
String arrayDesc = array.getDescriptor();
FieldNode values = classNode.fields.stream().filter(f -> f.desc.equals(arrayDesc) && ((f.access & FLAGS) == FLAGS)).findFirst().orElse(null);
//Static methods named "create" with first argument as a string //Static methods named "create" with first argument as a string
List<MethodNode> candidates = classNode.methods.stream() List<MethodNode> candidates = classNode.methods.stream()
.filter(m -> ((m.access & Opcodes.ACC_STATIC) != 0) && m.name.equals("create")) .filter(m -> ((m.access & Opcodes.ACC_STATIC) != 0) && m.name.equals("create"))
.collect(Collectors.toList()); .toList();
if (candidates.isEmpty()) { if (candidates.isEmpty()) {
throw new IllegalStateException("IExtensibleEnum has no candidate factory methods: " + classType.getClassName()); throw new IllegalStateException("IExtensibleEnum has no candidate factory methods: " + classType.getClassName());
} }
candidates.forEach(mtd -> for (var mtd : candidates)
{ {
Type[] args = Type.getArgumentTypes(mtd.desc); Type[] args = Type.getArgumentTypes(mtd.desc);
if (args.length == 0 || !args[0].equals(STRING)) { if (args.length == 0 || !args[0].equals(STRING)) {
@@ -108,8 +114,7 @@ public class RuntimeEnumExtender implements ILaunchPluginService {
Type[] ctrArgs = new Type[args.length + 1]; Type[] ctrArgs = new Type[args.length + 1];
ctrArgs[0] = STRING; ctrArgs[0] = STRING;
ctrArgs[1] = Type.INT_TYPE; ctrArgs[1] = Type.INT_TYPE;
for (int x = 1; x < args.length; x++) System.arraycopy(args, 1, ctrArgs, 2, args.length - 1);
ctrArgs[1 + x] = args[x];
String desc = Type.getMethodDescriptor(Type.VOID_TYPE, ctrArgs); String desc = Type.getMethodDescriptor(Type.VOID_TYPE, ctrArgs);
@@ -231,7 +236,7 @@ public class RuntimeEnumExtender implements ILaunchPluginService {
ins.load(vars, classType); ins.load(vars, classType);
ins.areturn(classType); ins.areturn(classType);
} }
}); }
return ComputeFlags.COMPUTE_FRAMES; return ComputeFlags.COMPUTE_FRAMES;
} }
@@ -11,7 +11,7 @@ import java.util.concurrent.Executors;
import java.util.concurrent.Future; import java.util.concurrent.Future;
public class BackgroundWaiter { public class BackgroundWaiter {
private static ExecutorService runner = Executors.newSingleThreadExecutor(); private static final ExecutorService runner = Executors.newSingleThreadExecutor();
public static void runAndTick(Runnable r, Runnable tick) { public static void runAndTick(Runnable r, Runnable tick) {
ImmediateWindowHandler.updateProgress("Loading bootstrap resources"); ImmediateWindowHandler.updateProgress("Loading bootstrap resources");
@@ -36,7 +36,9 @@ public class FMLConfig
EARLY_WINDOW_FBSCALE("earlyWindowFBScale", 1, "Early window framebuffer scale"), EARLY_WINDOW_FBSCALE("earlyWindowFBScale", 1, "Early window framebuffer scale"),
EARLY_WINDOW_MAXIMIZED("earlyWindowMaximized", Boolean.FALSE, "Early window starts maximized"), EARLY_WINDOW_MAXIMIZED("earlyWindowMaximized", Boolean.FALSE, "Early window starts maximized"),
EARLY_WINDOW_SKIP_GL_VERSIONS("earlyWindowSkipGLVersions", List.of(), "Skip specific GL versions, may help with buggy graphics card drivers"), EARLY_WINDOW_SKIP_GL_VERSIONS("earlyWindowSkipGLVersions", List.of(), "Skip specific GL versions, may help with buggy graphics card drivers"),
EARLY_WINDOW_SQUIR("earlyWindowSquir", Boolean.FALSE, "Squir?") EARLY_WINDOW_SQUIR("earlyWindowSquir", Boolean.FALSE, "Squir?"),
EARLY_WINDOW_SHOW_CPU("earlyWindowShowCPU", Boolean.FALSE, "Whether to show CPU usage stats in early window"),
EARLY_WINDOW_LOG_HELP_MSG("earlyWindowLogHelpMessage", Boolean.TRUE, "Whether to log a help message on first attempt, to aid troubleshooting. This setting should automatically disable itself after a successful launch"),
; ;
private final String entry; private final String entry;
@@ -17,11 +17,9 @@ import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.fml.loading.targets.CommonLaunchHandler; import net.minecraftforge.fml.loading.targets.CommonLaunchHandler;
import net.minecraftforge.forgespi.Environment; import net.minecraftforge.forgespi.Environment;
import net.minecraftforge.forgespi.coremod.ICoreModProvider; import net.minecraftforge.forgespi.coremod.ICoreModProvider;
import org.apache.commons.lang3.tuple.Pair;
import org.slf4j.Logger; import org.slf4j.Logger;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -36,7 +34,6 @@ import static net.minecraftforge.fml.loading.LogMarkers.SCAN;
public class FMLLoader { public class FMLLoader {
private static final Logger LOGGER = LogUtils.getLogger(); private static final Logger LOGGER = LogUtils.getLogger();
private static AccessTransformerService accessTransformer; private static AccessTransformerService accessTransformer;
private static ModDiscoverer modDiscoverer;
private static ICoreModProvider coreModProvider; private static ICoreModProvider coreModProvider;
private static LanguageLoadingProvider languageLoadingProvider; private static LanguageLoadingProvider languageLoadingProvider;
private static Dist dist; private static Dist dist;
@@ -44,7 +41,7 @@ public class FMLLoader {
private static LoadingModList loadingModList; private static LoadingModList loadingModList;
private static RuntimeDistCleaner runtimeDistCleaner; private static RuntimeDistCleaner runtimeDistCleaner;
private static Path gamePath; private static Path gamePath;
private static VersionInfo versionInfo = VersionInfo.detect(); private static final VersionInfo versionInfo = VersionInfo.detect();
private static String launchHandlerName; private static String launchHandlerName;
private static CommonLaunchHandler commonLaunchHandler; private static CommonLaunchHandler commonLaunchHandler;
public static Runnable progressWindowTick; public static Runnable progressWindowTick;
@@ -62,7 +59,7 @@ public class FMLLoader {
/*eventBus =*/ getPlugin(env, "eventbus", "1.0", "EventBus"); /*eventBus =*/ getPlugin(env, "eventbus", "1.0", "EventBus");
runtimeDistCleaner = getPlugin(env, "runtimedistcleaner", "1.0", "RuntimeDistCleaner"); runtimeDistCleaner = getPlugin(env, "runtimedistcleaner", "1.0", "RuntimeDistCleaner");
coreModProvider = getSingleService(ICoreModProvider.class, "CoreMod"); coreModProvider = getSingleService(ICoreModProvider.class, "CoreMod");
LOGGER.debug(CORE,"FML found CoreMod version : {}", JarVersionLookupHandler.getInfo(coreModProvider.getClass()).impl().version().orElse("MISSING")); LOGGER.debug(CORE, "FML found CoreMod version : {}", JarVersionLookupHandler.getInfo(coreModProvider.getClass()).impl().version().orElse("MISSING"));
checkPackage(Environment.class, "2.0", "ForgeSPI"); checkPackage(Environment.class, "2.0", "ForgeSPI");
try { try {
@@ -74,14 +71,15 @@ public class FMLLoader {
} }
} }
@SuppressWarnings("unchecked")
private static <T> T getPlugin(IEnvironment env, String id, String version, String name) throws IncompatibleEnvironmentException { private static <T> T getPlugin(IEnvironment env, String id, String version, String name) throws IncompatibleEnvironmentException {
@SuppressWarnings("unchecked") var plugin = env.findLaunchPlugin(id).orElse(null);
var plugin = (T)env.findLaunchPlugin(id).orElseThrow(() -> { if (plugin == null) {
LOGGER.error(CORE, "{} library is missing, we need this to run", name); LOGGER.error(CORE, "{} library is missing, we need this to run", name);
return new IncompatibleEnvironmentException("Missing " + name + ", cannot run"); throw new IncompatibleEnvironmentException("Missing " + name + ", cannot run");
}); }
checkPackage(plugin.getClass(), version, name); checkPackage(plugin.getClass(), version, name);
return plugin; return (T) plugin;
} }
private static void checkPackage(Class<?> cls, String version, String name) throws IncompatibleEnvironmentException { private static void checkPackage(Class<?> cls, String version, String name) throws IncompatibleEnvironmentException {
@@ -137,20 +135,20 @@ public class FMLLoader {
} }
commonLaunchHandler = (CommonLaunchHandler)launchHandler.get(); commonLaunchHandler = (CommonLaunchHandler)launchHandler.get();
launchHandlerName = launchHandler.get().name(); launchHandlerName = launchHandler.get().name();
gamePath = environment.getProperty(IEnvironment.Keys.GAMEDIR.get()).orElse(Paths.get(".").toAbsolutePath()); gamePath = environment.getProperty(IEnvironment.Keys.GAMEDIR.get()).orElse(Path.of(".").toAbsolutePath());
naming = commonLaunchHandler.getNaming(); naming = commonLaunchHandler.getNaming();
dist = commonLaunchHandler.getDist(); dist = commonLaunchHandler.getDist();
production = commonLaunchHandler.isProduction(); production = commonLaunchHandler.isProduction();
accessTransformer.getExtension().accept(Pair.of(naming, "srg")); accessTransformer.getExtension().accept(Map.entry(naming, "srg"));
runtimeDistCleaner.getExtension().accept(dist); runtimeDistCleaner.getExtension().accept(dist);
} }
public static List<ITransformationService.Resource> beginModScan(final Map<String,?> arguments) { public static List<ITransformationService.Resource> beginModScan(final Map<String,?> arguments) {
LOGGER.debug(SCAN,"Scanning for Mod Locators"); LOGGER.debug(SCAN,"Scanning for Mod Locators");
modDiscoverer = new ModDiscoverer(arguments); var modDiscoverer = new ModDiscoverer(arguments);
modValidator = modDiscoverer.discoverMods(); modValidator = modDiscoverer.discoverMods();
var pluginResources = modValidator.getPluginResources(); var pluginResources = modValidator.getPluginResources();
return List.of(pluginResources); return List.of(pluginResources);
@@ -172,10 +170,6 @@ public class FMLLoader {
return languageLoadingProvider; return languageLoadingProvider;
} }
static ModDiscoverer getModDiscoverer() {
return modDiscoverer;
}
public static CommonLaunchHandler getLaunchHandler() { public static CommonLaunchHandler getLaunchHandler() {
return commonLaunchHandler; return commonLaunchHandler;
} }
@@ -24,7 +24,7 @@ import static net.minecraftforge.fml.loading.LogMarkers.CORE;
public class FMLServiceProvider implements ITransformationService { public class FMLServiceProvider implements ITransformationService {
private static final Logger LOGGER = LogUtils.getLogger(); private static final Logger LOGGER = LogUtils.getLogger();
private Map<String, Object> arguments; private final Map<String, Object> arguments = new HashMap<>();
public FMLServiceProvider() { public FMLServiceProvider() {
var markers = System.getProperty("forge.logging.markers", "").split(","); var markers = System.getProperty("forge.logging.markers", "").split(",");
@@ -45,7 +45,6 @@ public class FMLServiceProvider implements ITransformationService {
FMLConfig.load(); FMLConfig.load();
LOGGER.debug(CORE, "Preparing ModFile"); LOGGER.debug(CORE, "Preparing ModFile");
environment.computePropertyIfAbsent(Environment.Keys.MODFILEFACTORY.get(), k->ModFile::new); environment.computePropertyIfAbsent(Environment.Keys.MODFILEFACTORY.get(), k->ModFile::new);
arguments = new HashMap<>();
LOGGER.debug(CORE, "Preparing launch handler"); LOGGER.debug(CORE, "Preparing launch handler");
FMLLoader.setupLaunchHandler(environment, arguments); FMLLoader.setupLaunchHandler(environment, arguments);
FMLEnvironment.setupInteropEnvironment(environment); FMLEnvironment.setupInteropEnvironment(environment);
@@ -68,14 +67,6 @@ public class FMLServiceProvider implements ITransformationService {
FMLLoader.onInitialLoad(environment, otherServices); FMLLoader.onInitialLoad(environment, otherServices);
} }
@Override
public void arguments(BiFunction<String, String, OptionSpecBuilder> argumentBuilder) {
}
@Override
public void argumentValues(OptionResult option) {
}
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
@Override @Override
public @NotNull List<ITransformer> transformers() { public @NotNull List<ITransformer> transformers() {
@@ -140,7 +140,7 @@ public class ImmediateWindowHandler {
@Override @Override
public void updateModuleReads(final ModuleLayer layer) { public void updateModuleReads(final ModuleLayer layer) {
var fm = layer.findModule("forge"); var fm = layer.findModule("net.minecraftforge.forge");
if (fm.isPresent()) { if (fm.isPresent()) {
getClass().getModule().addReads(fm.get()); getClass().getModule().addReads(fm.get());
var clz = fm.map(l -> Class.forName(l, "net.minecraftforge.client.loading.NoVizFallback")).orElseThrow(); var clz = fm.map(l -> Class.forName(l, "net.minecraftforge.client.loading.NoVizFallback")).orElseThrow();
@@ -1,28 +0,0 @@
/*
* Copyright (c) Forge Development LLC and contributors
* SPDX-License-Identifier: LGPL-2.1-only
*/
package net.minecraftforge.fml.loading;
import java.nio.file.Files;
import java.nio.file.Path;
public class LibraryFinder {
private static Path libsPath;
static Path findLibsPath() {
if (libsPath == null) {
libsPath = Path.of(System.getProperty("libraryDirectory", "libraries"));
if (!Files.isDirectory(libsPath))
throw new IllegalStateException("Library directory: `" + libsPath + "` does not exist. Set it via the `libraryDirectory` system property.");
}
return libsPath;
}
public static Path findPathForMaven(final String group, final String artifact, final String extension, final String classifier, final String version) {
return findLibsPath().resolve(MavenCoordinateResolver.get(group, artifact, extension, classifier, version));
}
public static Path findPathForMaven(final String maven) {
return findLibsPath().resolve(MavenCoordinateResolver.get(maven));
}
}
@@ -5,31 +5,25 @@
package net.minecraftforge.fml.loading; package net.minecraftforge.fml.loading;
import cpw.mods.modlauncher.api.LamdbaExceptionUtils;
import net.minecraftforge.fml.loading.moddiscovery.BackgroundScanHandler; import net.minecraftforge.fml.loading.moddiscovery.BackgroundScanHandler;
import net.minecraftforge.fml.loading.moddiscovery.ModFile; import net.minecraftforge.fml.loading.moddiscovery.ModFile;
import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo; import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
import net.minecraftforge.fml.loading.moddiscovery.ModInfo; import net.minecraftforge.fml.loading.moddiscovery.ModInfo;
import net.minecraftforge.forgespi.locating.IModFile; import net.minecraftforge.forgespi.locating.IModFile;
import java.net.URL;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Enumeration;
import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.NoSuchElementException;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
* Master list of all mods <em>in the loading context. This class cannot refer outside the * Master list of all mods <em>in the loading context. This class cannot refer outside the
* loading package</em> * loading package</em>
*/ */
public class LoadingModList public class LoadingModList {
{
private static LoadingModList INSTANCE; private static LoadingModList INSTANCE;
private final List<ModFileInfo> modFiles; private final List<ModFileInfo> modFiles;
private final List<ModInfo> sortedList; private final List<ModInfo> sortedList;
@@ -37,15 +31,14 @@ public class LoadingModList
private final List<EarlyLoadingException> preLoadErrors; private final List<EarlyLoadingException> preLoadErrors;
private List<IModFile> brokenFiles; private List<IModFile> brokenFiles;
private LoadingModList(final List<ModFile> modFiles, final List<ModInfo> sortedList) private LoadingModList(final List<ModFile> modFiles, final List<ModInfo> sortedList) {
{
this.modFiles = modFiles.stream() this.modFiles = modFiles.stream()
.map(ModFile::getModFileInfo) .map(ModFile::getModFileInfo)
.map(ModFileInfo.class::cast) .map(ModFileInfo.class::cast)
.collect(Collectors.toList()); .toList();
this.sortedList = sortedList.stream() this.sortedList = sortedList.stream()
.map(ModInfo.class::cast) .map(ModInfo.class::cast)
.collect(Collectors.toList()); .toList();
this.fileById = this.modFiles.stream() this.fileById = this.modFiles.stream()
.map(ModFileInfo::getMods) .map(ModFileInfo::getMods)
.flatMap(Collection::stream) .flatMap(Collection::stream)
@@ -54,21 +47,18 @@ public class LoadingModList
this.preLoadErrors = new ArrayList<>(); this.preLoadErrors = new ArrayList<>();
} }
public static LoadingModList of(List<ModFile> modFiles, List<ModInfo> sortedList, final EarlyLoadingException earlyLoadingException) public static LoadingModList of(List<ModFile> modFiles, List<ModInfo> sortedList, final EarlyLoadingException earlyLoadingException) {
{
INSTANCE = new LoadingModList(modFiles, sortedList); INSTANCE = new LoadingModList(modFiles, sortedList);
if (earlyLoadingException != null) if (earlyLoadingException != null)
{
INSTANCE.preLoadErrors.add(earlyLoadingException); INSTANCE.preLoadErrors.add(earlyLoadingException);
}
return INSTANCE; return INSTANCE;
} }
public static LoadingModList get() { public static LoadingModList get() {
return INSTANCE; return INSTANCE;
} }
public void addCoreMods()
{ public void addCoreMods() {
modFiles.stream() modFiles.stream()
.map(ModFileInfo::getFile) .map(ModFileInfo::getFile)
.map(ModFile::getCoreMods) .map(ModFile::getCoreMods)
@@ -76,28 +66,28 @@ public class LoadingModList
.forEach(FMLLoader.getCoreModProvider()::addCoreMod); .forEach(FMLLoader.getCoreModProvider()::addCoreMod);
} }
public void addAccessTransformers() public void addAccessTransformers() {
{ for (ModFileInfo modFile : modFiles) {
modFiles.stream() ModFile mod = modFile.getFile();
.map(ModFileInfo::getFile) var at = mod.getAccessTransformer().orElse(null);
.forEach(mod -> mod.getAccessTransformer().ifPresent(path -> FMLLoader.addAccessTransformer(path, mod))); if (at != null) {
FMLLoader.addAccessTransformer(at, mod);
}
}
} }
public void addForScanning(BackgroundScanHandler backgroundScanHandler) public void addForScanning(BackgroundScanHandler backgroundScanHandler) {
{
backgroundScanHandler.setLoadingModList(this); backgroundScanHandler.setLoadingModList(this);
modFiles.stream() modFiles.stream()
.map(ModFileInfo::getFile) .map(ModFileInfo::getFile)
.forEach(backgroundScanHandler::submitForScanning); .forEach(backgroundScanHandler::submitForScanning);
} }
public List<ModFileInfo> getModFiles() public List<ModFileInfo> getModFiles() {
{
return modFiles; return modFiles;
} }
public Path findResource(final String className) public Path findResource(final String className) {
{
for (ModFileInfo mf : modFiles) { for (ModFileInfo mf : modFiles) {
final Path resource = mf.getFile().findResource(className); final Path resource = mf.getFile().findResource(className);
if (Files.exists(resource)) return resource; if (Files.exists(resource)) return resource;
@@ -105,55 +95,11 @@ public class LoadingModList
return null; return null;
} }
public Enumeration<URL> findAllURLsForResource(final String resName) { public ModFileInfo getModFileById(String modid) {
final String resourceName;
// strip a leading slash
if (resName.startsWith("/")) {
resourceName = resName.substring(1);
} else {
resourceName = resName;
}
return new Enumeration<URL>() {
private final Iterator<ModFileInfo> modFileIterator = modFiles.iterator();
private URL next;
@Override
public boolean hasMoreElements() {
if (next!=null) return true;
next = findNextURL();
return next != null;
}
@Override
public URL nextElement() {
if (next == null) {
next = findNextURL();
if (next == null) throw new NoSuchElementException();
}
URL result = next;
next = null;
return result;
}
private URL findNextURL() {
while (modFileIterator.hasNext()) {
final ModFileInfo next = modFileIterator.next();
final Path resource = next.getFile().findResource(resourceName);
if (Files.exists(resource)) {
return LamdbaExceptionUtils.uncheck(()->new URL("modjar://" + next.getMods().get(0).getModId() + "/" + resourceName));
}
}
return null;
}
};
}
public ModFileInfo getModFileById(String modid)
{
return this.fileById.get(modid); return this.fileById.get(modid);
} }
public List<ModInfo> getMods() public List<ModInfo> getMods() {
{
return this.sortedList; return this.sortedList;
} }
@@ -36,7 +36,7 @@ public class MCPNamingService implements INameMappingService {
@Override @Override
public Map.Entry<String, String> understanding() { public Map.Entry<String, String> understanding() {
return Pair.of("srg", "mcp"); return Map.entry("srg", "mcp");
} }
@Override @Override
@@ -77,7 +77,7 @@ public class MCPNamingService implements INameMappingService {
} }
private static void loadMappings(final String mappingFileName, BiConsumer<String, String> mapStore) { private static void loadMappings(final String mappingFileName, BiConsumer<String, String> mapStore) {
URL path = ClassLoader.getSystemResource(mappingFileName); //We EXPLICITLY go through the SystemClassLoader here because this is dev-time only. And will be on the root classpath. URL path = MCPNamingService.class.getClassLoader().getResource(mappingFileName);
if (path == null) if (path == null)
return; return;
@@ -34,7 +34,7 @@ public class MavenCoordinateResolver {
(!extension.isEmpty() ? "." + extension : ".jar"); (!extension.isEmpty() ? "." + extension : ".jar");
String[] groups = groupId.split("\\."); String[] groups = groupId.split("\\.");
Path result = Paths.get(groups[0]); Path result = Path.of(groups[0]);
for (int i = 1; i < groups.length; i++) { for (int i = 1; i < groups.length; i++) {
result = result.resolve(groups[i]); result = result.resolve(groups[i]);
} }
@@ -10,6 +10,8 @@ import cpw.mods.jarhandling.SecureJar;
import cpw.mods.modlauncher.api.LamdbaExceptionUtils; import cpw.mods.modlauncher.api.LamdbaExceptionUtils;
import cpw.mods.modlauncher.api.NamedPath; import cpw.mods.modlauncher.api.NamedPath;
import cpw.mods.modlauncher.serviceapi.ITransformerDiscoveryService; import cpw.mods.modlauncher.serviceapi.ITransformerDiscoveryService;
import org.jetbrains.annotations.ApiStatus;
import org.slf4j.Logger; import org.slf4j.Logger;
import java.io.IOException; import java.io.IOException;
@@ -20,6 +22,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
@ApiStatus.Internal
public class ModDirTransformerDiscoverer implements ITransformerDiscoveryService { public class ModDirTransformerDiscoverer implements ITransformerDiscoveryService {
private static final Logger LOGGER = LogUtils.getLogger(); private static final Logger LOGGER = LogUtils.getLogger();
private static final Set<String> SERVICES = Set.of( private static final Set<String> SERVICES = Set.of(
@@ -76,4 +79,15 @@ public class ModDirTransformerDiscoverer implements ITransformerDiscoveryService
.filter(SERVICES::contains) .filter(SERVICES::contains)
.forEach(s -> found.add(new NamedPath(s, path))); .forEach(s -> found.add(new NamedPath(s, path)));
} }
public static boolean isServiceProvider(Path path) {
var jar = SecureJar.from(path);
for (var providers : jar.moduleDataProvider().descriptor().provides()) {
if (SERVICES.contains(providers.service()))
return true;
}
return false;
}
} }
@@ -8,7 +8,7 @@ package net.minecraftforge.fml.loading;
import com.google.common.graph.GraphBuilder; import com.google.common.graph.GraphBuilder;
import com.google.common.graph.MutableGraph; import com.google.common.graph.MutableGraph;
import com.mojang.logging.LogUtils; import com.mojang.logging.LogUtils;
import net.minecraftforge.forgespi.language.IModInfo; import net.minecraftforge.forgespi.language.IModInfo.ModVersion;
import net.minecraftforge.fml.loading.EarlyLoadingException.ExceptionData; import net.minecraftforge.fml.loading.EarlyLoadingException.ExceptionData;
import net.minecraftforge.fml.loading.moddiscovery.ModFile; import net.minecraftforge.fml.loading.moddiscovery.ModFile;
import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo; import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
@@ -20,226 +20,250 @@ import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
import org.slf4j.Logger; import org.slf4j.Logger;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collection;
import java.util.Comparator; import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Function;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
import static java.util.stream.Collectors.*;
import static net.minecraftforge.fml.loading.LogMarkers.LOADING; import static net.minecraftforge.fml.loading.LogMarkers.LOADING;
public class ModSorter public class ModSorter {
{
private static final Logger LOGGER = LogUtils.getLogger(); private static final Logger LOGGER = LogUtils.getLogger();
private final UniqueModListBuilder uniqueModListBuilder;
private List<ModFile> modFiles;
private List<ModInfo> sortedList;
private Map<String, IModInfo> modIdNameLookup;
private List<ModFile> systemMods;
private ModSorter(final List<ModFile> modFiles) private record State(List<ModFile> files, List<ModInfo> mods) {}
{
this.uniqueModListBuilder = new UniqueModListBuilder(modFiles); private ModSorter() {}
}
@SuppressWarnings("removal")
public static LoadingModList sort(List<ModFile> mods, final List<ExceptionData> errors) {
State systemMods = detectSystemMods(mods);
List<ModFile> modFiles;
public static LoadingModList sort(List<ModFile> mods, final List<ExceptionData> errors)
{
final ModSorter ms = new ModSorter(mods);
try { try {
ms.buildUniqueList(); modFiles = new UniqueModListBuilder(mods).buildUniqueList().modFiles();
} catch (EarlyLoadingException e) { } catch (EarlyLoadingException e) {
// We cannot build any list with duped mods. We have to abort immediately and report it // We cannot build any list with duped mods. We have to abort immediately and report it
return LoadingModList.of(ms.systemMods, ms.systemMods.stream().map(mf->(ModInfo)mf.getModInfos().get(0)).collect(toList()), e); // Note this will never actually throw an error because the duplicate checks are done in ModDiscovererer before we get to this phase
// So all this is really doing is wasting time.
// But i'm leaving it here until I rewrite all of cpw's mod loading code because its such a clusterfuck.
return LoadingModList.of(systemMods.files(), systemMods.mods(), e);
} }
var named = new HashMap<String, ModInfo>();
for (var file : modFiles) {
for (var info : file.getModInfos())
named.put(info.getModId(), (ModInfo)info);
}
// try and validate dependencies // try and validate dependencies
final List<ExceptionData> failedList = Stream.concat(ms.verifyDependencyVersions().stream(), errors.stream()).toList(); final List<ExceptionData> failedList = Stream.concat(verifyDependencyVersions(modFiles).stream(), errors.stream()).toList();
// if we miss one or the other, we abort now // if we miss one or the other, we abort now
if (!failedList.isEmpty()) { if (!failedList.isEmpty()) {
return LoadingModList.of(ms.systemMods, ms.systemMods.stream().map(mf->(ModInfo)mf.getModInfos().get(0)).collect(toList()), new EarlyLoadingException("failure to validate mod list", null, failedList)); return LoadingModList.of(systemMods.files(), systemMods.mods(), new EarlyLoadingException("failure to validate mod list", null, failedList));
} else { } else {
// Otherwise, lets try and sort the modlist and proceed // Otherwise, lets try and sort the modlist and proceed
EarlyLoadingException earlyLoadingException = null;
try { try {
ms.sort(); var sorted = sort(modFiles, named);
return LoadingModList.of(sorted.files(), sorted.mods(), null);
} catch (EarlyLoadingException e) { } catch (EarlyLoadingException e) {
earlyLoadingException = e; // The only exception that can happen here is a cyclic exception, but fall back to system mods so we can display the nice screen.
return LoadingModList.of(systemMods.files(), systemMods.mods(), e);
} }
return LoadingModList.of(ms.modFiles, ms.sortedList, earlyLoadingException);
} }
} }
private void sort() private static State sort(final List<ModFile> modFiles, final Map<String, ModInfo> named) {
{ final MutableGraph<ModInfo> graph = GraphBuilder.directed().build();
// lambdas are identity based, so sorting them is impossible unless you hold reference to them
final MutableGraph<ModFileInfo> graph = GraphBuilder.directed().build();
AtomicInteger counter = new AtomicInteger();
Map<ModFileInfo, Integer> infos = modFiles.stream()
.map(ModFile::getModFileInfo)
.filter(ModFileInfo.class::isInstance)
.map(ModFileInfo.class::cast)
.collect(toMap(Function.identity(), e -> counter.incrementAndGet()));
infos.keySet().forEach(graph::addNode);
modFiles.stream()
.map(ModFile::getModInfos)
.<IModInfo>mapMulti(Iterable::forEach)
.map(IModInfo::getDependencies)
.<IModInfo.ModVersion>mapMulti(Iterable::forEach)
.forEach(dep -> addDependency(graph, dep));
final List<ModFileInfo> sorted; int counter = 0;
try var infos = new HashMap<ModInfo, Integer>();
{ for (var file : modFiles) {
sorted = TopologicalSort.topologicalSort(graph, Comparator.comparing(infos::get)); if (file.getModFileInfo() instanceof ModFileInfo info) {
} for (var imod : info.getMods()) {
catch (CyclePresentException e) var mod = (ModInfo)imod;
{ infos.put(mod, counter++);
Set<Set<ModFileInfo>> cycles = e.getCycles(); graph.addNode(mod);
if (LOGGER.isErrorEnabled(LOADING)) }
{
LOGGER.error(LOADING, "Mod Sorting failed.\nDetected Cycles: {}\n", cycles);
} }
var dataList = cycles.stream() }
.<ModFileInfo>mapMulti(Iterable::forEach)
.<IModInfo>mapMulti((mf,c)->mf.getMods().forEach(c)) for (var file : modFiles) {
.map(IModInfo::getModId) for (var info : file.getModInfos()) {
.map(list -> new ExceptionData("fml.modloading.cycle", list)) for (var dep : info.getDependencies()) {
.toList(); // Ordering isn't effected by sides, should it be?
//if (!dep.getSide().isCorrectSide())
// continue;
var target = named.get(dep.getModId());
// soft dep that doesn't exist. No edge required.
if (target == null)
continue;
var self = (ModInfo)dep.getOwner();
switch (dep.getOrdering()) {
case BEFORE -> graph.putEdge(self, target);
case AFTER -> graph.putEdge(target, self);
default -> {}
}
}
}
}
final List<ModInfo> sorted;
try {
sorted = TopologicalSort.topologicalSort(graph, Comparator.comparing(infos::get));
} catch (CyclePresentException e) {
Set<Set<ModInfo>> cycles = e.getCycles();
var buf = new StringBuilder();
buf.append("Mod Sorting failed - Detected Cycles: \n");
var dataList = new ArrayList<ExceptionData>();
for (var cycle : cycles) {
buf.append("\tCycle:\n");
for (var mod : cycle) {
var modDeps = new StringBuilder()
.append(mod.getModId())
.append(' ')
.append(mod.getDependencies().stream()
.filter(v -> cycle.stream().anyMatch(m -> m.getModId().equals(v.getModId())))
.map(dep -> dep.getOrdering().name() + " " + dep.getModId())
.collect(Collectors.joining(", "))
);
dataList.add(new ExceptionData("fml.modloading.cycle", modDeps.toString()));
buf.append("\t\tMod: ").append(modDeps.toString()).append('\n');
}
}
LOGGER.error(LOADING, buf.toString());
throw new EarlyLoadingException("Sorting error", e, dataList); throw new EarlyLoadingException("Sorting error", e, dataList);
} }
this.sortedList = sorted.stream()
.map(ModFileInfo::getMods)
.<IModInfo>mapMulti(Iterable::forEach)
.map(ModInfo.class::cast)
.collect(toList());
this.modFiles = sorted.stream()
.map(ModFileInfo::getFile)
.collect(toList());
}
private void addDependency(MutableGraph<ModFileInfo> topoGraph, IModInfo.ModVersion dep) var files = new LinkedHashSet<ModFile>();
{ var list = new ArrayList<ModInfo>();
final ModFileInfo self = (ModFileInfo)dep.getOwner().getOwningFile();
final IModInfo targetModInfo = modIdNameLookup.get(dep.getModId()); for (var mod : sorted) {
// soft dep that doesn't exist. Just return. No edge required. files.add(mod.getOwningFile().getFile());
if (targetModInfo == null || !(targetModInfo.getOwningFile() instanceof final ModFileInfo target)) return; list.add(mod);
if (self == target)
return; // in case a jar has two mods that have dependencies between
switch (dep.getOrdering()) {
case BEFORE -> topoGraph.putEdge(self, target);
case AFTER -> topoGraph.putEdge(target, self);
default -> {}
} }
return new State(files.stream().toList(), list);
} }
private void buildUniqueList() private static State detectSystemMods(final List<ModFile> modFiles) {
{
final UniqueModListBuilder.UniqueModListData uniqueModListData = uniqueModListBuilder.buildUniqueList();
this.modFiles = uniqueModListData.modFiles();
detectSystemMods(uniqueModListData.modFilesByFirstId());
modIdNameLookup = uniqueModListData.modFilesByFirstId().entrySet().stream()
.filter(e -> !e.getValue().get(0).getModInfos().isEmpty())
.collect(Collectors.toMap(
Map.Entry::getKey,
e -> e.getValue().get(0).getModInfos().get(0)
));
}
private void detectSystemMods(final Map<String, List<ModFile>> modFilesByFirstId) {
// Capture system mods (ex. MC, Forge) here, so we can keep them for later // Capture system mods (ex. MC, Forge) here, so we can keep them for later
var systemMods = List.of("minecraft", "forge"); var systemMods = List.of("minecraft", "forge");
LOGGER.debug("Configured system mods: {}", systemMods); LOGGER.debug("Configured system mods: {}", systemMods);
this.systemMods = new ArrayList<>(); var mods = new ArrayList<ModInfo>();
var files = new ArrayList<ModFile>();
for (var systemMod : systemMods) { for (var systemMod : systemMods) {
var container = modFilesByFirstId.get(systemMod); var mod = findMod(modFiles, systemMod);
if (container != null && !container.isEmpty()) { if (mod == null)
LOGGER.debug("Found system mod: {}", systemMod);
this.systemMods.add((ModFile) container.get(0));
} else {
throw new IllegalStateException("Failed to find system mod: " + systemMod); throw new IllegalStateException("Failed to find system mod: " + systemMod);
}
LOGGER.debug("Found system mod: {}", systemMod);
mods.add(mod.info());
files.add(mod.file());
} }
return new State(files, mods);
} }
private List<EarlyLoadingException.ExceptionData> verifyDependencyVersions() private record ModPair(ModFile file, ModInfo info) {}
{ private static ModPair findMod(final List<ModFile> modFiles, String name) {
final var modVersions = modFiles.stream() for (var file : modFiles) {
.map(ModFile::getModInfos) for (var mod : file.getModFileInfo().getMods()) {
.<IModInfo>mapMulti(Iterable::forEach) if (name.equals(mod.getModId()))
.collect(toMap(IModInfo::getModId, IModInfo::getVersion)); return new ModPair(file, (ModInfo)mod);
}
}
return null;
}
final var modVersionDependencies = modFiles.stream() private static List<ExceptionData> verifyDependencyVersions(final List<ModFile> files) {
.map(ModFile::getModInfos) final var modVersions = new HashMap<String, ArtifactVersion>();
.<IModInfo>mapMulti(Iterable::forEach) final var modRequirements = new HashSet<ModVersion>();
.collect(groupingBy(Function.identity(), flatMapping(e -> e.getDependencies().stream(), toList()))); int mandatoryRequired = 0;
final var modRequirements = modVersionDependencies.values().stream() for (var file : files) {
.<IModInfo.ModVersion>mapMulti(Iterable::forEach) for (var info : file.getModInfos()) {
.filter(mv -> mv.getSide().isCorrectSide()) modVersions.put(info.getModId(), info.getVersion());
.collect(toSet()); for (var dep : info.getDependencies()) {
if (dep.getSide().isCorrectSide()) {
if (modRequirements.add(dep) && dep.isMandatory())
mandatoryRequired++;
}
}
}
}
final long mandatoryRequired = modRequirements.stream().filter(IModInfo.ModVersion::isMandatory).count();
LOGGER.debug(LOADING, "Found {} mod requirements ({} mandatory, {} optional)", modRequirements.size(), mandatoryRequired, modRequirements.size() - mandatoryRequired); LOGGER.debug(LOADING, "Found {} mod requirements ({} mandatory, {} optional)", modRequirements.size(), mandatoryRequired, modRequirements.size() - mandatoryRequired);
final var missingVersions = modRequirements.stream()
.filter(mv -> (mv.isMandatory() || modVersions.containsKey(mv.getModId())) && this.modVersionNotContained(mv, modVersions))
.collect(toSet());
final long mandatoryMissing = missingVersions.stream().filter(IModInfo.ModVersion::isMandatory).count();
LOGGER.debug(LOADING, "Found {} mod requirements missing ({} mandatory, {} optional)", missingVersions.size(), mandatoryMissing, missingVersions.size() - mandatoryMissing);
if (!missingVersions.isEmpty()) { final var missingMandatory = new HashSet<ModVersion>();
if (mandatoryMissing > 0) { final var missingOptional = new HashSet<ModVersion>();
LOGGER.error(
LOADING,
"Missing or unsupported mandatory dependencies:\n{}",
missingVersions.stream()
.filter(IModInfo.ModVersion::isMandatory)
.map(ver -> formatDependencyError(ver, modVersions))
.collect(Collectors.joining("\n"))
);
}
if (missingVersions.size() - mandatoryMissing > 0) {
LOGGER.error(
LOADING,
"Unsupported installed optional dependencies:\n{}",
missingVersions.stream()
.filter(ver -> !ver.isMandatory())
.map(ver -> formatDependencyError(ver, modVersions))
.collect(Collectors.joining("\n"))
);
}
return missingVersions.stream() for (var dep : modRequirements) {
.map(mv -> new ExceptionData(mv.isMandatory() ? "fml.modloading.missingdependency" : "fml.modloading.missingdependency.optional", var modId = dep.getModId();
mv.getOwner(), mv.getModId(), mv.getOwner().getModId(), mv.getVersionRange(), var existing = modVersions.get(modId);
modVersions.getOrDefault(mv.getModId(), new DefaultArtifactVersion("null"))))
.toList(); if (!dep.isMandatory() && existing == null)
continue;
var range = dep.getVersionRange();
if (existing != null && (range.containsVersion(existing) || "0.0NONE".equals(existing.toString())))
continue;
if (!VersionSupportMatrix.testVersionSupportMatrix(range, modId, "mod"))
(dep.isMandatory() ? missingMandatory : missingOptional).add(dep);
} }
return Collections.emptyList();
LOGGER.debug(LOADING, "Found {} mod requirements missing ({} mandatory, {} optional)", missingMandatory.size() + missingOptional.size(), missingMandatory.size(), missingOptional.size());
var ret = new ArrayList<ExceptionData>();
if (!missingMandatory.isEmpty()) {
LOGGER.error(LOADING, "Missing or unsupported mandatory dependencies:\n{}", formatDependencyError(missingMandatory, modVersions));
for (var mv : missingMandatory)
ret.add(data(mv, modVersions, "fml.modloading.missingdependency"));
}
if (!missingOptional.isEmpty()) {
LOGGER.error(LOADING, "Unsupported installed optional dependencies:\n{}", formatDependencyError(missingMandatory, modVersions));
for (var mv : missingMandatory)
ret.add(data(mv, modVersions, "fml.modloading.missingdependency.optional"));
}
return ret;
} }
private static String formatDependencyError(IModInfo.ModVersion dependency, Map<String, ArtifactVersion> modVersions) private static String formatDependencyError(Collection<ModVersion> missing, Map<String, ArtifactVersion> modVersions) {
{ var ret = new ArrayList<String>();
ArtifactVersion installed = modVersions.get(dependency.getModId()); for (var dep : missing) {
return String.format( var installed = modVersions.get(dep.getModId());
ret.add(String.format(
"\tMod ID: '%s', Requested by: '%s', Expected range: '%s', Actual version: '%s'", "\tMod ID: '%s', Requested by: '%s', Expected range: '%s', Actual version: '%s'",
dependency.getModId(), dep.getModId(),
dependency.getOwner().getModId(), dep.getOwner().getModId(),
dependency.getVersionRange(), dep.getVersionRange(),
installed != null ? installed.toString() : "[MISSING]" installed != null ? installed.toString() : "[MISSING]"
); ));
}
return String.join("\n", ret);
} }
private boolean modVersionNotContained(final IModInfo.ModVersion mv, final Map<String, ArtifactVersion> modVersions) private static final ArtifactVersion NULL_VERSION = new DefaultArtifactVersion("null");
{ private static ExceptionData data(ModVersion mv, Map<String, ArtifactVersion> modVersions, String key) {
return !(VersionSupportMatrix.testVersionSupportMatrix(mv.getVersionRange(), mv.getModId(), "mod", (modId, range) -> modVersions.containsKey(modId) && return new ExceptionData(key, mv.getOwner(), mv.getModId(), mv.getOwner().getModId(), mv.getVersionRange(), modVersions.getOrDefault(mv.getModId(), NULL_VERSION));
(range.containsVersion(modVersions.get(modId)) || modVersions.get(modId).toString().equals("0.0NONE"))));
} }
} }
@@ -8,14 +8,8 @@ package net.minecraftforge.fml.loading;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.EnumSet; import java.util.EnumSet;
import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Objects;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.stream.Collectors;
import com.google.common.collect.Streams;
import com.mojang.logging.LogUtils; import com.mojang.logging.LogUtils;
import cpw.mods.modlauncher.serviceapi.ILaunchPluginService; import cpw.mods.modlauncher.serviceapi.ILaunchPluginService;
import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.Dist;
@@ -28,138 +22,177 @@ import org.objectweb.asm.Type;
import org.objectweb.asm.tree.AbstractInsnNode; import org.objectweb.asm.tree.AbstractInsnNode;
import org.objectweb.asm.tree.AnnotationNode; import org.objectweb.asm.tree.AnnotationNode;
import org.objectweb.asm.tree.ClassNode; import org.objectweb.asm.tree.ClassNode;
import org.objectweb.asm.tree.FieldNode;
import org.objectweb.asm.tree.MethodNode; import org.objectweb.asm.tree.MethodNode;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.Marker; import org.slf4j.Marker;
import org.slf4j.MarkerFactory; import org.slf4j.MarkerFactory;
public class RuntimeDistCleaner implements ILaunchPluginService public class RuntimeDistCleaner implements ILaunchPluginService {
{
private static final Logger LOGGER = LogUtils.getLogger(); private static final Logger LOGGER = LogUtils.getLogger();
private static final Marker DISTXFORM = MarkerFactory.getMarker("DISTXFORM"); private static final Marker DISTXFORM = MarkerFactory.getMarker("DISTXFORM");
private static String DIST; private static String DIST;
private static final String ONLYIN = Type.getDescriptor(OnlyIn.class); private static final String ONLYIN = Type.getDescriptor(OnlyIn.class);
private static final String ONLYINS = Type.getDescriptor(OnlyIns.class); private static final String ONLYINS = Type.getDescriptor(OnlyIns.class);
private static final String MOD = "Lnet/minecraftforge/fml/common/Mod;";
@Override @Override
public String name() public String name() {
{
return "runtimedistcleaner"; return "runtimedistcleaner";
} }
@Override @Override
public int processClassWithFlags(final Phase phase, final ClassNode classNode, final Type classType, final String reason) public int processClassWithFlags(final Phase phase, final ClassNode classNode, final Type classType, final String reason) {
{ var changed = false;
AtomicBoolean changes = new AtomicBoolean();
if (remove(classNode.visibleAnnotations, DIST)) var annotations = unpack(classNode.visibleAnnotations);
{
if (remove(annotations, DIST)) {
LOGGER.error(DISTXFORM, "Attempted to load class {} for invalid dist {}", classNode.name, DIST); LOGGER.error(DISTXFORM, "Attempted to load class {} for invalid dist {}", classNode.name, DIST);
throw new RuntimeException("Attempted to load class "+ classNode.name + " for invalid dist "+ DIST); throw new RuntimeException("Attempted to load class "+ classNode.name + " for invalid dist "+ DIST);
} }
if (classNode.interfaces != null ) if (!FMLEnvironment.production && !annotations.isEmpty() && hasModAnnotation(classNode.visibleAnnotations)) {
{ LOGGER.error(DISTXFORM, "Attempted to load class {} with @Mod and @OnlyIn/@OnlyIns annotations", classNode.name);
unpack(classNode.visibleAnnotations).stream() throw new RuntimeException("Found @OnlyIn on @Mod class "+ classNode.name + " - this is not allowed as it causes crashes. Remove the OnlyIn and consider setting clientSideOnly=true in the root of your mods.toml instead");
.filter(ann->Objects.equals(ann.desc, ONLYIN)) }
.filter(ann->ann.values.indexOf("_interface") != -1)
.filter(ann->!Objects.equals(((String[])ann.values.get(ann.values.indexOf("value") + 1))[1], DIST)) if (classNode.interfaces != null && !classNode.interfaces.isEmpty()) {
.map(ann -> ((Type)ann.values.get(ann.values.indexOf("_interface") + 1)).getInternalName()) for (var ann : annotations) {
.forEach(intf -> { if (ann.intf == null || DIST.equals(ann.side))
if (classNode.interfaces.remove(intf)) { continue;
LOGGER.debug(DISTXFORM,"Removing Interface: {} implements {}", classNode.name, intf);
changes.compareAndSet(false, true); if (classNode.interfaces.remove(ann.intf)) {
} LOGGER.debug(DISTXFORM,"Removing Interface: {} implements {}", classNode.name, ann.intf);
}); changed = true;
}
}
//Remove Class level @OnlyIn/@OnlyIns annotations, this is important if anyone gets ambitious and tries to reflect an annotation with _interface set. //Remove Class level @OnlyIn/@OnlyIns annotations, this is important if anyone gets ambitious and tries to reflect an annotation with _interface set.
if (classNode.visibleAnnotations != null) { if (classNode.visibleAnnotations != null) {
Iterator<AnnotationNode> itr = classNode.visibleAnnotations.iterator(); for (var itr = classNode.visibleAnnotations.iterator(); itr.hasNext(); ) {
while (itr.hasNext()) { var ann = itr.next();
AnnotationNode ann = itr.next(); if (ONLYIN.equals(ann.desc) || ONLYINS.equals(ann.desc)) {
if (Objects.equals(ann.desc, ONLYIN) || Objects.equals(ann.desc, ONLYINS)) { LOGGER.debug(DISTXFORM, "Removing Class Annotation: {} @{}", classNode.name, ann.desc);
LOGGER.debug(DISTXFORM,"Removing Class Annotation: {} @{}", classNode.name, ann.desc);
itr.remove(); itr.remove();
changes.compareAndSet(false, true); changed = true;
} }
} }
} }
} }
Iterator<FieldNode> fields = classNode.fields.iterator(); for (var itr = classNode.fields.iterator(); itr.hasNext(); ) {
while(fields.hasNext()) var field = itr.next();
{ if (remove(unpack(field.visibleAnnotations), DIST)) {
FieldNode field = fields.next(); LOGGER.debug(DISTXFORM, "Removing field: {}.{}", classNode.name, field.name);
if (remove(field.visibleAnnotations, DIST)) itr.remove();
{ changed = true;
LOGGER.debug(DISTXFORM,"Removing field: {}.{}", classNode.name, field.name);
fields.remove();
changes.compareAndSet(false, true);
} }
} }
LambdaGatherer lambdaGatherer = new LambdaGatherer(); var lambdaGatherer = new LambdaGatherer();
Iterator<MethodNode> methods = classNode.methods.iterator(); for (var itr = classNode.methods.iterator(); itr.hasNext(); ) {
while(methods.hasNext()) var method = itr.next();
{ if (remove(unpack(method.visibleAnnotations), DIST)) {
MethodNode method = methods.next(); LOGGER.debug(DISTXFORM, "Removing method: {}.{}{}", classNode.name, method.name, method.desc);
if (remove(method.visibleAnnotations, DIST)) itr.remove();
{
LOGGER.debug(DISTXFORM,"Removing method: {}.{}{}", classNode.name, method.name, method.desc);
methods.remove();
lambdaGatherer.accept(method); lambdaGatherer.accept(method);
changes.compareAndSet(false, true); changed = true;
} }
} }
// remove dynamic synthetic lambda methods that are inside of removed methods // remove dynamic synthetic lambda methods that are inside of removed methods
for (List<Handle> dynamicLambdaHandles = lambdaGatherer.getDynamicLambdaHandles(); for (List<Handle> handles = lambdaGatherer.getDynamicLambdaHandles();
!dynamicLambdaHandles.isEmpty(); dynamicLambdaHandles = lambdaGatherer.getDynamicLambdaHandles()) !handles.isEmpty(); handles = lambdaGatherer.getDynamicLambdaHandles()) {
{
lambdaGatherer = new LambdaGatherer(); lambdaGatherer = new LambdaGatherer();
methods = classNode.methods.iterator(); for (var itr = classNode.methods.iterator(); itr.hasNext(); ) {
while (methods.hasNext()) MethodNode method = itr.next();
{ if ((method.access & Opcodes.ACC_SYNTHETIC) == 0)
MethodNode method = methods.next(); continue;
if ((method.access & Opcodes.ACC_SYNTHETIC) == 0) continue;
for (Handle dynamicLambdaHandle : dynamicLambdaHandles) for (var handle : handles) {
{ if (method.name.equals(handle.getName()) && method.desc.equals(handle.getDesc())) {
if (method.name.equals(dynamicLambdaHandle.getName()) && method.desc.equals(dynamicLambdaHandle.getDesc())) LOGGER.debug(DISTXFORM, "Removing lambda method: {}.{}{}", classNode.name, method.name, method.desc);
{ itr.remove();
LOGGER.debug(DISTXFORM,"Removing lambda method: {}.{}{}", classNode.name, method.name, method.desc);
methods.remove();
lambdaGatherer.accept(method); lambdaGatherer.accept(method);
changes.compareAndSet(false, true); changed = true;
} }
} }
} }
} }
return changes.get() ? ComputeFlags.SIMPLE_REWRITE : ComputeFlags.NO_REWRITE;
return changed ? ComputeFlags.SIMPLE_REWRITE : ComputeFlags.NO_REWRITE;
} }
private static record Target(String side, String intf) {
static Target from(final AnnotationNode node) {
var idx = node.values.indexOf("value");
var value = (String[])node.values.get(idx + 1); // Enums are stored as [Type, Value]
idx = node.values.indexOf("_interface");
if (idx == -1)
return new Target(value[1], null);
var intf = (Type)node.values.get(idx + 1);
return new Target(value[1], intf.getInternalName());
}
}
/**
* Unpack any OnlyIn or OnlyIns annotations to Target objects.
*/
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
private static List<AnnotationNode> unpack(final List<AnnotationNode> anns) { private static List<Target> unpack(final List<AnnotationNode> anns) {
if (anns == null) return Collections.emptyList(); if (anns == null || anns.isEmpty())
List<AnnotationNode> ret = anns.stream().filter(ann->Objects.equals(ann.desc, ONLYIN)).collect(Collectors.toList()); return Collections.emptyList();
anns.stream().filter(ann->Objects.equals(ann.desc, ONLYINS) && ann.values != null)
.map( ann -> (List<AnnotationNode>)ann.values.get(ann.values.indexOf("value") + 1)) var ret = new ArrayList<Target>();
.filter(v -> v != null) for (var node : anns) {
.forEach(v -> v.forEach(ret::add)); if (ONLYIN.equals(node.desc))
ret.add(Target.from(node));
else if (ONLYINS.equals(node.desc)) {
if (node.values == null || node.values.isEmpty())
continue;
int idx = node.values.indexOf("value");
if (idx == -1)
continue;
var subNodes = (List<AnnotationNode>)node.values.get(idx + 1);
if (subNodes != null) {
for (var sub : subNodes)
ret.add(Target.from(sub));
}
}
}
return ret; return ret;
} }
private boolean remove(final List<AnnotationNode> anns, final String side) private static boolean remove(final List<Target> targets, final String side) {
{ for (var target : targets) {
return unpack(anns).stream(). if (target.intf == null && !side.equals(target.side))
filter(ann->Objects.equals(ann.desc, ONLYIN)). return true;
filter(ann->ann.values.indexOf("_interface") == -1). }
anyMatch(ann -> !Objects.equals(((String[])ann.values.get(ann.values.indexOf("value")+1))[1], side));
return false;
}
private static boolean hasModAnnotation(final List<AnnotationNode> anns) {
if (anns == null || anns.isEmpty())
return false;
for (var ann : anns) {
if (ann.desc.equals(MOD))
return true;
}
return false;
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Override @Override
public Consumer<Dist> getExtension() public Consumer<Dist> getExtension() {
{ return s -> {
return (s)-> {
DIST = s.name(); DIST = s.name();
LOGGER.debug(DISTXFORM, "Configuring for Dist {}", DIST); LOGGER.debug(DISTXFORM, "Configuring for Dist {}", DIST);
}; };
@@ -169,9 +202,15 @@ public class RuntimeDistCleaner implements ILaunchPluginService
private static final EnumSet<Phase> NAY = EnumSet.noneOf(Phase.class); private static final EnumSet<Phase> NAY = EnumSet.noneOf(Phase.class);
@Override @Override
public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty) public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty) {
{ if (isEmpty)
return isEmpty ? NAY : YAY; return NAY;
String internalName = classType.getInternalName();
if (internalName.startsWith("net/minecraftforge/"))
return NAY;
return YAY;
} }
private static class LambdaGatherer extends MethodVisitor { private static class LambdaGatherer extends MethodVisitor {
@@ -186,23 +225,21 @@ public class RuntimeDistCleaner implements ILaunchPluginService
} }
public void accept(MethodNode method) { public void accept(MethodNode method) {
Streams.stream(method.instructions.iterator()). for (var insn : method.instructions) {
filter(insnNode->insnNode.getType() == AbstractInsnNode.INVOKE_DYNAMIC_INSN). if (insn.getType() == AbstractInsnNode.INVOKE_DYNAMIC_INSN)
forEach(insnNode->insnNode.accept(this)); insn.accept(this);
}
@Override
public void visitInvokeDynamicInsn(String name, String desc, Handle bsm, Object... bsmArgs)
{
if (META_FACTORY.equals(bsm))
{
Handle dynamicLambdaHandle = (Handle) bsmArgs[1];
dynamicLambdaHandles.add(dynamicLambdaHandle);
} }
} }
public List<Handle> getDynamicLambdaHandles() @Override
{ public void visitInvokeDynamicInsn(String name, String desc, Handle bsm, Object... bsmArgs) {
if (META_FACTORY.equals(bsm)) {
var handle = (Handle)bsmArgs[1];
dynamicLambdaHandles.add(handle);
}
}
public List<Handle> getDynamicLambdaHandles() {
return dynamicLambdaHandles; return dynamicLambdaHandles;
} }
} }
@@ -14,16 +14,17 @@ import org.apache.commons.lang3.text.StrSubstitutor;
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
public class StringSubstitutor { public class StringSubstitutor {
private static final Map<String, String> GLOBALS = Map.of(
"mcVersion", FMLLoader.versionInfo().mcVersion(),
"forgeVersion", FMLLoader.versionInfo().forgeVersion()
);
public static String replace(final String in, final ModFile file) { public static String replace(final String in, final ModFile file) {
return new StrSubstitutor(getStringLookup(file)).replace(in); return new StrSubstitutor(getStringLookup(file)).replace(in);
} }
private static StrLookup<String> getStringLookup(final ModFile file) { private static StrLookup<String> getStringLookup(final ModFile file) {
var globals = Map.of( return new StrLookup<>() {
"mcVersion", FMLLoader.versionInfo().mcVersion(),
"forgeVersion", FMLLoader.versionInfo().forgeVersion()
);
return new StrLookup<String>() {
@Override @Override
public String lookup(String key) { public String lookup(String key) {
var parts = key.split("\\."); var parts = key.split("\\.");
@@ -32,7 +33,7 @@ public class StringSubstitutor {
var pfx = parts[0]; var pfx = parts[0];
if ("global".equals(pfx)) if ("global".equals(pfx))
return globals.get(parts[1]); return GLOBALS.get(parts[1]);
else if ("file".equals(pfx) && file != null) else if ("file".equals(pfx) && file != null)
return String.valueOf(file.getSubstitutionMap().get().get(parts[1])); return String.valueOf(file.getSubstitutionMap().get().get(parts[1]));
@@ -9,6 +9,7 @@ import com.mojang.logging.LogUtils;
import net.minecraftforge.fml.loading.moddiscovery.ModFile; import net.minecraftforge.fml.loading.moddiscovery.ModFile;
import net.minecraftforge.forgespi.language.IModInfo; import net.minecraftforge.forgespi.language.IModInfo;
import org.apache.maven.artifact.versioning.ArtifactVersion; import org.apache.maven.artifact.versioning.ArtifactVersion;
import org.jetbrains.annotations.ApiStatus;
import org.slf4j.Logger; import org.slf4j.Logger;
import java.util.ArrayList; import java.util.ArrayList;
@@ -23,16 +24,18 @@ import static java.util.stream.Collectors.groupingBy;
import static java.util.stream.Collectors.joining; import static java.util.stream.Collectors.joining;
import static net.minecraftforge.fml.loading.LogMarkers.LOADING; import static net.minecraftforge.fml.loading.LogMarkers.LOADING;
public class UniqueModListBuilder @ApiStatus.Internal
{ @Deprecated(since = "1.21.3", forRemoval = true) // TODO: [FML][Loading] Convert to package private in 1.22
public class UniqueModListBuilder {
private final static Logger LOGGER = LogUtils.getLogger(); private final static Logger LOGGER = LogUtils.getLogger();
private final List<ModFile> modFiles; private final List<ModFile> modFiles;
public UniqueModListBuilder(final List<ModFile> modFiles) {this.modFiles = modFiles;} public UniqueModListBuilder(final List<ModFile> modFiles) {
this.modFiles = modFiles;
}
public UniqueModListData buildUniqueList() public UniqueModListData buildUniqueList() {
{
List<ModFile> uniqueModList; List<ModFile> uniqueModList;
List<ModFile> uniqueLibListWithVersion; List<ModFile> uniqueLibListWithVersion;
@@ -47,12 +50,12 @@ public class UniqueModListBuilder
// Select the newest by artifact version sorting of non-unique files thus identified // Select the newest by artifact version sorting of non-unique files thus identified
uniqueModList = modFilesByFirstId.entrySet().stream() uniqueModList = modFilesByFirstId.entrySet().stream()
.map(this::selectNewestModInfo) .map(UniqueModListBuilder::selectNewestModInfo)
.toList(); .toList();
// Select the newest by artifact version sorting of non-unique files thus identified // Select the newest by artifact version sorting of non-unique files thus identified
uniqueLibListWithVersion = libFilesWithVersionByModuleName.entrySet().stream() uniqueLibListWithVersion = libFilesWithVersionByModuleName.entrySet().stream()
.map(this::selectNewestModInfo) .map(UniqueModListBuilder::selectNewestModInfo)
.toList(); .toList();
// Transform to the full mod id list // Transform to the full mod id list
@@ -75,7 +78,7 @@ public class UniqueModListBuilder
final List<String> dupedModErrors = modIds.values().stream() final List<String> dupedModErrors = modIds.values().stream()
.filter(modInfos -> modInfos.size() > 1) .filter(modInfos -> modInfos.size() > 1)
.map(mods -> String.format("\tMod ID: '%s' from mod files: %s", .map(mods -> String.format("\tMod ID: '%s' from mod files: %s",
mods.get(0).getModId(), mods.getFirst().getModId(),
mods.stream() mods.stream()
.map(modInfo -> modInfo.getOwningFile().getFile().getFileName()).collect(joining(", ")) .map(modInfo -> modInfo.getOwningFile().getFile().getFileName()).collect(joining(", "))
)).toList(); )).toList();
@@ -91,9 +94,8 @@ public class UniqueModListBuilder
final List<String> dupedLibErrors = versionedLibIds.values().stream() final List<String> dupedLibErrors = versionedLibIds.values().stream()
.filter(modFiles -> modFiles.size() > 1) .filter(modFiles -> modFiles.size() > 1)
.map(mods -> String.format("\tLibrary: '%s' from files: %s", .map(mods -> String.format("\tLibrary: '%s' from files: %s",
getModId(mods.get(0)), getModId(mods.getFirst()),
mods.stream() mods.stream().map(ModFile::getFileName).collect(joining(", "))
.map(modFile -> modFile.getFileName()).collect(joining(", "))
)).toList(); )).toList();
if (!dupedLibErrors.isEmpty()) { if (!dupedLibErrors.isEmpty()) {
@@ -107,25 +109,23 @@ public class UniqueModListBuilder
final Map<String, List<ModFile>> uniqueModFilesByFirstId = uniqueModList.stream() final Map<String, List<ModFile>> uniqueModFilesByFirstId = uniqueModList.stream()
.collect(groupingBy(UniqueModListBuilder::getModId)); .collect(groupingBy(UniqueModListBuilder::getModId));
final List<ModFile> loadedList = new ArrayList<>(); final List<ModFile> loadedList = new ArrayList<>(uniqueModList);
loadedList.addAll(uniqueModList);
loadedList.addAll(uniqueLibListWithVersion); loadedList.addAll(uniqueLibListWithVersion);
return new UniqueModListData(loadedList, uniqueModFilesByFirstId); return new UniqueModListData(loadedList, uniqueModFilesByFirstId);
} }
private ModFile selectNewestModInfo(Map.Entry<String, List<ModFile>> fullList) { private static ModFile selectNewestModInfo(Map.Entry<String, List<ModFile>> fullList) {
List<ModFile> modInfoList = fullList.getValue(); List<ModFile> modInfoList = fullList.getValue();
if (modInfoList.size() > 1) { if (modInfoList.size() > 1) {
LOGGER.debug("Found {} mods for first modid {}, selecting most recent based on version data", modInfoList.size(), fullList.getKey()); LOGGER.debug("Found {} mods for first modid {}, selecting most recent based on version data", modInfoList.size(), fullList.getKey());
modInfoList.sort(Comparator.comparing(this::getVersion).reversed()); modInfoList.sort(Comparator.comparing(UniqueModListBuilder::getVersion).reversed());
LOGGER.debug("Selected file {} for modid {} with version {}", modInfoList.get(0).getFileName(), fullList.getKey(), this.getVersion(modInfoList.get(0))); LOGGER.debug("Selected file {} for modid {} with version {}", modInfoList.getFirst().getFileName(), fullList.getKey(), getVersion(modInfoList.getFirst()));
} }
return modInfoList.get(0); return modInfoList.get(0);
} }
private ArtifactVersion getVersion(final ModFile mf) private static ArtifactVersion getVersion(final ModFile mf) {
{
if (mf.getModFileInfo() == null || mf.getModInfos() == null || mf.getModInfos().isEmpty()) { if (mf.getModFileInfo() == null || mf.getModInfos() == null || mf.getModInfos().isEmpty()) {
return mf.getJarVersion(); return mf.getJarVersion();
} }
@@ -138,9 +138,8 @@ public class UniqueModListBuilder
return modFile.getSecureJar().name(); return modFile.getSecureJar().name();
} }
return modFile.getModFileInfo().moduleName(); return modFile.getModFileInfo().getMods().get(0).getModId();
} }
public record UniqueModListData(List<ModFile> modFiles, Map<String, List<ModFile>> modFilesByFirstId) {} public record UniqueModListData(List<ModFile> modFiles, Map<String, List<ModFile>> modFilesByFirstId) {}
} }
@@ -25,7 +25,7 @@ public record VersionInfo(String forgeVersion, String mcVersion, String mcpVersi
/*==========================================================================* /*==========================================================================*
* INTERNAL SHIT * * INTERNAL SHIT *
*==========================================================================*/ *==========================================================================*/
private static Gson GSON = new GsonBuilder().create(); private static final Gson GSON = new GsonBuilder().create();
private static <T> T readJson(String path, Class<T> type) { private static <T> T readJson(String path, Class<T> type) {
try (var is = VersionInfo.class.getResourceAsStream(path)) { try (var is = VersionInfo.class.getResourceAsStream(path)) {
if (is == null) if (is == null)
@@ -5,33 +5,53 @@
package net.minecraftforge.fml.loading; package net.minecraftforge.fml.loading;
import net.minecraftforge.forgespi.language.MavenVersionAdapter;
import org.apache.maven.artifact.versioning.ArtifactVersion; import org.apache.maven.artifact.versioning.ArtifactVersion;
import org.apache.maven.artifact.versioning.DefaultArtifactVersion; import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
import org.apache.maven.artifact.versioning.VersionRange; import org.apache.maven.artifact.versioning.VersionRange;
import org.jetbrains.annotations.ApiStatus;
import java.util.ArrayList; import java.util.Collections;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.function.BiPredicate; import java.util.function.BiPredicate;
@ApiStatus.Internal // since 1.21.1, will be made non-public in a later MC version
public class VersionSupportMatrix { public class VersionSupportMatrix {
private static final HashMap<String, List<ArtifactVersion>> overrideVersions = new HashMap<>(); private static final Map<String, List<ArtifactVersion>> OVERRIDE_VERSIONS;
static { static {
final ArtifactVersion version = new DefaultArtifactVersion(FMLLoader.versionInfo().mcVersion()); if ("1.21.1".equals(FMLLoader.versionInfo().mcVersion())) {
if (MavenVersionAdapter.createFromVersionSpec("[1.19.2]").containsVersion(version)) { OVERRIDE_VERSIONS = Map.ofEntries(
// 1.19.2 is Compatible with 1.19.1 // 1.21.1 is compatible with 1.21
add("languageloader.javafml", "42"); entry("languageloader.javafml", "51"),
add("mod.minecraft", "1.19.1"); entry("mod.minecraft", "1.21"),
add("mod.forge", "42.0.9"); entry("mod.forge", "51.0.33")
);
} else {
OVERRIDE_VERSIONS = Collections.emptyMap();
} }
} }
private static void add(String key, String value) {
overrideVersions.computeIfAbsent(key, k -> new ArrayList<>()).add(new DefaultArtifactVersion(value)); /**
} * @deprecated Use {@link #testVersionSupportMatrix(VersionRange, String, String)} instead, unwrapping your BiPredicate.
public static <T> boolean testVersionSupportMatrix(VersionRange declaredRange, String lookupId, String type, BiPredicate<String, VersionRange> standardLookup) { */
@Deprecated(forRemoval = true, since = "1.21.1")
public static boolean testVersionSupportMatrix(VersionRange declaredRange, String lookupId, String type, BiPredicate<String, VersionRange> standardLookup) {
if (standardLookup.test(lookupId, declaredRange)) return true; if (standardLookup.test(lookupId, declaredRange)) return true;
List<ArtifactVersion> custom = overrideVersions.get(type + "." + lookupId); return testVersionSupportMatrix(declaredRange, lookupId, type);
return custom == null ? false : custom.stream().anyMatch(declaredRange::containsVersion); }
public static boolean testVersionSupportMatrix(VersionRange declaredRange, String lookupId, String type) {
if (OVERRIDE_VERSIONS.isEmpty()) return false;
List<ArtifactVersion> custom = OVERRIDE_VERSIONS.get(type + "." + lookupId);
return custom != null && custom.stream().anyMatch(declaredRange::containsVersion);
}
private static Map.Entry<String, List<ArtifactVersion>> entry(String typeAndLookupId, String declaredRange) {
return Map.entry(typeAndLookupId, List.of(new DefaultArtifactVersion(declaredRange)));
}
private static Map.Entry<String, List<ArtifactVersion>> entry(String typeAndLookupId, List<String> declaredRanges) {
return Map.entry(typeAndLookupId, declaredRanges.stream().map(DefaultArtifactVersion::new).map(it -> (ArtifactVersion) it).toList());
} }
} }
@@ -49,10 +49,7 @@ public class ForgeHighlight {
LOGGER.warn("Failed to invoke initializeTerminal on TCA", e); LOGGER.warn("Failed to invoke initializeTerminal on TCA", e);
} }
if (!TerminalConsoleAppender.isAnsiSupported() && Arrays.stream(options).noneMatch(s -> s.equals("disableAnsi=true"))) { if (!TerminalConsoleAppender.isAnsiSupported() && Arrays.stream(options).noneMatch(s -> s.equals("disableAnsi=true"))) {
List<String> optionList = new ArrayList<>(); options = new String[] { options[0], "disableAnsi=true" };
optionList.add(options[0]);
optionList.add("disableAnsi=true");
options = optionList.toArray(new String[0]);
} }
return HighlightConverter.newInstance(config, options); return HighlightConverter.newInstance(config, options);
} }
@@ -6,6 +6,7 @@
package net.minecraftforge.fml.loading.moddiscovery; package net.minecraftforge.fml.loading.moddiscovery;
import com.mojang.logging.LogUtils; import com.mojang.logging.LogUtils;
import cpw.mods.jarhandling.JarMetadata; import cpw.mods.jarhandling.JarMetadata;
import cpw.mods.jarhandling.SecureJar; import cpw.mods.jarhandling.SecureJar;
import net.minecraftforge.fml.loading.LogMarkers; import net.minecraftforge.fml.loading.LogMarkers;
@@ -18,52 +19,128 @@ import net.minecraftforge.forgespi.locating.IModProvider;
import net.minecraftforge.forgespi.locating.ModFileLoadingException; import net.minecraftforge.forgespi.locating.ModFileLoadingException;
import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger; import org.slf4j.Logger;
import java.io.IOException; import java.io.IOException;
import java.lang.module.InvalidModuleDescriptorException;
import java.lang.module.ModuleDescriptor;
import java.lang.module.ModuleDescriptor.Version;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.Collections; import java.util.Collections;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Optional; import java.util.Optional;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.jar.JarFile; import java.util.jar.JarFile;
import java.util.stream.Collectors;
@ApiStatus.Internal @ApiStatus.Internal
public abstract class AbstractModProvider implements IModProvider { public abstract class AbstractModProvider implements IModProvider {
private static final Logger LOGGER = LogUtils.getLogger(); private static final Logger LOGGER = LogUtils.getLogger();
protected static final String MODS_TOML = "META-INF/mods.toml"; protected static final String MODS_TOML = "META-INF/mods.toml";
protected static final String MODULE_INFO = "module-info.class";
protected IModLocator.ModFileOrException createMod(Path path) { protected IModLocator.ModFileOrException createMod(Path path) {
return createMod(path, false);
}
@Nullable
protected IModLocator.ModFileOrException createMod(Path path, boolean ignoreUnknown) {
return createMod(path, ignoreUnknown, getDefaultJarModType());
}
@Nullable
protected IModLocator.ModFileOrException createMod(Path path, boolean ignoreUnknown, String defaultType) {
var mjm = new ModJarMetadata(); var mjm = new ModJarMetadata();
var sj = SecureJar.from( SecureJar sj = null;
jar -> jar.moduleDataProvider().findFile(MODS_TOML).isPresent() ? mjm : JarMetadata.from(jar, path), try {
path sj = SecureJar.from(jar -> loadMetaFromJar(jar, mjm), path);
); } catch (Throwable t) {
return new IModLocator.ModFileOrException(null, new ModFileLoadingException("Failed to create secure jar for \"" + path + "\" - " + t.getMessage()));
}
IModFile mod; IModFile mod;
var type = sj.moduleDataProvider().getManifest().getMainAttributes().getValue(ModFile.TYPE); var type = sj.moduleDataProvider().getManifest().getMainAttributes().getValue(ModFile.TYPE);
if (type == null) if (type == null)
type = getDefaultJarModType(); type = defaultType;
if (sj.moduleDataProvider().findFile(MODS_TOML).isPresent()) { if (sj.moduleDataProvider().findFile(MODS_TOML).isPresent()) {
LOGGER.debug(LogMarkers.SCAN, "Found {} mod of type {}: {}", MODS_TOML, type, path); LOGGER.debug(LogMarkers.SCAN, "Found {} mod of type {}: {}", MODS_TOML, type, path);
mod = new ModFile(sj, this, ModFileParser::modsTomlParser); mod = new ModFile(sj, this, ModFileParser::modsTomlParser);
// ModJarMetadata is only used when loading mods.toml mods as ModJarMetadata
mjm.setModFile(mod);
if (mod.getModFileInfo().getFileProperties().containsKey(ModFileInfo.NOT_A_FORGE_MOD_PROP)) {
LOGGER.error(LogMarkers.SCAN, "Unable to load file \"{}\" because its mods.toml is requesting an invalid javafml loaderVersion (use \"*\" if you want to allow all versions) and is missing a forge modId dependency declaration (see the sample mods.toml in the MDK).", path);
return new IModLocator.ModFileOrException(null, new ModFileLoadingException("File \"%s\" is not a Forge mod and cannot be loaded. Look for a Forge version of this mod or consider alternative mods.".formatted(mod.getFileName())));
}
} else if (type != null) { } else if (type != null) {
LOGGER.debug(LogMarkers.SCAN, "Found {} mod of type {}: {}", JarFile.MANIFEST_NAME, type, path); LOGGER.debug(LogMarkers.SCAN, "Found {} mod of type {}: {}", JarFile.MANIFEST_NAME, type, path);
mod = new ModFile(sj, this, this::manifestParser, type); mod = new ModFile(sj, this, this::manifestParser, type);
} else if (ignoreUnknown) {
return null;
} else } else
return new IModLocator.ModFileOrException(null, new ModFileLoadingException("Invalid mod file found " + path)); return new IModLocator.ModFileOrException(null, new ModFileLoadingException("Invalid mod file found " + path));
mjm.setModFile(mod);
return new IModLocator.ModFileOrException(mod, null); return new IModLocator.ModFileOrException(mod, null);
} }
private static JarMetadata loadMetaFromJar(SecureJar jar, ModJarMetadata mjm) {
var info = jar.moduleDataProvider().open(MODULE_INFO).orElse(null);
if (info != null) {
try {
var desc = ModuleDescriptor.read(info, jar::getPackages);
var all = new HashSet<>(jar.getPackages());
all.removeAll(desc.packages());
if (!all.isEmpty()) {
var missing = all.stream().sorted().collect(Collectors.joining(", "));
LOGGER.error("Invalid module-info, missing packages " + missing);
throw new ModFileLoadingException("Invalid module-info, missing packages " + missing);
} else {
return new JarMetadata() {
@Override
public String name() {
return desc.name();
}
@Override
public String version() {
return desc.version().map(Version::toString).or(desc::rawVersion).orElse(null);
}
@Override
public ModuleDescriptor descriptor() {
return desc;
}
};
}
} catch (InvalidModuleDescriptorException | IOException e) {
LOGGER.error("Failed to parse " + jar.getPrimaryPath() + " module-info", e);
throw new ModFileLoadingException("Invalid module-info: " + e.getMessage());
} finally {
try {
info.close();
} catch (IOException e) {}
}
}
if (jar.moduleDataProvider().findFile(MODS_TOML).isEmpty())
return JarMetadata.from(jar, jar.getPrimaryPath());
return mjm;
}
protected IModFileInfo manifestParser(final IModFile mod) { protected IModFileInfo manifestParser(final IModFile mod) {
var mf = mod.getSecureJar().moduleDataProvider().getManifest().getMainAttributes(); var mf = mod.getSecureJar().moduleDataProvider().getManifest().getMainAttributes();
var license = mf.getValue("LICENSE"); var license = mf.getValue("LICENSE");
var dummy = new IConfigurable() { var dummy = new IConfigurable() {
@Override
public <T> Optional<T> getConfigElement(String key) {
return Optional.empty();
}
@Override @Override
public <T> Optional<T> getConfigElement(String... key) { public <T> Optional<T> getConfigElement(String... key) {
return Optional.empty(); return Optional.empty();
@@ -109,29 +186,31 @@ public abstract class AbstractModProvider implements IModProvider {
}; };
} }
try { try (var files = Files.walk(root)) {
Files.walk(root) files
.filter(p -> p.toString().endsWith(".class")) .filter(p -> p.toString().endsWith(".class"))
.forEach(consumer); .forEach(consumer);
file.setSecurityStatus(holder.value); file.setSecurityStatus(holder.value);
} catch(IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }
LOGGER.debug(LogMarkers.SCAN, "Scan finished: {}", file); LOGGER.debug(LogMarkers.SCAN, "Scan finished: {}", file);
} }
private static class Holder<T> { private static final class Holder<T> {
T value; private T value;
} }
private record DefaultModFileInfo(IModFile mod, String license, IConfigurable configurable) implements IModFileInfo, IConfigurable { private record DefaultModFileInfo(IModFile mod, String license, IConfigurable configurable) implements IModFileInfo, IConfigurable {
@Override public <T> Optional<T> getConfigElement(final String string) { return Optional.empty(); }
@Override public <T> Optional<T> getConfigElement(final String... strings) { return Optional.empty(); } @Override public <T> Optional<T> getConfigElement(final String... strings) { return Optional.empty(); }
@Override public List<? extends IConfigurable> getConfigList(final String... strings) { return null; } @Override public List<? extends IConfigurable> getConfigList(final String... strings) { return null; }
@Override public List<IModInfo> getMods() { return Collections.emptyList(); } @Override public List<IModInfo> getMods() { return Collections.emptyList(); }
@Override public List<LanguageSpec> requiredLanguageLoaders() { return Collections.emptyList(); } @Override public List<LanguageSpec> requiredLanguageLoaders() { return Collections.emptyList(); }
@Override public boolean showAsResourcePack() { return false; } @Override public boolean showAsResourcePack() { return false; }
@Override public boolean showAsDataPack() { return false; }
@Override public Map<String, Object> getFileProperties() { return Collections.emptyMap(); } @Override public Map<String, Object> getFileProperties() { return Collections.emptyMap(); }
@Override public String getLicense() { return license; } @Override public String getLicense() { return license; }
@Override public IModFile getFile() { return mod; } @Override public IModFile getFile() { return mod; }
@@ -29,6 +29,7 @@ public class BackgroundScanHandler
} }
private static final Logger LOGGER = LogUtils.getLogger(); private static final Logger LOGGER = LogUtils.getLogger();
private static final boolean DEBUG = LOGGER.isErrorEnabled(LogMarkers.SCAN);
private final ExecutorService modContentScanner; private final ExecutorService modContentScanner;
private final List<ModFile> modFiles; private final List<ModFile> modFiles;
private ScanStatus status; private ScanStatus status;
@@ -55,16 +56,16 @@ public class BackgroundScanHandler
} }
status = ScanStatus.RUNNING; status = ScanStatus.RUNNING;
ImmediateWindowHandler.updateProgress("Scanning mod candidates"); ImmediateWindowHandler.updateProgress("Scanning mod candidates");
final CompletableFuture<ModFileScanData> future = CompletableFuture.supplyAsync(file::compileContent, modContentScanner) CompletableFuture<ModFileScanData> future = CompletableFuture.supplyAsync(file::compileContent, modContentScanner)
.whenComplete(file::setScanResult) .whenComplete(file::setScanResult);
.whenComplete((r,t)-> this.addCompletedFile(file,r,t)); if (DEBUG) future = future.whenComplete((r, t) -> addCompletedFile(file, t));
file.setFutureScanResult(future); file.setFutureScanResult(future);
} }
private void addCompletedFile(final ModFile file, final ModFileScanData modFileScanData, final Throwable throwable) { private void addCompletedFile(final ModFile file, final Throwable throwable) {
if (throwable != null) { if (throwable != null) {
status = ScanStatus.ERRORED; status = ScanStatus.ERRORED;
LOGGER.error(LogMarkers.SCAN,"An error occurred scanning file {}", file, throwable); LOGGER.error(LogMarkers.SCAN, "An error occurred scanning file {}", file, throwable);
} }
} }
@@ -8,6 +8,7 @@ package net.minecraftforge.fml.loading.moddiscovery;
import com.mojang.logging.LogUtils; import com.mojang.logging.LogUtils;
import net.minecraftforge.fml.loading.LogMarkers; import net.minecraftforge.fml.loading.LogMarkers;
import net.minecraftforge.fml.loading.ModDirTransformerDiscoverer;
import net.minecraftforge.forgespi.locating.IModLocator; import net.minecraftforge.forgespi.locating.IModLocator;
import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.ApiStatus;
@@ -17,9 +18,9 @@ import java.io.IOException;
import java.net.URI; import java.net.URI;
import java.net.URL; import java.net.URL;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.jar.Attributes; import java.util.jar.Attributes;
@@ -27,7 +28,7 @@ import java.util.jar.JarFile;
import java.util.jar.Manifest; import java.util.jar.Manifest;
@ApiStatus.Internal @ApiStatus.Internal
public class ClasspathLocator extends AbstractModProvider implements IModLocator { public final class ClasspathLocator extends AbstractModProvider implements IModLocator {
private static final Logger LOGGER = LogUtils.getLogger(); private static final Logger LOGGER = LogUtils.getLogger();
private static final Attributes.Name MOD_TYPE = new Attributes.Name("FMLModType"); private static final Attributes.Name MOD_TYPE = new Attributes.Name("FMLModType");
@@ -71,16 +72,19 @@ public class ClasspathLocator extends AbstractModProvider implements IModLocator
} }
var ret = new ArrayList<ModFileOrException>(); var ret = new ArrayList<ModFileOrException>();
for (var path : claimed) for (var path : claimed) {
ret.add(createMod(path)); // Filter out anything found by the ServiceLoader
if (!ModDirTransformerDiscoverer.isServiceProvider(path))
ret.add(createMod(path));
}
return ret; return ret;
} }
private List<URL> getUrls(ClassLoader cl, String resource) { private static List<URL> getUrls(ClassLoader cl, String resource) {
try { try {
var lst = Collections.list(cl.getResources(resource)); var lst = Collections.list(cl.getResources(resource));
if (LOGGER.isDebugEnabled(LogMarkers.SCAN)) { if (LOGGER.isDebugEnabled(LogMarkers.SCAN)) {
Collections.sort(lst, (a, b) -> a.toString().compareTo(b.toString())); lst.sort(Comparator.comparing(URL::toString));
LOGGER.debug(LogMarkers.SCAN, "Scanning Classloader: {} for {}", cl, resource); LOGGER.debug(LogMarkers.SCAN, "Scanning Classloader: {} for {}", cl, resource);
for (var url : lst) for (var url : lst)
LOGGER.debug(LogMarkers.SCAN, "\t{}", url); LOGGER.debug(LogMarkers.SCAN, "\t{}", url);
@@ -100,8 +104,7 @@ public class ClasspathLocator extends AbstractModProvider implements IModLocator
len += 2; len += 2;
} }
str = str.substring(0, str.length() - len); str = str.substring(0, str.length() - len);
var path = Paths.get(URI.create(str)); return Path.of(URI.create(str));
return path;
} }
private static Path getPathFromResource(ClassLoader cl, String resource) { private static Path getPathFromResource(ClassLoader cl, String resource) {
@@ -15,7 +15,7 @@ import java.nio.file.Path;
import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.ApiStatus;
@ApiStatus.Internal @ApiStatus.Internal
public class CoreModFile implements ICoreModFile { public final class CoreModFile implements ICoreModFile {
private final Path internalPath; private final Path internalPath;
private final ModFile file; private final ModFile file;
private final String name; private final String name;
@@ -12,10 +12,12 @@ import java.nio.file.Path;
import java.util.Arrays; import java.util.Arrays;
import java.util.Optional; import java.util.Optional;
import java.util.function.BiPredicate; import java.util.function.BiPredicate;
import java.util.stream.Stream;
import java.util.zip.ZipFile; import java.util.zip.ZipFile;
import static cpw.mods.modlauncher.api.LamdbaExceptionUtils.*; import static cpw.mods.modlauncher.api.LamdbaExceptionUtils.*;
// TODO: [FML][Loader] By the time this is reached, most stuff this checks for is already filtered out - needs fixing.
public enum InvalidModIdentifier { public enum InvalidModIdentifier {
OLDFORGE(filePresent("mcmod.info")), OLDFORGE(filePresent("mcmod.info")),
@@ -23,9 +25,9 @@ public enum InvalidModIdentifier {
LITELOADER(filePresent("litemod.json")), LITELOADER(filePresent("litemod.json")),
OPTIFINE(filePresent("optifine/Installer.class")), OPTIFINE(filePresent("optifine/Installer.class")),
BUKKIT(filePresent("plugin.yml")), BUKKIT(filePresent("plugin.yml")),
INVALIDZIP((f,zf) -> !zf.isPresent()); INVALIDZIP((f,zf) -> zf.isEmpty()); // note: only this one INVALIDZIP check is ran until the todo on this class is fixed
private BiPredicate<Path, Optional<ZipFile>> ident; private final BiPredicate<Path, Optional<ZipFile>> ident;
InvalidModIdentifier(BiPredicate<Path, Optional<ZipFile>> identifier) InvalidModIdentifier(BiPredicate<Path, Optional<ZipFile>> identifier)
{ {
@@ -40,7 +42,7 @@ public enum InvalidModIdentifier {
public static Optional<String> identifyJarProblem(Path path) public static Optional<String> identifyJarProblem(Path path)
{ {
Optional<ZipFile> zfo = optionalFromException(() -> new ZipFile(path.toFile())); Optional<ZipFile> zfo = optionalFromException(() -> new ZipFile(path.toFile()));
Optional<String> result = Arrays.stream(values()). Optional<String> result = Stream.of(INVALIDZIP).
filter(i -> i.ident.test(path, zfo)). filter(i -> i.ident.test(path, zfo)).
map(InvalidModIdentifier::getReason). map(InvalidModIdentifier::getReason).
findAny(); findAny();
@@ -6,7 +6,6 @@
package net.minecraftforge.fml.loading.moddiscovery; package net.minecraftforge.fml.loading.moddiscovery;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import com.mojang.logging.LogUtils; import com.mojang.logging.LogUtils;
import net.minecraftforge.fml.loading.EarlyLoadingException; import net.minecraftforge.fml.loading.EarlyLoadingException;
import net.minecraftforge.forgespi.language.IModInfo; import net.minecraftforge.forgespi.language.IModInfo;
@@ -26,6 +25,7 @@ import java.nio.file.FileSystem;
import java.nio.file.FileSystems; import java.nio.file.FileSystems;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
@@ -51,7 +51,7 @@ public class JarInJarDependencyLocator extends AbstractModProvider implements ID
@Override @Override
public List<IModFile> scanMods(Iterable<IModFile> loadedMods) { public List<IModFile> scanMods(Iterable<IModFile> loadedMods) {
final List<IModFile> sources = Lists.newArrayList(); final List<IModFile> sources = new ArrayList<>();
loadedMods.forEach(sources::add); loadedMods.forEach(sources::add);
var dependenciesToLoad = JarSelector.detectAndSelect( var dependenciesToLoad = JarSelector.detectAndSelect(
@@ -83,7 +83,14 @@ public class JarInJarDependencyLocator extends AbstractModProvider implements ID
final Map<String, ?> outerFsArgs = ImmutableMap.of("packagePath", pathInModFile); final Map<String, ?> outerFsArgs = ImmutableMap.of("packagePath", pathInModFile);
final FileSystem zipFS = FileSystems.newFileSystem(filePathUri, outerFsArgs); final FileSystem zipFS = FileSystems.newFileSystem(filePathUri, outerFsArgs);
final Path pathInFS = zipFS.getPath("/"); final Path pathInFS = zipFS.getPath("/");
return Optional.of(createMod(pathInFS).file()); final IModFile.Type parentType = file.getType();
final String modType;
if (parentType == IModFile.Type.LIBRARY || parentType == IModFile.Type.LANGPROVIDER) {
modType = IModFile.Type.LIBRARY.name();
} else {
modType = IModFile.Type.GAMELIBRARY.name();
}
return Optional.of(createMod(pathInFS, false, modType).file());
} catch (Exception e) { } catch (Exception e) {
LOGGER.error("Failed to load mod file {} from {}", path, file.getFileName()); LOGGER.error("Failed to load mod file {} from {}", path, file.getFileName());
final RuntimeException exception = new ModFileLoadingException("Failed to load mod file " + file.getFileName()); final RuntimeException exception = new ModFileLoadingException("Failed to load mod file " + file.getFileName());
@@ -95,34 +102,34 @@ public class JarInJarDependencyLocator extends AbstractModProvider implements ID
protected EarlyLoadingException exception(Collection<JarSelector.ResolutionFailureInformation<IModFile>> failedDependencies) { protected EarlyLoadingException exception(Collection<JarSelector.ResolutionFailureInformation<IModFile>> failedDependencies) {
final List<EarlyLoadingException.ExceptionData> errors = failedDependencies.stream() final List<EarlyLoadingException.ExceptionData> errors = failedDependencies.stream()
.filter(entry -> !entry.sources().isEmpty()) //Should never be the case, but just to be sure .filter(entry -> !entry.sources().isEmpty()) //Should never be the case, but just to be sure
.map(this::buildExceptionData) .map(JarInJarDependencyLocator::buildExceptionData)
.toList(); .toList();
return new EarlyLoadingException(failedDependencies.size() + " Dependency restrictions were not met.", null, errors); return new EarlyLoadingException(failedDependencies.size() + " Dependency restrictions were not met.", null, errors);
} }
@NotNull @NotNull
private EarlyLoadingException.ExceptionData buildExceptionData(JarSelector.ResolutionFailureInformation<IModFile> entry) { private static EarlyLoadingException.ExceptionData buildExceptionData(JarSelector.ResolutionFailureInformation<IModFile> entry) {
return new EarlyLoadingException.ExceptionData( return new EarlyLoadingException.ExceptionData(
getErrorTranslationKey(entry), getErrorTranslationKey(entry),
entry.identifier().group() + ":" + entry.identifier().artifact(), entry.identifier().group() + ":" + entry.identifier().artifact(),
entry.sources() entry.sources()
.stream() .stream()
.flatMap(this::getModWithVersionRangeStream) .flatMap(JarInJarDependencyLocator::getModWithVersionRangeStream)
.map(this::formatError) .map(JarInJarDependencyLocator::formatError)
.collect(Collectors.joining(", ")) .collect(Collectors.joining(", "))
); );
} }
@NotNull @NotNull
private String getErrorTranslationKey(JarSelector.ResolutionFailureInformation<IModFile> entry) { private static String getErrorTranslationKey(JarSelector.ResolutionFailureInformation<IModFile> entry) {
return entry.failureReason() == JarSelector.FailureReason.VERSION_RESOLUTION_FAILED ? return entry.failureReason() == JarSelector.FailureReason.VERSION_RESOLUTION_FAILED ?
"fml.dependencyloading.conflictingdependencies" : "fml.dependencyloading.conflictingdependencies" :
"fml.dependencyloading.mismatchedcontaineddependencies"; "fml.dependencyloading.mismatchedcontaineddependencies";
} }
@NotNull @NotNull
private Stream<ModWithVersionRange> getModWithVersionRangeStream(JarSelector.SourceWithRequestedVersionRange<IModFile> file) { private static Stream<ModWithVersionRange> getModWithVersionRangeStream(JarSelector.SourceWithRequestedVersionRange<IModFile> file) {
return file.sources() return file.sources()
.stream() .stream()
.map(IModFile::getModFileInfo) .map(IModFile::getModFileInfo)
@@ -145,7 +152,7 @@ public class JarInJarDependencyLocator extends AbstractModProvider implements ID
} }
@NotNull @NotNull
private String formatError(ModWithVersionRange modWithVersionRange){ private static String formatError(ModWithVersionRange modWithVersionRange){
return YELLOW + modWithVersionRange.modInfo().getModId() + RESET + " - " + return YELLOW + modWithVersionRange.modInfo().getModId() + RESET + " - " +
RED + modWithVersionRange.versionRange().toString() + RESET + " - " + RED + modWithVersionRange.versionRange().toString() + RESET + " - " +
GREEN + modWithVersionRange.artifactVersion().toString() + RESET; GREEN + modWithVersionRange.artifactVersion().toString() + RESET;
@@ -18,24 +18,22 @@ import java.util.List;
import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.ApiStatus;
@ApiStatus.Internal @ApiStatus.Internal
public class MinecraftLocator extends AbstractModProvider implements IModLocator { public final class MinecraftLocator extends AbstractModProvider implements IModLocator {
@Override @Override
public List<IModLocator.ModFileOrException> scanMods() { public List<IModLocator.ModFileOrException> scanMods() {
var minecraft = FMLLoader.getLaunchHandler().getMinecraftPaths(); var minecraft = FMLLoader.getLaunchHandler().getMinecraftPaths();
var paths = minecraft.toArray(Path[]::new);
// Minecraft itself. // Minecraft itself.
var meta = new ModJarMetadata(); var meta = new ModJarMetadata();
var mcjar = SecureJar.from( var mcjar = SecureJar.from(jar -> meta, paths);
jar -> meta, var mc = ModFileFactory.FACTORY.build(mcjar, this, MinecraftLocator::buildMinecraftTOML);
minecraft.toArray(Path[]::new)
);
var mc = ModFileFactory.FACTORY.build(mcjar, this, this::buildMinecraftTOML);
meta.setModFile(mc); meta.setModFile(mc);
return List.of(new ModFileOrException(mc, null)); return List.of(new ModFileOrException(mc, null));
} }
private IModFileInfo buildMinecraftTOML(final IModFile iModFile) { private static IModFileInfo buildMinecraftTOML(final IModFile iModFile) {
// We haven't changed this in years, and I can't be asked right now to special case this one file in the path. // We haven't changed this in years, and I can't be asked right now to special case this one file in the path.
final var conf = Config.inMemory(); final var conf = Config.inMemory();
conf.set("modLoader", "minecraft"); conf.set("modLoader", "minecraft");
@@ -52,7 +50,7 @@ public class MinecraftLocator extends AbstractModProvider implements IModLocator
conf.set("mods", List.of(mods)); conf.set("mods", List.of(mods));
var configWrapper = new NightConfigWrapper(conf); var configWrapper = new NightConfigWrapper(conf);
return new ModFileInfo((ModFile)iModFile, configWrapper, configWrapper::setFile, List.of()); return new ModFileInfo((ModFile) iModFile, configWrapper, configWrapper::setFile);
} }
@Override @Override
@@ -6,12 +6,12 @@
package net.minecraftforge.fml.loading.moddiscovery; package net.minecraftforge.fml.loading.moddiscovery;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.Maps;
import com.mojang.logging.LogUtils; import com.mojang.logging.LogUtils;
import cpw.mods.modlauncher.Launcher; import cpw.mods.modlauncher.Launcher;
import cpw.mods.modlauncher.api.IModuleLayerManager; import cpw.mods.modlauncher.api.IModuleLayerManager;
import cpw.mods.modlauncher.util.ServiceLoaderUtils; import cpw.mods.modlauncher.util.ServiceLoaderUtils;
import net.minecraftforge.fml.loading.EarlyLoadingException; import net.minecraftforge.fml.loading.EarlyLoadingException;
import net.minecraftforge.fml.loading.FMLLoader;
import net.minecraftforge.fml.loading.ImmediateWindowHandler; import net.minecraftforge.fml.loading.ImmediateWindowHandler;
import net.minecraftforge.fml.loading.LogMarkers; import net.minecraftforge.fml.loading.LogMarkers;
import net.minecraftforge.fml.loading.UniqueModListBuilder; import net.minecraftforge.fml.loading.UniqueModListBuilder;
@@ -22,10 +22,12 @@ import net.minecraftforge.forgespi.locating.IDependencyLocator;
import net.minecraftforge.forgespi.locating.IModFile; import net.minecraftforge.forgespi.locating.IModFile;
import net.minecraftforge.forgespi.locating.IModLocator; import net.minecraftforge.forgespi.locating.IModLocator;
import net.minecraftforge.forgespi.locating.ModFileLoadingException;
import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.ApiStatus;
import org.slf4j.Logger; import org.slf4j.Logger;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.EnumMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
@@ -47,29 +49,34 @@ public class ModDiscoverer {
modLocators = ServiceLoader.load(moduleLayerManager.getLayer(IModuleLayerManager.Layer.SERVICE).orElseThrow(), IModLocator.class); modLocators = ServiceLoader.load(moduleLayerManager.getLayer(IModuleLayerManager.Layer.SERVICE).orElseThrow(), IModLocator.class);
dependencyLocators = ServiceLoader.load(moduleLayerManager.getLayer(IModuleLayerManager.Layer.SERVICE).orElseThrow(), IDependencyLocator.class); dependencyLocators = ServiceLoader.load(moduleLayerManager.getLayer(IModuleLayerManager.Layer.SERVICE).orElseThrow(), IDependencyLocator.class);
modLocatorList = ServiceLoaderUtils.streamServiceLoader(()-> modLocators, sce->LOGGER.error("Failed to load mod locator list", sce)).collect(Collectors.toList()); modLocatorList = ServiceLoaderUtils.streamServiceLoader(()-> modLocators, sce->LOGGER.error("Failed to load mod locator list", sce)).collect(Collectors.toList());
modLocatorList.forEach(l->l.initArguments(arguments)); for (IModLocator iModLocator : modLocatorList) {
iModLocator.initArguments(arguments);
}
dependencyLocatorList = ServiceLoaderUtils.streamServiceLoader(()-> dependencyLocators, sce->LOGGER.error("Failed to load dependency locator list", sce)).collect(Collectors.toList()); dependencyLocatorList = ServiceLoaderUtils.streamServiceLoader(()-> dependencyLocators, sce->LOGGER.error("Failed to load dependency locator list", sce)).collect(Collectors.toList());
dependencyLocatorList.forEach(l->l.initArguments(arguments)); for (IDependencyLocator l : dependencyLocatorList) {
l.initArguments(arguments);
}
if (LOGGER.isDebugEnabled(LogMarkers.CORE)) if (LOGGER.isDebugEnabled(LogMarkers.CORE))
{ {
LOGGER.debug(LogMarkers.CORE, "Found Mod Locators : {}", modLocatorList.stream() LOGGER.debug(LogMarkers.CORE, "Found Mod Locators : {}", modLocatorList.stream()
.map(modLocator -> "(%s:%s)".formatted(modLocator.name(), .map(modLocator -> "(%s:%s)".formatted(modLocator.name(),
modLocator.getClass().getPackage().getImplementationVersion())).collect(Collectors.joining(","))); modLocator.getClass().getPackage().getImplementationVersion())).collect(Collectors.joining(",")));
}
if (LOGGER.isDebugEnabled(LogMarkers.CORE))
{
LOGGER.debug(LogMarkers.CORE, "Found Dependency Locators : {}", dependencyLocatorList.stream() LOGGER.debug(LogMarkers.CORE, "Found Dependency Locators : {}", dependencyLocatorList.stream()
.map(dependencyLocator -> "(%s:%s)".formatted(dependencyLocator.name(), .map(dependencyLocator -> "(%s:%s)".formatted(dependencyLocator.name(),
dependencyLocator.getClass().getPackage().getImplementationVersion())).collect(Collectors.joining(","))); dependencyLocator.getClass().getPackage().getImplementationVersion())).collect(Collectors.joining(",")));
} }
} }
@SuppressWarnings("removal")
public ModValidator discoverMods() { public ModValidator discoverMods() {
LOGGER.debug(LogMarkers.SCAN,"Scanning for mods and other resources to load. We know {} ways to find mods", modLocatorList.size()); LOGGER.debug(LogMarkers.SCAN,"Scanning for mods and other resources to load. We know {} ways to find mods", modLocatorList.size());
List<ModFile> loadedFiles = new ArrayList<>(); List<ModFile> loadedFiles = new ArrayList<>();
List<EarlyLoadingException.ExceptionData> discoveryErrorData = new ArrayList<>(); List<EarlyLoadingException.ExceptionData> discoveryErrorData = new ArrayList<>();
boolean successfullyLoadedMods = true; boolean successfullyLoadedMods = true;
List<IModFileInfo> brokenFiles = new ArrayList<>(); List<IModFileInfo> brokenFiles = new ArrayList<>();
List<ModFileLoadingException> modFileLoadingExceptions = new ArrayList<>();
boolean distIsDedicatedServer = FMLLoader.getDist().isDedicatedServer();
ImmediateWindowHandler.updateProgress("Discovering mod files"); ImmediateWindowHandler.updateProgress("Discovering mod files");
//Loop all mod locators to get the prime mods to load from. //Loop all mod locators to get the prime mods to load from.
for (IModLocator locator : modLocatorList) { for (IModLocator locator : modLocatorList) {
@@ -80,7 +87,17 @@ public class ModDiscoverer {
var exceptions = candidates.stream().map(IModLocator.ModFileOrException::ex).filter(Objects::nonNull).toList(); var exceptions = candidates.stream().map(IModLocator.ModFileOrException::ex).filter(Objects::nonNull).toList();
if (!exceptions.isEmpty()) { if (!exceptions.isEmpty()) {
LOGGER.debug(LogMarkers.SCAN, "Locator {} found {} invalid mod files", locator, exceptions.size()); LOGGER.debug(LogMarkers.SCAN, "Locator {} found {} invalid mod files", locator, exceptions.size());
brokenFiles.addAll(exceptions.stream().map(e->e instanceof InvalidModFileException ime ? ime.getBrokenFile() : null).filter(Objects::nonNull).toList()); for (ModFileLoadingException ex : exceptions) {
// pipe exception messages through the discoveryErrorData to avoid swallowing some exceptions and improve error messages
// (no longer a generic "Invalid mod file" for all InvalidModExceptions - it actually shows the exception message now)
if (ex instanceof InvalidModFileException invalidModFileEx) {
var modInfo = invalidModFileEx.getBrokenFile();
brokenFiles.add(modInfo);
discoveryErrorData.add(new EarlyLoadingException.ExceptionData(ex.getMessage(), modInfo));
} else {
discoveryErrorData.add(new EarlyLoadingException.ExceptionData(ex.getMessage()));
}
}
} }
var locatedFiles = candidates.stream().map(IModLocator.ModFileOrException::file).filter(Objects::nonNull).collect(Collectors.toList()); var locatedFiles = candidates.stream().map(IModLocator.ModFileOrException::file).filter(Objects::nonNull).collect(Collectors.toList());
@@ -88,8 +105,17 @@ public class ModDiscoverer {
if (!badModFiles.isEmpty()) { if (!badModFiles.isEmpty()) {
LOGGER.error(LogMarkers.SCAN, "Locator {} returned {} files which is are not ModFile instances! They will be skipped!", locator, badModFiles.size()); LOGGER.error(LogMarkers.SCAN, "Locator {} returned {} files which is are not ModFile instances! They will be skipped!", locator, badModFiles.size());
brokenFiles.addAll(badModFiles.stream().map(IModFile::getModFileInfo).toList()); brokenFiles.addAll(badModFiles.stream().map(IModFile::getModFileInfo).toList());
locatedFiles.removeAll(badModFiles);
} }
locatedFiles.removeAll(badModFiles);
if (distIsDedicatedServer) {
var clientOnlyModFiles = locatedFiles.stream().filter(file -> file.getModFileInfo().isClientSideOnly()).toList();
if (!clientOnlyModFiles.isEmpty()) {
LOGGER.warn(LogMarkers.SCAN, "Locator {} returned {} files which are client-side-only mods, but we're on a dedicated server. They will be skipped!", locator, clientOnlyModFiles.size());
locatedFiles.removeAll(clientOnlyModFiles);
}
}
LOGGER.debug(LogMarkers.SCAN, "Locator {} found {} valid mod files", locator, locatedFiles.size()); LOGGER.debug(LogMarkers.SCAN, "Locator {} found {} valid mod files", locator, locatedFiles.size());
handleLocatedFiles(loadedFiles, locatedFiles); handleLocatedFiles(loadedFiles, locatedFiles);
} catch (InvalidModFileException imfe) { } catch (InvalidModFileException imfe) {
@@ -103,7 +129,7 @@ public class ModDiscoverer {
} }
//First processing run of the mod list. Any duplicates will cause resolution failure and dependency loading will be skipped. //First processing run of the mod list. Any duplicates will cause resolution failure and dependency loading will be skipped.
Map<IModFile.Type, List<ModFile>> modFilesMap = Maps.newHashMap(); Map<IModFile.Type, List<ModFile>> modFilesMap = new EnumMap<>(IModFile.Type.class);
try { try {
final UniqueModListBuilder modsUniqueListBuilder = new UniqueModListBuilder(loadedFiles); final UniqueModListBuilder modsUniqueListBuilder = new UniqueModListBuilder(loadedFiles);
final UniqueModListBuilder.UniqueModListData uniqueModsData = modsUniqueListBuilder.buildUniqueList(); final UniqueModListBuilder.UniqueModListData uniqueModsData = modsUniqueListBuilder.buildUniqueList();
@@ -111,7 +137,7 @@ public class ModDiscoverer {
//Grab the temporary results. //Grab the temporary results.
//This allows loading to continue to a base state, in case dependency loading fails. //This allows loading to continue to a base state, in case dependency loading fails.
modFilesMap = uniqueModsData.modFiles().stream() modFilesMap = uniqueModsData.modFiles().stream()
.collect(Collectors.groupingBy(IModFile::getType)); .collect(Collectors.groupingBy(IModFile::getType, () -> new EnumMap<>(IModFile.Type.class), Collectors.toList()));
loadedFiles = uniqueModsData.modFiles(); loadedFiles = uniqueModsData.modFiles();
} }
catch (EarlyLoadingException exception) { catch (EarlyLoadingException exception) {
@@ -148,11 +174,11 @@ public class ModDiscoverer {
//We now only need the mod files map, not the list. //We now only need the mod files map, not the list.
modFilesMap = uniqueModsAndDependenciesData.modFiles().stream() modFilesMap = uniqueModsAndDependenciesData.modFiles().stream()
.collect(Collectors.groupingBy(IModFile::getType)); .collect(Collectors.groupingBy(IModFile::getType, () -> new EnumMap<>(IModFile.Type.class), Collectors.toList()));
} catch (EarlyLoadingException exception) { } catch (EarlyLoadingException exception) {
LOGGER.error(LogMarkers.SCAN, "Failed to build unique mod list after dependency discovery.", exception); LOGGER.error(LogMarkers.SCAN, "Failed to build unique mod list after dependency discovery.", exception);
discoveryErrorData.addAll(exception.getAllData()); discoveryErrorData.addAll(exception.getAllData());
modFilesMap = loadedFiles.stream().collect(Collectors.groupingBy(IModFile::getType)); modFilesMap = loadedFiles.stream().collect(Collectors.groupingBy(IModFile::getType, () -> new EnumMap<>(IModFile.Type.class), Collectors.toList()));
} }
} }
else { else {
@@ -162,13 +188,12 @@ public class ModDiscoverer {
//Validate the loading. With a deduplicated list, we can now successfully process the artifacts and load //Validate the loading. With a deduplicated list, we can now successfully process the artifacts and load
//transformer plugins. //transformer plugins.
var validator = new ModValidator(modFilesMap, brokenFiles, discoveryErrorData); var validator = new ModValidator(modFilesMap, brokenFiles, discoveryErrorData, modFileLoadingExceptions);
validator.stage1Validation(); validator.stage1Validation();
return validator; return validator;
} }
private void handleLocatedFiles(final List<ModFile> loadedFiles, final List<IModFile> locatedFiles) private static void handleLocatedFiles(final List<ModFile> loadedFiles, final List<IModFile> locatedFiles) {
{
var locatedModFiles = locatedFiles.stream().filter(ModFile.class::isInstance).map(ModFile.class::cast).toList(); var locatedModFiles = locatedFiles.stream().filter(ModFile.class::isInstance).map(ModFile.class::cast).toList();
for (IModFile mf : locatedModFiles) { for (IModFile mf : locatedModFiles) {
LOGGER.info(LogMarkers.SCAN, "Found mod file {} of type {} with provider {}", mf.getFileName(), mf.getType(), mf.getProvider()); LOGGER.info(LogMarkers.SCAN, "Found mod file {} of type {} with provider {}", mf.getFileName(), mf.getType(), mf.getProvider());
@@ -45,7 +45,6 @@ public class ModFile implements IModFile {
private Throwable scanError; private Throwable scanError;
private final SecureJar jar; private final SecureJar jar;
private final Type modFileType; private final Type modFileType;
private final Manifest manifest;
private final IModProvider provider; private final IModProvider provider;
private IModFileInfo modFileInfo; private IModFileInfo modFileInfo;
private ModFileScanData fileModFileScanData; private ModFileScanData fileModFileScanData;
@@ -65,7 +64,7 @@ public class ModFile implements IModFile {
this.jar = jar; this.jar = jar;
this.parser = parser; this.parser = parser;
manifest = this.jar.moduleDataProvider().getManifest(); var manifest = this.jar.moduleDataProvider().getManifest();
modFileType = Type.valueOf(type); modFileType = Type.valueOf(type);
jarVersion = Optional.ofNullable(manifest.getMainAttributes().getValue(Attributes.Name.IMPLEMENTATION_VERSION)).orElse("0.0NONE"); jarVersion = Optional.ofNullable(manifest.getMainAttributes().getValue(Attributes.Name.IMPLEMENTATION_VERSION)).orElse("0.0NONE");
this.modFileInfo = ModFileParser.readModList(this, this.parser); this.modFileInfo = ModFileParser.readModList(this, this.parser);
@@ -7,51 +7,55 @@ package net.minecraftforge.fml.loading.moddiscovery;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import com.mojang.logging.LogUtils; import com.mojang.logging.LogUtils;
import cpw.mods.modlauncher.api.LamdbaExceptionUtils;
import net.minecraftforge.fml.loading.LogMarkers; import net.minecraftforge.fml.loading.LogMarkers;
import net.minecraftforge.fml.loading.StringUtils; import net.minecraftforge.fml.loading.StringUtils;
import net.minecraftforge.forgespi.language.IConfigurable; import net.minecraftforge.forgespi.language.IConfigurable;
import net.minecraftforge.forgespi.language.IModFileInfo; import net.minecraftforge.forgespi.language.IModFileInfo;
import net.minecraftforge.forgespi.language.IModInfo; import net.minecraftforge.forgespi.language.IModInfo;
import net.minecraftforge.forgespi.language.MavenVersionAdapter; import net.minecraftforge.forgespi.language.MavenVersionAdapter;
import org.jetbrains.annotations.ApiStatus;
import org.slf4j.Logger; import org.slf4j.Logger;
import javax.security.auth.x500.X500Principal; import javax.security.auth.x500.X500Principal;
import java.net.URL; import java.net.URL;
import java.security.CodeSigner;
import java.security.InvalidKeyException; import java.security.InvalidKeyException;
import java.security.MessageDigest; import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.security.NoSuchProviderException; import java.security.NoSuchProviderException;
import java.security.SignatureException; import java.security.SignatureException;
import java.security.cert.Certificate; import java.security.cert.CertificateEncodingException;
import java.security.cert.CertificateException; import java.security.cert.CertificateException;
import java.security.cert.X509Certificate; import java.security.cert.X509Certificate;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.Optional; import java.util.Optional;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream;
public class ModFileInfo implements IModFileInfo, IConfigurable public class ModFileInfo implements IModFileInfo, IConfigurable {
{
private static final Logger LOGGER = LogUtils.getLogger(); private static final Logger LOGGER = LogUtils.getLogger();
private static final String MAYBE_NOT_JAVAFML_VER = "[2,)";
private static final String JAVAFML = "javafml";
@ApiStatus.Internal
public static final String NOT_A_FORGE_MOD_PROP = "__FORGE__not_a_forge_mod";
private final IConfigurable config; private final IConfigurable config;
private final ModFile modFile; private final ModFile modFile;
private final URL issueURL; private final URL issueURL;
private final List<LanguageSpec> languageSpecs; private final List<LanguageSpec> languageSpecs;
private final boolean showAsResourcePack; private final boolean showAsResourcePack;
private final boolean clientSideOnly;
private final boolean showAsDataPack;
private final List<IModInfo> mods; private final List<IModInfo> mods;
private final Map<String,Object> properties; private final Map<String,Object> properties;
private final String license; private final String license;
private final List<String> usesServices; private final List<String> usesServices;
ModFileInfo(final ModFile modFile, final IConfigurable config, Consumer<IModFileInfo> configFileConsumer) ModFileInfo(final ModFile modFile, final IConfigurable config, Consumer<IModFileInfo> configFileConsumer) {
{
this.modFile = modFile; this.modFile = modFile;
this.config = config; this.config = config;
configFileConsumer.accept(this); configFileConsumer.accept(this);
@@ -59,33 +63,55 @@ public class ModFileInfo implements IModFileInfo, IConfigurable
var modLoader = config.<String>getConfigElement("modLoader") var modLoader = config.<String>getConfigElement("modLoader")
.orElseThrow(()->new InvalidModFileException("Missing ModLoader in file", this)); .orElseThrow(()->new InvalidModFileException("Missing ModLoader in file", this));
// as is modloader version // as is modloader version
var modLoaderVersion = config.<String>getConfigElement("loaderVersion") var modLoaderVerStr = config.<String>getConfigElement("loaderVersion")
.map(MavenVersionAdapter::createFromVersionSpec)
.orElseThrow(()->new InvalidModFileException("Missing ModLoader version in file", this)); .orElseThrow(()->new InvalidModFileException("Missing ModLoader version in file", this));
var modLoaderVersion = MavenVersionAdapter.createFromVersionSpec(modLoaderVerStr);
this.languageSpecs = new ArrayList<>(List.of(new LanguageSpec(modLoader, modLoaderVersion))); this.languageSpecs = new ArrayList<>(List.of(new LanguageSpec(modLoader, modLoaderVersion)));
// if true, this might not be a Forge mod
boolean maybeNotAForgeMod = modLoader.equals(JAVAFML)
&& modLoaderVersion.hasRestrictions() // if loaderVersion is not "*"
&& modLoaderVerStr.equals(MAYBE_NOT_JAVAFML_VER); // if loaderVersion is exactly "[2,)"
// the remaining properties are optional with sensible defaults // the remaining properties are optional with sensible defaults
this.license = config.<String>getConfigElement("license") this.license = config.<String>getConfigElement("license")
.orElse(""); .orElse("");
this.showAsResourcePack = config.<Boolean>getConfigElement("showAsResourcePack") this.showAsResourcePack = config.<Boolean>getConfigElement("showAsResourcePack")
.orElse(false); .orElse(false);
this.clientSideOnly = config.<Boolean>getConfigElement("clientSideOnly")
.orElse(false);
this.showAsDataPack = config.<Boolean>getConfigElement("showAsDataPack")
.orElse(false);
this.usesServices = config.<List<String>>getConfigElement("services") this.usesServices = config.<List<String>>getConfigElement("services")
.orElse(List.of()); .orElse(List.of());
this.properties = config.<Map<String, Object>>getConfigElement("properties")
.orElse(Collections.emptyMap());
this.modFile.setFileProperties(this.properties);
this.issueURL = config.<String>getConfigElement("issueTrackerURL") this.issueURL = config.<String>getConfigElement("issueTrackerURL")
.map(StringUtils::toURL) .map(StringUtils::toURL)
.orElse(null); .orElse(null);
final List<? extends IConfigurable> modConfigs = config.getConfigList("mods");
if (modConfigs.isEmpty()) // if clientSideOnly, then this is definitely a Forge mod
{ if (this.clientSideOnly)
throw new InvalidModFileException("Missing mods list", this); maybeNotAForgeMod = false;
if (maybeNotAForgeMod) {
// mark this file as not a Forge mod. Note: this marker may be removed later based on the mod dependencies
this.properties = config.<Map<String, Object>>getConfigElement("properties")
.orElse(new LinkedHashMap<>());
this.properties.put(NOT_A_FORGE_MOD_PROP, true);
} else {
this.properties = config.<Map<String, Object>>getConfigElement("properties")
.orElse(Collections.emptyMap());
} }
this.modFile.setFileProperties(this.properties);
final List<? extends IConfigurable> modConfigs = config.getConfigList("mods");
if (modConfigs == null || modConfigs.isEmpty())
throw new InvalidModFileException("Missing mods list", this);
this.mods = modConfigs.stream() this.mods = modConfigs.stream()
.map(mi-> (IModInfo)new ModInfo(this, mi)) .map(mi -> (IModInfo) ModInfo.of(this, mi))
.toList(); .toList();
if (LOGGER.isDebugEnabled(LogMarkers.LOADING))
{ if (LOGGER.isDebugEnabled(LogMarkers.LOADING)) {
LOGGER.debug(LogMarkers.LOADING, "Found valid mod file {} with {} mods - versions {}", LOGGER.debug(LogMarkers.LOADING, "Found valid mod file {} with {} mods - versions {}",
this.modFile.getFileName(), this.modFile.getFileName(),
this.mods.stream().map(IModInfo::getModId).collect(Collectors.joining(",", "{", "}")), this.mods.stream().map(IModInfo::getModId).collect(Collectors.joining(",", "{", "}")),
@@ -99,13 +125,11 @@ public class ModFileInfo implements IModFileInfo, IConfigurable
} }
@Override @Override
public List<IModInfo> getMods() public List<IModInfo> getMods() {
{
return mods; return mods;
} }
public ModFile getFile() public ModFile getFile() {
{
return this.modFile; return this.modFile;
} }
@@ -115,32 +139,42 @@ public class ModFileInfo implements IModFileInfo, IConfigurable
} }
@Override @Override
public Map<String, Object> getFileProperties() public Map<String, Object> getFileProperties() {
{
return this.properties; return this.properties;
} }
@Override @Override
public boolean showAsResourcePack() public boolean showAsResourcePack() {
{
return this.showAsResourcePack; return this.showAsResourcePack;
} }
@Override @Override
public <T> Optional<T> getConfigElement(final String... key) public boolean isClientSideOnly() {
{ return this.clientSideOnly;
}
@Override
public boolean showAsDataPack() {
return this.showAsDataPack;
}
@Override
public <T> Optional<T> getConfigElement(final String key) {
return this.config.getConfigElement(key); return this.config.getConfigElement(key);
} }
@Override @Override
public List<? extends IConfigurable> getConfigList(final String... key) public <T> Optional<T> getConfigElement(final String... key) {
{ return this.config.getConfigElement(key);
}
@Override
public List<? extends IConfigurable> getConfigList(final String... key) {
return this.config.getConfigList(key); return this.config.getConfigList(key);
} }
@Override @Override
public String getLicense() public String getLicense() {
{
return license; return license;
} }
@@ -149,54 +183,83 @@ public class ModFileInfo implements IModFileInfo, IConfigurable
return this; return this;
} }
public URL getIssueURL() public URL getIssueURL() {
{
return issueURL; return issueURL;
} }
public boolean missingLicense() public boolean missingLicense() {
{
return Strings.isNullOrEmpty(license); return Strings.isNullOrEmpty(license);
} }
private static final char[] HEX = "0123456789ABCDEF".toCharArray();
public Optional<String> getCodeSigningFingerprint() { public Optional<String> getCodeSigningFingerprint() {
var signers = this.modFile.getSecureJar().getManifestSigners(); var signers = this.modFile.getSecureJar().getManifestSigners();
return (signers == null ? Stream.<CodeSigner>of() : Arrays.stream(signers)) if (signers == null)
.flatMap(csa->csa.getSignerCertPath().getCertificates().stream()) return Optional.empty();
.findFirst()
.map(LamdbaExceptionUtils.rethrowFunction(Certificate::getEncoded)) for (var signer : signers) {
.map(bytes->LamdbaExceptionUtils.uncheck(()->MessageDigest.getInstance("SHA-256")).digest(bytes)) for (var cert : signer.getSignerCertPath().getCertificates()) {
.map(StringUtils::binToHex) try {
.map(str-> String.join(":", str.split("(?<=\\G.{2})"))); var encoded = cert.getEncoded();
var sha256 = MessageDigest.getInstance("SHA-256");
var digest = sha256.digest(encoded);
var buf = new StringBuilder(digest.length * 3);
for (int x = 0; x < digest.length - 1; x++) {
buf.append(HEX[(digest[x] & 0xF0) >> 4]);
buf.append(HEX[(digest[x] & 0x0F) ]);
buf.append(':');
}
buf.append(HEX[(digest[digest.length - 1] & 0xF0) >> 4]);
buf.append(HEX[(digest[digest.length - 1] & 0x0F) ]);
// We only care about the first. Should we list them all?
return Optional.of(buf.toString());
} catch (CertificateEncodingException | NoSuchAlgorithmException e) {
sneak(e);
}
}
}
return Optional.empty();
} }
public Optional<String> getTrustData() { public Optional<String> getTrustData() {
return Arrays.stream(this.modFile.getSecureJar().getManifestSigners()) var signers = this.modFile.getSecureJar().getManifestSigners();
.flatMap(csa->csa.getSignerCertPath().getCertificates().stream()) if (signers == null)
.findFirst() return Optional.empty();
.map(X509Certificate.class::cast)
.map(c->{ for (var signer : signers) {
StringBuffer sb = new StringBuffer(); for (var cert : signer.getSignerCertPath().getCertificates()) {
sb.append(c.getSubjectX500Principal().getName(X500Principal.RFC2253).split(",")[0]); if (!(cert instanceof X509Certificate x509))
boolean selfSigned = false; continue;
try {
c.verify(c.getPublicKey()); var sb = new StringBuilder();
selfSigned = true; sb.append(x509.getSubjectX500Principal().getName(X500Principal.RFC2253).split(",")[0]);
} catch (CertificateException | NoSuchAlgorithmException | InvalidKeyException | SignatureException | NoSuchProviderException e) {
// not self signed var selfSigned = false;
} try {
if (selfSigned) { x509.verify(x509.getPublicKey());
selfSigned = true;
} catch (CertificateException | NoSuchAlgorithmException | InvalidKeyException | SignatureException | NoSuchProviderException e) {
// not self signed
}
if (selfSigned)
sb.append(" self-signed"); sb.append(" self-signed");
} else { else
sb.append(" signed by ").append(c.getIssuerX500Principal().getName(X500Principal.RFC2253).split(",")[0]); sb.append(" signed by ").append(x509.getIssuerX500Principal().getName(X500Principal.RFC2253).split(",")[0]);
};
return sb.toString(); return Optional.of(sb.toString());
}); }
}
return Optional.empty();
} }
@Override @Override
public String moduleName() { public String moduleName() {
return getMods().get(0).getModId(); return this.modFile.getSecureJar().name();
} }
@Override @Override
@@ -208,4 +271,9 @@ public class ModFileInfo implements IModFileInfo, IConfigurable
public List<String> usesServices() { public List<String> usesServices() {
return usesServices; return usesServices;
} }
@SuppressWarnings("unchecked")
private static <E extends Throwable, R> R sneak(Throwable e) throws E {
throw (E)e;
}
} }
@@ -13,6 +13,7 @@ import net.minecraftforge.fml.loading.LogMarkers;
import net.minecraftforge.forgespi.language.IModFileInfo; import net.minecraftforge.forgespi.language.IModFileInfo;
import net.minecraftforge.forgespi.locating.IModFile; import net.minecraftforge.forgespi.locating.IModFile;
import net.minecraftforge.forgespi.locating.ModFileFactory; import net.minecraftforge.forgespi.locating.ModFileFactory;
import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger; import org.slf4j.Logger;
import java.io.IOException; import java.io.IOException;
@@ -30,7 +31,7 @@ public class ModFileParser {
return parser.build(modFile); return parser.build(modFile);
} }
public static IModFileInfo modsTomlParser(final IModFile imodFile) { public static @Nullable IModFileInfo modsTomlParser(final IModFile imodFile) {
ModFile modFile = (ModFile) imodFile; ModFile modFile = (ModFile) imodFile;
LOGGER.debug(LogMarkers.LOADING,"Considering mod file candidate {}", modFile.getFilePath()); LOGGER.debug(LogMarkers.LOADING,"Considering mod file candidate {}", modFile.getFilePath());
final Path modsjson = modFile.findResource("META-INF", "mods.toml"); final Path modsjson = modFile.findResource("META-INF", "mods.toml");
@@ -19,6 +19,7 @@ import org.jetbrains.annotations.ApiStatus;
import org.slf4j.Logger; import org.slf4j.Logger;
import java.net.URL; import java.net.URL;
import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -26,255 +27,225 @@ import java.util.Optional;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@ApiStatus.Internal @ApiStatus.Internal
public class ModInfo implements IModInfo, IConfigurable { public record ModInfo(
ModFileInfo getOwningFile,
IConfigurable getConfig,
String getModId,
String getNamespace,
ArtifactVersion getVersion,
String getDisplayName,
String getDescription,
Optional<String> getLogoFile,
boolean getLogoBlur,
Optional<URL> getUpdateURL,
Optional<URL> getModURL,
Holder<List<? extends ModVersion>> dependencies,
Holder<List<ForgeFeature.Bound>> forgeFeatures,
Map<String, Object> getModProperties
) implements IModInfo, IConfigurable {
private static final Logger LOGGER = LogUtils.getLogger(); private static final Logger LOGGER = LogUtils.getLogger();
private static final DefaultArtifactVersion DEFAULT_VERSION = new DefaultArtifactVersion("1"); private static final DefaultArtifactVersion DEFAULT_VERSION = new DefaultArtifactVersion("1");
private static final Pattern VALID_MODID = Pattern.compile("^[a-z][a-z0-9_]{1,63}$"); private static final Pattern VALID_MODID = Pattern.compile("^[a-z][a-z0-9_]{1,63}$");
private static final Pattern VALID_NAMESPACE = Pattern.compile("^[a-z][a-z0-9_.-]{1,63}$"); private static final Pattern VALID_NAMESPACE = Pattern.compile("^[a-z][a-z0-9_.-]{1,63}$");
private static final Pattern VALID_VERSION = Pattern.compile("^\\d+.*"); private static final Pattern VALID_VERSION = Pattern.compile("^\\d+.*");
private final ModFileInfo owningFile; public static ModInfo of(ModFileInfo owningFile, IConfigurable config) {
private final String modId;
private final String namespace;
private final ArtifactVersion version;
private final String displayName;
private final String description;
private final Optional<String> logoFile;
private final boolean logoBlur;
private final Optional<URL> updateJSONURL;
private final List<? extends IModInfo.ModVersion> dependencies;
private final List<ForgeFeature.Bound> features;
private final Map<String,Object> properties;
private final IConfigurable config;
private final Optional<URL> modUrl;
public ModInfo(final ModFileInfo owningFile, final IConfigurable config)
{
Optional<ModFileInfo> ownFile = Optional.ofNullable(owningFile);
this.owningFile = owningFile;
this.config = config;
// These are sourced from the mod specific [[mod]] entry // These are sourced from the mod specific [[mod]] entry
this.modId = config.<String>getConfigElement("modId") String modId = config.<String>getConfigElement("modId").orElse(null);
.orElseThrow(() -> new InvalidModFileException("Missing modId", owningFile)); if (modId == null)
throw new InvalidModFileException("Missing modId", owningFile);
// verify we have a valid modid // verify we have a valid modid
if (!VALID_MODID.matcher(this.modId).matches()) { if (!VALID_MODID.matcher(modId).matches()) {
LOGGER.error(LogUtils.FATAL_MARKER, "Invalid modId found in file {} - {} does not match the standard: {}", this.owningFile.getFile().getFilePath(), this.modId, VALID_MODID.pattern()); LOGGER.error(LogUtils.FATAL_MARKER, "Invalid modId found in file {} - {} does not match the standard: {}", owningFile.getFile().getFilePath(), modId, VALID_MODID.pattern());
throw new InvalidModFileException("Invalid modId found : " + this.modId, owningFile); throw new InvalidModFileException("Invalid modId found : " + modId, owningFile);
} }
this.namespace = config.<String>getConfigElement("namespace")
.orElse(this.modId); String namespace = config.<String>getConfigElement("namespace")
.orElse(modId);
// verify our namespace is valid // verify our namespace is valid
if (!VALID_NAMESPACE.matcher(this.namespace).matches()) { if (!VALID_NAMESPACE.matcher(namespace).matches()) {
LOGGER.error(LogUtils.FATAL_MARKER, "Invalid override namespace found in file {} - {} does not match the standard: {}", this.owningFile.getFile().getFilePath(), this.namespace, VALID_NAMESPACE.pattern()); LOGGER.error(LogUtils.FATAL_MARKER, "Invalid override namespace found in file {} - {} does not match the standard: {}", owningFile.getFile().getFilePath(), namespace, VALID_NAMESPACE.pattern());
throw new InvalidModFileException("Invalid override namespace found : " + this.namespace, owningFile); throw new InvalidModFileException("Invalid override namespace found : " + namespace, owningFile);
} }
this.version = config.<String>getConfigElement("version")
.map(s -> StringSubstitutor.replace(s, ownFile.map(ModFileInfo::getFile).orElse(null))) ArtifactVersion version = config.<String>getConfigElement("version")
.map(s -> StringSubstitutor.replace(s, owningFile.getFile()))
.map(DefaultArtifactVersion::new) .map(DefaultArtifactVersion::new)
.orElse(DEFAULT_VERSION); .orElse(DEFAULT_VERSION);
// verify we have a valid mod version // verify we have a valid mod version
if (!VALID_VERSION.matcher(this.version.toString()).matches()) { if (!VALID_VERSION.matcher(version.toString()).matches())
throw new InvalidModFileException("Illegal version number specified "+this.version, this.getOwningFile()); throw new InvalidModFileException("Illegal version number specified " + version, owningFile);
}
// The remaining properties all default to sensible values and are not essential // The remaining properties all default to sensible values and are not essential
this.displayName = config.<String>getConfigElement("displayName") String displayName = config.<String>getConfigElement("displayName")
.orElse(this.modId); .orElse(modId);
this.description = config.<String>getConfigElement("description")
String description = config.<String>getConfigElement("description")
.orElse("MISSING DESCRIPTION") .orElse("MISSING DESCRIPTION")
.replace("\r\n", "\n").stripIndent(); .replace("\r\n", "\n").stripIndent();
this.logoFile = Optional.ofNullable(config.<String>getConfigElement("logoFile")
.orElseGet(() -> ownFile.flatMap(mf -> mf.<String>getConfigElement("logoFile")) Optional<String> logoFile = Optional.ofNullable(
.orElse(null))); config.<String>getConfigElement("logoFile")
this.logoBlur = config.<Boolean>getConfigElement("logoBlur") .orElseGet(() -> owningFile.<String>getConfigElement("logoFile").orElse(null))
.orElseGet(() -> ownFile.flatMap(f -> f.<Boolean>getConfigElement("logoBlur")) );
.orElse(true));
this.updateJSONURL = config.<String>getConfigElement("updateJSONURL") Boolean logoBlur = config.<Boolean>getConfigElement("logoBlur").orElse(null);
if (logoBlur == null)
logoBlur = owningFile.<Boolean>getConfigElement("logoBlur").orElse(true);
Optional<URL> updateJSONURL = config.<String>getConfigElement("updateJSONURL")
.map(StringUtils::toURL); .map(StringUtils::toURL);
this.modUrl = config.<String>getConfigElement("modUrl")
Optional<URL> modUrl = config.<String>getConfigElement("modUrl")
.map(StringUtils::toURL); .map(StringUtils::toURL);
// These are sourced from the file rather than the mod-specific block, but with a modid tag
this.dependencies = ownFile.map(mfi -> mfi.getConfigList("dependencies", this.modId)) // dependencies and features are done after the constructor as they need to reference the ModInfo we are creating
.orElse(Collections.emptyList()) List<? extends ModVersion> dependencies = Collections.emptyList();
.stream() List<ForgeFeature.Bound> forgeFeatures = Collections.emptyList();
.map(dep -> new ModVersion(this, dep))
.toList(); Map<String, Object> modProperties = owningFile.<Map<String, Object>>getConfigElement("modproperties", modId)
this.features = ownFile.flatMap(mfi -> mfi.<Map<String, Object>>getConfigElement("features", this.modId)) .map(Collections::unmodifiableMap)
.stream()
.flatMap(m->m.entrySet().stream())
.map(this::makeBound)
.toList();
this.properties = ownFile.flatMap(mfi -> mfi.<Map<String, Object>>getConfigElement("modproperties", this.modId))
.orElse(Collections.emptyMap()); .orElse(Collections.emptyMap());
return new ModInfo(
owningFile, config,
modId, namespace, version,
displayName, description, logoFile, logoBlur, updateJSONURL, modUrl,
new Holder<>(dependencies), new Holder<>(forgeFeatures), modProperties
).setupDependencies().setupForgeFeatures();
} }
@Override private ModInfo setupDependencies() {
public ModFileInfo getOwningFile() { var deps = getOwningFile.getConfigList("dependencies", getModId);
return owningFile; if (deps == null || deps.isEmpty()) {
dependencies.value = Collections.emptyList();
return this;
}
var tmp = new ModVersion[deps.size()];
for (int i = 0; i < deps.size(); i++) {
tmp[i] = ModVersion.of(this, deps.get(i));
}
dependencies.value = List.of(tmp);
return this;
} }
@Override private ModInfo setupForgeFeatures() {
public String getModId() { var feats = getOwningFile.<Map<String, Object>>getConfigElement("features", getModId).orElse(null);
return modId; if (feats == null) {
} forgeFeatures.value = Collections.emptyList();
return this;
}
@Override var tmp = new ArrayList<ForgeFeature.Bound>();
public String getDisplayName() for (var entry : feats.entrySet()) {
{ if (!(entry.getValue() instanceof String val))
return this.displayName; throw new InvalidModFileException("Invalid feature bound {" + entry.getValue() + "} for key {" + entry.getKey() + "} only strings are accepted", getOwningFile);
} tmp.add(new ForgeFeature.Bound(entry.getKey(), val, this));
}
@Override forgeFeatures.value = List.copyOf(tmp);
public String getDescription()
{
return this.description;
}
@Override
public ArtifactVersion getVersion() {
return version;
}
@Override
public List<? extends IModInfo.ModVersion> getDependencies() {
return this.dependencies;
}
@Override
public String getNamespace() {
return this.namespace;
}
@Override
public Map<String, Object> getModProperties() {
return this.properties;
}
@Override
public Optional<URL> getUpdateURL() {
return this.updateJSONURL;
}
@Override
public Optional<String> getLogoFile()
{
return this.logoFile;
}
@Override
public boolean getLogoBlur()
{
return this.logoBlur;
}
@Override
public IConfigurable getConfig() {
return this; return this;
} }
@Override @Override
public List<? extends ForgeFeature.Bound> getForgeFeatures() { public <T> Optional<T> getConfigElement(String key) {
return this.features; return getConfig.getConfigElement(key);
} }
@Override @Override
public <T> Optional<T> getConfigElement(final String... key) { public <T> Optional<T> getConfigElement(String... key) {
return this.config.getConfigElement(key); return getConfig.getConfigElement(key);
} }
@Override @Override
public List<? extends IConfigurable> getConfigList(final String... key) { public List<? extends IConfigurable> getConfigList(String... key) {
return null; return null;
} }
@Override @Override
public Optional<URL> getModURL() { public List<? extends IModInfo.ModVersion> getDependencies() {
return modUrl; return dependencies.value;
} }
private ForgeFeature.Bound makeBound(Map.Entry<String, Object> e) { @Override
if (e.getValue() instanceof String val) { public List<? extends ForgeFeature.Bound> getForgeFeatures() {
return new ForgeFeature.Bound(e.getKey(), val, this); return forgeFeatures.value;
} else { }
throw new InvalidModFileException("Invalid feature bound {" + e.getValue() + "} for key {" + e.getKey() + "} only strings are accepted", this.owningFile);
private static final class Holder<T> {
private T value;
public Holder(T value) {
this.value = value;
} }
} }
class ModVersion implements net.minecraftforge.forgespi.language.IModInfo.ModVersion { private record ModVersion(
private IModInfo owner; Holder<IModInfo> owner,
private final String modId;
private final VersionRange versionRange;
private final boolean mandatory;
private final Ordering ordering;
private final DependencySide side;
private final Optional<URL> referralUrl;
public ModVersion(final IModInfo owner, final IConfigurable config) { String getModId,
this.owner = owner; VersionRange getVersionRange,
this.modId = config.<String>getConfigElement("modId") boolean isMandatory,
.orElseThrow(()->new InvalidModFileException("Missing required field modid in dependency", getOwningFile())); Ordering getOrdering,
this.mandatory = config.<Boolean>getConfigElement("mandatory") DependencySide getSide,
.orElseThrow(()->new InvalidModFileException("Missing required field mandatory in dependency", getOwningFile())); Optional<URL> getReferralURL
this.versionRange = config.<String>getConfigElement("versionRange") ) implements IModInfo.ModVersion {
public static ModVersion of(IModInfo owner, IConfigurable config) {
var modId = config.<String>getConfigElement("modId").orElse(null);
if (modId == null)
throw new InvalidModFileException("Missing required field modid in dependency", owner.getOwningFile());
if (modId.equals("forge")) {
var fileProps = owner.getOwningFile().getFileProperties();
// Checking containsKey to avoid a possible exception if the property is not present (due to Collections.emptyMap())
if (!fileProps.isEmpty() && fileProps.containsKey(ModFileInfo.NOT_A_FORGE_MOD_PROP)) {
// if the mod has a dependency on Forge, but we thought it wasn't a Forge mod earlier, we were wrong
// so remove the flag.
fileProps.remove(ModFileInfo.NOT_A_FORGE_MOD_PROP);
}
}
boolean mandatory;
var mandatoryValue = config.<Boolean>getConfigElement("mandatory");
if (mandatoryValue.isPresent())
mandatory = mandatoryValue.get();
else if (owner.getOwningFile().getFileProperties().containsKey(ModFileInfo.NOT_A_FORGE_MOD_PROP))
mandatory = true;
else
throw new InvalidModFileException("Missing required field mandatory in dependency", owner.getOwningFile());
var versionRange = config.<String>getConfigElement("versionRange")
.map(MavenVersionAdapter::createFromVersionSpec) .map(MavenVersionAdapter::createFromVersionSpec)
.orElse(UNBOUNDED); .orElse(UNBOUNDED);
this.ordering = config.<String>getConfigElement("ordering") var ordering = config.<String>getConfigElement("ordering")
.map(Ordering::valueOf) .map(Ordering::valueOf)
.orElse(Ordering.NONE); .orElse(Ordering.NONE);
this.side = config.<String>getConfigElement("side") var side = config.<String>getConfigElement("side")
.map(DependencySide::valueOf) .map(DependencySide::valueOf)
.orElse(DependencySide.BOTH); .orElse(DependencySide.BOTH);
this.referralUrl = config.<String>getConfigElement("referralUrl") var referralUrl = config.<String>getConfigElement("referralUrl")
.map(StringUtils::toURL); .map(StringUtils::toURL);
}
return new ModVersion(
@Override new Holder<>(owner),
public String getModId() modId, versionRange, mandatory, ordering, side, referralUrl
{ );
return modId;
} }
@Override @Override
public VersionRange getVersionRange() public IModInfo getOwner() {
{ return owner.value;
return versionRange;
} }
@Override @Override
public boolean isMandatory() public void setOwner(IModInfo newOwner) {
{ owner.value = newOwner;
return mandatory;
}
@Override
public Ordering getOrdering()
{
return ordering;
}
@Override
public DependencySide getSide()
{
return side;
}
@Override
public void setOwner(final IModInfo owner)
{
this.owner = owner;
}
@Override
public IModInfo getOwner()
{
return owner;
}
@Override
public Optional<URL> getReferralURL() {
return referralUrl;
} }
} }
} }
@@ -9,49 +9,64 @@ import cpw.mods.jarhandling.JarMetadata;
import net.minecraftforge.forgespi.locating.IModFile; import net.minecraftforge.forgespi.locating.IModFile;
import java.lang.module.ModuleDescriptor; import java.lang.module.ModuleDescriptor;
import java.util.Objects; import java.util.Objects;
import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.ApiStatus;
@ApiStatus.Internal @ApiStatus.Internal
public final class ModJarMetadata implements JarMetadata { public final class ModJarMetadata implements JarMetadata {
private static final String AUTOMATIC_MODULE_NAME = "Automatic-Module-Name";
private IModFile modFile; private IModFile modFile;
private String name;
private String version;
private ModuleDescriptor descriptor; private ModuleDescriptor descriptor;
ModJarMetadata() { ModJarMetadata() { }
}
public void setModFile(IModFile file) { public void setModFile(IModFile file) {
this.modFile = file; this.modFile = file;
var mods = this.modFile.getModFileInfo().getMods();
if (!mods.isEmpty()) {
var main = mods.get(0);
this.name = main.getModId();
this.version = main.getVersion().toString();
}
var jar = file.getSecureJar();
var aname = jar.moduleDataProvider().getManifest().getMainAttributes().getValue(AUTOMATIC_MODULE_NAME);
if (aname != null)
this.name = aname;
} }
@Override @Override
public String name() { public String name() {
return modFile.getModFileInfo().moduleName(); return this.name;
} }
@Override @Override
public String version() { public String version() {
return modFile.getModFileInfo().versionString(); return this.version;
} }
@Override @Override
public ModuleDescriptor descriptor() { public ModuleDescriptor descriptor() {
if (descriptor != null) return descriptor; if (descriptor != null)
return descriptor;
var bld = ModuleDescriptor.newAutomaticModule(name()) var bld = ModuleDescriptor.newAutomaticModule(name())
.version(version()) .version(version())
.packages(modFile.getSecureJar().getPackages()); .packages(modFile.getSecureJar().getPackages());
modFile.getSecureJar().getProviders().stream()
.filter(p -> !p.providers().isEmpty()) for (var provider : modFile.getSecureJar().getProviders()) {
.forEach(p -> bld.provides(p.serviceName(), p.providers())); if (provider.providers().isEmpty())
modFile.getModFileInfo().usesServices().forEach(bld::uses); continue;
bld.provides(provider.serviceName(), provider.providers());
}
descriptor = bld.build(); descriptor = bld.build();
return descriptor; return descriptor;
} }
public IModFile modFile() {
return modFile;
}
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
if (obj == this) return true; if (obj == this) return true;
@@ -6,11 +6,18 @@
package net.minecraftforge.fml.loading.moddiscovery; package net.minecraftforge.fml.loading.moddiscovery;
import com.mojang.logging.LogUtils; import com.mojang.logging.LogUtils;
import cpw.mods.jarhandling.SecureJar;
import cpw.mods.modlauncher.api.IModuleLayerManager; import cpw.mods.modlauncher.api.IModuleLayerManager;
import cpw.mods.modlauncher.api.ITransformationService; import cpw.mods.modlauncher.api.ITransformationService;
import net.minecraftforge.fml.loading.*; import net.minecraftforge.fml.loading.EarlyLoadingException;
import net.minecraftforge.fml.loading.ImmediateWindowHandler;
import net.minecraftforge.fml.loading.LoadingModList;
import net.minecraftforge.fml.loading.LogMarkers;
import net.minecraftforge.fml.loading.ModSorter;
import net.minecraftforge.forgespi.language.IModFileInfo; import net.minecraftforge.forgespi.language.IModFileInfo;
import net.minecraftforge.forgespi.locating.IModFile; import net.minecraftforge.forgespi.locating.IModFile;
import net.minecraftforge.forgespi.locating.ModFileLoadingException;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger; import org.slf4j.Logger;
@@ -18,25 +25,30 @@ import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors;
public class ModValidator { public class ModValidator {
private static final Logger LOGGER = LogUtils.getLogger(); private static final Logger LOGGER = LogUtils.getLogger();
//private final Map<IModFile.Type, List<ModFile>> modFiles;
private final List<ModFile> candidatePlugins; private final List<ModFile> candidatePlugins;
private final List<ModFile> candidateMods; private final List<ModFile> candidateMods;
private final List<ModFile> gameLibraries;
private LoadingModList loadingModList; private LoadingModList loadingModList;
private List<IModFile> brokenFiles; private final List<IModFile> brokenFiles = new ArrayList<>();
private final List<EarlyLoadingException.ExceptionData> discoveryErrorData; private final List<EarlyLoadingException.ExceptionData> discoveryErrorData;
private final List<ModFileLoadingException> modFileLoadingExceptions;
public ModValidator(final Map<IModFile.Type, List<ModFile>> modFiles, final List<IModFileInfo> brokenFiles, final List<EarlyLoadingException.ExceptionData> discoveryErrorData) { public ModValidator(Map<IModFile.Type, List<ModFile>> modFiles, List<IModFileInfo> brokenFiles, List<EarlyLoadingException.ExceptionData> discoveryErrorData, List<ModFileLoadingException> modFileLoadingExceptions) {
//this.modFiles = modFiles;
this.candidateMods = lst(modFiles.get(IModFile.Type.MOD)); this.candidateMods = lst(modFiles.get(IModFile.Type.MOD));
this.candidateMods.addAll(lst(modFiles.get(IModFile.Type.GAMELIBRARY))); this.gameLibraries = lst(modFiles.get(IModFile.Type.GAMELIBRARY));
this.candidateMods.addAll(this.gameLibraries);
this.candidatePlugins = lst(modFiles.get(IModFile.Type.LANGPROVIDER)); this.candidatePlugins = lst(modFiles.get(IModFile.Type.LANGPROVIDER));
this.candidatePlugins.addAll(lst(modFiles.get(IModFile.Type.LIBRARY))); this.candidatePlugins.addAll(lst(modFiles.get(IModFile.Type.LIBRARY)));
this.discoveryErrorData = discoveryErrorData; this.discoveryErrorData = discoveryErrorData;
this.brokenFiles = brokenFiles.stream().map(IModFileInfo::getFile).collect(Collectors.toList()); // mutable list this.brokenFiles.addAll(brokenFiles.stream().map(IModFileInfo::getFile).toList());
this.modFileLoadingExceptions = modFileLoadingExceptions;
}
public ModValidator(Map<IModFile.Type, List<ModFile>> modFiles, List<IModFileInfo> brokenFiles, List<EarlyLoadingException.ExceptionData> discoveryErrorData) {
this(modFiles, brokenFiles, discoveryErrorData, List.of());
} }
private static List<ModFile> lst(List<ModFile> files) { private static List<ModFile> lst(List<ModFile> files) {
@@ -52,10 +64,9 @@ public class ModValidator {
} }
@NotNull @NotNull
private List<ModFile> validateFiles(final List<ModFile> mods) { private static List<ModFile> validateFiles(final List<ModFile> mods) {
final List<ModFile> brokenFiles = new ArrayList<>(); final List<ModFile> brokenFiles = new ArrayList<>();
for (Iterator<ModFile> iterator = mods.iterator(); iterator.hasNext(); ) for (Iterator<ModFile> iterator = mods.iterator(); iterator.hasNext();) {
{
ModFile modFile = iterator.next(); ModFile modFile = iterator.next();
if (!modFile.getProvider().isValid(modFile) || !modFile.identifyMods()) { if (!modFile.getProvider().isValid(modFile) || !modFile.identifyMods()) {
LOGGER.warn(LogMarkers.SCAN, "File {} has been ignored - it is invalid", modFile.getFilePath()); LOGGER.warn(LogMarkers.SCAN, "File {} has been ignored - it is invalid", modFile.getFilePath());
@@ -71,13 +82,32 @@ public class ModValidator {
} }
public ITransformationService.Resource getModResources() { public ITransformationService.Resource getModResources() {
return new ITransformationService.Resource(IModuleLayerManager.Layer.GAME, this.candidateMods.stream().map(IModFile::getSecureJar).toList()); var mods = new ArrayList<SecureJar>();
// Add only the valid mods that we will be attempting to load.
// If any detectable error happens during the sorting process {missing deps, duplicates,
// This helps prevent coremods/mixins from screwing up us displaying the error screens that the sorting/validation is trying to display.
// This won't fix them all as they are still loaded and will still apply but it might help
for (var info : this.loadingModList.getModFiles())
mods.add(info.getFile().getSecureJar());
// Add any game libraries, this *may* be duplicates, depending on the state of the sorting. But until I get around to re-writing
// that clusterfuck of a system, have this simple de-duplication. Order of resource is important, but i'm unsure if duplication is
// so might as well waste a few cycles on checking. Still faster then converting from a set to a list.
// Ideally we would explicitly list out which mods to load {forge and MC being the only ones} but some coremods could require extra things.
// So try game libraries as well
for (var lib : this.gameLibraries) {
var jar = lib.getSecureJar();
if (!mods.contains(jar))
mods.add(jar);
}
return new ITransformationService.Resource(IModuleLayerManager.Layer.GAME, mods);
} }
private List<EarlyLoadingException.ExceptionData> validateLanguages() { private List<EarlyLoadingException.ExceptionData> validateLanguages() {
List<EarlyLoadingException.ExceptionData> errorData = new ArrayList<>(); List<EarlyLoadingException.ExceptionData> errorData = new ArrayList<>();
for (Iterator<ModFile> iterator = this.candidateMods.iterator(); iterator.hasNext(); ) { for (Iterator<ModFile> iterator = this.candidateMods.iterator(); iterator.hasNext();) {
final ModFile modFile = iterator.next(); var modFile = iterator.next();
try { try {
modFile.identifyLanguage(); modFile.identifyLanguage();
} catch (EarlyLoadingException e) { } catch (EarlyLoadingException e) {
@@ -16,6 +16,7 @@ import org.slf4j.Logger;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
@@ -42,11 +43,21 @@ public class ModsFolderLocator extends AbstractModProvider implements IModLocato
public List<IModLocator.ModFileOrException> scanMods() { public List<IModLocator.ModFileOrException> scanMods() {
LOGGER.debug(LogMarkers.SCAN, "Scanning mods dir {} for mods", this.modFolder); LOGGER.debug(LogMarkers.SCAN, "Scanning mods dir {} for mods", this.modFolder);
var excluded = ModDirTransformerDiscoverer.allExcluded(); var excluded = ModDirTransformerDiscoverer.allExcluded();
try (var stream = Files.list(this.modFolder)) { try {
return stream.filter(path -> !excluded.contains(path) && path.getFileName().toString().toLowerCase(Locale.ROOT).endsWith(SUFFIX)) var ret = new ArrayList<IModLocator.ModFileOrException>();
.sorted(Comparator.comparing(path -> path.getFileName().toString().toLowerCase(Locale.ROOT))) var files = Files.list(this.modFolder).toList();
.map(this::createMod) for (var file : files) {
.toList(); var name = file.getFileName().toString().toLowerCase(Locale.ROOT);
if (excluded.contains(file) || !name.endsWith(SUFFIX))
continue;
var mod = this.createMod(file, true);
if (mod == null) {
LOGGER.debug(LogMarkers.SCAN, "Found unknown jar file {} ignoring", file);
} else {
ret.add(mod);
}
}
return ret;
} catch (IOException e) { } catch (IOException e) {
return sneak(e); return sneak(e);
} }
@@ -6,6 +6,8 @@
package net.minecraftforge.fml.loading.moddiscovery; package net.minecraftforge.fml.loading.moddiscovery;
import com.electronwill.nightconfig.core.UnmodifiableConfig; import com.electronwill.nightconfig.core.UnmodifiableConfig;
import com.google.common.collect.ImmutableMap;
import net.minecraftforge.forgespi.language.IConfigurable; import net.minecraftforge.forgespi.language.IConfigurable;
import net.minecraftforge.forgespi.language.IModFileInfo; import net.minecraftforge.forgespi.language.IModFileInfo;
@@ -16,11 +18,12 @@ import java.util.Optional;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.Nullable;
import static java.util.Arrays.asList; import static java.util.Arrays.asList;
@ApiStatus.Internal @ApiStatus.Internal
class NightConfigWrapper implements IConfigurable { final class NightConfigWrapper implements IConfigurable {
private final UnmodifiableConfig config; private final UnmodifiableConfig config;
private IModFileInfo file; private IModFileInfo file;
@@ -28,35 +31,51 @@ class NightConfigWrapper implements IConfigurable {
this.config = config; this.config = config;
} }
NightConfigWrapper setFile(IModFileInfo file) { private NightConfigWrapper(UnmodifiableConfig config, IModFileInfo file) {
this.config = config;
this.file = file;
}
void setFile(IModFileInfo file) {
this.file = file; this.file = file;
return this;
} }
@Override @Override
@SuppressWarnings("unchecked") public <T> Optional<T> getConfigElement(String key) {
var path = List.of(key);
return Optional.ofNullable(validate(this.config.get(path), path));
}
@Override
public <T> Optional<T> getConfigElement(final String... key) { public <T> Optional<T> getConfigElement(final String... key) {
var path = asList(key); var path = asList(key);
return this.config.getOptional(path).map(value -> { return Optional.ofNullable(validate(this.config.get(path), path));
if (value instanceof UnmodifiableConfig) { }
return (T) ((UnmodifiableConfig) value).valueMap();
} else if (value instanceof ArrayList<?> al && al.size() > 0 && al.get(0) instanceof UnmodifiableConfig) { @SuppressWarnings("unchecked")
throw new InvalidModFileException("The configuration path " + path + " is invalid. I wasn't expecting a multi-object list - remove one of the [[ ]]", file); private <T> T validate(@Nullable T value, List<String> path) {
} if (value instanceof UnmodifiableConfig cfg) {
return (T) value; // New Night config doesn't implement valueMap(), so do a copy.
}); var entries = cfg.entrySet();
var builder = ImmutableMap.builderWithExpectedSize(entries.size());
for (var e : entries)
builder.put(e.getKey(), e.getValue());
return (T) builder.build();
} else if (value instanceof ArrayList<?> al && !al.isEmpty() && al.getFirst() instanceof UnmodifiableConfig) {
throw new InvalidModFileException("The configuration path " + path + " is invalid. I wasn't expecting a multi-object list - remove one of the [[ ]]", file);
}
return value;
} }
@Override @Override
public List<? extends IConfigurable> getConfigList(final String... key) { public List<? extends IConfigurable> getConfigList(final String... key) {
final List<String> path = asList(key); final List<String> path = asList(key);
if (this.config.contains(path) && !(this.config.get(path) instanceof Collection)) { if (this.config.contains(path) && !(this.config.get(path) instanceof Collection)) {
throw new InvalidModFileException("The configuration path "+path+" is invalid. Expecting a collection!", file); throw new InvalidModFileException("The configuration path " + path + " is invalid. Expecting a collection!", file);
} }
final Collection<UnmodifiableConfig> nestedConfigs = this.config.getOrElse(path, ArrayList::new); final Collection<UnmodifiableConfig> nestedConfigs = this.config.getOrElse(path, ArrayList::new);
return nestedConfigs.stream() return nestedConfigs.stream()
.map(NightConfigWrapper::new) .map(conf -> new NightConfigWrapper(conf, file))
.map(cw->cw.setFile(file))
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
} }
@@ -21,37 +21,36 @@ import java.nio.file.Path;
import java.util.List; import java.util.List;
@ApiStatus.Internal @ApiStatus.Internal
class Scanner { record Scanner(ModFile fileToScan, ModFileScanData result) {
private static final Logger LOGGER = LogUtils.getLogger(); private static final Logger LOGGER = LogUtils.getLogger();
private final ModFile fileToScan; private static final boolean DEBUG = LOGGER.isDebugEnabled(LogMarkers.SCAN);
public Scanner(final ModFile fileToScan) { public Scanner(ModFile fileToScan) {
this.fileToScan = fileToScan; this(fileToScan, new ModFileScanData());
} }
public ModFileScanData scan() { public ModFileScanData scan() {
ModFileScanData result = new ModFileScanData();
result.addModFileInfo(fileToScan.getModFileInfo()); result.addModFileInfo(fileToScan.getModFileInfo());
fileToScan.scanFile(p -> fileVisitor(p, result)); fileToScan.scanFile(this::fileVisitor);
final List<IModLanguageProvider> loaders = fileToScan.getLoaders(); final List<IModLanguageProvider> loaders = fileToScan.getLoaders();
if (loaders != null) { if (loaders != null) {
loaders.forEach(loader -> { for (IModLanguageProvider loader : loaders) {
LOGGER.debug(LogMarkers.SCAN, "Scanning {} with language loader {}", fileToScan.getFilePath(), loader.name()); if (DEBUG) LOGGER.debug("Scanning {} with language loader {}", fileToScan.getFilePath(), loader.name());
loader.getFileVisitor().accept(result); loader.getFileVisitor().accept(result);
}); }
} }
return result; return result;
} }
private void fileVisitor(final Path path, final ModFileScanData result) { private void fileVisitor(final Path path) {
LOGGER.debug(LogMarkers.SCAN,"Scanning {} path {}", fileToScan, path); try (InputStream in = Files.newInputStream(path)) {
try (InputStream in = Files.newInputStream(path)){
ModClassVisitor mcv = new ModClassVisitor(); ModClassVisitor mcv = new ModClassVisitor();
ClassReader cr = new ClassReader(in); ClassReader cr = new ClassReader(in);
cr.accept(mcv, 0); cr.accept(mcv, ClassReader.SKIP_CODE | ClassReader.SKIP_DEBUG | ClassReader.SKIP_FRAMES);
mcv.buildData(result.getClasses(), result.getAnnotations()); mcv.buildData(result.getClasses(), result.getAnnotations());
} catch (IOException | IllegalArgumentException e) { } catch (IOException | IllegalArgumentException e) {
// mark path bad // mark path bad
if (DEBUG) LOGGER.warn("Failed scanning {} path {}", fileToScan, path);
} }
} }
} }
@@ -10,7 +10,7 @@ import java.util.concurrent.atomic.AtomicInteger;
public final class ProgressMeter { public final class ProgressMeter {
private final String name; private final String name;
private final int steps; private final int steps;
private AtomicInteger current; private final AtomicInteger current;
private Message label; private Message label;
public ProgressMeter(String name, int steps, int current, Message label) { public ProgressMeter(String name, int steps, int current, Message label) {
@@ -24,8 +24,8 @@ import java.util.function.Supplier;
@ApiStatus.Internal @ApiStatus.Internal
class ArgumentList { class ArgumentList {
private static final Logger LOGGER = LogUtils.getLogger(); private static final Logger LOGGER = LogUtils.getLogger();
private List<Supplier<String[]>> entries = new ArrayList<>(); private final List<Supplier<String[]>> entries = new ArrayList<>();
private Map<String, EntryValue> values = new HashMap<>(); private final Map<String, EntryValue> values = new HashMap<>();
public static ArgumentList from(String... args) { public static ArgumentList from(String... args) {
ArgumentList ret = new ArgumentList(); ArgumentList ret = new ArgumentList();
@@ -77,8 +77,8 @@ class ArgumentList {
public String[] getArguments() { public String[] getArguments() {
return entries.stream() return entries.stream()
.flatMap(e -> Arrays.asList(e.get()).stream()) .flatMap(e -> Arrays.stream(e.get()))
.toArray(size -> new String[size]); .toArray(String[]::new);
} }
public boolean hasValue(String key) { public boolean hasValue(String key) {
@@ -122,7 +122,7 @@ class ArgumentList {
return ent.getValue(); return ent.getValue();
} }
private class EntryValue implements Supplier<String[]> { private static final class EntryValue implements Supplier<String[]> {
private final String prefix; private final String prefix;
private final String key; private final String key;
private final boolean split; private final boolean split;
@@ -40,7 +40,7 @@ abstract class CommonDevLaunchHandler extends CommonLaunchHandler {
String username = args.get("username"); String username = args.get("username");
if (username != null) { // Replace '#' placeholders with random numbers if (username != null) { // Replace '#' placeholders with random numbers
Matcher m = Pattern.compile("#+").matcher(username); Matcher m = Pattern.compile("#+").matcher(username);
StringBuffer replaced = new StringBuffer(); StringBuilder replaced = new StringBuilder();
while (m.find()) { while (m.find()) {
m.appendReplacement(replaced, getRandomNumbers(m.group().length())); m.appendReplacement(replaced, getRandomNumbers(m.group().length()));
} }
@@ -7,7 +7,6 @@ package net.minecraftforge.fml.loading.targets;
import com.mojang.logging.LogUtils; import com.mojang.logging.LogUtils;
import cpw.mods.modlauncher.api.ILaunchHandlerService; import cpw.mods.modlauncher.api.ILaunchHandlerService;
import cpw.mods.modlauncher.api.ITransformingClassLoaderBuilder;
import cpw.mods.modlauncher.api.ServiceRunner; import cpw.mods.modlauncher.api.ServiceRunner;
import net.minecraftforge.fml.loading.FMLLoader; import net.minecraftforge.fml.loading.FMLLoader;
import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.Dist;
@@ -46,10 +45,6 @@ public abstract class CommonLaunchHandler implements ILaunchHandlerService {
public abstract List<Path> getMinecraftPaths(); public abstract List<Path> getMinecraftPaths();
@Override
public void configureTransformationClassLoader(final ITransformingClassLoaderBuilder builder) {
}
protected String[] preLaunch(String[] arguments, ModuleLayer layer) { protected String[] preLaunch(String[] arguments, ModuleLayer layer) {
URI uri; URI uri;
try (var reader = layer.configuration().findModule("net.minecraftforge.fmlloader").orElseThrow().reference().open()) { try (var reader = layer.configuration().findModule("net.minecraftforge.fmlloader").orElseThrow().reference().open()) {
@@ -78,7 +73,7 @@ public abstract class CommonLaunchHandler implements ILaunchHandlerService {
protected static final LaunchType CLIENT = new LaunchType("client", "minecraft", "net.minecraft.client.main.Main", Dist.CLIENT, false); protected static final LaunchType CLIENT = new LaunchType("client", "minecraft", "net.minecraft.client.main.Main", Dist.CLIENT, false);
protected static final LaunchType DATA = new LaunchType("data", "minecraft", "net.minecraft.data.Main", Dist.CLIENT, true); protected static final LaunchType DATA = new LaunchType("data", "minecraft", "net.minecraft.data.Main", Dist.CLIENT, true);
protected static final LaunchType SERVER = new LaunchType("server", "minecraft", "net.minecraft.server.Main", Dist.DEDICATED_SERVER, false); protected static final LaunchType SERVER = new LaunchType("server", "minecraft", "net.minecraft.server.Main", Dist.DEDICATED_SERVER, false);
protected static final LaunchType SERVER_GAMETEST = new LaunchType("server_gametest", "forge", "net.minecraftforge.gametest.GameTestMain", Dist.DEDICATED_SERVER, false); protected static final LaunchType SERVER_GAMETEST = new LaunchType("server_gametest", "net.minecraftforge.forge", "net.minecraftforge.gametest.GameTestMain", Dist.DEDICATED_SERVER, false);
protected void runTarget(String module, String target, final String[] arguments, final ModuleLayer layer) throws Throwable { protected void runTarget(String module, String target, final String[] arguments, final ModuleLayer layer) throws Throwable {
var mod = layer.findModule(module).orElse(null); var mod = layer.findModule(module).orElse(null);
@@ -89,4 +84,24 @@ public abstract class CommonLaunchHandler implements ILaunchHandlerService {
if (mtd == null) throw new IllegalStateException("Class " + target + " in module " + module + " does not have a main(String[]) method"); if (mtd == null) throw new IllegalStateException("Class " + target + " in module " + module + " does not have a main(String[]) method");
mtd.invoke(null, (Object)arguments); mtd.invoke(null, (Object)arguments);
} }
protected static Path getPathFromResource(String resource) {
return getPathFromResource(resource, ForgeDevLaunchHandler.class.getClassLoader());
}
protected static Path getPathFromResource(String resource, ClassLoader cl) {
var url = cl.getResource(resource);
if (url == null)
throw new IllegalStateException("Could not find " + resource + " in classloader " + cl);
var str = url.toString();
int len = resource.length();
if ("jar".equalsIgnoreCase(url.getProtocol())) {
str = url.getFile();
len += 2;
}
str = str.substring(0, str.length() - len);
var path = Path.of(URI.create(str));
return path;
}
} }
Loaded 100 of 2428 files, more files were not shown because too many files have changed in this diff. Show more