Commit graph

338 commits

Author SHA1 Message Date
Adrian Siekierka
da03fd2827 apply terrible workaround for source remapper/JDT? bug (Mercury devs notified) 2018-12-28 22:08:36 +01:00
asie
cd54faba44 fix runtask rundir 2018-12-23 21:43:22 +01:00
asie
d4ae5e9b72 fix #48 2018-12-23 19:37:09 +01:00
asie
0b38f3ecc5 use more reliable renamer, update Stitch - fix #46 2018-12-23 19:18:40 +01:00
asie
4700788ead fix #47 2018-12-23 09:37:54 +01:00
modmuss50
8d326da8be Close jar when no fabric-installer.json found 2018-12-22 22:19:26 +00:00
Adrian Siekierka
4c625b45bc fix licenseFormat 2018-12-22 21:27:46 +01:00
therealfarfetchd
58512f2f47 Put tasks in 'fabric' group 2018-12-22 17:06:18 +01:00
Adrian Siekierka
baaf430fd8 mark Loom 0.2.0, update Mixin library 2018-12-22 15:46:58 +01:00
Adrian Siekierka
a39d0b6656 add cleanLoomMappings, close #36 2018-12-22 15:35:36 +01:00
Adrian Siekierka
d9b8c90b5f working source code remapping for mod dependencies 2018-12-22 15:29:46 +01:00
Adrian Siekierka
530896e41a make modCompile use flat directory artifact location instead of hack 2018-12-22 14:44:34 +01:00
Adrian Siekierka
a620812aab build functional intermediary-mapped sources JARs; update Stitch 2018-12-22 14:37:16 +01:00
modmuss50
2b85714448 Very early source remapping 2018-12-22 10:31:30 +01:00
Adrian Siekierka
79ec748a12 parse fabric-installer.json for mod devenvs, add loaderLaunchMethod param for that purpose, tweak LineNumberAdjustmentVisitor 2018-12-22 10:31:10 +01:00
asie
1445b8240a update dependencies, remap LVTs when mapping JAR 2018-12-20 12:32:02 +01:00
modmuss50
4731589579 Default idea's run config (when importing with idea's gradle tools) to use the _main module. Not a perfect fix but will now work with the default import settings. 2018-12-19 23:06:06 +00:00
modmuss50
278c8d2401 Add a way to disable IDE run config auto generation. (Only applys when importing with idea's gradle tools) 2018-12-19 23:05:19 +00:00
asie
e93292564d fix #26 2018-12-17 15:05:52 +01:00
asie
5c7c94e5fc fix #37 2018-12-15 22:19:50 +01:00
asie
83d6a2da42 add minVersion filling support - fix #34 2018-12-15 14:33:25 +01:00
asie
fe194ea64d use resolved dependency version for mapping files 2018-12-15 14:14:50 +01:00
asie
ad4e6fd6ff fix #20 2018-12-13 09:50:01 +01:00
modmuss50
f875e34a67 Only add -XstartOnFirstThread on mac os 2018-12-12 18:10:47 +00:00
modmuss50
a2fc5ddf9c Merge branch 'start-on-first-thread' of https://github.com/shadowfacts/fabric-loom into shadowfacts-start-on-first-thread 2018-12-12 13:44:42 +00:00
modmuss50
96e0dd30be Auto generate eclipse launch files 2018-12-12 13:43:42 +00:00
asie
f61b06f616 add some debug code for refmap issue 2018-12-12 07:16:01 +01:00
asie
b00b42e3bf fix #28 2018-12-12 07:10:30 +01:00
David Vierra
a6c3406ba5 runClient and runServer now respect the jvmArgs property 2018-12-11 14:05:12 -10:00
Sander de Goeij
8544e64033 Fix a typo in launch.json generation 2018-12-11 13:25:48 +01:00
Shadowfacts
8a0c05eadb
Add -XstartOnFirstThread, required when running on macOS 2018-12-10 20:47:02 -05:00
modmuss50
f8bcf214f8 use project root dir, should fix files being all over the place 2018-12-10 14:28:58 +00:00
Adrian Siekierka
da675e9545 clean mapping provider code 2018-12-09 22:22:35 +01:00
asie
72a0375696 clean up Maven repositories 2018-12-09 08:21:32 +01:00
asie
c6c88e69de update Stitch, add CleanLoomBiaries 2018-12-08 13:40:02 +01:00
modmuss50
43d3a46296 Use pomf jar, and don't override run configs 2018-12-04 20:20:22 +00:00
asie
f9d0c39601 enable rebuildSourceFilenames 2018-12-02 02:20:18 +01:00
modmuss50
3766182f93 Added vscode task to generate launch.json
A few plugins will make the experience a lot better:
https://marketplace.visualstudio.com/items?itemName=redhat.java
https://marketplace.visualstudio.com/items?itemName=vscjava.vscode-java-debug
https://marketplace.visualstudio.com/items?itemName=vscjava.vscode-java-pack
2018-12-01 17:04:15 +00:00
modmuss50
64e052cf25 Clean up GenIdeaProject, fixes run args not being updated 2018-12-01 16:08:52 +00:00
Adrian Siekierka
daaccc87f2 download minecraft libraries through maven 2018-12-01 11:03:25 +01:00
Adrian Siekierka
836b321107 switch to fernflower, add line number remapping 2018-12-01 10:52:17 +01:00
Adrian Siekierka
e41e3e532a add sources generation, update guava 2018-11-30 21:16:42 +01:00
modmuss50
37c5b2c913 Fix minecraft version json having a jar extension 2018-11-28 11:51:09 +00:00
asie
e0972e5349 update stitch, fix error when mappings partially present 2018-11-21 18:33:25 +01:00
asie
b1d5bd0536 add field name population on mapping download 2018-11-21 09:03:56 +01:00
asie
823854f2a1 update tiny-remapper 2018-11-12 01:25:06 +01:00
asie
24b1b0669d do not try closing twice in ModProcessor 2018-11-12 00:35:12 +01:00
asie
dbaba22207 fix try...catch segments not closing files in some cases 2018-11-12 00:17:44 +01:00
asie
cffd468b68 clean up RemapJar, add automatic mixin refmap name fill-in 2018-11-06 10:36:35 +01:00
modmuss50
1fae916384 fix run client, fix needed as it now runs in a named env 2018-11-05 22:15:00 +00:00
modmuss50
c5a19955ff New experimental way of remapping mods, this may not stay 2018-11-05 20:33:57 +00:00
modmuss50
94c7137086 Split mappings and minecraft 2018-11-05 15:54:14 +00:00
asie
8e3822dec7 fix AP not being present on classpath 2018-11-05 14:57:43 +01:00
asie
1691c8c2d8 use one asset directory 2018-11-05 14:44:52 +01:00
modmuss50
10f134fcc2 Only remap jars when required 2018-11-05 12:07:03 +00:00
modmuss50
9ed5dd7a01 Generate idea run configs for dir based projects 2018-11-05 12:00:54 +00:00
modmuss50
9d03783792 2 small fixes 2018-11-05 10:57:29 +00:00
asie
b6779a6ec0 fix library transitiveness 2018-11-05 10:40:34 +01:00
modmuss50
d0e649766b Change some stuff in hope that it helps things 2018-11-04 21:28:46 +00:00
modmuss50
bbf5e341e3 Fix some streams not being closed, clean up the mod reobfuscater, fix runClient task 2018-11-04 18:46:37 +00:00
NikkyAI
40f9168b6a disable shading and small other fixes (#12)
* make Project in LoomGradleExtension private

* use gradle all distribution

* disable shading
2018-11-04 00:27:55 +00:00
modmuss50
0a5245d508 Revert "Fix some streams not being closed, clean up the mod reobfuscater, fix runClient task"
This reverts commit 30a71c1
2018-11-03 18:44:31 +00:00
modmuss50
3a6a4f4056 Log version 2018-11-03 18:03:43 +00:00
modmuss50
0770c57d6d Revert "Fix remapped mods not being resolved by the ide"
This reverts commit 356a7c4
2018-11-03 17:24:16 +00:00
modmuss50
ecd512c54d Merge remote-tracking branch 'origin/dev' into dev 2018-11-03 13:51:07 +00:00
modmuss50
30a71c133d Fix some streams not being closed, clean up the mod reobfuscater, fix runClient task 2018-11-03 13:50:57 +00:00
NikkyAI
b3a5f4ebd7 add gradle plugin marker (#11)
format build.gradle
format


do tabs
2018-11-03 13:01:34 +00:00
modmuss50
356a7c4d00 Fix remapped mods not being resolved by the ide 2018-11-03 12:59:37 +00:00
asie
d908e4129c fabric-base -> fabric-loader 2018-11-02 21:16:14 +01:00
Adrian Siekierka
dff255da68 rename mapping headers 2018-11-02 17:19:57 +01:00
Adrian Siekierka
6b17d207d5 fix mod compilation 2018-11-02 10:33:03 +01:00
asie
e05aae6cd8 remove MixinDevRemapper, delete intermediary JAR before trying to create it 2018-11-02 09:02:19 +01:00
asie
060cdd8c2f pass fabricMappingFile to devenv 2018-11-02 00:44:31 +01:00
asie
226f237924 mixin refmap remapping support 2018-11-02 00:40:51 +01:00
asie
c38094ef3f obfuscate mixin methods/fields in output mod JARs 2018-11-01 22:15:51 +01:00
Adrian Siekierka
bd5d306a9a debloat, fix fabric-base 2018-11-01 12:15:09 +01:00
modmuss50
f32359d7c3 Fix building mods 2018-10-31 19:55:29 +00:00
modmuss50
79cfe6fbb3 Mod dev env fixes 2018-10-31 19:25:41 +00:00
Adrian Siekierka
0d2c97bf51 move JAR merging to Stitch 2018-10-31 18:18:42 +01:00
Adrian Siekierka
a99bee8f7c update libraries, switch to tiny-remapper as default 2018-10-31 15:23:50 +01:00
modmuss50
5ca71d9d15 Map mods to intermediary 2018-10-31 13:20:50 +00:00
modmuss50
cbdb516d5b Download pomf directly from maven, can be refactored to use maven correctly in the future 2018-10-30 11:45:27 +00:00
modmuss50
ec4bd3162a Added modCompile config to allow deps to be remapped 2018-10-29 11:55:30 +00:00
asie
da4d67cd3a net.fabricmc.base -> net.fabricmc.loader 2018-10-28 01:00:57 +02:00
Adrian Siekierka
2668cae022 allow using either Enigma or Tiny for remapping JAR 2018-10-27 18:20:29 +02:00
Adrian Siekierka
fdd4334a15 add license header 2018-10-27 16:14:05 +02:00
asie
708430e66e cleanup 2018-10-27 08:27:06 +02:00
modmuss50
8481ccc478 Remove some mixin prebaker stuff we no longer need 2018-10-27 00:06:51 +01:00
modmuss50
9a2b847772 Use tiny remapper to remap minecraft, some minor cleanup 2018-10-26 23:43:39 +01:00
modmuss50
90746a93c1 More name updates, should help in a few places 2018-10-25 12:40:41 +01:00
modmuss50
252b06bfc2 Revert to use fabric mod.json format 2018-10-25 12:32:39 +01:00
asie
5446a322d4 fix refmap generation 2018-10-25 11:51:01 +02:00
asie
2c5e50b5a3 ongoing de-OMLification 2018-10-24 22:07:18 +02:00
modmuss50
b2f78a3904 Update gradle + fix build 2018-10-22 19:53:07 +01:00
modmuss50
88315e4ccf Revert "Remove a bunch of stuff + update to support modlauncher"
This reverts commit 6b59f9c
2018-10-22 19:46:42 +01:00
modmuss50
337bb1392e Remove some fusion stuff we dont need 2018-10-22 19:35:44 +01:00
modmuss50
b8f0ec9d95 Revert to old name 2018-10-22 19:25:18 +01:00
TheCodedOne
6666738b92 Use deobf jar 2018-08-18 02:40:23 +01:00
TheCodedOne
76f94700ab Dont make different things for every damn OML version 2018-08-18 02:03:19 +01:00
TheCodedOne
bf07da6c30 Fix dev env 2018-08-18 02:00:48 +01:00
modmuss50
856e8b5c1f
Mixin remapper + fixes. Now runs on notch names 2018-08-07 18:52:17 +01:00
modmuss50
dffcc5a9d8
Fix OML building 2018-08-07 15:56:39 +01:00
modmuss50
60fd3105cc
Remove LW, should also fix lwjgl 2 being added 2018-08-07 12:42:50 +01:00
modmuss50
18dfa2cdb2
Fix crash, as we no longer have special mappings for the mixins, something will need to be done about this however, but it will most likey be at runtime 2018-08-05 22:16:52 +01:00
modmuss50
6b59f9cc59
Remove a bunch of stuff + update to support modlauncher 2018-08-05 21:45:54 +01:00
gegy1000
d73bcc926d Update enigma 2018-06-23 16:03:43 +02:00
gegy1000
b598d87680 Update enigma 2018-06-23 09:53:53 +02:00
modmuss50
5296c98606
Fix OML not being in IDE's scopes 2018-06-20 13:19:44 +01:00
modmuss50
fb94d092ad
Add skipPrebake 2018-06-20 13:12:02 +01:00
modmuss50
9e4012571a
Lets get it working, and then write clean code 2018-06-19 11:04:39 +01:00
modmuss50
65bebb6fbc
Should fix OML build part 2 2018-06-19 10:49:10 +01:00
modmuss50
0b75f4d284
Should fix OML build 2018-06-19 10:43:40 +01:00
modmuss50
1893966038
throw an error if a jar is missing 2018-06-18 17:01:39 +01:00
modmuss50
69f15e870c
Ensure file is moved 2018-06-18 16:55:51 +01:00
modmuss50
cc23189335
Small tweaks 2018-06-18 16:41:50 +01:00
modmuss50
527000ed24
Inital work on getting the prebaker to work, still very broken but things have worked 2018-06-18 16:16:03 +01:00
modmuss50
b298dd2a1b include pack.mcmeta + more log4j stuff 2018-05-15 21:35:58 +01:00
modmuss50
f1a00533ad Fix to support new mod.json format 2018-05-15 11:58:51 +01:00
modmuss50
d13f33d0f3 Inital work on mixin prebaker, old code taken from fabric-base 2018-05-15 11:54:40 +01:00
TheCodedOne
24e3a3fb7d Make OpenGradle merge data from client 2018-05-15 02:14:12 +01:00
TheCodedOne
db3ff955e5 Change default enviroment arguments to oml 2018-05-15 01:56:39 +01:00
modmuss50
4f5d72d82f Merge remote-tracking branch 'origin/master' 2018-05-14 21:29:52 +01:00
modmuss50
5546d876fb No longer use sponges own tweak class, run client task now uses the obfed jar. 2018-05-14 21:29:48 +01:00
gegy1000
5280806f45 Fix VSCode resource configuration 2018-05-14 16:13:20 +02:00
modmuss50
66c043f171 Fix runClient 2018-05-14 14:47:43 +01:00
modmuss50
ae97990aaa Use OML pomf 2018-05-14 14:35:23 +01:00
modmuss50
fe13ce212e Fix build 2018-05-14 11:22:50 +01:00
modmuss50
55c6018bff Update to gradle 4.7 2018-05-14 11:20:19 +01:00
modmuss50
a9dfbde6d4 Revert 3857631498 2018-05-14 11:17:26 +01:00
TheCodedOne
e9d2218173 add mixins to the default arguments 2018-05-14 00:01:38 +01:00
TheCodedOne
3156237af7 Set task groups 2018-05-13 21:31:44 +01:00
TheCodedOne
bd7dfab919 Move user cache 2018-05-13 02:43:40 +01:00
TheCodedOne
abf17b01d7 Fix environment setup 2018-05-11 23:00:06 +01:00
TheCodedOne
7341575237 Rename to OpenGradle 2018-05-11 21:57:42 +01:00
modmuss50
33ed804006
Download mappings straight from Jenkins, bypassing clouldflare 2017-05-13 12:07:23 +01:00
modmuss50
3857631498
Remove all mixin related code 2017-05-12 20:17:21 +01:00
modmuss50
9018e10b7f
Fix ObfuscationService when using local mappings. 2017-05-12 13:16:39 +01:00
modmuss50
aa483181c0
Update Gradle, Fix mappings not being extracted when using local mappings. 2017-05-11 13:02:53 +01:00
modmuss50
6dbe4d7271
Fix NPE when downloading libs. 2017-04-05 13:23:06 +01:00
modmuss50
4059979e21
Update jenkins URL 2017-04-05 13:20:40 +01:00
modmuss50
29631ad1bb
Fix crash when resolving libs of new snapshot. 2017-03-31 12:27:55 +01:00
modmuss50
d4792dd0af
Always remap jar when using local mappings. 2017-02-10 13:26:53 +00:00
modmuss50
673f21c506
Add the ability to use custom mapping files. 2017-02-10 13:14:46 +00:00
modmuss50
2eaae5be44
Allow running without a POMF version set, and remove cyclic dep of fabric base to allow building for now. 2017-02-09 18:21:42 +00:00
lclc98
017a7a3688 Fixed Deobf Typo (#8) 2016-11-16 21:03:54 +00:00
modmuss50
a6ce8cfd9d Update to use my jenkins 2016-11-16 20:59:20 +00:00
modmuss50
1e10eb79a5
Fix vscode task 2016-11-02 17:30:04 +00:00
modmuss50
dd6b229dc5
Set defaultObfuscationEnv, and potentially fix mixin mappings not being applied. 2016-10-24 16:14:17 +01:00
modmuss50
ac8087f1c7
Add null check to refmap location 2016-10-23 18:47:06 +01:00
modmuss50
e274d0c8c5
Improve mod re-mapper 2016-10-23 17:31:56 +01:00
modmuss50
9f959ef04d
Fix mod obof, and add property to specify refmapName 2016-10-20 16:55:46 +01:00
asiekierka
14fb337330 work on refmap inclusion, mixin applying 2016-10-16 11:49:16 +02:00
asiekierka
f2933cb818 feed tinymapping file to MixinPrebaker 2016-10-14 21:52:54 +02:00
asiekierka
170735618c unify mapping loader with tiny-remapper 2016-10-14 16:18:12 +02:00
modmuss50
a2903acd3b
Fix temp dir not being deleted after use 2016-10-12 19:41:10 +01:00
asiekierka
ca963664e6 add partially working mixin remap 2016-10-12 20:02:14 +02:00
modmuss50
3ebbd9463c
Initial untested support for mixin remapping 2016-10-12 15:34:04 +01:00
modmuss50
68cd938036
Fix file not found with remapper 2016-10-12 11:08:12 +01:00
modmuss50
b43793b3fc
Initial untested work on mod remapping 2016-10-12 10:44:31 +01:00
modmuss50
85d51cb1a1
Remove need to use genIdeaRuns, now just use the idea task
Remove making everything public - breaks a lot of shit
2016-10-12 10:22:08 +01:00
modmuss50
22f1743a08
Fix mixin pre-baker 2016-10-09 13:18:00 +01:00
modmuss50
3f24ce0289
Initial work on pre baking mixins
Downloading of fabric base + deps needs fixing, I may do it a different way.

This is mainly moving pc commit as a lot of stuff here isn't final.
2016-10-07 13:17:04 +01:00
modmuss50
5e18df32a5 Initial work on remapping mixins 2016-09-28 16:51:31 +01:00
modmuss50
c322cbd3de Use weave
Update to gradle 3.1
Add new maven handling
2016-09-22 20:33:47 +01:00
modmuss50
a32b94a657 Add runServer and runClient tasks 2016-09-21 10:46:57 +01:00
modmuss50
7b9ae34c1e Added basic visual code support, run with vscode to generate workspace 2016-09-20 20:01:10 +01:00
modmuss50
91708d4475 pomfVersion 2016-09-10 15:26:24 +01:00
modmuss50
ab0b8fd09f Rename pomf to pomf_build 2016-09-10 13:15:27 +01:00
modmuss50
5da73c87f8 Use pomf releases, build against gradle 3 2016-09-10 13:09:15 +01:00
modmuss50
3072d34e47 Load basic info from mods.json file 2016-08-29 11:08:23 +01:00
modmuss50
31583ce44b Minecraft jars are stored in the project folder 2016-08-28 12:00:58 +01:00
modmuss50
3180710e0b Fix jar file not being public 2016-08-25 18:03:21 +01:00
modmuss50
53752d098c Fix missing natives 2016-08-25 12:59:33 +01:00
modmuss50
3eb9b77746 Now stores files in the user gradle folder, will prevent downloading assets for each project 2016-08-25 12:42:23 +01:00
modmuss50
547c242ff0 publify enigma exported jar file 2016-08-24 22:38:23 +01:00
Modmuss50
b3c6e50b9a Add back missing png file 2016-08-23 00:14:34 +01:00
Shadowfacts
e3b9e83f10
Generate server run config 2016-08-20 10:16:23 -04:00
modmuss50
14574cf6a0 Handle new method of mappings 2016-08-17 19:34:57 +01:00
modmuss50
65e2a76d70 Jar merging + reformat 2016-08-17 17:38:54 +01:00
modmuss50
c03f842227 Fix mod dev workspaces 2016-08-17 17:07:54 +01:00
Shadowfacts
00382284fe
Update IDEA run configuration generation 2016-08-17 10:45:04 -04:00
modmuss50
c89344527b Load project deps from within gradle, should allow moduals to be built 2016-08-17 00:30:48 +01:00
Jamie Mansfield
5e9d3b819b Update Gradle wrapper to 3.0 (#2)
- Rename plugin to 'net.fabricmc.loom' from 'fabric-loom'

- Add .gitattributes

- Use the same .gitignore from fabric-base

- Add license headers
2016-08-16 23:29:10 +01:00
modmuss50
8ec207dd0f change plugin name 2016-08-16 19:25:34 +01:00
modmuss50
d358f461fe Rename things 2016-08-16 19:19:05 +01:00
Shadowfacts
451adbeeb6 Fix idea main class (#1) 2016-08-15 22:49:20 +01:00
modmuss50
8e96c92f88 Update main class location 2016-08-15 19:43:56 +01:00
asiekierka
7efa7780fe recreate repo 2016-08-15 12:22:14 +02:00