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

748 commits

Author SHA1 Message Date
Vazkii
f2e4e20f35 Add Null check to FMLClientHandler.sendPacket 2012-10-05 17:36:52 +02:00
Christian
124f47f55c Update patches *sigh* 2012-10-02 22:04:25 -04:00
Christian
550e622bc7 Add in a savehandler strategy for reading and writing data to the 
world save. This service is only available to coremods via the
WorldAccessContainer interface on the mod wrapper. This is deliberate
and will not change.
 2012-10-02 21:54:47 -04:00
Christian
a554846e57 Add in some bukkit supporting code. Most of this is unimplemented 
until the bukkit coremod is complete.
 2012-10-02 20:26:47 -04:00
Christian
0ed0d284b5 New stuff on the ModLoader! Risu has been busy. Closes #114 2012-10-02 08:29:12 -04:00
Christian
9a8a38d345 Mods can now declare a range of minecraft versions they will run against 2012-10-02 01:29:46 -04:00
Christian
7cd5ae04f7 Fix maps supporting greater than byte() dimension sizing 2012-09-29 00:21:42 -04:00
Christian
639039dd18 Fix language registry additions, closes #113 2012-09-28 22:12:23 -04:00
pahimar
df7d2b7161 Added ability to query the Language Registry by key and language for specific localized text, as well as loading in localization text from a specific file/URL 2012-09-26 15:41:58 -04:00
Christian
7dbda77f10 Extreme headless mode is back! 2012-09-25 22:46:47 -04:00
Christian
eb034416ae Fix parent child counts showing properly. Closes #107 thanks scott! 2012-09-25 19:00:36 -04:00
Christian
d21bc1085c It's useMetadata, not usesMetadata. thanks myrathi and psx. closes #110 2012-09-25 18:57:42 -04:00
Christian
2bee777740 Fix random shuffling when manipulating biomes by using a LinkedHashSet to preserve iteration order. Closes #111 2012-09-25 18:54:46 -04:00
Christian
b29aebf338 Try and fix the newline capture so consoles show on the server on windows again 2012-09-24 17:22:39 -04:00
Christian
37340b0f80 Readd ancient searge name so dan200 and computercraft can run again. REMOVE THAT CODE DAN. 2012-09-24 17:22:16 -04:00
Christian
98151df96b Fix missing import. Thanks ichun :( 2012-09-21 18:17:56 -04:00
Christian
f73d283341 Version file searching should work for directories too 2012-09-21 17:39:52 -04:00
Christian
cb2535fa95 Fix bug causing NPE if non-whitelisted player joins an FML server without FML installed 2012-09-21 10:12:39 -04:00
iChun
efb0e73df9 Fixed ModTextureAnimation not updating and not binding to correct image. 2012-09-17 23:46:09 +08:00
Christian
a837d82e68 Tidy code 2012-09-16 21:44:11 -04:00
Christian
9b081b9d46 Change version.properties search slightly, allow access to found file from the preinit event 2012-09-16 21:42:59 -04:00
Christian
83a57f5259 Add in the capability to read an internal version as <modid>.version from a file 
in the zip call version.properties. Handy for autobuilding scripts.
 2012-09-16 21:05:56 -04:00
Christian
e619e00079 Fix up reversed assignment for version fallback 2012-09-16 21:05:56 -04:00
LexManos
8f0b7c05fe Fixup Item in hand rendering of textures > 16x 2012-09-15 18:24:27 -07:00
LexManos
b404f294c5 Make the exception print for headless servers if the Downloader cant initalize. 2012-09-15 18:06:59 -07:00
LexManos
48d12444c0 Remove a bunch of warning about javadoc, not a real fix, but no more warning. 2012-09-15 18:04:56 -07:00
LexManos
82fba4bfaa Update MCP Mapings 2012-09-15 17:09:45 -07:00
LexManos
ec2a59bde8 Makes GetModSrc check the common folder when attempting to extract source files 2012-09-15 17:09:34 -07:00
Christian
149a626e5a Tie parent/child containers together again. Should close #96 2012-09-15 15:58:20 -04:00
Christian
9cd4ed0c91 Village mating produces added villagers, and the egg should place 
added villagers too. Closes #97.
 2012-09-15 15:49:08 -04:00
Christian
09558e9e15 Clean up stale references to the Player stored in the NetworkRegistry, 
closes #100
 2012-09-15 15:36:26 -04:00
CovertJaguar
13756b6f2c More readable init logs 2012-09-14 00:47:48 -07:00
Christian
0de240c4fe Fix onConnectionClosed not being called on the client side of a connection 2012-09-09 11:29:08 -04:00
Christian
74343a0cff Add in exclusion list for IFMLLoadingPlugin. 2012-09-08 12:19:03 -04:00
Christian
3461c12d95 Remove debug cruft 2012-09-07 23:14:54 -04:00
Christian
67d8b3b475 To properly align with packet9respawn, make packet1login's dimension an int as well 2012-09-07 22:57:01 -04:00
Christian
ab34f2d2cf Attempt to build some protocol negotiation, and fix packet1login so that the dimension is a short, matching packet9respawn 2012-09-07 22:46:31 -04:00
Christian
c4d5c89f85 Compatibility level is now passed from server to client - and 
the client tracks it. This means certain packet changes can be made
without breaking comms, hopefully
 2012-09-07 19:32:36 -04:00
Christian
67b9fbe363 Fix dependency checking: you can depend on specific versions of FML 2012-09-07 19:08:28 -04:00
iChun
7a0ab7e563 Fix handleTinyPacket using short instead of int. 
Silly cpw :P
 2012-09-07 18:35:26 +08:00
Christian
e564610b54 Fix up tiny packet handler to actually work 2012-09-06 22:59:38 -04:00
Christian
94d076a14a Allow javax to be shipped by mods. Should allow some more modloader mods to work 
unaltered
 2012-09-06 22:03:02 -04:00
Christian
d2e99c3443 Add in a little bit of protocol cleanup. Start work on allowing multiple 
protocol versions
 2012-09-06 21:54:43 -04:00
Christian
45bbdd14d6 Give a way to build the packet131mapdata packet correctly populated 2012-09-06 10:12:37 -04:00
Christian
8b8d9a58f6 Capture and leverage Packet131MapData 2012-09-06 10:03:30 -04:00
Christian
50c74f93bd Make console logging pass through a single logging thread to avoid concurrency problems with launchers and stuff 2012-09-04 19:11:45 -04:00
Christian
6d9b9fde47 Overlooked chat message support *sigh*. Fixes wierd mods that communicate through custom 
chat messages rather than anything else. Hi Superior enchanting!
 2012-09-04 12:37:59 -04:00
Christian
7a58542fb8 Rescan mod packages where there was a possible mod identified to try and make sure we load it. Fixes Matmos r16 2012-09-04 11:39:51 -04:00
Christian
61153abf7b And handle the other way to globally register an entity 2012-09-03 21:37:20 -04:00
Christian
788d1c9925 Fix up mods trying to register entities outside of modloading. Now you'll get a big fat warning for doing such a derpy thing. 2012-09-03 21:32:21 -04:00
Christian
6de655df47 Fix CJB mod compatibilty for real. Gui container registration can now happen in the constructor. YUK! 2012-09-03 21:14:11 -04:00
Christian
2af15b3a95 Fix compatibility with ModLoader dispenser hook. Fixes a bug with 
IDispenseHandler too - though it means that interface is now
deprecated
 2012-09-03 11:37:17 -04:00
Christian
5bea2a0bbd Fix headless operation, hopefully 2012-09-02 13:29:46 -04:00
Christian
599476d587 Fix up trying to re-add stuff to the classpath when it's already there 2012-09-02 12:56:08 -04:00
Christian
d538dcf06f Fix out of range entity id handling for ModLoader mods a bit more. Thanks Herobrine mod! 2012-09-02 12:39:06 -04:00
Christian
6072420a02 Expose GuiMerchantButton 2012-09-02 12:15:13 -04:00
Christian
6056c760d4 Log a big fat warning for the developer in the case the network version 
is not acceptable to the mod itself. (This can happen because of a bad range
specifier for example)
 2012-08-31 23:41:29 -04:00
Christian
8f70ed5f33 Also, make missing entity not blow things up 2012-08-31 16:49:35 -04:00
Christian
17cbb9d3b7 Fix entity tracker "update" packet not computing correctly. Should work now.. 2012-08-31 16:41:05 -04:00
Christian
bd137b7f06 Fix up addRenderer to catch exceptions from the basemod, also, addrenderer now supplies a list of the 
default renderers from MC for editing and will note the changes made.
 2012-08-31 11:18:17 -04:00
Christian
befe8f5f47 Change download location for FML libraries to files.minecraftforge.net, add an encoding param to the javac command line to force utf 8 2012-08-31 11:18:17 -04:00
Christian
74d6437856 Add in random jar/zip files to the classpath. UGH this is so fucking ugly it's not funny. 2012-08-30 20:10:53 -04:00
Christian
93f9cc45f9 Use a null socket and try to prefer the result of getLocalHost in the broadcast data. 2012-08-29 16:12:40 -04:00
Christian
ece5483ad7 Add in an ItemRenderer null check so FML can run render adding mods 2012-08-29 13:58:56 -04:00
Christian
8df9a051d6 Inverted boolean logic. Grrr. 2012-08-29 13:44:40 -04:00
Christian
81a8e94c79 ModLoader mob spawns use packet 24- build a bypass system so that 
they can still use it
 2012-08-29 12:58:16 -04:00
Christian
3415dbfd0d Remove debug statements 2012-08-28 23:07:37 -04:00
Christian
3b0c0fcecf Fix keybindings not loading properly from gamesettings file after restart 2012-08-28 22:15:18 -04:00
Christian
62a7d347e7 Fix so we always send received packets to handlers. 
Renders 250 filtering useless unless i can figure a way to intercept *outbound* packets that isn't as messy as I'm
contemplating
 2012-08-27 17:46:08 -04:00
Christian
d105213aed Some tests 2012-08-26 22:23:05 -04:00
Christian
870214000f Fix trying to load the client side packet handler, when on the server, hopefully? 2012-08-26 22:18:57 -04:00
Christian
5a6275f0e1 Fix up network negotiation - now it will disconnect with a nice 
error screen if there are missing mods on the client vs server
 2012-08-26 22:13:43 -04:00
Christian
b32dea398b Fix missing addCommand call: thanks "spawnwolf test command" 2012-08-26 13:07:35 -04:00
Christian
4b371d8d5b Fix a couple of modloader mods. Thanks! 2012-08-26 12:52:50 -04:00
Christian
85a585725b Some functionality fixes for @Instance injection. 2012-08-26 10:55:55 -04:00
Christian
fe73f11443 Versions now have two flavours: the @Mod(version) which is the "programmatic version" and 
is used for all version relationship calculation. The "display version" as sourced from
mcmod.info is used for display purposes only and can be literally anything. Note: they fall back
to one another when they're missing, and to "1.0" if both are absent.

Also, changed @Instance. Now, you can inject *other* mods using @Instance as long as you depend
on them as a "before" or "dependency" relationship. Classes containing @Instance will only be
loaded if the Mod the @Instance refers is present. So you don't have to worry about runtime class
resolution.
 2012-08-26 10:45:00 -04:00
Christian
a0302861cf Always for ML mods into "public" class accessibility - we don't call from the default package like ML does. 2012-08-25 21:57:25 -04:00
Christian
1da6a1fc6c Add in a convenience method for getting a class instance based on 
existence of another Mod. Useful for soft dependencies.
 2012-08-25 21:26:41 -04:00
Christian
b308be04e7 And more mod sorting fixes. 2012-08-24 12:10:43 -04:00
Christian
67fa435dd4 Actually *use* the sorted mod list 2012-08-24 11:58:18 -04:00
Chicken Bones
542219112a The access transformer will now handle classes in packages. 
Eg.

public net/minecraft/client/Minecraft.T #timer
 2012-08-24 08:09:10 +10:00
Christian
6657b6561b Reverse the meaning of state in fml.modStates system property and fmlModState.properties - it was very 
derpy before. Now: true is enabled, false is disabled, as you would expect
 2012-08-23 17:37:44 -04:00
Christian
02792c45e6 Actually fix the corrupt JSON problem 2012-08-23 17:27:53 -04:00
Christian
4f6861ee50 Fix isModLoaded for "disabled" mods, and the toposort as well 2012-08-23 17:08:18 -04:00
Christian
1870b7d793 A bit more information for dependency handling 2012-08-23 16:46:23 -04:00
Christian
c465b17afe Fix up handing corrupt mcmod.info 2012-08-23 16:43:28 -04:00
Christian
72097d5bf5 Fix a problem with network ids 2012-08-23 16:38:34 -04:00
Christian
87fa59b0f7 Fix up version handling properly. Hopefully, and the error screen. 2012-08-23 15:29:17 -04:00
Christian
675f4115aa Only active mods should have dependencies checked, and be sorted 2012-08-23 14:33:54 -04:00
Christian
e7c6a47951 Fix oddity with Screen, print a version out in the sorted list! 2012-08-23 14:28:49 -04:00
Christian
9974f7a6d5 Fix metadata 2012-08-23 14:05:17 -04:00
Christian
4b6b090712 Fix up versioned dependencies so they work a lot better, also add in a missing mods screen 2012-08-23 13:43:25 -04:00
Christian
e6dce6cdbc Fix missing serverSendPacket 2012-08-23 09:02:12 -04:00
Christian
e37b40dac9 Trading support for ModLoader - thanks Herblore! 2012-08-23 01:40:03 -04:00
Christian
4e8668c922 Close the jar, for cleanliness sake 2012-08-23 01:39:35 -04:00
Christian
12f66bdc86 Fix authors - it'll read both "authors" and "authorList" from the json now 2012-08-23 01:17:47 -04:00
Christian
346661cc6b More ML compatibility - fix up dragon mounts, thanks! 2012-08-23 00:37:45 -04:00
Christian
fe0d081eec Fix up loading mods that are grandchildren of BaseMod 2012-08-23 00:04:34 -04:00
Christian
0ae888e8f8 Fix entity handling for ModLoader mods, thanks parachute mod! 2012-08-22 23:46:16 -04:00
Christian
908a57f3c4 Fix formatting 2012-08-22 18:00:38 -04:00
Christian
8f6883da8e Tweak patches and hooks slightly 2012-08-22 17:58:46 -04:00
Christian
9bfa7acf0d More precise error handling when an invalid class is present 2012-08-22 17:50:07 -04:00
Christian
af104b81f2 Fix textures not applying properly 2012-08-22 17:50:07 -04:00
Christian
5233ae520d Fix up entity spawning - hopefully they won't warp anymore. 2012-08-22 17:50:07 -04:00
Christian
d544e56ec3 Add in a helper on the server start event for adding commands to 
the server.
 2012-08-22 17:50:07 -04:00
Christian
be7b413bec Move villager trading hook up a bit. thanks sengir. 2012-08-22 17:50:07 -04:00
Christian
550c206997 Fix LAN to try hard to find a real network interface, not just localhost 
most of the time
 2012-08-22 17:50:07 -04:00
Christian
5330afb78e Update build to not bother building client jar. Universal is everything 
now.
 2012-08-22 17:50:07 -04:00
Christian
ebc1aea5d2 Null protection for ticks() -- probably should uses EnumSet.noneOf() but 
you can also use null now to stop ticking. closes #77
 2012-08-22 17:50:07 -04:00
Chicken Bones
fe263206e2 FML will now search '<mcpdir>/forge/accesstransformers' for user defined access transformer config files to be applied during forge setup 2012-08-23 06:31:00 +10:00
Chicken Bones
0806bc7b22 Added IPlayerTracker hooks 2012-08-23 06:28:53 +10:00
Christian
5d59af0cec Automatic mod entity registration into the global entity list. This might break 
entity code out there, sorry, but this way for most entities you no longer
need to manage the global mod entity stuff at all. just remove it. FML will
take care of the rest (note, worlds won't load the old entities)
 2012-08-21 19:34:33 -04:00
Christian
d27e722903 Add in a utility function that *might* tell you the context 
you're running in on either client or server: FMLCommonHandler.getEffectiveSide
 2012-08-21 19:15:07 -04:00
Christian
ba16217fe2 Try and stop sendPacketToAllAround from being crashy 2012-08-21 18:50:26 -04:00
Christian
63e8249040 Mods can add mod specific crash information to the crash report now 
Forge needs to implement MinecraftForge.getCrashCallable
 2012-08-21 18:48:12 -04:00
Christian
a17396eca5 Fix up dispenser handling, add in new params for the dispenser: breaks IDispenseHandler, sorry 2012-08-20 21:44:54 -04:00
Christian
ab90aa4d99 Fix up MLProp handling for null info 2012-08-20 21:44:47 -04:00
Christian
b8a30cec94 GUIs working in FML for ML mods 2012-08-20 21:44:28 -04:00
Christian
bb98ae9e28 Support gui opening for Shelf mod 2012-08-20 21:43:59 -04:00
LexManos
85e3c330e7 Updated MCPMerger to annotate unique classes with there sides, and SideTransformer to null out any class that is loaded on the wrong side. 2012-08-19 22:26:52 -07:00
Christian
45175c0e94 Expose more of the village construction parts for building village 
pieces
 2012-08-19 11:23:29 -04:00
Christian
52d3f237af Allow access to the type "ComponentVillage" 2012-08-19 10:35:06 -04:00
Christian
09c7ea2d9d Documentation and registration for villager stuff 2012-08-19 10:30:24 -04:00
Christian
3a0ad876b5 Fix javadoc derp 2012-08-19 10:21:19 -04:00
Christian
8a521c1d32 Villager trading, manipulation and village enhancement. Still WIP but should be functional 2012-08-19 10:13:15 -04:00
Christian
b07f1069b9 Fix exception based logging to actually log the exception! 2012-08-19 09:31:26 -04:00
Christian
3e94ee2c36 Fix up keyboard events for modloader 2012-08-19 01:44:33 -04:00
Christian
a1385f4797 Pickup notification 2012-08-19 00:26:55 -04:00
Christian
ce276375b2 Update fml_at with new transforms 2012-08-18 20:08:27 -04:00
Christian
9a540ef6d4 Fix derp where client sided packet handler would be created on a dedi server env 2012-08-18 19:50:46 -04:00
Christian
f86a29468e Add in support for "dummy" keybindings- ones that are added to the list but never do anything 
so the mod can handle it all themselves.
 2012-08-18 10:24:29 -04:00
Christian
b65a38cb30 Don't complain about minecraft source code being in "net.minecraft.src". Derp. 2012-08-18 10:09:53 -04:00
Christian
298d6db6e2 Fix ModLoader add XP Smelting 2012-08-18 10:09:25 -04:00
Christian
3d87561505 Actually register client/server packetspecs as their correct sides! fixes #71 2012-08-18 09:28:36 -04:00
Christian
1cbe058250 Error if channel name is invalid - either too short, or too long 2012-08-17 16:59:48 -04:00
Christian
8a679f6d9e Add a connect and read timeout for downloading libraries. This should really stop the "waiting forever" at startup screen. 2012-08-17 16:21:18 -04:00
Christian
0e473145b3 GIANT FAT WARNINGS if you use any code in net.minecraft.src or any subpackage thereof. Get it out of there, now! 2012-08-17 16:13:05 -04:00
Christian
73bf3a8985 Fix up ML GUI ticking. Thanks sharose! 2012-08-17 16:09:46 -04:00
Christian
5ea0932e24 Organize ALL the imports 2012-08-17 09:25:04 -04:00
Christian
290f2d6781 Expose the server in serverstart event 2012-08-17 09:25:04 -04:00
Christian
94f834d5d7 Fix up directory injection of log file locations 2012-08-17 09:25:04 -04:00
Christian
30d6970e77 Refer to FMLLog, not FMLRelaunchLog 2012-08-17 09:25:04 -04:00
Christian
8408f58fb1 Tidy up server launch - reflection not required anymore 2012-08-17 09:25:04 -04:00
Christian
0fab4eca7b Also, log what the directory discoverer finds for mcmod.info 2012-08-17 09:25:04 -04:00
Christian
549969ade6 And log the exception if it has a problem reading the jar file 2012-08-17 09:25:04 -04:00
Christian
26bb005731 Fix jar loader failing to inject any metadata at all if mcmod.info is not found. 2012-08-17 09:25:04 -04:00
LexManos
8444fa6d3c Change install.cmd to install.bat, why, cuz people are .... Updated readme to mention needing server and client. 2012-08-16 22:57:11 -07:00
Christian
11c1cae8b0 Some compatibility fixes for Rei's minimap, and tidy up a couple of things 2012-08-16 13:55:42 -04:00
Christian
4d87779d39 Fix Forge branding string call 2012-08-16 13:01:48 -04:00
Christian
1cc6778038 Update FML for mcp 72 final, change download location for FML files, and make the stop button work. 
Hello is NOT going to go away :)
 2012-08-16 12:22:56 -04:00