Commit graph

4604 commits

Author SHA1 Message Date
Christian
582a785fb8 Change some stuff around - begin launching the server through the wrapper too.
A lot of patches went in - the client and server both launch and start up mods.
2012-08-02 02:08:30 -02:30
LexManos
6eb4353b95 Rebase 2012-08-01 17:41:34 -07:00
LexManos
b9d3497b60 Merge pull request #114 from cpw/master
Line endings
2012-08-01 17:04:16 -07:00
Christian
c21dca182c Normalize the repo 2012-08-01 21:21:29 -02:30
Christian
ff152479e6 More stuff 2012-08-01 21:19:11 -02:30
Christian
7f8bf56d4f Fix classpath for Client, maybe? 2012-08-01 21:19:11 -02:30
Christian
22fd1652a0 Line endings for this branch 2012-08-01 21:18:55 -02:30
Christian
5f51e63385 A load of transformer accesses- also a few tweaks to the transformer, and linux support in the fml python 2012-08-01 18:59:45 -02:30
LexManos
4fb08f1660 Rewrote patch generation and application to no longer need diff, and attempt to apply common patches on decompiles that don't have one side or the other. 2012-08-01 06:54:57 -07:00
LexManos
d0036dda00 Updated eclipse projects to have src-common linked resources 2012-08-01 03:52:03 -07:00
LexManos
4ca63717e5 Modified the decompiler stage to:
Compile and run AccessTransformer during the pre-RG stage of decompilation.
Merge resulting sources that are identical to src/common

ToDo:
Finish the common intergration:
-update_patches - Add common folder support
-apply_patches:
--patch each side, also patch all common patches to each side incase they are not merged, only if file exists.
2012-08-01 03:25:45 -07:00
LexManos
62535863ad Add temp AccessTransformer config for FML 2012-08-01 03:18:31 -07:00
LexManos
629b384f0d Discard old setup script 2012-08-01 03:18:02 -07:00
LexManos
b9982f18f5 Fixed AccessTransformer issue with trying to load files, instead of resources. 2012-08-01 03:17:36 -07:00
LexManos
3a0a329c77 Merge pull request #113 from someh4x0r/master
Fix BlockTrapDoor.disableValidation on server
2012-08-01 02:40:11 -07:00
Robert Ou
008972e448 Fix BlockTrapDoor.disableValidation on server 2012-08-01 16:36:27 +08:00
Christian
1753b28475 Commit the start of some pluggable transformers 2012-07-31 09:46:45 -04:00
Christian
e7a7b3c844 XP for smelting 2012-07-30 23:07:53 -04:00
Christian
6f8b39ea09 Beginning the 1.3.1 update 2012-07-30 22:31:07 -04:00
Christian
e001103ed8 Add in the ability to create versioned dependencies for mod relationships
BaseMod versions are loaded too late so will never work as a versioned
dependency requirement, but can have versioned deps of others
2012-07-30 17:01:27 -04:00
Christian
d1d12e4ebd Fix up coremods with relaunch, add in a sample "coremod" 2012-07-30 11:34:30 -04:00
Christian
b79ec382d7 Add in events for the method pre/init/post annotations so we can add in extra data during the event phase 2012-07-30 00:33:21 -04:00
Christian
a850ea6bc0 Fix whitespace issue 2012-07-29 23:54:07 -04:00
Christian
825f1a8b50 Fix window sticking around - it doesn't anymore 2012-07-29 23:46:52 -04:00
Christian
e1fc02b5b9 Add in "transform excluded" classes that we still need to take loading responsibility for 2012-07-29 23:30:37 -04:00
Christian
b53ce2aa90 Added in some dialogs when things don't go so well 2012-07-29 22:55:53 -04:00
Christian
ba28161f16 New logging stuff, also the early plugin api for forge 2012-07-29 22:54:59 -04:00
Christian
50ed44359d Merge branch 'minecraft1.3' into newfmlmod 2012-07-23 23:02:25 -02:30
Christian
f78400711e Fix up mod classloading delegation 2012-07-23 22:54:36 -02:30
Christian
69e895e687 Some patches to go along with the other changes 2012-07-23 22:51:16 -02:30
Christian
769663466f More stuff as I roll out the changes 2012-07-23 22:50:37 -02:30
Christian
9e4131c3e8 A bunch more fixes for FML mods 2012-07-23 16:33:17 -02:30
Christian
8b5ddf1739 Merge remote-tracking branch 'mainlap/newkeys' into newfmlmod
Conflicts:
	client/cpw/mods/fml/client/FMLClientHandler.java
2012-07-22 20:30:42 -02:30
Christian
5561f8218a New key handling 2012-07-22 20:25:18 -02:30
Christian
2a19eca517 Check in a lot of recent work 2012-07-22 11:56:38 -02:30
Christian
3115f92ee4 Check in new fml mod work so far. Lots still to do. 2012-07-14 13:58:46 -04:00
LexManos
2671641b83 Cleaned up the install script for the source distrabution to setup the workspace properly, delete argo, and download all required dependancies. 2012-07-12 18:07:58 -07:00
LexManos
0a9ee584bf Added call to clean_source to build script to fix patch fuzz on windows. 2012-07-12 18:06:39 -07:00
LexManos
48dcdca805 Fix Client-Clean project to use relative path to argo. 2012-07-12 18:06:01 -07:00
LexManos
9083be320b Should fix NPE on older ISoundHandlers EXA: http://minecraftforge.net/forum/index.php/topic,759.html 2012-07-10 17:02:13 -07:00
LexManos
a628765419 Merge pull request #104 from cpw/master
Update to fml 176 - fixes a subtle tick bug
2012-07-09 21:36:57 -07:00
Christian
dbfe9c020b Update fml with recent tick fix 2012-07-10 00:32:56 -04:00
LexManos
45f0c521a3 Merge pull request #102 from TrueBrain/EntityTracker
-Add: sync serverPos[XYZ] on spawning of entity
2012-07-09 16:03:10 -07:00
TrueBrain
9f6ed73b6c -Codechange: applied LexManos' request 2012-07-10 00:33:50 +02:00
TrueBrain
f76827e253 -Fix: check for null where needed 2012-07-10 00:29:18 +02:00
LexManos
d7ccc8619f Made WorldGenMinable metadata sensitive. 2012-07-09 13:43:39 -07:00
LexManos
bf155beaad Fixed a improper rounding in EntityMinecart 2012-07-09 13:43:24 -07:00
TrueBrain
7dff7fd62d -Add: sync serverPos[XYZ] on spawning of entity
This fixes the issue that, up to 400 ticks from getting in range,
entities have a wrong offset (because server and client don't agree on
the position to calculate relative updates from)
2012-07-09 14:00:47 +02:00
Christian
2db9292ba5 Another bloody ticking fix. This should fix mods that use ML.setInGameHook(true,false) on the
server side to recieve ticks.
2012-07-08 22:06:11 -04:00
Christian
9d6266d85b Fix up mod classloading delegation 2012-07-06 15:59:16 -04:00