Commit Graph

96 Commits

Author SHA1 Message Date
shedaniel
77e71acd99 a 2021-05-01 19:40:27 +08:00
shedaniel
f9ba0104d1 Merge remote-tracking branch 'FabricMC/dev/0.7' into dev/0.7-forge 2021-04-30 10:06:21 +08:00
modmuss50
974cd1fa6c Update MCE to 0.4.3 2021-04-28 22:50:53 +01:00
modmuss50
7de021e7c1 Revert "Update MCE"
This reverts commit b85659640d.
2021-04-27 18:04:47 +01:00
shedaniel
4c94886db8 Merge remote-tracking branch 'FabricMC/dev/0.7' into dev/0.7-forge 2021-04-27 20:55:19 +08:00
modmuss50
b85659640d Update MCE 2021-04-27 13:12:01 +01:00
modmuss50
12ac6cfcfe Update mixin-compile-extensions 2021-04-14 20:45:17 +01:00
shedaniel
cb821ede0f Revert "WIP AT -> JarProcessor"
This reverts commit 4fe9b81e
2021-04-13 16:31:15 +08:00
shedaniel
4fe9b81e32 WIP AT -> JarProcessor 2021-04-04 20:19:18 +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
11a39428c3 Fix build script 2021-03-07 20:59:13 +08:00
shedaniel
ce4a1cb2a3 Merge remote-tracking branch 'FabricMC/dev/0.6' into dev/0.6-forge
# Conflicts:
#	.github/workflows/test-push.yml
#	build.gradle
#	src/main/java/net/fabricmc/loom/util/Constants.java
2021-02-20 18:29:31 +08:00
modmuss50
46957df360 Run tests against gradle 7 and fail on deprecation. Fix gradle 8 support again. 2021-02-14 13:56:22 +00: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
409f5f8e93 Update MCE - Remove auto population of minVersion in mixins - Drop some log levels. 2021-02-11 18:12:27 +00:00
shedaniel
32e5297de4 Merge remote-tracking branch 'FabricMC/dev/0.6' into dev/0.6-forge 2021-02-02 14:59:33 +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
fd391958c0 Adding Constant of the plugin id, don't duplicate the classpath if it is already the root project. 2021-01-19 22:02:33 +08:00
shedaniel
e88f78bc62 Merge remote-tracking branch 'FabricMC/dev/0.6' into dev/0.6-forge
# Conflicts:
#	.github/workflows/test-push.yml
#	build.gradle
#	src/main/java/net/fabricmc/loom/util/Constants.java
2021-01-18 09:08:38 +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
modmuss50
47097c65ce Gradle 7 (and hopefully 8) support (#332)
* First pass on gradle 7 support

* Fix Gradle 8 deprecation warnings

* Add a deprecated compile constant
2021-01-17 18:34:22 +00: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
modmuss50
03444f26b0 General code cleanup (#313)
* First general cleanup pass

* Review feedback

* Fix build

* Fix tests
2020-12-24 20:58:30 +00:00
modmuss50
b27bc3d39a Use launcher metadata manifest v2. Closes #290 2020-12-21 19:37:35 +00:00
modmuss50
3bdccee02e Refactor and fix game/loader library handling (#298)
Update fernflower
2020-12-21 19:34:00 +00:00
Juuxel
3655421422 Add javax annotations for Forge
Forge uses the "default" annotations such as ParametersAreNonnullByDefault.
2020-12-03 22:16:16 +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
d1281be741 Migrate to access-widener library (#294) 2020-11-15 16:15:02 +00:00
i509VCB
21a9209b86 Split out some constants (#267)
This pull request also reorganizes parts of the constants class into categories.
2020-09-21 20:22:31 +01:00
modmuss50
2a1aca87cc Update MCE 2020-08-26 18:29:41 +01:00
Juuxel
5949549194 Add Forge dependencies using the userdev jar 2020-07-30 16:45:18 +03:00
Juuxel
38721a3f8c Add non-patched and Forge classes to the game jar 2020-07-27 20:29:56 +03:00
Juuxel
ffa70d6637 Some Forge stuff 2020-07-27 15:58:31 +03:00
modmuss50
9d318dd859 Use jetbrains annotations by default. (#240)
Minecraft is also remapped to use them. Any use of jsr should be removed.
2020-07-26 20:57:58 +01:00
modmuss50
2f6071991c Update mixin compile extensions 2020-06-21 19:29:49 +01:00
modmuss50
6323137f56 update DLI 2020-06-02 12:35:55 +01:00
modmuss50
dff10a5d79 Use a custom dev time log4j config. Enables color output and improves overall logging. (#186)
* Use a custom dev time log4j config. Enables color output and improves overall logging.
Color output is not enabled by default for eclipse users

* Use the run config to force enable ansi colors

* Improve IDE detection
2020-04-04 14:18:40 +01:00
modmuss50
ee462f8f9e 0.2.7 refactors (#178)
* Rough work on project based jars, skeleton for AccessEscalators?

* First working draft

* Minor changes

* Add support for mutable, better error checking when parsing file.
Code cleanup
Remap if needed when reading

* Fix inner classes and genSources

* Fix CME

* Caching, only regen jar when input changes

* Some work, untested

* Fix writing, fix checkstyle issues

* More fixes

* Move jars into a maven file structure, cleans up the file structure, and will benefit idea 2020
Add some basic validation to the AccessWidenerRemapper, will present any issues with the mappings when building (May need a way to disable?)
+ Some bugs fixes

* Fix issues with source jars in idea 2020, should be backwards compatible with 2019

* Move to lorenz-tiny

* Build fix + small cleanup

* Remove accesswidener's for now

* Update dev launch injector, should fix all issues with spaces in the path.
2020-03-06 11:15:34 +00:00
modmuss50
610cd82a78 Update mixin compile extensions 2019-11-18 22:14:49 +00:00
modmuss50
b69d0db1c2 Use Dev Launch Injector to ensure that the launch options are always kept upto date. (#138)
* Generate pre-launch classes to set the run args and system property's
Will remove the need to regen the run configs each time the game is updated

* fix minor thing.

* Small cleanup

* Another small rename + remove testing code

* Remove import

* Add basic auto upgrade path, put the launch classes in a package

* Suggested cleanups

* Use dev-launch-wrapper

* Remove old classes

* Rename to dev-launch-injector

* Update more things I forgot about
2019-11-11 18:52:19 +00:00
liach
c8ef934bda Add mixin ap to projects in a "better way" (#144)
* Add mixin ap to projects in a "better way"

Signed-off-by: liach <liach@users.noreply.github.com>

* Remove obsolete bad code

Signed-off-by: liach <liach@users.noreply.github.com>

* Use a field in constants instead

Signed-off-by: liach <liach@users.noreply.github.com>

* String format does not work

Signed-off-by: liach <liach@users.noreply.github.com>
2019-11-11 16:52:13 +00:00
Fudge
8e916f8fb0 Support using TinyV2 mappings (#132) 2019-11-09 19:00:36 +00:00
modmuss50
f85daec559 Reformat to use Fabric API's checkstyle (#137)
* Reformat to use Fabric API's checkstyle

* Fix

* Fix

* Update

* Travis and fixes

* possible fix for checkstyle?

* Helps if i push the checkstyle.xml file...

* Log checkstyle issues to console - used by travis

* Fix some more issues

* opps
2019-11-02 20:23:27 +00:00
modmuss50
6bec4e592a add modCompileOnly and include deps in the implementation configuration in the run tasks 2019-09-06 19:59:45 +01:00
asie
754c061e2b add modApi, modImplementation, modRuntimeOnly; try to improve source remapping performance 2019-05-28 09:23:27 +02:00
asie
eff108344f refactor genSources into multiple reusable tasks 2019-05-10 11:48:15 +02:00
modmuss50
02e9616622 Start on 0.2.1 2019-04-07 15:18:11 +01:00
asie
e038abcb8e more gradle fixes 2018-12-31 00:42:49 +01:00
asie
6749c9688e fix gradle 5 support changes 2018-12-30 23:26:50 +01:00