keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity
469 commits 1 branch 2 tags 103 MiB
Commit graph

460 commits

Author SHA1 Message Date
Christian
6d0f7ace17 Entity spawn adjustment - tracker 2012-08-09 08:40:32 -04:00
LexManos
859ebae365 Fix ModLoader compilation, and MCPmerger invocation for Forge. 2012-08-09 03:04:25 -07:00
LexManos
3d26511322 Include conf folder and merge config in source zip 2012-08-08 23:44:32 -07:00
Christian
185babbd85 Entity spawning - done 2012-08-09 01:58:14 -04:00
Christian
d970f7a530 Generate a universal binary package since we can now :) 2012-08-09 01:57:42 -04:00
Christian
c1bd11e64a Reorganized all the current patches 2012-08-08 22:57:37 -04:00
Christian
c1b3bfd007 Fix up annotation parser to parse arrays and enums 2012-08-08 22:10:56 -04:00
LexManos
9b81775a2f Added SideTransformer to strip side only functions/fields out. 2012-08-08 18:53:41 -07:00
LexManos
ac8945a4f8 Stage 1 of merging the client and server for MCP. 
Results:
Client: 362
Server: 3 (Only due to issues of FF decompilation inconsistancies)
Common: 910

Stage 2: Write runtime transformer to remove annotated fields/methods with invalid side annotation.
 2012-08-08 05:48:06 -07:00
Christian
77f4cc5bea Gui Handler ported from MC forge 2012-08-08 00:31:24 -04:00
Christian
8998d4c5e0 Revert dumb stuff with commands patch - lots of gfx patching 2012-08-07 23:11:37 -04:00
Christian
0ddf61cee2 Almost finished basic network stuff now 2012-08-07 20:41:37 -04:00
Christian
84efb72e46 Update some patches- more network work 2012-08-07 20:10:36 -04:00
Christian
f4b9055171 Bunch of hooks re-added : network is more complete now, lot of basemod cleanup, moving stuff into 
the registry area
 2012-08-06 22:30:13 -04:00
Christian
12927291a7 Fix location of forge in common handler - also some tweaks to modloader and other stuff 2012-08-06 17:27:21 -04:00
Christian
73bdd512c5 Network support - there's still some work to do and full id sync isn't done yet, but it has proper registration 
semantics and hooks for 250 handling
 2012-08-06 16:12:50 -04:00
Christian
8bda53cb77 Add in a lot of network handler stuff - also, expose the asm harvested data 2012-08-06 09:52:42 -04:00
Christian
09098f8a0f Remove some unneeded fields from the annotations 2012-08-05 02:24:02 -04:00
LexManos
63d5d42512 Made empty constructor for ModMetadata public 2012-08-04 22:51:57 -07:00
LexManos
7e68b53196 Fix path trimming for copytree 2012-08-04 20:36:27 -07:00
Christian
e92be964fd Change property name to fml.modStates not fml.disabledMods- it makes more sense that way 2012-08-04 12:35:46 -04:00
Christian
969de94d8a Add in a bit of logging when events get sent to mod containers 2012-08-04 11:45:40 -04:00
Christian
e39092335a Allow coremods to inject a modcontainer and run code 
this will mean that FML is deliberately and very obviously incompatible with a modloader installation.

Fix up worldtype so that the server can run.
 2012-08-04 11:31:06 -04:00
LexManos
ae79c79447 Patch commands.py to support side '2' as common, as well as fix a few small errors in the update_patches and fml scripts. 2012-08-04 03:34:34 -07:00
LexManos
fc8c2ac6e4 Merged transformers/ to /common and renamed the asm source download to align better with the asm bin file name. 2012-08-03 23:51:49 -07:00
LexManos
fbc968e1b4 Change place commands.py backup is stored. 2012-08-03 23:24:58 -07:00
LexManos
08eb7c5c45 FML finish won't updatemcp automatically, easier integration with forge. 2012-08-03 17:36:16 -07:00
LexManos
18aec5b257 Fix packaging and install to not have the src/ folder, making it align better with the dev env. 2012-08-03 17:32:23 -07:00
LexManos
34706d6acf Moved setting up eclipse to setup_mcp 2012-08-03 16:56:00 -07:00
LexManos
b572c6a038 Fixed ant script to support common folder building and add the new files to the dist archives. 2012-08-03 03:37:45 -07:00
LexManos
2fccc04903 setup_fml's decompile will result in proper md5 files now {if there is no compiler issues} 2012-08-03 03:35:38 -07:00
LexManos
7949a15226 Removed FMLRegistry, and IMinecraftRegistry. 
Updated server side to use the seperated registry classes like the client does.
Updated searge name references on server
Made StatBase.statName public using AccessTransformer
Server should compile now
 2012-08-03 01:50:48 -07:00
LexManos
476dfbc754 Fix MockBlock compile 2012-08-03 01:47:09 -07:00
LexManos
f1717526d8 Download argo/guava source references in install, and updated eclipse workspaces to reference them. 2012-08-02 23:36:00 -07:00
LexManos
56153c43d6 Cleaned up commands.patch, removed debug print in fml.py 2012-08-02 21:14:06 -07:00
LexManos
79ed963c4a Remove clientdrop, old reference files. 2012-08-02 20:32:51 -07:00
LexManos
5f848d3d2a Delete some dead files 2012-08-02 19:42:12 -07:00
Christian
1b20de0ab6 Fix commands patch, WorldType patch and some ML compat stuff 2012-08-02 20:09:18 -02:30
Christian
6d70a76c95 More fixes 2012-08-02 16:50:30 -02:30
Christian
b51c357d50 More build fixes for jenkins 2012-08-02 10:33:29 -02:30
Christian
e44515304a Try and fix the jenkins build 2012-08-02 10:30:52 -02:30
Christian
dab4179024 Change some event names, hook up the event code for server events for FML 2012-08-02 09:31:03 -02:30
LexManos
1e47f3e468 Introduced patching of runtime/commands.py to allow for usage of the src/common folder. 2012-08-02 00:51:51 -07:00
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
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
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
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
Christian
25fb847dc1 Fixes 2012-07-06 10:42:49 -04:00
Christian
98e31e5f03 Incorporate server patches into client 2012-07-06 10:29:17 -04:00
Christian
0ff59e7978 Remove two places that are unpatchable now 2012-07-06 09:52:21 -04:00
Christian
97cfbb990d Server repatching 2012-07-06 09:44:00 -04:00
Christian
59949849f0 Add a "checkpatches" target and check if your patches are up to date before running a repatch operation 2012-07-06 09:19:58 -04:00
Christian
be59dfff54 Launch through the applet launcher too 2012-07-06 01:04:33 -04:00
Christian
32e93213f1 Some patches for the server 2012-07-05 22:31:46 -04:00
Christian
b9466b8ee5 Lots of client patch fixup 2012-07-05 18:13:47 -04:00
Christian
275b78957a Update git ignore to ignore a fernflowerzip that's lying around 2012-07-05 15:38:37 -04:00
Christian
4ab2a3cb6b And we have a brand, "fml". We're definitely modded :) 2012-07-05 15:36:31 -04:00
Christian
58576c2a19 UnexpectedThrowable is now the much more awesome CrashReport! 2012-07-05 15:35:38 -04:00
Christian
c0b707a9bd Merge branch 'master' into minecraft1.3 
Bring some of the ticking fixes in

Conflicts:
	client/cpw/mods/fml/client/FMLClientHandler.java
	patches/minecraft_server/net/minecraft/server/MinecraftServer.java.patch
 2012-07-05 15:30:21 -04:00
Christian
e8b09f4692 Got the relauncher downloading and injecting library files 2012-07-05 15:23:37 -04:00
Christian
decbe8ba7c Tweak ticking YET AGAIN. Should fire a solitary GUILOAD tick right as the game screen loads. 
Hopefully fixes worldload tick issue too
 2012-07-04 00:16:30 -04:00
Christian
53c2b50212 FFS let this fix that bloody ticking mess that is ML compatibility. 2012-07-03 23:03:51 -04:00
Christian
3d8a5edc30 Separate gui ticking completely. send it as if it's a world tick. ML gui ticks are epically dumb. 
Fix Worldload being filtered from the trigger arming.
Also, improve errors going to an error screen. There should be more information now.
 2012-07-03 22:39:35 -04:00
Christian
275fd394c1 Change gui ticking and world load tick. Should close issue #40 and kill it deader 
than a very very dead thing. *$^*(#% Modloader ticking b#%$hit
 2012-07-03 21:37:54 -04:00
Christian
d1f791f94e Merge branch 'master' into minecraft1.3 2012-07-03 08:15:58 -04:00
Christian
60b50bb7f2 Tweak build xml for more cleanliness 2012-07-03 08:14:35 -04:00
Christian
9cafdf94ac Merge branch 'antscriptupdates' 2012-07-02 23:50:49 -04:00
Christian
07a1927c25 Update some stuff 2012-07-02 23:49:40 -04:00