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

1768 commits

Author SHA1 Message Date
Christian
a66e8462d8 Try and see if there is anything to the identityHashCode collision hypothesis. If you see this in your error messages, kindly let us know! 2014-05-10 14:53:08 -04:00
Christian
0a9099c8dd Add a helper for casting some common collection types into generic form 2014-05-10 13:36:24 -04:00
Lex Manos
123f5919ba Fix network disconnect with message on the client side in NetworkDispatcher. 2014-05-09 13:23:24 -07:00
Lex Manos
6b82a4fed8 Fixed default network mod checking to allow client side mods without the server side. Mods wishing to REQUIRE server side components must specify a custom check handler using @NetworkCheckHandler 2014-05-09 13:22:54 -07:00
Christian
3a77c79f8a Ensure that the loadcontroller is ready to preinit. 2014-05-08 10:40:52 -04:00
Christian
f866aeaacb Clean up some missing generic info 
PS: NOPE: still not modding.
 2014-05-08 10:36:01 -04:00
Christian
b286cb6a57 Split loadmods into loadmods and preinitmods, to allow resource loading to occur *always* between the two phases. This should fix 
mods not being able to access resources during preinit.

PS: I'm still not modding.
 2014-05-08 10:23:05 -04:00
Christian
0b795b8bab Re-add removed genericiterable to clean a warning 2014-05-08 09:58:03 -04:00
Christian
f628bde87b Revert "Fix refreshResources not happening if an error occurs." 
This reverts commit fff86ee9d35874bdf77a1eaabe77615441644064.
 2014-05-08 09:56:43 -04:00
LexManos
7229ba5c83 Merge pull request #419 from Thog92/master 
updated wrapper to gradle 1.12
 2014-05-07 15:41:05 -07:00
LexManos
51fc256111 Merge pull request #402 from AbrarSyed/patch-1 
Added dependency examples to the shipped example mod's build.gradle.
 2014-05-07 15:40:50 -07:00
AbrarSyed
437e479446 documented dependencies 2014-05-07 17:34:44 -05:00
Lex Manos
e33224054b Fine use FMLCommonHandler. 2014-05-07 14:36:00 -07:00
Lex Manos
3cb3988491 Fix potential rance condition in connecting to vanilla servers as well. And move latch into client side only. 2014-05-07 13:54:22 -07:00
Lex Manos
18aed8bf1b Attempt to fix another race condition related to reading NetClientHandler. 2014-05-07 13:31:16 -07:00
LexManos
e69004b50e Merge pull request #411 from matthewprenger/master 
Update ExampleMod mcmod.info
 2014-05-07 12:39:12 -07:00
Thog92
366fc5c76c updated wrapper to gradle 1.12 2014-05-06 22:03:44 +02:00
Lex Manos
5a2b6a604b Fixed memory leak on the client caused by Netty holding references to the World. Closes #415 #417 2014-05-05 22:14:13 -07:00
Christian
ad3b232604 Fix display of mod status at the server 2014-04-30 22:47:10 -04:00
Christian
af73743eb7 Fix mod version checking 2014-04-30 22:26:16 -04:00
Christian
0be4719fd5 Fix refreshResources not happening if an error occurs. 2014-04-30 21:55:55 -04:00
Christian
66ad8ea41a Clean some generic warnings up. Make a generic list handler. Helpful for others I think too. 2014-04-30 21:55:55 -04:00
Player
74c89da967 Fix saving backups with the raw name. 
Fix air block not being assigned as the default.
 2014-04-30 09:44:09 +02:00
Matthew Prenger
e8b3603ee8 Update mcmod.info 2014-04-28 22:27:52 -05:00
Player
2d3cd66680 Registry: Treat all 1.6 entries as items. 2014-04-26 21:56:25 +02:00
Player
dfa9f2d1a2 Registry: Misc tweaks 2014-04-26 21:56:25 +02:00
Player
7175165d15 Registry: Crash earlier with conflicting name/object registrations. 2014-04-26 21:56:25 +02:00
Player
9d00580d7e prevent the world from getting saved twice at shutdown 2014-04-26 21:56:25 +02:00
Player
624e68e18e Registry: Fix Block-before-ItemBlock allocation when loading 1.6 world saves, more validation 2014-04-26 21:56:25 +02:00
Player
09ff49fe58 Fix vanilla bug causing integrated server saving from 2 threads concurrently after a crash 2014-04-26 21:56:25 +02:00
Christian
c7d887f078 Fix SimpleNetworkWrapper - this is not me modding, 
I didn't realize it was broken until Pahimar told me.

Put an example in the docs.
 2014-04-26 09:33:09 -04:00
Christian
840c96a212 I'm still not modding. Player has contributed greatly to the 1.7 release of FML. He needs authorship credit. 2014-04-19 11:38:46 -04:00
Christian
a7c15e30aa I am not modding, I am fixing an annoyance. The MCP version has long since been 9.03. Also, the JSON from MC updated.. 2014-04-19 10:46:04 -04:00
Player
ea2972725a Registry: Add support for registering ItemBlocks before their Blocks 2014-04-07 17:30:38 +02:00
Player
07d5d5c7af Registry: Protect against putObject misuse, handle duplicate registrations better 2014-04-06 17:11:23 +02:00
Player
6ffbcc5903 Registry: Complain about missing mods when repairing broken worlds 
Registry: Reduce console spam
 2014-04-06 14:49:59 +02:00
Player
b5cc021754 Registry: Fix debug info 2014-04-05 01:54:07 +02:00
Player
7284104472 Registry: Repair mismatched ItemBlocks as well 
Fix a few misc issues
 2014-04-05 01:47:19 +02:00
Player
2e6b7e2eb5 Remove unneeded entity spawn debug logging. 2014-04-03 21:00:42 +02:00
Player
37a81d04d9 Enable custom gui rendering only as required 2014-04-03 17:58:53 +02:00
Player
407f6f79af Registry: Allow ignoring missing mods from the GUI, with confirm+backup 
Registry: Add confirm+backup for automated corrupted id table fixup
Require the user to confirm loading from a backup level.dat
 2014-04-01 21:56:53 +02:00
Player
3eaa002091 Registry: Complain about bogus registrations 2014-04-01 14:40:24 +02:00
Player
11ab034638 initial attempt at a better way to ask the user in case of startup issues 2014-04-01 14:30:47 +02:00
Player
e013f1514d Merge branch 'master' of https://github.com/MinecraftForge/FML 
Conflicts:
	src/main/java/cpw/mods/fml/client/FMLClientHandler.java
	src/main/java/cpw/mods/fml/client/GuiModItemsMissing.java
	src/main/java/cpw/mods/fml/common/FMLContainer.java
	src/main/java/cpw/mods/fml/common/registry/FMLControlledNamespacedRegistry.java
	src/main/java/cpw/mods/fml/common/registry/GameData.java
 2014-04-01 07:00:20 +02:00
Lex Manos
0586c2b1aa Update patches for Fixed FF in FG 1.2. 2014-03-31 16:02:54 -07:00
Player
56f31def7b Registry: allow handling missing blocks/items regardless of the mod id 2014-03-31 04:09:59 +02:00
Player
d392ddf3be Fix old 1.7 worlds with broken ID mappings 2014-03-30 17:17:54 +02:00
Player
939a095896 Registry: cleanup, fix missing id error GUI formatting 2014-03-27 08:30:55 +01:00
AbrarSyed
ed79732705 updated wrapper to gradle 1.11 2014-03-26 13:34:25 -05:00
AbrarSyed
4db8573645 updated example a little 2014-03-26 13:34:01 -05:00
Player
ac44af863b Registry: Implement support for remapping blocks/items to a new name. 2014-03-25 00:36:37 +01:00
Player
180c605570 Fix FMLMissingMappingsEvent.get 2014-03-24 21:47:25 +01:00
Player
e9ca678ab3 Registry: Block IDs after failing to find a mapping for them 2014-03-24 21:16:36 +01:00
Player
ff6083e77b Fix remaining issue with autoassigned Block and Item IDs overlapping. 2014-03-20 23:41:01 +01:00
AbrarSyed
ff6143dc85 updated for ForgeGradle 1.2 2014-03-19 02:15:53 -05:00
LexManos
0cd40e70b6 Update README.txt 2014-03-18 01:54:32 -05:00
Lex Manos
f632ea0c36 Fix network close events never getting called. Closes #381 #382 2014-03-15 18:16:27 -07:00
Lex Manos
244e39df0c Fix long standing deobf issue that caused announce-player-achievements property to have no effect on dedicated servers. 2014-03-11 01:57:44 -07:00
Lex Manos
9b615893d9 Fix hard link to DedicatedSerever when opening a LAN connection causing stalls on connecting. 2014-03-11 00:50:55 -07:00
Lex Manos
d3d244f4a2 Re-enable post initalize texture pack reloading to allow Icons to be registerd through any init phase. 2014-03-03 23:23:55 -08:00
Lex Manos
55199c25d8 Kill the modEventTypes list, register anything that extends FMLEvent, Fixes MissingMappingEvent handler, and any future events added. 2014-02-25 12:30:29 -08:00
Lex Manos
e7e85ad07b Reload game settings after mod loading is finished to capture mod keybindings. Closes #378 2014-02-22 20:59:25 -08:00
Christian
322e691d04 FML expands S3F to support payloads up to 2 megs in size. Should be transparent 2014-02-16 18:30:27 -05:00
cpw
9910256063 Merge pull request #373 from bloodmc/master 
Prevent player data getting reset during disconnects.
 2014-02-14 10:57:50 -07:00
cpw
bd8ffc99d4 Merge pull request #371 from bl4ckscor3/patch-1 
Fix ExampleMod.java for build #1024+
 2014-02-14 10:57:32 -07:00
bloodshot
f1db5dd5af Prevent player dat files getting reset during disconnects. 
Since FML nulls out the player's playerNetServerHandler during login, we need to
make sure that writePlayerData does not attempt to overwrite the player's dat file
if the player disconnects during the "Logging In" process.
 2014-02-13 02:44:18 -05:00
Christian
2bf052ad91 Some argumentation 2014-02-08 22:41:02 -05:00
Christian
64aa12b7e6 Fix failing to load a world with missing mod blocks and items. There will be a way to force worlds to load 
when stuff is missing, but for right now, it will fail as this is "world safe".
 2014-02-08 22:37:40 -05:00
Christian
2d1f9f2811 Try and handle removal of mods a bit better. Currently no way to allow a world which has missing 
blocks to load - but i have the code in place to allow it i think.
 2014-02-08 12:18:34 -05:00
bl4ckscor3
a5fb93271c Fix ExampleMod.java for build #1024+ 2014-02-08 12:34:01 +01:00
Dan Roque
982f5c7e1b Prevent players from logging in until server has finished starting. 
This improves server security as it guarantees no players will be
allowed to connect until the server has fully initialized.
 2014-02-05 20:49:10 -05:00
Lex Manos
dbf2c416c7 Fix isRemote, this is integral to so many parts of the code, everyone knows it by this name, People should not change it. 2014-02-04 23:40:50 -08:00
Lex Manos
284c1eb06b Update MCP mapping snapshot to latest crowdsourced names. 2014-02-04 22:56:27 -08:00
Christian
f8532711cb Clean up FMLEventChannel. Closes #367. 2014-02-04 20:01:44 -05:00
Lex Manos
45efe4edfd Fix obf error when right clicking a Empty Map. 2014-02-04 12:49:18 -08:00
Christian
5d811025a7 Tweak so that writing to the context will automatically send a message back to 
the originator in handshakeestablished.
 2014-02-02 12:11:57 -05:00
Christian
be8d33070e Ensure we check both item and block registries when finding valid IDs. Should fix #365 2014-02-01 11:05:33 +00:00
Lex Manos
498ab360e8 Bump gradle wrapper to 1.10 2014-01-29 21:04:55 -08:00
Christian
92f5351cf9 And make a loud message if there isn't a modcontainer found, substitute Minecraft. In general, this can only happen 
for coremods not properly registering their code. Closes #363
 2014-01-25 06:20:09 -05:00
Christian
e7ba3fd525 Try harder to find a mod container. 2014-01-25 06:17:14 -05:00
Christian
bd8e9657d8 Beginning of a saveinspectionhandler. 2014-01-20 22:27:03 -05:00
Christian
acda9b5dd7 Log4j2 doesn't need debug level logging for itself anymore 2014-01-20 22:01:20 -05:00
Christian
294c825cc1 And don't spam NONE everywhere 2014-01-20 22:00:24 -05:00
Christian
5898d2a1f8 Log4j2 logging context for things. This should help add context when things go wrong in mods. 2014-01-20 21:58:39 -05:00
Christian
60abcb6341 Name the log files properly. fml-junk is an early startup annoyance I can't kill because log4j2. 2014-01-20 21:31:20 -05:00
Christian
d92176fe8c Log the bad packet in a prettier way. Also, don't show the authlib debug data in the log file. 2014-01-20 17:29:17 -05:00
Christian
cb47b4ac46 And turn down some more logging, now we have useful logging back again.. 2014-01-20 16:09:34 -05:00
Christian
d22c79abd7 Fix derp with networkcheck 2014-01-20 16:06:50 -05:00
Christian
9fb9942498 Add in error logging for outbound messages. Fix bug with indexedcodec NPE 2014-01-20 16:02:26 -05:00
Christian
87a45d83fb Fix log4j2 config. Fix server gui to *show* logging. Fix log spamminess in the console. Fix bug in servergui that can cause deadlock. 2014-01-20 15:09:24 -05:00
Christian
7a3fd048d2 Fix reply handling. Make the proxy message available for subclasses of indexedcodec. Fire user events into the network 
event firing.
 2014-01-20 11:58:14 -05:00
Christian
62629d4140 Clean up and document outbound handler a bit better. Add in dispatcher target. Closes #361 2014-01-20 11:26:54 -05:00
Christian
e21e2d8168 Add in example assets dir. Closes #308 2014-01-20 08:15:55 -05:00
Christian
0189a7c97e Merge branch 'trait-optional' of github.com:RainWarrior/FML 2014-01-20 08:14:27 -05:00
Christian
887392cf1b And restore suppressions. ABRAR, DON'T TIDY CODE!!!! 2014-01-20 08:09:02 -05:00
Christian
932734170d Merge branch 'logging' of github.com:AbrarSyed/FML into abrar-borked 2014-01-20 08:06:45 -05:00
Christian
188488abc3 Make sidedproxy support non-public fields. Closes #344 2014-01-20 07:55:26 -05:00
Christian
ad15c01cd8 Try and stop the epic channel closed spam at close time. Closes #353 2014-01-20 07:53:09 -05:00
Christian
8121f3fcae findBlock should now return null, not the default block, if the thing being looked for is not found. Closes #352 2014-01-20 07:49:44 -05:00
Christian
48ff8b895a Allow connection when server is apparently offline. Might allow :NOFML circumvention though. Hmmm. Closes #359 2014-01-20 07:46:17 -05:00
Christian
9c9e04c2e1 Check the mod, not it's container, in the check handler. Closes #358 2014-01-20 07:42:35 -05:00
Christian
1ef1507299 Allow indexed messages to validate themselves. Also, catch exceptions from 
an embedded channel, and cause them to close the connection. It's ugly, but
it means that the client doesn't crash if it connects to a screwy bungycord that's trying a 1.6 handshake for some reason.
 2014-01-19 22:08:19 -05:00
Christian
755726bb7c Add a type adapter for artifact version. Should fix #354 2014-01-19 10:49:28 -05:00
cpw
608d401b75 Merge pull request #355 from jk-5/errorhandling 
Throw an exception when discriminator is not found
 2014-01-19 07:38:41 -08:00
jk-5
f080c5d2e8 Make NetworkEventFiringHandler sharable 
Fixes #356
 2014-01-19 12:27:31 +01:00
jk-5
1a548b5bb5 Throw an exception when discriminator is not found 2014-01-19 11:21:24 +01:00
Christian
44a093e74b SSP Worlds updating from 1.6 will now pop a warning message before loading, and will capture a timestamped 
zip file in the minecraft dir before starting to load. Allows for people to test updates.
 2014-01-18 22:25:35 -05:00
Abrar Syed
a0f021d985 put max number of FML log files to 3 2014-01-19 00:53:58 +00:00
Abrar Syed
41dcef50f7 changed fml log level to all 2014-01-19 00:49:47 +00:00
Lex Manos
189dc35060 Move placement of single player world load hook to fix NPEs. 2014-01-18 13:05:18 -08:00
Christian
3b367fcb8e Fix memory leak?! 2014-01-17 23:36:03 -05:00
Christian
d7ed255e17 Fix NPE at startup 2014-01-17 23:35:53 -05:00
Christian
b21975b8f0 Clean up some warnings about @Override 2014-01-17 23:19:22 -05:00
Christian
b4a6418d1c Make UniqueIdentifier final and add a hashCode. Closes #348 
Clean up language registry. It can be used to access all translations of mods on client or server.
Auto loads from assets files.
 2014-01-17 17:47:30 -05:00
Christian
f9bc1f0847 Put logging exception handlers on all channel inbounds. Fix problem with failure to login. Closes #350 2014-01-17 17:00:55 -05:00
Christian
135633b2ad Fire a custom packet channel registration/deregistration event, for any mods that care about that 
kind of thing
 2014-01-16 19:45:42 -05:00
Christian
b70742e72d Fix bug with SSP, and hook so we can do confirmation of world loading, as well as other things 2014-01-16 18:15:45 -05:00
Christian
971289194c Add in some tests and examples for the "simple" network stuff 2014-01-16 18:07:25 -05:00
Christian
42c04dab2e Clean up some warnings. Add in simple network impl 2014-01-16 18:06:36 -05:00
Christian
cb33a05824 Merge branch 'simplenet' 2014-01-16 14:59:13 -05:00
Christian
ef1ee38b55 Fix bukkit connectivity issue. 2014-01-16 14:58:28 -05:00
Christian
c3974f2e81 Some fixes and tweaks 2014-01-16 09:14:39 -05:00
Lex Manos
f125c0ddd3 Added basic Mojang account authentication support for development time login. 2014-01-14 16:49:03 -08:00
Jezzadabomb
14272e4932 At the request of AbrarSyed. 2014-01-14 15:39:24 +11:00
Christian
725aba9d41 Divert connection through FML, so we can deny connections to servers that don't want us 2014-01-13 13:47:18 -05:00
Christian
1a41990745 Fix possible NPE derp 2014-01-13 13:46:22 -05:00
Christian
2e76283ccd Fix up privacy derp in TickEvent. Closes #343 2014-01-13 08:43:33 -05:00
Christian
9017256609 Fix openGui. Closes #342 2014-01-13 08:40:56 -05:00
Christian
670f76accd Add in a simple(ish) event driven network handling system. Register using newEventDrivenChannel 
and you'll get a simple network handler that will fire events at the subscriber(s) of your
choice, whenever a packet is received. You'll also get some convenience methods for sending
to things.
 2014-01-12 13:20:41 -05:00
Christian
7a8eda46c4 Fix potential ordering issue, clean up some imports 2014-01-11 22:01:01 -05:00
AbrarSyed
5176bc8841 Logging Changes 2014-01-11 16:43:14 +00:00
RainWarrior
8639a76726 Propagate Optional method removal to trait implementation classes 2014-01-10 00:56:00 +04:00
Christian
f6476c1970 Fix csv string vs list of strings. Thanks immibis. Closes #334 2014-01-09 14:55:52 -05:00
cpw
6cdc949de7 Merge pull request #336 from jadar/master 
added override toString method for getting full name.
 2014-01-09 11:54:54 -08:00
Christian
ad305ef997 Fix TargetPoint to be static 2014-01-09 08:41:52 -05:00
Christian
abf452f889 Fix the keybinding array to the right one 2014-01-09 08:40:42 -05:00
Christian
f7d932d418 Fix problem with connecting to vanilla. 
SHOW what's modded and what's vanilla in the list. Hooks that make the blocking work to come
 2014-01-06 23:48:53 -05:00
Jadar
13c998ae5e undid readme change 2014-01-06 15:58:42 -06:00
Jadar
37b0797e3e changed the readme to reflect new setup task. 2014-01-06 11:09:34 -06:00
Jadar
183c317b83 added override toString method for getting full name. 2014-01-06 10:25:13 -06:00
Lex Manos
5e4ddab6ba Mark jopt needed on the server, herp derp, blame Abrar! 2014-01-05 19:02:47 -08:00
Christian
7f05ffa511 Fix stupid hardcoding derp 2014-01-03 23:04:24 -05:00
Christian
d102e694c8 Add a utility method for finding the channel handler name based on type. Should fix naming weirdnesses. 2014-01-03 22:57:36 -05:00
Christian
ec0d44b8c9 Fix up mcpname derp in GuiScrollingList. 2014-01-02 22:44:26 -05:00
Christian
c67e3d3abe Merge branch 'patch-1' of github.com:airbreather/FML 2014-01-02 22:21:25 -05:00
Christian
62dde437ca Tweaks 2014-01-02 22:18:02 -05:00
Christian
43dd8a8ee7 Fix up readmes and credits. We no longer support modloader. 2014-01-02 22:18:02 -05:00
iChun
5eaedffe3b Added transparent background for GuiIngameModOptions as per cpw's request. May not compile due to manual de-mcp-fication. 2014-01-02 22:18:02 -05:00
Christian
aa963c5df6 Config GUIs in the modlist now work. 2014-01-02 11:51:16 -05:00
airbreather
37686f33af Avoiding redundant calls to LogManager 2014-01-01 11:40:32 -05:00
Christian
7a62801209 Tweak button positions. 2014-01-01 02:09:40 -05:00
iChun
29d84cc6af Fix button size for GuiModList 2014-01-01 14:16:23 +08:00
Christian
584ad55ce6 Starting work on the actual GUI. Still work to do. Needs an API. 2014-01-01 00:57:24 -05:00
Christian
a9ae906546 Fix derpiness with Mods button when Realms is available 2013-12-31 20:21:28 -05:00
Christian
3e0285e508 Lots of network cleanup. Gui packets now work too! 2013-12-31 19:55:41 -05:00
Christian
e4d2f73fe2 Expose the nethandler in a few places, and pull out FMLEmbeddedChannel, exposing a utility method on it. 
More to come.
 2013-12-31 09:45:26 -05:00
Christian
a80409c59a Add in the tweakclass, fix the json for lzma @ the server. 2013-12-30 13:06:59 -05:00
Christian
9caa3842cf Allow itemstacks for furnace recipe inputs. Allow passing extra arguments through registerblock into the itemblock constructor. 2013-12-28 18:04:30 -05:00
Christian
e27b438f7d Fire simple network connect/disconnect gameevents. 2013-12-28 17:51:40 -05:00
Christian
7b7b8245db Fix example mod code for 1.7 2013-12-28 13:44:37 -05:00
Christian
c68f3119a4 Attempt to load old pre-1.7 worlds. ENSURE YOU HAVE A BACKUP! 2013-12-27 11:48:55 -05:00
Christian
fa0bce3efb Make gradlew executable on linux 2013-12-27 11:26:46 -05:00
Christian
3030324b99 AT for renderblocks 2013-12-27 00:08:49 -05:00
Christian
59405fc7ee Update render registry 2013-12-27 00:07:48 -05:00
Christian
2362fdb9d5 Fix handling world reloads when new stuffs are added 2013-12-26 12:42:40 -05:00
Lex Manos
f4fc6377b3 Add 1.7.2 base json, Gradle will automatically download updated versions of this. Keeping it in the repo allows us to see what base json we have built our jsons off of. And if it changes update accordingly. 2013-12-23 22:36:47 -08:00
Christian
41e930a4b9 Fix handshaking properly. Also, fix ID syncup. It now will completely freeze the idmap after preinit. 
This frozen map is used to inject "new" stuff into existing serverside worlds. Interesting sideeffect: remote
servers lacking things will change the client, to also LACK ids for those things. watch for -1 ids in your remap
events. Note: idmaps should be considered temporary per server instance. SERVERSTOPPED will restore "startup" state,
as will client logout.
 2013-12-24 00:47:10 -05:00
Christian
54731a2acc Fix build script 2013-12-23 20:24:54 -05:00
Lex Manos
20e0f821b3 Add new required --accessToken to launch specs. 2013-12-22 18:35:50 -08:00
Christian
61c6980105 bump to legacy launcher 1.9 with logging unification stuffs. 2013-12-18 11:15:53 -05:00
Christian
8b621292e3 More tweaking on id stuffs at worldload 2013-12-18 11:15:03 -05:00
Christian
f6f746ceca Working on id missing handling 2013-12-18 08:34:44 -05:00
Lex Manos
78f822e51c Update patches for Gradle's rename rewrite: MinecraftForge/ForgeGradle@19e7acf2a2 2013-12-18 04:01:37 -08:00
Christian
58fc22e6b4 IWorldGenerator now has an ordering at registration time. This means the order of worldgen should be much more stable. 2013-12-17 11:42:54 -05:00
Christian
5aa0054f23 ICraftingHandler, IPickupHandler are now both events. 2013-12-17 11:24:57 -05:00
Christian
751c5e39a4 Code to disable mods at runtime, or other times. 2013-12-17 10:51:00 -05:00
Christian
95f0447881 Ticks, Player events, keybindings, all migrated to the new event driven system. 2013-12-16 23:18:00 -05:00
Christian
041054ea8b Fire a user event down the channels when a handshake has occured. 2013-12-16 20:00:01 -05:00
Christian
69ce79e1d7 Patch some GUIs. We're gonna add some basic mod gui config support. 2013-12-16 11:48:39 -05:00
Christian
26056619a9 Copy eventhandler from Forge into FML. It is going to replace a lot of the runtime event systems. 2013-12-16 11:48:09 -05:00
Christian
a0fcbdccb5 Update for log4j2 2013-12-16 11:47:48 -05:00
Christian
d188a5ad82 Some patching touchups 2013-12-13 00:18:05 -05:00
LexManos
ed62082e1e Merge pull request #316 from AbrarSyed/patch-4 
Update shiped ForgeGradle for 1.7
 2013-12-12 17:23:04 -08:00
Lex Manos
5e6ff7e729 Rename synthetic bridge methods, these methods are not decompiled, but need to reobf correctly cross the recompile boundary. 2013-12-12 17:18:04 -08:00
Abrar Syed
e4fe6ab949 Update shiped ForgeGradle for 1.7 2013-12-12 17:11:37 -06:00
Christian
e4479b81cb First functional release under reobfuscation. 2013-12-12 18:01:09 -05:00
Christian
7956c2f659 Fix AT, Fix exc. Almost works now! 2013-12-12 01:39:30 -05:00
Lex Manos
1322e3407b Kill old patches and add rejects to ignore file. 2013-12-11 20:39:15 -08:00
Christian
b3e35e381f Clean up patches for latest exc. 2013-12-11 23:03:30 -05:00
Christian
7b93e40d7c Fix exc this time *sigh* 2013-12-11 22:58:46 -05:00
Christian
1533d88ef8 Fix the exc file. Fix the deobfremapper for handling inner classes. 2013-12-11 22:54:51 -05:00
Christian
fb7913f583 Fix stupid possible compiler error. 2013-12-11 20:17:08 -05:00
Christian
5e57ce519e SpawnAdjustment packet. Clean up stuffs. No more compile errors. 2013-12-11 19:29:52 -05:00
Christian
5086f22370 Entity spawning works. 2013-12-11 18:46:25 -05:00
Christian
5eb2aec84e Fixed remote and local connections work with mods now. 2013-12-11 12:35:08 -05:00
Christian
4f6aabda09 Add in a remapping event for mods to consume. 2013-12-10 19:25:49 -05:00
Christian
985e4ceb4a Cleanups 2013-12-10 17:29:26 -05:00
Christian
531334b122 ID syncing. 2013-12-10 14:32:06 -05:00
Lex Manos
9f76245783 Did it manually, forgot it needed the end comma 2013-12-09 20:49:37 -08:00
Lex Manos
cf6b9e7c1a Update for fixed Enum cleaning and names. 2013-12-09 20:44:17 -08:00
Lex Manos
d92633d368 Add mappings for Items/Blocks fields. 2013-12-09 20:43:57 -08:00
Lex Manos
cda439fe9d Add sonatype snapshots repo for SpecialSource snapshots. 2013-12-09 20:43:27 -08:00
Christian
4fc600010e ID loading from the server save now works. 2013-12-09 21:36:49 -05:00
Christian
eff9a3cedc More network stuff, partially done id syncing. 2013-12-09 01:22:24 -05:00
Christian
bead2dab97 OK, network channels appear to be working well for both dedi and integrated servers. 
The beginnings of the new mod structure too.
 2013-12-06 14:52:33 -05:00
Christian
89c7a02146 More cleanup. Bidirectional server <-> client network works for mods as well as FML|HS now. 2013-12-06 11:17:40 -05:00
Christian
add83f145a Check in patches. Add in some network timeout tweaking values so you can debug the network. 2013-12-06 08:07:09 -05:00
Christian
1c44a6c181 A network design I like. It uses the netty embedded channel to allow mods to build channel pipelines on top of 
custom payload packets.
 2013-12-06 03:11:03 -05:00
Christian
fadff73489 The basic network handshaking for FML is done. All scenarios seem to work. 2013-12-04 00:11:08 -05:00
Christian
37a00f0158 Update gitignore 2013-12-02 23:54:15 -05:00
Christian
e5ffbd7fdf Merge branch 'master' of github.com:MinecraftForge/FML 
Conflicts:
	install/build.gradle
	patches/minecraft/net/minecraft/client/multiplayer/NetClientHandler.java.patch
	patches/minecraft/net/minecraft/network/NetServerHandler.java.patch
 2013-12-02 23:52:27 -05:00
Christian
f10969e3aa Pass 1: Most patches are restored. 
NOTES: 1. Network is completely broken. 2. GameRegistry is partially broken. 3. ID sync is not in.
 2013-12-02 23:48:26 -05:00
Abrar Syed
75b64fe9b8 fix derp in example builscript 2013-11-26 14:23:31 -06:00
Lex Manos
45aa1485b3 Don't validate signatures in dev env. 2013-11-20 13:18:26 -08:00
Lex Manos
7b737de2c1 Make the working directory the root of the eclipse workspace. 2013-11-17 19:26:21 -08:00
AbrarSyed
af3e74d940 updated samples 2013-11-17 18:21:24 -06:00
LexManos
a5efa91e6a Merge pull request #306 from MinecraftForge/1.6.4 
Actually do it correctly. Should be more forge friendly now.
 2013-11-17 10:04:27 -08:00
Christian
b7b97efe81 Actually do it correctly. Should be more forge friendly now. 2013-11-13 19:10:11 -05:00
Christian
90e3b49ea5 Merge branch '1.6.4' 2013-11-13 07:55:12 -05:00
Christian
56c9c3c77f Way to go, missing import. *sigh* 2013-11-13 07:45:37 -05:00
Christian
c060a44371 Don't try and open GUIs on the server. 2013-11-12 18:04:25 -05:00
Christian
b8ece10f0b Merge branch '1.6.4' 2013-11-12 17:02:08 -05:00
pahimar
95a8b419ef Add in null protection for client/server sides of handleChat 2013-11-11 14:12:02 -05:00
Christian
82004fe703 Kill more references to modloader. 2013-11-10 13:15:26 -05:00
Christian
2867dfdfa5 Remove all public all the time from Minecraft. It is unnecessary with ModLoader gone. DEAL WITH IT. File AT public requests, make a coremod, whatever. This needed to die. 2013-11-10 12:01:26 -05:00
Christian
5cec48da72 Deprecation cleanup. Bye bye more modloader stuffs 2013-11-10 11:58:34 -05:00
Christian
a8e44dad47 First pass : kill modloader, clean up warnings 2013-11-10 11:49:06 -05:00
Lex Manos
394cfa940e Join the developers list in the pom and fix the client run configs in the workspace. 2013-11-09 19:22:17 -08:00
Abrar Syed
43bcf33f49 Update 1.6.4-rel.json 2013-11-09 21:14:58 -06:00
Christian
4cefffa1c9 Change the build to capture an MCP version, also, tweak the sources so mavenLocal can be used for ForgeGradle 2013-11-09 20:00:05 -05:00
Christian
e378a24759 Fix license and naming 2013-11-09 14:28:54 -05:00
AbrarSyed
923b2069ec added src distribution gradle file 2013-11-09 14:28:54 -05:00
Lex Manos
b4a5c25d36 Move to install to not clutter root directory with the .bat and .sh files I know are coming. 2013-11-09 14:28:54 -05:00
Lex Manos
e034f74311 Include eclipse template workspace, for packaging in src distro. 2013-11-09 14:28:54 -05:00
Lex Manos
8364a4e522 Add gradle wrapper 2013-11-09 14:28:53 -05:00
Lex Manos
d0bae88b04 Publish to repo folder for local testing. 2013-11-09 14:28:53 -05:00
AbrarSyed
c272eceac8 Step 3: The Rebirth 2013-11-09 14:28:53 -05:00
Lex Manos
d41794a9b6 Step 2: The Reformation 2013-11-09 14:28:53 -05:00
AbrarSyed
d2d36880b0 Step 1: The Purge 2013-11-09 14:28:53 -05:00
Christian
7831555a7f Add in the ability to strip interface references for specific interfaces - this is probably mostly useful for 
scala scenarios where sythetic methods are generated and is not a substitute for using Optional.Method where appropriate.
Closes #300
 2013-11-09 14:27:15 -05:00
Christian
3b42a14dba Change a couple of warnings, as a prelude to 1.7- preinit is now required for all GameRegistry activity, and every item and block REQUIRES registration. 2013-11-06 16:18:41 -05:00
Christian
83d8713bea Fix derp with custom properties. They work now! 2013-11-05 22:23:24 -05:00
Christian
289678252b Fix recursive API dependency resolution. Allows nested APIs, such as BuildCraft's 2013-10-31 09:39:34 -04:00
Christian
cfeebf7810 Fix up duplicate entries 2013-10-30 22:46:19 -04:00
Christian
ee8630bc55 Add in an API marker for API type packages. 
This does several things:
1. Packages marked as API will generate a new "modid" (the provides) that can be depended on.
2. Packages marked as API will be searched systemwide, and anything declaring that package (even without the API marker)
will get an implicit dependency on the API package.
3. The API package itself will get a soft dependency on the "owner" package.

@Optional elements can refer to the API packages instead of a concrete mod as well.
 2013-10-30 22:20:28 -04:00
Christian
9efeaa8caa Attempt to inject coremods as tweakers, so both can share a dependency ordering 2013-10-27 13:28:50 -04:00
Christian
f7a6bb7eb7 Wrapping coremods as tweakers. Part 1. 2013-10-20 11:53:07 +02:00
Christian
cfb78d482a Fix up documentation of VersionCheckHandler - it only ever accepted a String and only works on the NetworkMod annotated class 2013-10-20 11:45:00 +02:00
Christian
09c7df2bb3 Modify ordering of networkmod registration and mod instantiation. This fixes VersionCheckHandler logging an incorrect failure message due 
to NPE.
 2013-10-20 11:41:28 +02:00
Lex Manos
0b0b94978c Make each mod's EventBus log a child of it's main logger. 2013-10-19 18:24:24 -07:00
Christian
fa97bebf34 Fix up handling the new method signature data for NetworkCheckHandlers 2013-10-14 21:28:15 -04:00
Christian
c56f2e3b37 Use null to empty, so missing values work. *sigh* 2013-10-13 22:36:47 -04:00
Christian
5e03f2e85b Primitive capability for tweakers to order. Add a "TweakOrder" integer 
property to your manifest, or accept the default of zero.
 2013-10-12 10:28:11 -04:00
Kevin Ji
cfcdb92c8e Very minor style fixes 
Replacing tabs with spaces consistently, making brace styles consistent, etc.
 2013-10-09 19:53:50 -07:00
Christian
daf454af62 Support, and fix up, interface lists for Optional 2013-10-09 13:58:14 -04:00
Lex Manos
1754a5820a Delay sound system backend initalization to speed up startup and prevent race condition on some computers. 2013-10-06 11:13:07 -07:00
Christian
b542f13c5c ModLoader is officially deprecated. It will all cease to be with 1.7. 2013-10-06 11:06:31 -04:00
Christian
955d532264 Optional shouldn't be constructable itself. It's purely a wrapper thing. 2013-10-06 10:56:47 -04:00
Christian
19173a7b97 Add in support for Optional interfaces and methods. Be gone coremods! 2013-10-04 17:20:05 -04:00
Christian
ea25a3ffd0 Fix null killing the server 2013-09-29 15:51:38 -04:00
Lex Manos
7e53a294fe Fix md5s for new checksums.sha1 in scala libraries. 2013-09-28 19:47:32 -07:00
Christian
05c66728e7 Attempt at a shared modlist implementation - should allow visibility between liteloader and fml for "mod list display" 2013-09-27 10:45:20 -04:00
Christian
dc72bfe56a Cross-modsystem compatibility fix with thanks to Mumfrey @ liteloader 2013-09-27 10:01:39 -04:00
Christian
ef70a1d29e Add to both the classloader and the parent 2013-09-26 13:01:00 -04:00
Christian
9bcf633e8c Fix deobf tweaker 2013-09-26 10:11:29 -04:00
Christian
036cda37b0 TYPOS!!! 2013-09-26 09:33:48 -04:00
Christian
cbf22b0ab5 Separate deobf tweaker so it runs last. Should fix problems with cascaded tweakers 
expecting an obf environment.
 2013-09-26 09:23:25 -04:00
Christian
952d602f49 Update for launchwrapper 1.8 2013-09-25 16:40:59 -04:00
Christian
61ae96f03a Use the negative cache in latest legacylauncher. 2013-09-25 11:46:11 -04:00
Christian
96d9c3b8bc Add debugging for deobfuscation 
Add negative caching for field and method maps. Should shortcut some work

Fix handling the case where a class doesn't exist, but still needs deobf

Ask the patch manager for the bytes for the class, not the classLoader

Fix up some more places where we should look for a patched class

Fix problem with empty source classes and runtime deobfuscation
 2013-09-25 07:37:25 -04:00
Lex Manos
c1623cb8e3 Update to new installer that uses xz compression and better support for non-standard jvms 2013-09-24 23:21:17 -07:00
Christian
8f17d1c694 And use the parent that's actually going to be valid. *sigh* 2013-09-24 08:42:13 -04:00
Christian
8929267b20 Herpaderp. Make addURL accessible. *sigh* 2013-09-24 07:33:11 -04:00
Christian
48c92084da Fix injection of tweaker into system 2013-09-23 13:33:16 -04:00
Simon McVittie
5bf7d3cb4b Fix NPE when loading second single-player world 
After leaving a single-player world, getServer() can return null, resulting
in the stack trace below, "Fatal errors were detected during the
transition from SERVER_STOPPING to SERVER_ABOUT_TO_START",
"The ForgeModLoader state engine has become corrupted" and the client
getting stuck forever.

Exception in thread "Server thread" java.lang.NullPointerException
at cpw.mods.fml.client.FMLClientHandler.serverStopped(FMLClientHandler.java:620)
at cpw.mods.fml.common.FMLCommonHandler.handleServerStopped(FMLCommonHandler.java:468)
at net.minecraft.server.MinecraftServer.run(MinecraftServer.java:471)
at net.minecraft.server.ThreadMinecraftServer.run(SourceFile:583)
 2013-09-22 16:56:24 +01:00
Christian
85811a013d Fix classpath for launchwrapper 1.7 2013-09-21 16:15:05 -04:00
Christian
0c365eb893 Update workspaces for 1.6.4 2013-09-20 17:23:18 -04:00
Christian
da0972980b Fix up a deep crash in the early server init hanging the client 2013-09-20 17:12:01 -04:00
Christian
74b7cba492 Update for MC 1.6.4 2013-09-20 16:25:12 -04:00
Lex Manos
1928c177ac Make final transformers actually work on methods as well. 2013-09-19 12:59:12 -07:00
Christian
d2712dafdb Format the log messages through MessageFormat. Thanks CovertJaguar for the pointer. Closes #282 2013-09-19 08:23:56 -04:00
Lex Manos
fcf2af484d Update the src distro's eclipse workspace. 2013-09-18 15:21:56 -07:00
Christian
b721a51bc4 Update mc_versions data and commands patch and eclipse workspace 2013-09-18 18:01:04 -04:00
Christian
3768ca1713 Update mcp mod info 2013-09-18 17:02:41 -04:00
Christian
2ea5f04228 Update for real 1.6.3 update 2013-09-18 16:59:28 -04:00
Christian
12c556bc36 Update for pre-ninja 1.6.3 update 2013-09-18 16:33:11 -04:00
Christian
88f1dce658 Merge branch 'master' into newtweak 2013-09-18 14:49:53 -04:00
Christian
56bf94b441 Update for new installer and thank you. 2013-09-17 21:56:25 -04:00
Christian
466902654e Add in support for using a mirror list and provide checksums for packed download of libs 2013-09-15 22:58:39 -04:00
Christian
4fc4accb6e Fix sidedness derp in LanguageRegistry. 2013-09-13 19:04:25 -05:00
Christian
9387bae26b Update MCP data 2013-09-03 17:56:09 -04:00
Christian
b41a7e1dab Remove @SideOnly from 70318 (getDistance) it makes no sense that it's not on the server. 2013-09-02 12:24:17 -04:00
Christian
b9ac2ac13c Use java 1.6 compatible method of closing the zip file. Stops stupid compile error. 2013-09-02 00:12:36 -04:00
Christian
4f9b778d14 Allow server side lang file injection, hopefully 2013-08-27 22:45:10 -04:00
Christian
5925fa7c79 Allow coremods to properly inject asset readers. 2013-08-27 12:31:37 -04:00
Christian
ded1a92dfd Update tweaker for new Launcher API 2013-08-23 10:42:26 -04:00
Christian
3b4f1983ce More exception handling for less derpiness. 2013-08-20 20:46:18 -04:00
Christian
94462565a5 Reset the IWorldGenerator seed for each mod, before calling. That should mean worldgen is consistent 
and not dependent on mod ordering, or mod sideeffects.
 2013-08-19 14:56:01 -04:00
Christian
6818c0f4da Try and use the relaunch log, which should be classloaded.. 2013-08-19 14:55:37 -04:00
Christian
4eb97daac3 Fix up scala refs, for better results 2013-08-18 18:58:36 -04:00
Christian
ed258920a0 Check keys, not values *sigh* 2013-08-17 13:27:43 -04:00
Christian
877dc77b75 And more coremod logging 2013-08-17 13:14:55 -04:00
Christian
dcba47209f Add in some log information 2013-08-17 13:10:28 -04:00
Christian
904e2df1f9 And actually instantiate the collection *sigh* 2013-08-17 12:57:15 -04:00
Christian
643e3d441a Add in "FMLCorePluginContainsMod" in the manifest. If this value is 
present, FML will attempt to parse your mod jar file as a normal mod
file as well, instantiating mod containers there.
 2013-08-17 12:48:38 -04:00
Christian
8f9b54a97a Clean up a couple of resources. Also, don't parse jars just because 
they're in the mods dir
 2013-08-17 11:40:15 -04:00
Christian
7c7cafbae1 Make sure we only add args to the argument list if a tweaker hasn't already. 
Should fix LiteLoader compatibility issue.
 2013-08-16 16:28:55 -04:00
Christian
779139b3ca Fix stupid derp is stupid. Closes #275 and means sp614x can do his thing 2013-08-16 16:18:50 -04:00
LexManos
4406d1e171 Update installer. 2013-08-06 11:42:38 -07:00
Bo
ea33f502fc Fixed install.sh not passing arguments to install.py 2013-08-03 17:43:57 +01:00
Grom PE
971dc1eb00 Add missing SideOnly in BaseMod 
NetClientHandler exists only on client side and thus method using it should be annotated with SideOnly.
 2013-08-01 14:19:30 +07:00
cpw
952218c845 Add in some reverse lookup methods for game registry data 2013-07-29 22:05:22 +02:00
cpw
7d31e4b25e Temporarily add a version of 'reobfuscate.py' that will resolve complex 
reobfuscation graph issues with specialsource. Copy it over 'reobfuscate.py'
in the mcp runtime dir. Hopefully will have an MCP/specialsource fix in
the coming days.
 2013-07-28 22:38:26 +02:00
cpw
e71ee7721b Fix keybindings being derped 2013-07-28 20:52:12 +02:00
LexManos
f872ac0a90 Use json 2.9.1 nightly for OSX in release json like vanilla does. 2013-07-17 12:21:26 -07:00
LexManos
f4311e2fae Stupid spaces and windows escaping -.- 2013-07-16 14:34:43 -07:00
LexManos
a9e2a2089f Add quotes for paths with spaces -.- 2013-07-16 13:35:14 -07:00
LexManos
f40e4cf3a8 Use a temporary file for recompile's command line to combat command length to long issues. 2013-07-16 13:08:26 -07:00
LexManos
9de739723f Fix potential NPE in villager skin registry. 2013-07-16 10:32:29 -07:00
LexManos
136e2180f7 Fix server launching. 2013-07-15 10:57:44 -07:00
Christian
10c6e5e353 Fix logo handling. no more NPE if the logo can't be found. Also, fix location of mcp logo now. 2013-07-14 13:40:55 -04:00
Christian
d0c2a8e62b Fix up jar sanity check code. FML validation of the jar works now and doesn't derp classloading. 2013-07-14 13:11:32 -04:00
Christian
8f2823709c The server.classpath generates the runtime manifest, so it needs the 
non-debug asm jars.
 2013-07-14 11:12:42 -04:00
LexManos
bf6f038793 Update Forge signature for new private key 2013-07-12 03:05:20 -07:00
LexManos
5d89e17ae9 Update build and eclipse workspaces for debug asm. 2013-07-12 00:22:11 -07:00
Christian
caeb0afecf Coremods now have a primitive dependency capability. Also, we search mods dir for special 
"TweakClass" manifests. These are using the vanilla tweak mechanism to inject into
Minecraft. Helpful for other "platform" systems, when you don't want to have to deal
with json changes!
 2013-07-11 23:23:33 -04:00
LexManos
3dd0b5d496 Kill release time scala libraries, to be re-evaluated after all movement is done and shit is fixed. May require manual instalation for mods that use scala. 2013-07-11 15:24:54 -07:00
LexManos
09cf5feee5 Kill mcp's truncate method, for more useful logs. 2013-07-10 15:23:21 -07:00
Christian
e33a1a02bf Fix up logos in the mod screen. Clean up some unnecessary casts and suppressions, use the -debug asm 
library at dev time, since it contains full symbols and code in compiled form.
 2013-07-10 15:47:13 -04:00
Christian
32680bb84d Force a global asset scan prior to mod construction : you should be able to 
reference assets anywhere in your mod now.
 2013-07-10 00:42:40 -04:00
Christian
28727a51a6 Update FML for new stealth update for 1.6.2 2013-07-09 15:00:28 -04:00
cpw
11bf88fceb Merge pull request #254 from CaptainShadows/patch-1 
@InstanceFactory was set to look for Fields instead of methods
 2013-07-09 07:19:24 -07:00
Christian
1fe0dcec09 And don't forget to remove the test code 2013-07-09 08:31:40 -04:00
Christian
fbfc11c9a9 Decode the file URL. Hopefully will make things work more.. 2013-07-09 08:30:47 -04:00
LexManos
95aa81bb3f Disable signature check of client for now, it's broken. 2013-07-09 05:04:11 -07:00
LexManos
50a8b1cc68 Temporarily disable GuiModList's Mod logos. 2013-07-09 03:27:49 -07:00
LexManos
a0211c4fb7 Don't validate signatures on servers, they are not signed. 2013-07-09 03:27:29 -07:00
LexManos
f45499612d Add MC Version to installed version name. 2013-07-09 03:27:01 -07:00
LexManos
66531ad420 Fix NPE in new debug line when patch targets don't exist. 2013-07-09 01:21:50 -07:00
Christian
67caa6692d Don't initialize the server. 2013-07-08 22:31:15 -04:00
Christian
2f299820fb FML now verifies that the minecraft jar is correct and intact. This is intended to discourage those who think that 
modifying the minecraft jar is still acceptable.
 2013-07-08 22:10:06 -04:00
Christian
9071d7d5e2 Test server-siding ResourceLocation 2013-07-08 19:31:00 -04:00
Christian
e0b7d1599c The game is going to exit in face of patch mismatch, unless you force it to run with fml.ignorePatchDiscrepancies in the system properties. 2013-07-08 14:34:03 -04:00
Christian
bfe955dbf2 Update for stealth update. Thanks mojang! 2013-07-08 13:19:55 -04:00
Christian
e64c07a109 We now generate an adler32 checksum for each patched file and verify at load time that they match. 
Mismatch won't crash, but will emit a big warning..
 2013-07-08 13:19:14 -04:00
Christian
94315253b1 Tweak debug data on patched classes 2013-07-08 12:28:32 -04:00
Captain Shadows
b788686126 @InstanceFactory was set to look for Fields instead of methods 
"fix it" to now match the javadoc :P

if it was set like that so modders wouldn't use it, it might be better to just say so in the documentation
 2013-07-08 00:07:54 -04:00
LexManos
611668931e Update eclipse workspaces for 1.6.2 2013-07-07 13:11:22 -07:00
Christian
ab3220cbb3 Add the jsons for 1.6.2 2013-07-07 16:05:53 -04:00
Christian
d164343522 Update for 1.6.2 and MCP 8.04 2013-07-07 15:49:11 -04:00