Commit graph

4062 commits

Author SHA1 Message Date
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
cpw
b501f21624 Merge pull request #311 from AbrarSyed/patch-3
fix derp in example builscript
2013-11-27 02:13:42 -08:00
Abrar Syed
75b64fe9b8 fix derp in example builscript 2013-11-26 14:23:31 -06:00
Lex Manos
54c440d75c Bump build for gradle fixes:
Now Builds for java 1.6
  Include version,json in universal
  Fixed classpath issues in eclipse task.
2013-11-20 23:44:54 -08:00
LexManos
954d46e587 Merge pull request #868 from luacs1998/patch-1
Update readme for ForgeGradle
2013-11-20 21:47:08 -08:00
Lex Manos
198539479f Updated FML: MinecraftForge/FML@c2b919d339 Don't validate signatures in dev env. 2013-11-20 20:41:20 -08:00
Lex Manos
45aa1485b3 Don't validate signatures in dev env. 2013-11-20 13:18:26 -08:00
luacs1998
30680d0268 Update README.txt 2013-11-20 22:49:20 +08:00
luacs1998
c1c88644ae Another update for eclipse users 2013-11-20 16:16:48 +08:00
luacs1998
36ce23073c Updated 2013-11-20 16:09:34 +08:00
luacs1998
45e2d12d06 Update readme for ForgeGradle
Let me know if there's anything else to add or change.
2013-11-20 15:49:08 +08:00
Lex Manos
e18a7569f8 Fix build file pom closures. 2013-11-19 16:47:50 -08:00
Lex Manos
3470b44e9a Proper configuratuion name for jenkins. 2013-11-19 15:35:06 -08:00
LexManos
23cfb03a3b Merge pull request #867 from GUIpsp/master
Fix gradle wrapper.
2013-11-19 15:15:09 -08:00
Guilherme Espada
918f91bc44 Make the gradle wrapper executable. 2013-11-19 22:37:52 +00:00
LexManos
6ff7584f96 Merge pull request #859 from AbrarSyed/master
Gradlization
2013-11-19 14:13:56 -08:00
Lex Manos
b15289113b update build.gradle 2013-11-19 16:00:07 -06:00
Lex Manos
99faaae9f6 Regenerate all patches, No functional change as added this is a formatting change only. 2013-11-18 17:17:45 -08:00
Lex Manos
0999017fda Updated FML:
MinecraftForge/FML@e9a7660cb8 updated samples
MinecraftForge/FML@30894f7afa Merge pull request #307 from AbrarSyed/master
MinecraftForge/FML@c4b8a393f9 Make the working directory the root of the eclipse workspace.
2013-11-18 17:17:22 -08:00
Lex Manos
34f4b58f69 Update run configs. 2013-11-18 16:19:31 -08:00
Lex Manos
7b737de2c1 Make the working directory the root of the eclipse workspace. 2013-11-17 19:26:21 -08:00
LexManos
c45c99d07c Merge pull request #307 from AbrarSyed/master
updated samples
2013-11-17 17:58:01 -08:00
AbrarSyed
af3e74d940 updated samples 2013-11-17 18:21:24 -06:00
Lex Manos
e9af710cf4 Fix for new FML, and publish to maven local 2013-11-17 12:01:31 -08:00
AbrarSyed
74104fe5d0 Update forge 2013-11-17 12:07:22 -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
Lex Manos
45cc0bd87c Fix NPE in FakePlayers when they are created in a purely client side environment. To remove in 1.7 as FakePlayers should be used for server side interaction with the world on a player's behalf, not for client rendering. 2013-11-16 15:26:52 -08:00
Lex Manos
77c5caffd5 Fix NPE on specific tile entities when the block break event is canceled. Closes #863 2013-11-16 15:26:00 -08:00
AbrarSyed
f5335d59cc added buildSrc to the gitIgnore 2013-11-14 20:22:31 -06:00
Christian
28abe2cc3c Updated FML:
MinecraftForge/FML@23baf3a8ce Actually fix the nethandler code

Update patches
2013-11-13 19:16:24 -05: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
745d601831 Updated FML:
MinecraftForge/FML@da72640c7e Way to go, missing import. *sigh*
2013-11-13 07:46:04 -05:00
Christian
56c9c3c77f Way to go, missing import. *sigh* 2013-11-13 07:45:37 -05:00
Christian
9fd39ebe79 Updated FML:
MinecraftForge/FML@b7f34629c3 Don't try and open GUIs on the server.
2013-11-12 18:05:04 -05:00
Christian
c060a44371 Don't try and open GUIs on the server. 2013-11-12 18:04:25 -05:00
Christian
4f05808b8e Don't send openGui commands from the fakeplayer. Fixes thaumcraft and probably others. 2013-11-12 17:33:24 -05:00
Christian
c8e249f919 Updated FML:
MinecraftForge/FML@6af42bc656 Add in null protection for client/server sides of handleChat
2013-11-12 17:22:20 -05:00
Christian
b8ece10f0b Merge branch '1.6.4' 2013-11-12 17:02:08 -05:00
LexManos
7adccac8ec Merge pull request #855 from CovertJaguar/patch-4
Fix Water/Lava Fluid Localization
2013-11-12 10:00:37 -08:00
CovertJaguar
0a12840e68 Fix Water/Lava Fluid Localization 2013-11-12 01:05:13 -08:00
Lex Manos
1bd3e96e6e Noop out FakePlayer.addStat. 2013-11-11 13:15:06 -08:00
pahimar
95a8b419ef Add in null protection for client/server sides of handleChat 2013-11-11 14:12:02 -05:00