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

4896 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
LexManos
8660d0471f Merge pull request #983 from DemoXinMC/master 
Added Ore Dictionary entries and recipe replacements for Diamond, Emerald, Crops, Redstone, and Glowstone
 2014-03-01 12:06:08 -08:00
LexManos
0a6dc66749 Merge pull request #984 from ShetiPhian/item-renderer-fix 
Small Fix: Held Items & Multiple Render Passes
 2014-02-28 05:03:41 -08:00
DemoXin
488eb30272 * Fixed Items.glowstone to Items.glowstone_dust 2014-02-28 02:54:50 -05:00
Timothy Tomkins
d2d2032f93 Small Fix: Held Items & Multiple Render Passes 
Passes beyond 1 now have the correct icon.
 2014-02-27 23:57:44 -05:00
DemoXin
58fde290f8 * Added Ore Dictionary entries and recipe replacements for Diamond, Emerald, Crops, Redstone, and Glowstone 2014-02-27 22:48:33 -05: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
246152d3c4 Fixed hashcode in FluidContainerRegistry, still needs a redesign. Closes #967 2014-02-23 16:56: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
LexManos
ee7aa93416 Merge pull request #978 from iChun/master 
Add cancelable RenderHandEvent.
 2014-02-21 10:28:37 -08:00
iChun
bad0639e90 Add cancelable RenderHandEvent. 2014-02-22 01:13:40 +08:00
Lex Manos
6f49bba302 Fix a typo in our tile entity fix causing it to be ineffective. 2014-02-20 12:04:27 -08:00
Lex Manos
b01d87f0c6 Fix items with color rendering incorrectly. 2014-02-19 12:34:21 -08:00
Christian
08a636c34f Update Forge for patch changes 
MinecraftForge/FML@064b66af3d Prevent players from logging in until server has finished starting.
MinecraftForge/FML@2aa73afa15 Fix ExampleMod.java for build #1024+
MinecraftForge/FML@c890206268 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.
MinecraftForge/FML@995c204338 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".
MinecraftForge/FML@fa5f4c8842 Some argumentation
MinecraftForge/FML@45409bfa0c Prevent player dat files getting reset during disconnects.
MinecraftForge/FML@33100d6bab Merge pull request #371 from bl4ckscor3/patch-1
MinecraftForge/FML@572d32358a Merge pull request #373 from bloodmc/master
MinecraftForge/FML@d0dd05a15c FML expands S3F to support payloads up to 2 megs in size. Should be transparent
 2014-02-18 21:03:44 -05: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
Lex Manos
3322996885 Fixeed a missed -1 in SpawnerAnimals patch. Thanks Blood. 2014-02-12 23:06:11 -08:00
Lex Manos
b43d63a7ad Cull FakePlayers when worlds are unloaded. 2014-02-11 18:25:33 -08:00
Lex Manos
c8e0b4a193 Use correct tag types when reading Forced Chunk data. Fixes ticket loading. Closes #964 2014-02-10 16:16:03 -08:00
Lex Manos
c4972b7658 Fixed FluidContainerRegisry.contansFluid closes #845 2014-02-10 15:29:36 -08: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
Lex Manos
8462f3b17c Fix AIOOB error with Endermen and blocks >256. Also better support for ID remapping. More to come later. 2014-02-07 19:15:05 -08: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
1e2c63f486 Add the beginnings of a Constants class, to document/clean some of the magic numbers that are in the MC code base. 2014-02-05 01:14:57 -08:00
Lex Manos
e68577ffd3 Updated FML: 
MinecraftForge/FML@03fb1879d7 Fix obf error when right clicking a Empty Map.
MinecraftForge/FML@6bb9b8b953 Clean up FMLEventChannel. Closes #367.
MinecraftForge/FML@b7b3450dcd Update MCP mapping snapshot to latest crowdsourced names.
MinecraftForge/FML@8c9e8b5270 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-05 01:14:24 -08: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
9d919f8ac9 Fix up the event handler so it knows it's owned by forge 2014-02-02 12:34:34 -05:00
Christian
67d9dac16d Add a discriminator for fluididspacket. remove extraneous channel handler. 2014-02-02 12:19:37 -05:00
Christian
978bfd6eb1 MinecraftForge/FML@d87822ad85 Bump gradle wrapper to 1.10 
MinecraftForge/FML@359ac3ca2a Ensure we check both item and block registries when finding valid IDs. Should fix #365
MinecraftForge/FML@cee0f0b811 Tweak so that writing to the context will automatically send a message back to the originator in handshakeestablished.
 2014-02-02 12:18:32 -05: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
539ee0ea88 Fixed missed parens causing trapdoors to fall off incorrectly. 2014-01-31 15:12:19 -08:00
Lex Manos
f85ab543ee Fixed issue where enchantment effects caused slight rendeirng issue. 2014-01-31 14:32:32 -08:00
Lex Manos
498ab360e8 Bump gradle wrapper to 1.10 2014-01-29 21:04:55 -08:00
Lex Manos
51414375e4 Uncomment aa few FluidRegistry entries. 2014-01-29 21:04:34 -08:00
Lex Manos
2b9a2b5c1a Inital Fluid system update, untested. Still in progress. 2014-01-29 18:34:23 -08:00
Lex Manos
51b008c391 Attempt a AIOOB error fix in tesselator when there are alot of transparent blocks in the rendering range. 2014-01-29 16:17:31 -08:00
Lex Manos
0d84da021f Fix NPE when breaking ice. 2014-01-29 15:43:13 -08:00
Christian
3059e517c5 MinecraftForge/FML@544320b8d2 Beginning of a saveinspectionhandler. 
MinecraftForge/FML@ab199c5811 Try harder to find a mod container.
MinecraftForge/FML@8633d780c9 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:30:12 -05: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
Lex Manos
f8f1b4211b Fix imporerly efficient tools breaking blocks to fast. 2014-01-24 21:43:47 -08:00