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

329 commits

Author SHA1 Message Date
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
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
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
pahimar
95a8b419ef Add in null protection for client/server sides of handleChat 2013-11-11 14:12:02 -05: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
12c556bc36 Update for pre-ninja 1.6.3 update 2013-09-18 16:33:11 -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
4f9b778d14 Allow server side lang file injection, hopefully 2013-08-27 22:45:10 -04: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
9071d7d5e2 Test server-siding ResourceLocation 2013-07-08 19:31:00 -04:00
Christian
bfe955dbf2 Update for stealth update. Thanks mojang! 2013-07-08 13:19:55 -04:00
Christian
d164343522 Update for 1.6.2 and MCP 8.04 2013-07-07 15:49:11 -04:00
LexManos
4f535cfbf8 Update to new MCP bugfix version, Fixes: Missing Armor/Item rendering, and Boss health mapping issues. 2013-07-03 18:23:38 -07:00
Christian
0f319c41e0 Remember to update your patches!!!! 2013-07-02 02:14:31 -04:00
Christian
569b791b93 1.6.1 2013-06-30 16:50:30 -04:00
Christian
daa85290e4 More fixups 2013-06-30 09:04:50 -04:00
LexManos
c7758deffa Push conf folder for 1.6, Relied heavily on a yet-unreleased version of MCP. 2013-06-29 22:48:24 -07:00
Christian
572c9acc59 More fixes, binpatching works 2013-06-29 15:16:18 -04:00
Christian
5b5f05859c First draft of 1.6 update 2013-06-29 13:33:14 -04:00
Christian
07a5efe612 Merge in binpatch and use launcher 2013-06-14 17:21:49 -04:00
Christian
c170b98a8c Attempt to properly fix deadlock if the internal server derps. It should never hang now. Damn you fast computer.. 2013-06-11 14:41:19 -04:00
Christian
3baad0a897 Update for minecraft 1.5.2 2013-04-27 01:24:06 -04:00
LexManos
d89f0dc683 Re-worked the Texture patches, optifine helper function, and re-added support for dynamically rotating the texture for mod authors who do things horribly wrong. 2013-04-09 20:06:41 -07:00
Christian
2208df18c4 And add the patches *sigh* 2013-04-09 20:26:10 -04:00
Christian
5be6e8b756 And the core patches for that 2013-03-30 12:13:53 -04:00
Christian
7e87a2e18f Fix up patch properly. Also, fix md5s for the jars. 2013-03-22 01:48:21 -04:00
mDiyo
68f48f4acc Fix missing block world rendering 2013-03-21 07:10:55 -07:00
LexManos
b6f2573adb Updated for new PR client jar. 2013-03-20 08:59:25 -07:00
LexManos
4900d41946 Updated to latest MCP and Minecraft 1.5.1 Pre-release. 2013-03-19 15:48:42 -07:00
LexManos
81d9e8315c Readjust size of mods button when Minecraft Realms button is enabled. 2013-03-11 16:20:56 -07:00
Christian
afb18ee321 Change type of connection queue to a concurrent linked queue. Much more efficient, hopefully. Closes #189 2013-03-10 01:25:36 -05:00
Christian
3c14424e30 Some fixes for the snapshot 2013-03-09 12:10:13 -05:00
Christian
ed3b056305 Update to MCP 1.5 and minecraft 1.5. 2013-03-08 20:36:05 -05:00
Christian
e7e2ffd8fb FIX massive performance issue with FML. Thanks to @sfPlayer1 for finding 
this epic derp on my part!
 2013-03-06 14:00:28 -05:00
Christian
9cbf2a08e9 Capture Minecraft logs into FML logging 2013-03-04 22:45:58 -05:00
LexManos
a0a4683ef9 Actually remove classes from the csv when removed, and moved All EntityMinecart entities to net.minecraft.entity.item 2013-03-02 00:12:31 -08:00
LexManos
5ef2c4c5ab Delete unneeded patch 2013-03-02 00:11:48 -08:00
Christian
793ae904af Update FML to 1.5 snapshot 13w09c 2013-03-02 02:06:32 -05:00
LexManos
d8e82d4c35 Fix bug in rename_vars where certian items would fail to be renamed. 2013-02-27 22:40:15 -08:00
Christian
939bf833b3 Fix renderengine patch *sigh* 2013-02-25 22:06:20 -05:00
Christian
22831e6b63 Merge branch 'master' into snapshot15 
Conflicts:
	patches/minecraft/net/minecraft/client/renderer/RenderEngine.java.patch
 2013-02-25 21:53:56 -05:00
Christian
ae58a0dbe3 Fix HD mob skins, FINALLY!!! 
Stupid eyes are stupid.
 2013-02-06 01:25:46 -05:00
Christian
11f226e813 Fix some class naming and packaging issues, pending an MCP update 
for the same
 2013-02-02 10:54:48 -05:00
Christian
92a377a4e8 Update for MCP 7.34 and MC 13w05b 2013-02-01 23:05:23 -05:00
Christian
331e6bcf62 Merge branch 'master' into snapshot15 
Fix up compilation and patching errors

Conflicts:
	common/cpw/mods/fml/common/registry/GameRegistry.java
	conf/joined.srg
	conf/params.csv
	conf/version.cfg
	patches/minecraft/net/minecraft/server/dedicated/DedicatedServer.java.patch
 2013-01-22 15:21:22 -05:00
Christian
51fcf93605 Update for MCP7.30c - fixes redstone rendering issues 2013-01-22 14:40:09 -05:00
Christian
c13502c690 Remember to add the new patches! 2013-01-22 09:32:53 -05:00
Christian
c048ec7aef Another packaging update. I think we're done now. 2013-01-12 00:33:32 -05:00
Christian
cad228093d Delete old patches not needed anymore 2013-01-11 23:53:14 -05:00
Christian
431372dc5f Initial patch update for snapshot 2013-01-11 23:47:05 -05:00
LexManos
674a9e5e52 Updated patches for new JAD style names. 2013-01-11 13:16:40 -08:00
Christian
55ca46b382 Move server stopped *after* the server has actually stopped. *sigh* 2012-12-31 01:20:35 -05:00
Christian
80193d4969 Add in a "server stopped" event 2012-12-30 23:52:38 -05:00
LexManos
484a673b1f Remove unneeded file 2012-12-20 14:30:59 -08:00
LexManos
c5a1b58d85 Fixed placement of onConnectionClosed callback. 2012-12-20 14:30:41 -08:00
Christian
5770708e75 Update to MC 1.4.6 2012-12-17 21:48:29 -05:00
Christian
a26b495ef9 Move Side and SideOnly to relauncher package 2012-12-15 23:21:26 -05:00
Christian
55dc3467de Change to download bouncy castle as well. We also finally properly use the downloaded libs 
even in vanilla code!
 2012-12-11 22:37:07 -05:00
Christian
229a501def Remove extraneous patch file 2012-12-11 20:37:12 -05:00
Christian
64226c3d7e Merge branch 'repackage' 
Conflicts:
	build.xml
	client/cpw/mods/fml/client/FMLClientHandler.java
	client/cpw/mods/fml/client/GuiIdMismatchScreen.java
	common/cpw/mods/fml/common/FMLCommonHandler.java
	common/cpw/mods/fml/common/IFMLSidedHandler.java
	common/cpw/mods/fml/common/network/ModIdMapPacket.java
	common/cpw/mods/fml/common/network/ModListResponsePacket.java
	common/cpw/mods/fml/common/registry/GameData.java
	common/cpw/mods/fml/common/registry/GameRegistry.java
	common/cpw/mods/fml/common/registry/ItemData.java
	common/cpw/mods/fml/common/registry/LanguageRegistry.java
	common/cpw/mods/fml/server/FMLServerHandler.java
	install/fml.py
	patches/minecraft/net/minecraft/client/Minecraft.java.patch
	patches/minecraft/net/minecraft/server/MinecraftServer.java.patch
	patches/minecraft/net/minecraft/world/storage/SaveHandler.java.patch
 2012-12-11 14:58:38 -05:00