Commit Graph

122 Commits

Author SHA1 Message Date
shedaniel
635fd8a55d Allow remapping to other namespaces 2021-04-13 16:05:26 +08: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
shedaniel
6f10845562 Allow switching to fabric mixin in forge, allowing advanced refmap remapper, making yarn for forge working. 2021-01-13 20:32:37 +08:00
shedaniel
49f3b7209e Allow the generation of tiny mappings with srg without being in a forge environment 2020-12-30 18:47:54 +08:00
shedaniel
7a1bf32134 Allow specifying multiple mixin configs for forge 2020-12-30 15:58:41 +08:00
modmuss50
792a64e2ef Optimise loom configuration, saves 1.2 seconds in my testing. #319 2020-12-27 16:25:30 +00:00
modmuss50
03444f26b0 General code cleanup (#313)
* First general cleanup pass

* Review feedback

* Fix build

* Fix tests
2020-12-24 20:58:30 +00:00
shedaniel
07f252d70e Option to disable mojmap warning + ways to add tasks to do before run. 2020-12-08 21:24:42 +08:00
Juuxel
8baa801394 Merge branch 'dev/0.5' into forge 2020-12-03 18:10:27 +02:00
Juuxel
e88a614b72 Add Forge mixin support 2020-12-03 12:21:01 +02:00
modmuss50
dd68c84226 Allow specifying natives directory with the fabric.loom.natives.dir gradle property.
Note this is designed to allow easy usage of custom natives, thus will not populate the directory with the default natives.
2020-12-02 20:18:12 +00:00
Juuxel
bda5d16924 Add fml.mcVersion and fml.forgeVersion to launch.cfg 2020-11-30 15:06:20 +02:00
Juuxel
e4d696bac2 Merge remote-tracking branch 'upstream/dev/0.5' into forge
# Conflicts:
#	src/main/java/net/fabricmc/loom/AbstractPlugin.java
#	src/main/java/net/fabricmc/loom/LoomGradleExtension.java
#	src/main/java/net/fabricmc/loom/providers/MappingsProvider.java
#	src/main/java/net/fabricmc/loom/task/RemapJarTask.java
#	src/main/java/net/fabricmc/loom/util/Constants.java
2020-11-29 22:50:37 +02:00
modmuss50
80aaf63832 Fix race condition with mixin's output mappings across source sets 2020-09-06 20:21:08 +01:00
modmuss50
20be96e733 Fix mixin mapping being shared between all projects. 2020-09-04 22:41:11 +01:00
modmuss50
9029a699d9 Official Mojang Mappings support
# Please read and understand the EULA before using!

Use in your build.gradle with the following:

`mappings minecraft.officialMojangMappings()`

To automatically migrate to Mojang mappings run the following:

`gradlew.bat migrateMappings --mappings "net.mojang.minecraft:mappings:1.16.2"`

Co-authored-by: Ramid Khan <ramidzkh@gmail.com>
2020-08-24 22:12:26 +01:00
Fudge
c4f25622a2 Allow adding additional jar processors (#247)
* processors

* cleanup

* oops

* make changes

* blargh
2020-08-24 20:10:21 +01:00
Juuxel
0f5efe13c9 Copy userdev 'inject' files into the game jar 2020-07-30 17:22:03 +03:00
Juuxel
ed331990e7 Use Project.findProperty in LoomGradleExtension.isForge 2020-07-30 16:09:02 +03:00
Juuxel
85eb839db1 Make all custom functional interfaces to util.function 2020-07-30 15:12:23 +03:00
Juuxel
6e5c3a8715 Make LoomGradleExtension.isForge load from gradle.properties 2020-07-30 15:10:48 +03:00
Juuxel
a44bdba5d6 Start adding a way to disable Forge processing 2020-07-30 14:57:28 +03:00
Juuxel
ab01d8c989 Force project-based file storage 2020-07-27 23:40:24 +03:00
Juuxel
38721a3f8c Add non-patched and Forge classes to the game jar 2020-07-27 20:29:56 +03:00
Juuxel
e7d779a64b Use ForgeGradle for producing SRG jars for patching 2020-07-27 17:01:28 +03:00
Juuxel
ffa70d6637 Some Forge stuff 2020-07-27 15:58:31 +03:00
Reece Dunham
1955bcb2ea General cleanup 2020-07-26 21:32:10 +01:00
modmuss50
de688c14ad Merge branch 'shared_caches' into dev/0.5
# Conflicts:
#	src/main/java/net/fabricmc/loom/AbstractPlugin.java
2020-07-26 21:25:09 +01:00