imports/architectury-loom
1
0
Fork 0
mirror of https://github.com/architectury/architectury-loom.git synced 2026-04-02 21:47:42 -05:00
Code Issues Packages Projects Releases Wiki Activity
989 Commits 46 Branches 9 Tags
07bc4eab7b23fee28d0036890337c5af97cc3d2f
Commit Graph

148 Commits

Author SHA1 Message Date
shedaniel
07bc4eab7b Merge branch 'upstream-0.9' into dev/0.9 
# Conflicts:
#	src/main/java/net/fabricmc/loom/LoomGradlePlugin.java
#	src/main/java/net/fabricmc/loom/configuration/LoomDependencyManager.java
#	src/main/java/net/fabricmc/loom/task/RemapJarTask.java
 2021-07-20 17:44:04 +08:00
shedaniel
49d05ad42d Give a proper working directory for GradleMappingContext 
Signed-off-by: shedaniel <daniel@shedaniel.me>

(cherry picked from commit 5eafbbceeb)
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-07-20 17:33:35 +08:00
modmuss50
2259a4efc8 Add versions used to compile/build against to jar manifest (#428) 
* Add versions used to compile/build against to jar manifest

* checkstyle

* Move to post remap

* Fix build

* Add mc version and mixin group

* Typo

* Make test run across versions better.
 2021-07-13 23:10:07 +01:00
shedaniel
ad3d7613b8 Merge remote-tracking branch 'FabricMC/dev/0.9' into dev/0.9 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-07-13 18:28:53 +08:00
modmuss50
54fe0909ff Use spotless for header validation, years have been back-filled from git history 2021-07-10 21:50:53 +01:00
shedaniel
9729933433 Allow specifying multiple accesstransformers 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-06-30 19:26:03 +08:00
shedaniel
9c95f9a900 Allow accessTransformer to be configured 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-06-30 00:43:26 +08:00
shedaniel
f3bf0a4207 Merge remote-tracking branch 'FabricMC/dev/0.9' into dev/0.9 
# Conflicts:
#	src/main/java/net/fabricmc/loom/configuration/providers/mappings/LayeredMappingSpecBuilder.java
 2021-06-20 20:24:40 +08:00
shedaniel
54d6ef7896 Fix typo "officalMojangMappings" (#420) 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-06-20 13:24:10 +01:00
shedaniel
10d810fad1 Readd silenceLicense 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-06-20 02:26:17 +08:00
shedaniel
1f93aab9d8 Reapply some patches 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-06-18 00:04:58 +08:00
shedaniel
24a515270a Merge remote-tracking branch 'FabricMC/dev/0.9' into dev/0.9 
# Conflicts:
#	build.gradle
#	src/main/java/net/fabricmc/loom/LoomGradleExtension.java
#	src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
#	src/main/java/net/fabricmc/loom/configuration/providers/MinecraftProvider.java
#	src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingsProvider.java
#	src/main/java/net/fabricmc/loom/configuration/providers/mappings/MojangMappingsDependency.java
#	src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftMappedProvider.java
#	src/main/java/net/fabricmc/loom/task/GenerateSourcesTask.java
#	src/main/java/net/fabricmc/loom/util/SourceRemapper.java
 2021-06-17 23:44:48 +08:00
modmuss50
1f9f48052b Basic layered mappings with @ParchmentMC support (#413) 2021-06-14 18:39:03 +01:00
shedaniel
5692cb277c Merge remote-tracking branch 'FabricMC/dev/0.8' into dev/0.8 
# Conflicts:
#	src/main/java/net/fabricmc/loom/LoomGradleExtension.java
 2021-05-20 22:20:38 +08:00
modmuss50
90ff811ecd Make the run config api stable 2021-05-15 19:58:08 +01:00
shedaniel
855836b972 Merge remote-tracking branch 'architectury/dev/0.7-forge' into dev/future 2021-05-12 21:43:28 +08:00
shedaniel
3f576a44ab Migration Mappings Detection 
Still having issues with source locations, would need to check it out first

Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-05-08 12:50:17 +08:00
shedaniel
68028031ba Merge remote-tracking branch 'architectury/dev/0.7-forge' into dev/future 2021-05-05 02:37:40 +08:00
shedaniel
8d96bc0b6f Use "loom.platform" instead of "loom.forge" 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-05-05 02:34:03 +08:00
shedaniel
aba834b040 Merge remote-tracking branch 'FabricMC/future/dev' into dev/future 
# Conflicts:
#	.github/workflows/test-push.yml
#	src/main/java/net/fabricmc/loom/LoomGradleExtension.java
#	src/main/java/net/fabricmc/loom/build/ModCompileRemapper.java
#	src/test/groovy/net/fabricmc/loom/test/util/ProjectTestTrait.groovy
 2021-05-05 02:21:49 +08:00
modmuss50
a5bc38a940 Make remapped configurations lazy 2021-05-04 19:07:21 +01:00
shedaniel
aa009c2b2d Add "loom.forge.include" for include configuration on forge 2021-04-14 08:45:26 +08:00
shedaniel
a0b84aaf17 Merge branch 'dev/0.6-forge' into dev/0.7-forge 
# Conflicts:
#	src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
#	src/main/java/net/fabricmc/loom/task/RemapJarTask.java
#	src/main/java/net/fabricmc/loom/task/RemapSourcesJarTask.java
#	src/main/java/net/fabricmc/loom/util/SourceRemapper.java
 2021-04-13 16:17:04 +08:00
shedaniel
635fd8a55d Allow remapping to other namespaces 2021-04-13 16:05:26 +08:00
shedaniel
8c859ecba2 Fix merge conflicts 2021-04-04 19:44:11 +08:00
shedaniel
ad1754a932 Merge remote-tracking branch 'FabricMC/dev/0.7' into dev/0.7-forge 
# Conflicts:
#	.github/workflows/test-push.yml
#	build.gradle
#	src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
#	src/main/java/net/fabricmc/loom/configuration/ide/RunConfig.java
#	src/main/java/net/fabricmc/loom/configuration/providers/MinecraftProvider.java
#	src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingsProvider.java
#	src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftMappedProvider.java
#	src/main/java/net/fabricmc/loom/configuration/providers/minecraft/assets/MinecraftAssetsProvider.java
#	src/main/java/net/fabricmc/loom/decompilers/fernflower/AbstractFernFlowerDecompiler.java
#	src/main/java/net/fabricmc/loom/decompilers/fernflower/ForkingJavaExec.java
#	src/main/java/net/fabricmc/loom/task/RemapJarTask.java
#	src/main/java/net/fabricmc/loom/util/GroovyXmlUtil.java
#	src/main/java/net/fabricmc/loom/util/HashedDownloadUtil.java
#	src/test/groovy/net/fabricmc/loom/BuildUtils.groovy
 2021-04-04 19:30:51 +08:00
modmuss50
759cac2e6b Constant unpicking (#328) 
* Start adding constant unpicking

* Update to use unpick cli

* Fix build?

* Fix?

* Fix log spam when unpicking

* Improve unpick tests
 2021-03-25 19:03:35 +00:00
shedaniel
8c0e612720 Merge remote-tracking branch 'FabricMC/dev/0.6' into dev/0.6-forge 
# Conflicts:
#	src/main/java/net/fabricmc/loom/LoomGradleExtension.java
 2021-02-27 17:43:24 +08:00
Shadowfacts
4540b3af33 Add log4jConfigs to Loom extension (#356) 
Allows mod build scripts to specify custom Log4j config files that will
be combined together when running Minecraft in the dev-env. For example:

    loom {
        log4jConfigs.from "MyCustomConfig.xml"
    }

See: https://logging.apache.org/log4j/2.x/manual/configuration.html#CompositeConfiguration
 2021-02-26 21:19:26 +00:00
shedaniel
dc73e7baa5 Add way to add new launch arguments, because this can change without regenerating the run configs. 2021-02-22 00:18:00 +08:00
shedaniel
e8800ec6ac Fix merge conflicts 2021-02-14 15:45:55 +08:00
shedaniel
021773f263 Merge remote-tracking branch 'FabricMC/dev/0.6' into dev/0.6-forge 
# Conflicts:
#	build.gradle
#	src/main/java/net/fabricmc/loom/LoomGradleExtension.java
#	src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
#	src/main/java/net/fabricmc/loom/configuration/processors/MinecraftProcessedProvider.java
#	src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingsProvider.java
#	src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftNativesProvider.java
#	src/main/java/net/fabricmc/loom/configuration/providers/minecraft/assets/MinecraftAssetsProvider.java
#	src/main/java/net/fabricmc/loom/task/GenVsCodeProjectTask.java
#	src/main/java/net/fabricmc/loom/util/SourceRemapper.java
 2021-02-14 15:42:50 +08:00
modmuss50
24c166fc79 Generate IDE run configs on a per config basis. Allows for much finer grain control over what run configs are generated. 
Defaults to generate all run configs on the root project.
 2021-02-11 18:50:25 +00:00
modmuss50
6b481fbcd6 Revert previous change, somewhat. I didnt understand the issue correctly. 2021-02-11 18:32:01 +00:00
modmuss50
4daec03a0f Rename runs -> runConfigs 2021-02-11 18:18:07 +00:00
modmuss50
409f5f8e93 Update MCE - Remove auto population of minVersion in mixins - Drop some log levels. 2021-02-11 18:12:27 +00:00
shedaniel
b8e27f3d9b Allow post configuring run configs 2021-02-09 09:19:48 +08:00
shedaniel
db7340caf1 Create the data run 2021-02-03 11:14:21 +08:00
shedaniel
32e5297de4 Merge remote-tracking branch 'FabricMC/dev/0.6' into dev/0.6-forge 2021-02-02 14:59:33 +08:00
NinjaPhenix
20248dc805 Fixes refmap errors in sub-subprojects by replacing any subsequent : with a _. 2021-01-29 21:13:50 +00:00
shedaniel
751509af4a Mark useFabricMixin = true by default. 2021-01-30 02:26:39 +08:00
modmuss50
6a315be278 Improve run configs (#318) (#338) 
Co-authored-by: ShadewRG <onankman@gmail.com>
Co-authored-by: UndeadCat | Shadew <redgalaxysw@gmail.com>
Co-authored-by: liach <7806504+liach@users.noreply.github.com>
 2021-01-29 18:04:39 +00:00
shedaniel
71392052eb Data Generator for Forge 2021-01-29 10:39:20 +08:00
shedaniel
10f5eb0612 fix mixinConfig 2021-01-24 20:11:49 +08:00
shedaniel
ed9100c418 Deprecate mixinConfig in favor of mixinConfig method to add to the list 2021-01-24 18:32:40 +08:00
shedaniel
ba3735c68e Allow configuring additional local sourceSets. 2021-01-20 20:00:06 +08:00
shedaniel
dd4ce6db5f Merge remote-tracking branch 'FabricMC/dev/0.6' into dev/0.6-forge 
# Conflicts:
#	src/main/java/net/fabricmc/loom/LoomGradleExtension.java
 2021-01-19 09:14:29 +08:00
modmuss50
a436eb7690 1 Infinite Loop 2021-01-18 22:10:44 +00:00
shedaniel
782323e568 Fix failed getMixinVersion resolution 2021-01-18 09:18:16 +08:00
shedaniel
3a49510c01 Merge remote-tracking branch 'FabricMC/dev/0.6' into dev/0.6-forge 2021-01-18 09:07:03 +08:00