Commit Graph

1354 Commits

Author SHA1 Message Date
Juuz
39d95d29bb Update Unprotect to 1.2.0 to fix hot swap issues 2022-05-24 20:44:21 +03:00
Emma C. Pointer-Null
5770b9a12d Improvements to Quilt JiJ (#83) 2022-05-08 16:57:17 +08:00
Juuxel
514ba75a1e Replace compile-time package access fixing on Forge with Unprotect (#84)
* Remove package access fixing

Requires Unprotect at runtime.

* Add Unprotect 1.0.0
2022-05-04 19:21:55 +08:00
Juuz
84a9b23df5 Aw2At: Fix incorrect AT for mutable fields
Fixes #76. Also introduces better tests
that cover this issue and the raw modifier
changes.
2022-05-03 13:56:31 +03:00
Juuz
99235bcba9 Fix code style 2022-04-24 19:37:06 +03:00
NinjaPhenix
2df553a4cb Some minor bug fixes for iface injection & refmaps in mixins for quilt. (#81) 2022-04-24 20:41:45 +08:00
shedaniel
06b75b3439 Merge remote-tracking branch 'FabricMC/dev/0.11' into dev/0.11.0
# Conflicts:
#	build.gradle
#	src/main/java/net/fabricmc/loom/task/service/TinyRemapperService.java
2022-04-22 14:05:07 +08:00
KosmX
9e57a4fc54 Create MixinMappingsService for every target MC version. (#631)
* Create MixinMappingsService for every target MC version.

* Use mappings identifier to identify MixinMappingsService.
2022-04-21 20:54:29 +01:00
shedaniel
7211c839fe Remap fabric mods on quilt as well
Signed-off-by: shedaniel <daniel@shedaniel.me>
2022-04-21 14:14:14 +08:00
shedaniel
73a09f5802 Make quilt mode suffix with _arch_quilt to not interfere with each other
Signed-off-by: shedaniel <daniel@shedaniel.me>
2022-04-21 14:14:07 +08:00
modmuss50
61ce05e522 Update ASM and TR. 2022-04-20 19:51:26 +01:00
shedaniel
aa5029e6fb Update tiny remapper and asm for java 19
Signed-off-by: shedaniel <daniel@shedaniel.me>
2022-04-21 01:58:48 +08:00
shedaniel
47c44245be Add quilt mode
Squashed commit of the following:

commit 2f5cd64dd232996e92e8d1f71e6ce5deb747d247
Author: shedaniel <daniel@shedaniel.me>
Date:   Wed Apr 20 16:23:18 2022 +0800

    Make installer json ignore fabric's on quilt mode

    Signed-off-by: shedaniel <daniel@shedaniel.me>

commit 381b346c88f22f30acd9620f57f6ef03e6c50102
Merge: f272145a 1c48b6cb
Author: shedaniel <daniel@shedaniel.me>
Date:   Wed Apr 20 15:43:46 2022 +0800

    Merge remote-tracking branch 'architectury/dev/0.11.0' into feature/0.11.0-quilt

commit f272145a19949c72bf1ebdcec3f7c13ed498eb5a
Author: shedaniel <daniel@shedaniel.me>
Date:   Sat Apr 16 14:22:07 2022 +0800

    Match quilt-loom up to 44030f5d4659c425cb6f1450f46be5a0546964f2

    Signed-off-by: shedaniel <daniel@shedaniel.me>

commit 0e084be5e391e79a75467d1c9a56efd02821247a
Merge: 471d6a06 4a7a2660
Author: shedaniel <daniel@shedaniel.me>
Date:   Sat Apr 16 14:13:40 2022 +0800

    Merge remote-tracking branch 'architectury/dev/0.11.0' into feature/0.11.0-quilt

commit 471d6a065a18839bbd4d724d8f4383de53752e8b
Author: shedaniel <daniel@shedaniel.me>
Date:   Mon Mar 28 18:47:20 2022 +0800

    Add QMJ support

    Signed-off-by: shedaniel <daniel@shedaniel.me>
2022-04-20 16:27:43 +08:00
shedaniel
1c48b6cbd9 Fix #79
Signed-off-by: shedaniel <daniel@shedaniel.me>
2022-04-16 15:19:23 +08:00
shedaniel
4a7a2660da Update TR, Fix #78
Signed-off-by: shedaniel <daniel@shedaniel.me>
2022-04-12 23:19:43 +08:00
shedaniel
e68aebe16f Update README
Signed-off-by: shedaniel <daniel@shedaniel.me>
2022-03-17 03:49:46 +08:00
shedaniel
d120159386 Merge remote-tracking branch 'FabricMC/dev/0.11' into dev/0.11.0 2022-03-17 02:46:54 +08:00
shedaniel
96a243e668 Merge remote-tracking branch 'architectury/dev/0.11.0' into dev/0.11.0 2022-03-15 00:31:20 +08:00
shedaniel
2e179471cb Fix #74
Signed-off-by: shedaniel <daniel@shedaniel.me>
2022-03-15 00:31:07 +08:00
Juuz
cb70b6468e Exclude org.ow2.asm from Forge maven repo
This should fix 1.3.2 and 1.4.7 or at the very
least get their tests to go further. Currently,
they hang when trying to download
org.ow2.asm:asm-all:4.1 from the Forge maven.
2022-03-09 03:22:26 +02:00
Juuz
50c1171d10 Fix part of #72
That was caused by two places resolving the configurations too early
before the mod processing had completed:

1. Forge sources remapper in Loom
2. Architectury plugin's runtime transformer file generation
   (see architectury/architectury-plugin#25)
2022-03-07 17:46:33 +02:00
Juuz
b1b77c008f Fix checkstyle 2022-03-07 12:28:13 +02:00
shedaniel
817bdb9a32 Fix forge mixin remapping
Signed-off-by: shedaniel <daniel@shedaniel.me>
2022-03-04 09:45:59 +08:00
shedaniel
fb0f6badd5 Fix alfd-transformed affecting automatic module name generation
Signed-off-by: shedaniel <daniel@shedaniel.me>
2022-03-04 09:23:56 +08:00
shedaniel
55bb78a439 Fix missing forge jar prefix in Forge 1.16
Signed-off-by: shedaniel <daniel@shedaniel.me>
2022-03-03 10:18:33 +08:00
shedaniel
e38fa2ef72 Fix DependencyDownloader to not include two versions of the same dependency
Signed-off-by: shedaniel <daniel@shedaniel.me>
2022-03-02 11:34:39 +08:00
shedaniel
edc3c82175 Merge remote-tracking branch 'FabricMC/dev/0.10' into dev/0.11.0
Signed-off-by: shedaniel <daniel@shedaniel.me>

# Conflicts:
#	src/main/java/net/fabricmc/loom/task/ValidateAccessWidenerTask.java
2022-03-02 11:23:00 +08:00
modmuss50
2a606dcf0b Add unpick support to layered file mappings, add direct url support to FileSpec. (#599)
* Add unpick support to layered file mappings, add direct url support to FileSpec.

* Disable unpick by default, fix unit tests.

* Fixes and improvements.
2022-02-27 12:27:46 +00:00
modmuss50
c406d24856 Update MCE, set the quiet Mixin AP flag. (#604) 2022-02-27 12:27:16 +00:00
shedaniel
8131dd7405 Fix checkstyle, replace "replace" with "add"
Weird that it worked though

Signed-off-by: shedaniel <daniel@shedaniel.me>
2022-02-17 01:21:51 +08:00
shedaniel
217ed9d1af Add option to inject AWs
Signed-off-by: shedaniel <daniel@shedaniel.me>
2022-02-16 14:51:05 +08:00
shedaniel
403d7c9484 Allow declaring interface injections in the architectury.common.json
Signed-off-by: shedaniel <daniel@shedaniel.me>
2022-02-16 13:44:49 +08:00
shedaniel
ced2fa30a1 Merge remote-tracking branch 'FabricMC/dev/0.11' into dev/0.11.0 2022-02-16 13:39:08 +08:00
modmuss50
56d8bcfcea Create .idea dir if it doesn't exist. 2022-02-11 20:11:14 +00:00
Juuz
ea9193870e Fix MinecraftPatchedProvider not storing files in its own working dir 2022-02-05 17:20:12 +02:00
modmuss50
94ce38068c Filter out classpath entries that do not exist. 2022-02-01 14:34:32 +00:00
Juuz
ec6f3680fe Merge remote-tracking branch 'upstream/dev/0.11' into dev/0.11.0 2022-01-31 17:15:36 +02:00
Juuxel
5dda747cee Add file mappings layer (#590)
* Support passing FileSpecs around for the FileSpec notation

* Add file mappings layer

* Add better tests for file mappings

* Remove unnecessary param in setup closure call

* Fix test code style

* Add ZipUtils.isZip

* Automatically detect whether the file is a zip

* Rename LayeredMappingSpecBuilder.fileMappings -> mappings

* Add test for file mappings in layered mappings, fix inconsistent hashCode being

* Resolve reviews
2022-01-31 14:50:19 +00:00
Juuz
e9f96b85d9 Fix SrgMerger test data for extra SRG mappings being inconsistent 2022-01-30 18:25:53 +02:00
Juuz
3776db3a5a Fix more weird edge cases in SrgMerger 2022-01-30 18:15:22 +02:00
modmuss50
287e6cefb9 Fix crash with Gradle 7.4+ during idea sync. 2022-01-29 18:14:13 +00:00
Juuz
a8a91164c4 SrgMerger: Fix reading tsrg2 files with proguard
Please be fixed now. *Please*
2022-01-28 21:21:07 +02:00
Juuz
f87fbaed60 Run Forge tests on 1.18.1 as well 2022-01-28 21:02:08 +02:00
Juuz
1abf60372b Fix up SrgMerger, hopefully for the last time 2022-01-28 16:05:51 +02:00
Juuz
f2aa466884 Centralise Forge log spam suppression into one place 2022-01-27 22:02:14 +02:00
Juuz
0697768f65 Get rid of duplicate jar prefix in ProcessedNamedMinecraftProvider 2022-01-27 21:32:05 +02:00
Juuz
3b9058f64b Set AbstractRemapJarTask.remapperIsolation default value to true
This matches what we did before.
2022-01-27 19:57:56 +02:00
Juuz
0f73e65a59 Merge remote-tracking branch 'upstream/dev/0.11' into dev/0.11.0
# Conflicts:
#	src/main/java/net/fabricmc/loom/task/AbstractRemapJarTask.java
#	src/main/java/net/fabricmc/loom/task/RemapTaskConfiguration.java
2022-01-27 19:56:59 +02:00
Juuz
3d5f61321b Revert "Workaround FabricMC/fabric-loom#587"
This reverts commit 3953aeda52.
2022-01-27 19:55:23 +02:00
modmuss50
4fe19028cf Add option to isolate the tiny remapper instance between sub-projects. (#588) 2022-01-27 17:08:17 +00:00