Christian
06f91d8936
Merge branch 'master' into mc179
2014-06-21 22:44:38 -04:00
Christian
c1ea6639d4
Fix up some patching bugs. Fully functional @ pre3
2014-06-21 15:55:32 -04:00
Christian
1c78a09cfd
Also patch in warnings for Vec3Pool - similarly removed.
2014-06-13 08:51:07 -04:00
Christian
be7cf8c01e
Checking in pre3 work
2014-06-12 21:13:26 -04:00
Christian
fada1ad7bb
Deprecate getAABBPool so people can stop using it in mods. Failure to do so will result in 1.7.10 upgrade incompatibility. Use getBoundingBox instead.
2014-06-08 21:30:47 -04:00
Christian
3885f9bf84
First draft 1.7.9 support.
...
This is not modding minecraft. It's performing an update. Go away!
2014-05-17 16:30:13 -04:00
Player
ee671c3eab
Fix ObjectIntIdentityMap sporadically matching non-identical objects.
2014-05-12 16:29:37 +02:00
Christian
39340e46aa
Finally hopefully fully kills the race condition causing a classcast
...
on slow machines.
This is me bugfixing. NOT MODDING! No! Stop it! I'm not!
2014-05-11 22:15:29 -04:00
Player
9d00580d7e
prevent the world from getting saved twice at shutdown
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
Player
7284104472
Registry: Repair mismatched ItemBlocks as well
...
Fix a few misc issues
2014-04-05 01:47:19 +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
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
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
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
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
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
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
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
45efe4edfd
Fix obf error when right clicking a Empty Map.
2014-02-04 12:49:18 -08: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
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
Lex Manos
189dc35060
Move placement of single player world load hook to fix NPEs.
2014-01-18 13:05:18 -08:00
Christian
d7ed255e17
Fix NPE at startup
2014-01-17 23:35:53 -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
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
ef1ee38b55
Fix bukkit connectivity issue.
2014-01-16 14:58:28 -05: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
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
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
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
Lex Manos
78f822e51c
Update patches for Gradle's rename rewrite: MinecraftForge/ForgeGradle@19e7acf2a2
2013-12-18 04:01:37 -08:00
Christian
5aa0054f23
ICraftingHandler, IPickupHandler are now both events.
2013-12-17 11:24:57 -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
69ce79e1d7
Patch some GUIs. We're gonna add some basic mod gui config support.
2013-12-16 11:48:39 -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
Christian
e4479b81cb
First functional release under reobfuscation.
2013-12-12 18:01:09 -05:00
Christian
b3e35e381f
Clean up patches for latest exc.
2013-12-11 23:03:30 -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
Lex Manos
cf6b9e7c1a
Update for fixed Enum cleaning and names.
2013-12-09 20:44:17 -08: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