Commit Graph

1286 Commits

Author SHA1 Message Date
Juuz
4e9b50fcbc Merge with Fabric 1.1, stage 2 2023-02-16 01:00:05 +02:00
Juuz
81d1f5d562 Merge with Fabric 1.1, stage 1 2023-02-16 00:53:48 +02:00
Juuz
3bae7bf8b0 Update forge runtime to 1.1.4 2023-02-07 19:48:42 +02:00
Juuz
40144c176f Fix code style 2023-01-21 13:19:41 +02:00
Juuz
5fbf3f4693 Delete temp files in Forge-related code after use
Windows doesn't remove them automatically, so we shouldn't let
them stay around after we're done using them.
2023-01-21 13:19:02 +02:00
Juuz
cf68a6eb1e Merge remote-tracking branch 'upstream/dev/1.0' into dev/1.0 2023-01-16 19:56:25 +02:00
Juuz
93d3b4c1bd Slightly clean up ModProcessor and SourceRemapper 2023-01-08 22:20:01 +02:00
Juuz
bb904a5a5d Improve ModMetadataFile
- Add ModMetadataFile.fromJar
- Add ModMetadataFile.getId and getFileName
- Document the code
- Move AccessWidenerFile to ModMetadataFile
2023-01-07 15:05:53 +02:00
Juuz
f2c0d7a35d Split Architectury extensions to Fabric classes into new classes (#116)
* Split custom RemapJarTask logic into a new class

* Split a lot of logic for Arch and Quilt mod metadata into new classes

* ArchitecturyCommonJson: Fix outdated error message

* Add minimal unit tests for ACJ and QMJ

* QuiltModJson: Fix error when there are no injected interfaces

* QuiltModJsonTest: Add test for mixin configs

* QuiltModJsonTest: Move to correct package

* Add tests for creating ACJ and QMJ instances
2023-01-07 01:51:32 +02:00
modmuss50
fea5fee15f Fix #790 (#791) 2023-01-06 10:58:26 +00:00
modmuss50
b79b64298b Update mercury (#777) 2022-12-18 15:59:53 +00:00
modmuss50
aef884d005 Add mixin mappings as compile task outputs (#768)
Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
2022-12-11 18:27:37 +00:00
modmuss50
be4e7a42a3 Fix getRuntimeRemapConfigurations() returning the wrong classpath. (#769) 2022-12-11 18:26:39 +00:00
Juuz
8dad64dc66 Merge remote-tracking branch 'upstream/dev/1.0' into dev/1.0 2022-12-11 15:40:24 +02:00
Juuz
892da2826a Fix source_roots property ordering for Forge 1.16.5
Resources have to come first since it expects mods.toml to be there.
2022-12-11 15:38:33 +02:00
Juuz
ec76760ca4 Clear Fernflower context after decompiling (#760) 2022-12-09 08:49:43 +00:00
modmuss50
7173c2a6cb Add AbstractRemapJarTask.getAdditionalClientOnlyEntries 2022-11-21 19:24:21 +00:00
Juuz
e48a7124f5 Add LoomGradleExtensionAPI.getRuns() for consistency with runs() (#748)
* Add LoomGradleExtensionAPI.getRuns() for consistency with runs()

* Improve jd
2022-11-01 19:31:03 +00:00
Juuz
ec360e418e Delete RunDataTask
It's been deprecated since for over a year (since 0.6/January 2021).
2022-10-30 14:20:44 +02:00
Juuz
2dcb964db8 Resolve Forge run args and vm args as config values 2022-10-30 13:06:15 +02:00
Juuz
7af0d425f8 Fix variable resolving in Forge run configs 2022-10-30 12:48:52 +02:00
Juuz
d4cc730f5d Fix common mods not being remapped 2022-10-30 12:01:22 +02:00
modmuss50
c73b3735cf Fix ProcessedNamedMinecraftProvider always re-processing jars. 2022-10-29 22:03:32 +01:00
Juuz
8d54df26ca Remove LaunchProviderSettings (#103)
* Remove LaunchProviderSettings

Closes #99.

- Added new RunConfigSettings.forgeTemplate API
- Removed LaunchProviderSettings and loom.launches
- Removed most evaluateLater usages, only used for configuring the
  RunConfigSettings since Forge runs aren't resolved yet when they're
  created
- Didn't migrate Forge userdev stuff to runs, most of it still injects
  directly into DLI

* Fix Fabric

* Fix 1.14 - 1.16.5 Forge, add test for ForgeRunTemplate for those versions

* Move ConfigValue out of mcpconfig, clean up

* Add test for config values

* Stop replacing user config values with ours
2022-10-29 14:21:50 +03:00
Juuz
515e1113c2 Merge remote-tracking branch 'upstream/dev/1.0' into dev/1.0
# Conflicts:
#	.github/workflows/test.yml
#	build.gradle
2022-10-29 13:54:39 +03:00
modmuss50
e7bee0daa8 Store minecraft jars in a maven repo instead of an ivy repo.
Improve intelij support for attaching sources.
2022-10-26 12:51:08 +01:00
modmuss50
ccc3e77fe1 Only use mixin mappings from projects with the same mapping id. 2022-10-26 12:51:08 +01:00
modmuss50
00a3b7ff4e Move Iface injection to new MinecraftJarProcessor API 2022-10-26 12:51:08 +01:00
modmuss50
47987b2aa3 Cleanup configuration related code by passing ConfigContext 2022-10-26 12:51:08 +01:00
modmuss50
06074ae73c Start on improved mappings service 2022-10-26 12:47:36 +01:00
modmuss50
9d7a3eef8f Fix crash.
More small fixes.
2022-10-26 12:47:36 +01:00
modmuss50
bfb7d9fcc2 Merge remote-tracking branch 'origin/dev/1.0' into fmj_2
# Conflicts:
#	src/main/java/net/fabricmc/loom/util/gradle/SourceSetHelper.java
#	src/test/groovy/net/fabricmc/loom/test/LoomTestConstants.groovy
2022-10-07 10:19:11 +01:00
modmuss50
0036d81a3a Fixes to legacy jar processors. 2022-10-06 22:48:09 +01:00
modmuss50
cc43cfc1dc Major steps towards config caching support :) 2022-10-06 21:42:45 +01:00
modmuss50
24b727c84c More changes 2022-10-04 20:46:46 +01:00
modmuss50
ab4234330e First look at MinecraftJarProcessor API 2022-10-03 22:00:07 +01:00
modmuss50
57b5f05c57 Fix support for latest Gradle 8.0 nightly. (#732)
* Fix support for Gradle 8.0.

* Cleanup

* Fix another gradle 8 issue?
2022-10-02 16:28:55 +01:00
modmuss50
f221101477 Inherit environment variables. Fixes #730 (#733) 2022-10-01 16:20:08 +01:00
modmuss50
559ead49e1 Search for injected interfaces in the client sourceset by default. (#731) 2022-10-01 09:55:03 +01:00
modmuss50
c9356349de Fix crash 2022-10-01 09:19:20 +01:00
modmuss50
514dd24e9e Initial support for fabric.mod.json V2 2022-10-01 08:59:39 +01:00
modmuss50
5ae24af98b Fix incorrect Mixin message argument key. 2022-09-24 21:02:49 +01:00
modmuss50
35e32e89f3 Retry failed tests. (#721)
* Retry failed tests.

* Minor updates.
2022-09-11 20:25:49 +01:00
Juuz
cd8822457e Fix v1 mappings (#104)
Fixes #100. A minor setback is that they can't now be used on Forge.
2022-09-11 21:55:17 +03:00
Juuz
c0677c5770 Merge remote-tracking branch 'upstream/dev/1.0' into dev/1.0 2022-09-11 19:39:46 +03:00
modmuss50
1b4226aca9 Fix mods being always being applied to the main sourceset and not the target. (#719) 2022-09-11 15:58:28 +01:00
Juuxel
ea9dc0baa5 Add genForgePatchedSources task (#98)
* Add genForgePatchedSources task

Closes #32. Also reworks the MCP executor system quite heavily:

- Instead of executing all steps up to `x`, it now resolves dependencies based on step inputs
- No-op steps are skipped
- Steps can be overridden with custom logic by callers
- You can add multiple desired steps to one round of execution
- All step types in MCPConfig 1.14-1.19 are supported now
- Variables that reference MCPConfig zip contents now work
  - Removed special case for `{mappings}` variable

Other:
- the MCPConfig zip is now completely extracted into the cache dir instead of just the config file
2022-09-07 15:36:05 +03:00
Juuz
f8603e11ef Checkstyle 2022-09-07 03:58:46 +03:00
Juuz
7690e46e29 Don't linemap Forge's own classes in GenerateSourcesTask 2022-09-07 03:54:26 +03:00
Juuz
8076b417b2 McpExecutor: Extract step logic implementations to their own classes 2022-09-07 01:14:09 +03:00