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

1673 commits

This branch
This branch
All branches
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
LexManos
ff5eb87e27 Merge pull request #413 from sfPlayer1/master 
backup+default block use fix
 2014-04-30 10:12:21 -07: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
LexManos
ede8bb6e61 Merge pull request #400 from sfPlayer1/master 
Fix various registry issues
 2014-04-07 09:57:13 -07: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