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

252 commits

Author SHA1 Message Date
Christian Weeks
b2e01d8f2a Bukkit version 2012-05-31 22:48:44 -04:00
Christian Weeks
2521e5b390 Merge branch 'bukkit' - massive code reorganization for fml 2.0 
Conflicts:
	common/cpw/mods/fml/common/IWorldGenerator.java
	common/cpw/mods/fml/common/registry/FMLRegistry.java
	common/cpw/mods/fml/common/registry/IMinecraftRegistry.java
	common/net/minecraft/server/CommonRegistry.java
	common/net/minecraft/server/IMinecraftRegistry.java
	common/net/minecraft/src/CommonRegistry.java
	common/net/minecraft/src/IMinecraftRegistry.java
 2012-05-31 22:45:19 -04:00
Christian Weeks
ae6621bfdd More tweaks for proper API 2012-05-31 22:42:23 -04:00
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