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

1599 commits

Author SHA1 Message Date
Christian Weeks
dfd15acb6d Reorganize for bukkit integration 2012-05-31 22:09:45 -04:00
Christian Weeks
660521e6f2 Fix project, new gui layout with screenshot, thanks Sengir! 2012-05-30 09:25:04 -04:00
Christian Weeks
b5a10c0153 Add in missing hooks, add branding information to the crash report 2012-05-27 07:14:35 -04:00
LexManos
d4fd21dcbc Fixed regex issue in last push. 2012-05-27 01:40:22 -07:00
LexManos
379c5b2888 Fixed up for newline before case bodies. 2012-05-27 01:24:45 -07:00
LexManos
51a959f8a4 Should fix windows {me} generating different patches then linux {cpw} 2012-05-27 00:22:27 -07:00
Christian Weeks
7d7c395ff3 Move first tick to the real first tick 2012-05-26 02:30:21 -04:00
Christian Weeks
7c590e62c6 Merge in the mod texture changes from Lex 2012-05-26 02:29:35 -04:00
LexManos
6191ed61e0 Fixed location refs to fmlversion.properties 2012-05-25 23:25:05 -07:00
Christian Weeks
96b442e3cc Add in a static render access class for optifine and other render editing mods to use 2012-05-25 22:13:51 -04:00
Christian Weeks
3454b43daa Add in a "world load" tick fired just as the world completes loading. This SHOULD fix millinaire. 2012-05-25 17:21:30 -04:00
Christian Weeks
f3b15940ee Changing up the mod list data 2012-05-25 15:25:35 -04:00
LexManos
7667df0caf Fixed up ModTexture* classes to use the ITextureFX events to resize the image as needed. Also fixed ModTextureStatic's not being applied properly. 2012-05-24 22:48:15 -07:00
Christian Weeks
d45134eb9a Fix up two stupid overwrites in my mergeup from lex 2012-05-24 23:18:04 -04:00
Christian Weeks
fe710a9245 Fix derp in MTS 2012-05-24 22:13:33 -04:00
Christian Weeks
46b7dc0fec Patch fixing 2012-05-24 21:40:34 -04:00
Christian Weeks
f5598573a2 Update some stuff for updated tweaks 2012-05-24 21:39:16 -04:00
Christian Weeks
d7c9010c92 Update FMLClient with my changes 2012-05-24 21:33:43 -04:00
Christian Weeks
012c378427 my tweaks 2012-05-24 21:06:27 -04:00
LexManos
00ca4ead44 difflist should include server and client now. 2012-05-24 03:48:59 -07:00
LexManos
2927be6247 Some patch cleanup. 2012-05-24 02:18:20 -07:00
LexManos
a9b317c941 Rewrote how HD Texture support worked, to make it easier for Optifine to integrate. 
Fixed TextureFlamesFX for extramly large texture sizes.
Fixed the texture size sceme to allow for different sizes of textures in the same pack.
 2012-05-24 01:35:37 -07:00
LexManos
1727ce69ed Line number changed.. 2012-05-24 01:33:50 -07:00
Christian Weeks
0d5ab57fa0 Fix up the watch 2012-05-18 20:42:12 -04:00
Christian Weeks
2dcd1c4065 And some tweaks to the texture handling 2012-05-18 20:17:07 -04:00
Christian Weeks
a40ba43957 Fix up some fubars in MTS and MTA 2012-05-18 20:16:41 -04:00
Christian Weeks
88f3c4f9bd Lots of error handling. 2012-05-18 10:38:40 -04:00
Christian Weeks
dd94427f22 Missed a patch *sigh* 2012-05-17 21:57:24 -04:00
Christian Weeks
cc4641b0d9 Add simple API to allow mods to let their textures be overriden by other mods 2012-05-17 21:47:12 -04:00
Christian Weeks
a9e17048e6 Because, of course, I broke the first build... 2012-05-17 20:27:24 -04:00
Christian Weeks
abee6d2507 Some logging of texture overrides- also, only unregister if it's an actual ModTextureStatic, not if it's a subclass. 2012-05-17 15:39:04 -04:00
Christian Weeks
1004a3236a Derpy exceptions derpy exception handling 2012-05-17 15:19:25 -04:00
Christian Weeks
8aacd2d127 Remove the dependency in RenderEngine, decided on the simple API for texture FX 2012-05-17 15:11:21 -04:00
Christian Weeks
bc3790e3ca Tweak the render patch- we won't fail if the updateTexture call fails 2012-05-16 00:34:50 -04:00
Christian Weeks
77d6ae8ffa Update patches: add in a setup for most of the texturefx classes 2012-05-16 00:01:12 -04:00
Christian Weeks
a220fb34e2 Tweaking texture loading 2012-05-16 00:00:52 -04:00
Christian Weeks
ddb1085064 Fix tileSize -> iconTileSize. Stupid MCP 2012-05-15 22:34:17 -04:00
Christian Weeks
319758bd33 Catch throwable (NoClassDefFoundError) and don't abort loading- it's probably a badly named class file. 2012-05-15 22:23:00 -04:00
Christian Weeks
1b299b4ff4 Fix some derpy 2012-05-15 22:18:41 -04:00
Christian Weeks
25ced3f321 Update patches for hd textures 2012-05-15 22:10:38 -04:00
Christian Weeks
0e3dcc4eda Change hd texture handling 2012-05-15 22:05:24 -04:00
Christian Weeks
6903deb69d Refresh the renderengine patch- catch and log some texture pack reload errors 2012-05-15 16:21:40 -04:00
Christian Weeks
5412be2d76 More mod list fixes 2012-05-15 16:19:46 -04:00
Christian Weeks
a77aeedee2 Lots of cleanup on the mod list, pretend we're the mcpatcher for mod HD detection. 2012-05-15 15:52:19 -04:00
Christian Weeks
bc23e7a657 Fix up fubar in worldprovider. Add in obfuscation detection. Capture the exception that crashes minecraft in the log file. 2012-05-14 18:21:35 -04:00
Christian Weeks
6b23024f11 ModLoader worldtype hackery compatibility 2012-05-14 16:21:05 -04:00
Christian Weeks
c2264c97aa Fix derp 2012-05-14 14:16:50 -04:00
Christian Weeks
828ada8aa6 Only log the warning once per texture 2012-05-14 13:20:50 -04:00
Christian Weeks
5c48a3c146 push patches 2012-05-14 12:22:46 -04:00
Christian Weeks
028fc2505b Fix millinaire support. Fix Portal eating rendering time. add in profile visibility for mod stuff. 2012-05-14 11:38:54 -04:00
Christian Weeks
6f6c3ee939 Fix the serverside. FUUUUUUUU! 2012-05-14 01:45:56 -04:00
Christian Weeks
a01711361d HD patching complete? Clean up mod info data, Dummy field for dummy mods 2012-05-14 01:39:21 -04:00
Christian Weeks
d48213b444 Improving the scroll list, HD texture patches 2012-05-13 02:46:39 -04:00
Christian Weeks
00aee5b8e1 Actually pass in the mod name 2012-05-12 02:25:15 -04:00
Christian Weeks
b26b3fda1b Fix up incorrect dependency handling 2012-05-12 02:10:50 -04:00
Christian Weeks
ff26096a0f Fix stupid problem with braces 2012-05-12 01:06:58 -04:00
Christian Weeks
fdd80dad80 Tick only when there's a world 2012-05-12 01:03:36 -04:00
Christian Weeks
caa5384552 Fix nulls in the mod list, start building the gui screen 2012-05-12 00:47:04 -04:00
Christian Weeks
053fd64bde Gui related ticking 2012-05-12 00:00:33 -04:00
Christian Weeks
c689991986 Try always loading the language data 2012-05-11 23:37:58 -04:00
Christian Weeks
1146642dec Always load the "en_US" langpack into the translation table first, then the actual language. 2012-05-11 22:20:09 -04:00
Christian Weeks
658f018404 Derpy derp- fix stupid pointless cast 2012-05-11 17:41:33 -04:00
Christian Weeks
394b046220 Fix missing ml.sendpacket, call in renderers 2012-05-11 17:31:28 -04:00
Christian Weeks
c032e39fed Actually mark the sprite as used when you allocate it! 2012-05-11 16:49:21 -04:00
Christian Weeks
a6da168420 Helps to add the new hook! 2012-05-11 16:30:23 -04:00
Christian Weeks
0cd0d69ec4 Hook texture pack changes and loads so we can register override textures 2012-05-11 16:23:26 -04:00
Christian Weeks
f1453839b4 Fix problem with nulls in getModList 
Work on the meta information file
 2012-05-11 15:18:26 -04:00
Christian Weeks
7735567ce0 More tweaks to stuff: mod list, branding, more hooks 2012-05-11 01:45:36 -04:00
Christian Weeks
abc7b3f2a6 Tidying up and more hooks 2012-05-10 21:30:06 -04:00
Christian Weeks
b7861ec04c Tweak block rendering organization. Add in worldgen for client. 2012-05-10 19:51:15 -04:00
Christian Weeks
813ad71f13 Tidy up a lot of code- ModLoader and BaseMod are now almost identical client and server side 2012-05-10 18:54:25 -04:00
Christian Weeks
bb2af1d883 Tweak ordering for sorting- should be a stable sort now 2012-05-10 15:48:26 -04:00
Christian Weeks
7b5ad64378 Update git version capture 2012-05-10 13:01:39 -04:00
Christian Weeks
be9557b8ef Ignore jenkins tags 2012-05-10 12:53:27 -04:00
Christian Weeks
57af97858b Tweak some build stuff for versioning 2012-05-10 12:24:17 -04:00
Christian Weeks
89a6790222 Update build to actually put Loader in... 2012-05-10 11:16:58 -04:00
Christian Weeks
4c9ca1ffc1 tweak location of build properties in src jar 2012-05-10 10:09:56 -04:00
Christian Weeks
5a93998097 Lots of tweaks to mod output pretty printing. new versioning scheme. 2012-05-10 09:42:31 -04:00
LexManos
ef6bb505b9 Inventroy rendering 2012-05-10 01:25:56 -07:00
LexManos
8d0a9b770d Fixed up the ModLoader render block hook, RP's blocks now render. 2012-05-10 01:00:07 -07:00
LexManos
2afed48993 Should fix colliding model ids with MC's internal IDs 2012-05-09 23:38:01 -07:00
Christian Weeks
f4862dc40d Fixes 2012-05-10 02:01:23 -04:00
Christian Weeks
311ca8866e Fix up build script a bit, all modloader is public, and fix tile entity renderer 2012-05-10 00:07:46 -04:00
Christian Weeks
7846f10c74 Add in some more stuff for handling key bindings, rendering 2012-05-07 17:44:49 -04:00
Christian Weeks
0438fbd47e Reorganize ticking a bit 2012-05-07 01:39:55 -04:00
Christian Weeks
56e7270dee Separate sprite handling, fix worldtype 2012-05-07 01:26:21 -04:00
Christian Weeks
b6b5955404 Working on the ticking stuff 2012-05-07 00:54:18 -04:00
LexManos
55d252b657 more client side hooks and Texture overrides/animations. 2012-05-06 16:32:59 -07:00
Christian Weeks
49be023eab Halfway through ticking- won't compile 2012-05-06 00:58:40 -04:00
Christian Weeks
8c79b9b946 ModLoader moves forwards 2012-05-05 20:33:40 -04:00
Christian Weeks
bca823c421 Let's get hooking! 2012-05-05 19:52:53 -04:00
Christian Weeks
e0e77a6bb5 API is restored for client side. Implementation starting. 2012-05-05 14:42:46 -04:00
Christian Weeks
50a3543de0 And some patches for that 2012-05-04 17:04:18 -04:00
Christian Weeks
816b0738e4 The beginning 2012-05-04 17:02:12 -04:00
Christian Weeks
4b4ad6781e Introduce the client side FML 2012-05-03 19:40:55 -04:00
Christian Weeks
071d54feaf Implement addBiome, hopefully. Pushes biome list to the WorldType field. Sorry Bioxx. 2012-05-03 14:05:13 -04:00
Christian Weeks
db1f432dbf Check in some eclipse crapola. 2012-05-03 14:04:16 -04:00
Christian Weeks
6ae8a2d5b9 Fix copied code. Derpbag. 2012-04-28 16:47:04 -04:00
Christian Weeks
f1168856bd Update FML with recent mainline changes 2012-04-28 16:40:25 -04:00
Christian Weeks
c3b0dca9b2 Merge branch 'master' into bukkit 2012-04-28 16:35:15 -04:00
Christian Weeks
12a928536a Fix a small issue with the build output script 
Fix a significant issue with MLProp handling and primitives- they work now
 2012-04-26 17:38:31 -04:00
Christian Weeks
ef88519637 More text fixup 2012-04-19 23:07:07 -04:00
Christian Weeks
e6a9eb7b91 Typos 2012-04-19 22:54:10 -04:00
Christian Weeks
cf351c6118 Add in detection for MLMP and try to fail with a graceful message. 2012-04-19 22:40:59 -04:00
Christian Weeks
e510cca030 Update bukkit with new mod fixes 2012-04-18 14:06:54 -04:00
Christian Weeks
a6d6b739bd Merge branch 'master', remote-tracking branch 'origin' into bukkit 2012-04-18 14:04:39 -04:00
Christian Weeks
e261ad1295 Tweak the loader a little bit to just use file names, not fully qualified directories when referring 
to mods.
 2012-04-18 14:03:30 -04:00
Christian Weeks
b2b4551df8 Damn you bukkit with your same names for different classes!!!! EntityPlayer->EntityHuman 2012-04-16 01:00:06 -04:00
Christian Weeks
8800abf06c Fix chunk generators for bukkit 2012-04-15 22:42:06 -04:00
Christian Weeks
9fb72398b5 Merge branch 'master' into bukkit 2012-04-15 21:58:18 -04:00
Christian Weeks
a08eefa261 Bukkit version 2012-04-14 23:01:03 -04:00
Christian Weeks
0ec65b4b3a Fix "soft" dependencies so they can exist properly 2012-04-14 10:01:55 -04:00
Christian
e78688acdc Fix server patch 2012-04-10 23:05:22 -04:00
Christian
62b400c499 Merge in fixes from chickenbones for tick related problem 
and straighten out variable naming in ModLoaderModContainer
 2012-04-10 22:22:13 -04:00
Christian Weeks
44a5b7b929 Push the patched file, as well 2012-04-09 10:24:58 -04:00
Christian Weeks
2ae31bddd2 Add in more "Player" related events. Fix up some MLProp stuff 2012-04-09 10:18:24 -04:00
Christian Weeks
f92149aef5 Fix regular expressions, thanks ChickenBones! 2012-04-09 09:19:20 -04:00
Christian Weeks
597b6f0d2c Tweak Console handler patch so we're more friendly to forge 2012-04-08 10:04:28 -04:00
Christian Weeks
33f1e26df4 A proper console command handler, also fix ordering of loaded mods 2012-04-08 09:55:56 -04:00
Christian Weeks
07437b95ae Add in a console command handler so you can access the command console 2012-04-08 02:00:57 -04:00
Christian Weeks
8fa4c1645c Don't send a register unless I have channels. Add the channel to the mod channels list. 2012-04-08 01:11:32 -04:00
Christian Weeks
83730ee9ec Split the packet salutation in two so we can work with or without forge 2012-04-08 00:18:37 -04:00
Christian Weeks
42aee9032f Add the player object to the onLogin event so you don't need to dive internals for it during login 2012-04-07 22:38:29 -04:00
Christian Weeks
331768b272 Call my handleLogin hook from NetLoginHandler, tweak output in server gui and log file. 2012-04-07 22:11:01 -04:00
Christian Weeks
0ae4c2e4a9 Fix subdirectory loading properly: mods will load inside eclipse.. 2012-04-06 16:14:01 -04:00
Christian Weeks
38094093b3 Actually figure out the path for directory class loading 2012-04-06 15:24:28 -04:00
Christian Weeks
cd2be85575 regular expressions in java==fail 2012-04-06 15:03:41 -04:00
Christian Weeks
b26bf5ab96 Recurse into subdirectories found 2012-04-06 14:43:12 -04:00
Christian Weeks
040a1d8cf7 Try multiple "jar" sources- for eclipse testing 2012-04-06 14:23:14 -04:00
Christian Weeks
a858478b92 it's addURL not addUrl dumbo 2012-04-06 13:57:40 -04:00
Christian Weeks
9304420a2c it's getdeclaredmethod, dipstick 2012-04-06 13:47:01 -04:00
Christian Weeks
71a9bf9f70 Fix package private resolution of fields/methods from base minecraft by loading into minecraft's class loader not our own 2012-04-06 13:27:50 -04:00
Christian Weeks
21d11f431f Add in a missing client side method to modloader stubbed for the server 2012-04-06 12:24:52 -04:00
Christian Weeks
47a15f4c77 Add the hooks for crafting and smelting 2012-04-06 10:34:44 -04:00
Christian Weeks
765194e8db Should load from whatever minecraft comes from now... 2012-04-06 09:59:58 -04:00
Christian Weeks
55fe1aa1e3 Build should work now. Fix a stupid javadoc import. 2012-04-05 21:44:06 -04:00
Christian Weeks
09d37f87b0 New build script- version the src dist as well 2012-04-05 21:40:16 -04:00
Christian Weeks
fc1dfa9cca Documentation: lots 
Some eclipse workspace settings that might help?
 2012-04-05 16:22:47 -04:00
Christian Weeks
8b1f984c53 Handle the minecraft object registry better- now the client compiles too 
Also a quickie astyle run over the code..
 2012-04-05 12:36:54 -04:00
Christian Weeks
ae927a3cf8 Update the patches and fix the shell script 2012-04-05 11:42:33 -04:00
Christian Weeks
3b19792a12 Reorganize the code a little bit- move some stuff that was on FMLHandler to the common handler. Add a delegate 
into the common handler that delegates to the right sided handler
 2012-04-05 11:34:57 -04:00
Christian Weeks
ebc532e3a9 Clean up extraneous print statements from the build 2012-04-05 10:42:15 -04:00
Christian Weeks
4470a808b1 Fix INSTALL-fml.txt file location in the server zip 2012-04-05 10:37:05 -04:00
Christian Weeks
ba7f0a8429 Append a .class to the diff file list. Now you should just be able to iterate it and read every file in it directly. 2012-04-05 10:16:23 -04:00
Christian Weeks
e828c1793d Run Astyle over the FML code. Happy lex? 2012-04-05 10:07:52 -04:00
Christian Weeks
011dd869de OK. Now the script works 2012-04-05 08:42:10 -04:00
Christian Weeks
21e55dc4c9 Crap at writing good python apparently 2012-04-05 08:29:07 -04:00
Christian Weeks
2ca5ccb861 Tweak file list script to print obf names 2012-04-05 08:25:04 -04:00
LexManos
6b4e73911b Merge remote-tracking branch 'origin/master' 2012-04-05 00:10:36 -07:00
LexManos
3478efe0d4 Rebuilt patches with new scripts. 2012-04-05 00:10:13 -07:00
LexManos
3a5c176af4 Cleaned up update_patches to fix a few bugs. Updated applypatches to normalize the patch file's line endings to make them work cross platform. Added download_firnflower and setup script. As well as added the GnuWin32's diff binary, so windows can create patches as well. http://gnuwin32.sourceforge.net/ 2012-04-05 00:09:29 -07:00
LexManos
9220174dbc Created eclipse workspace, should allow simple and quick access to working on FML 2012-04-05 00:06:11 -07:00
Christian Weeks
2489469aba Missed a couple of wording tweaks 2012-04-05 00:58:17 -04:00
Christian Weeks
11c3817779 Tweak the build a bit, add some more data and generate the 
touched file list for forge
 2012-04-04 11:05:31 -04:00
Christian Weeks
371d69f89c Tidy up some of the installation media 2012-04-04 09:48:36 -04:00
Christian Weeks
b2555e4a50 links to implementation 2012-04-03 23:09:22 -04:00
Christian Weeks
3b0126d197 Channel validation 2012-04-03 22:45:27 -04:00
Christian Weeks
053552cdcc NetworkHandler doesn't care about channel ownership 2012-04-03 17:06:02 -04:00
Christian Weeks
5bd4f750bb Update patches for network handler 2012-04-03 17:04:57 -04:00
Christian Weeks
09efd147e1 Modloader complete 2012-04-03 17:04:26 -04:00
Christian Weeks
cd255f4d6a Generic container 2012-04-03 16:12:19 -04:00
Christian Weeks
1e3cd7ca97 Config dir handling 2012-04-03 15:53:59 -04:00
Christian Weeks
e243ffd1ce MLProp 2012-04-03 15:41:25 -04:00
Christian Weeks
35ece09cfa Mod sorting 2012-04-03 12:03:21 -04:00
Christian Weeks
971de1c2b4 Everything except ordering 2012-04-02 23:06:30 -04:00
Christian Weeks
9e404a48c5 Fix build script for generating md5s 2012-04-02 18:12:49 -04:00
Christian Weeks
63dbdd8db3 Update to 1.2.5 and hopefully forge compatibility 2012-04-02 18:09:06 -04:00
Christian Weeks
8e1f51d792 Forge support 2012-04-01 02:14:14 -04:00
Christian Weeks
a8351a0e84 Initial attempts to support forge stuff 2012-03-31 02:28:14 -04:00
Christian Weeks
ebf945f2bd Fix NPE 2012-03-31 01:04:29 -04:00
Christian Weeks
e27f1c3a70 More logging and maybe fix default package mods 2012-03-31 00:59:43 -04:00
Christian Weeks
8091d8bdaf Logging fun. Whee! 2012-03-31 00:52:50 -04:00
Christian Weeks
281c455b5d Fail 2012-03-31 00:46:47 -04:00
Christian Weeks
44779a56b1 More logging 2012-03-31 00:43:54 -04:00
Christian Weeks
f37c8ae4d7 Tweak class loader 2012-03-31 00:22:08 -04:00
Christian Weeks
41f469f495 Add more patches 2012-03-30 22:28:12 -04:00
Christian Weeks
28ac773c0a Some implementation 2012-03-30 22:26:16 -04:00
Christian Weeks
376d3995b4 tweak MC server hook 2012-03-30 21:23:04 -04:00
Christian Weeks
cec16187c1 some build and logging tweaks 2012-03-30 21:21:43 -04:00
Christian Weeks
f075e613e3 Fix build 2012-03-30 21:10:43 -04:00
Christian Weeks
7f985856ec Fix derpy 2012-03-30 21:07:42 -04:00
Christian Weeks
d8580c2d02 Tweak loader a bit 2012-03-30 21:03:25 -04:00
Christian Weeks
12c23deee9 Fix patching 2012-03-30 20:43:58 -04:00
Christian Weeks
e5b4d1e953 More build stuff 2012-03-30 20:38:31 -04:00
Christian Weeks
18069778d9 More building fun 2012-03-30 17:36:50 -04:00
Christian Weeks
ba46c2e3bc fix build script 2012-03-30 17:00:49 -04:00
Christian Weeks
c521479962 Add in more ignore stuff and a sample "fmlbuild.properties" file 2012-03-30 16:42:11 -04:00
Christian Weeks
620764f315 More build stuff, adding in readme etc copied from forge 2012-03-30 16:40:54 -04:00
Christian Weeks
d97aaa4e82 Move more stuff around 2012-03-30 16:25:49 -04:00
Christian Weeks
c7437f3a3b Build system 2012-03-30 16:22:10 -04:00
Christian Weeks
cc65a26a89 Start patching fun 2012-03-30 13:33:29 -04:00
Christian Weeks
3afd52ac9d Ignore stuff 2012-03-30 11:35:35 -04:00
Christian Weeks
efa8cf41b2 We're Forge Mod Loader, not Forge ModLoader 2012-03-30 11:35:04 -04:00
Christian Weeks
b71f486837 Tweak license to refer to github 2012-03-30 10:16:36 -04:00
Christian Weeks
2edeba5af4 Add licenses reorganize code 2012-03-30 10:11:13 -04:00
Christian Weeks
7b3fb203fc Starting to get somewhere 2012-03-30 01:12:59 -04:00
Christian Weeks
62cca5a4b7 Thoughts on how to do the modloading properly 2012-03-28 16:44:36 -04:00
Christian Weeks
0cc2bc1923 Tab cleanup 2012-03-28 13:29:23 -04:00
Christian Weeks
7c30c12f9f Initial commit 2012-03-28 12:53:08 -04:00