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

606 commits

Author SHA1 Message Date
LexManos
f4b9333c99 Prevent water from dropping snowballs. 2013-05-13 20:31:46 -07:00
hitchh1k3r
fecb4dc35f updated FurnaceRecipes.java.patch 2013-05-12 01:15:52 -04:00
LexManos
e19ec10b7f Fire EntityJoinWorled event for forced entities {Players and there mounts} as well, just ignore the cancelled value. 2013-05-11 12:16:37 -07:00
LexManos
7ea4508933 MinecraftForge/FML@787c0c4a6a Don't spit error on LWJGL not supporting 4.3 just warning. 
Make custom item renderers attempt to use EQUIPPED type when running first person. For backwards compatiblity, will be removed in 1.6.
And a small change to make the 1.6 check not print it's stack trace.
 2013-05-11 10:59:03 -07:00
LexManos
348af15cb5 Merge pull request #564 from purpleposeidon/patch-1 
Fix render bounding box of trapped double chests
 2013-05-11 09:59:07 -07:00
LexManos
4cd70f5e98 Move Partical rendering down in the order, after everything else. Should fix particals rendering behind water, digging process, and selection. 2013-05-11 01:02:30 -07:00
James
1a52514c9d Fix render bounding box of trapped double chests 2013-05-11 00:48:04 -07:00
LexManos
e805d53089 Fixed NPE in rendering dragged items. 2013-05-09 01:03:36 -07:00
LexManos
ec755e09d0 Attempt to allocate a 8-bit stencil buffer when creating Minecraft's display context. If that throws an error it will revert back to it's default values. 
Also contains a method for modders to rereive how many bits the context was created with. Closes #552
 2013-05-08 17:13:19 -07:00
LexManos
2b7cd66f9a New RenderPlayer and RenderLiving events. Closes #493 2013-05-08 16:30:59 -07:00
LexManos
417fff89b8 Changed to just plane entity for flexability. 2013-05-08 15:27:18 -07:00
LexManos
810b03bd83 EntityPlayer sensitive version of Item.isValidArmor, deprecated older version. Closes #551 2013-05-08 15:09:53 -07:00
LexManos
c5c44c2de4 Merge pull request #556 from micdoodle8/master 
Separate EQUIPPED and EQUIPPED_FIRST_PERSON Item Render Types
 2013-05-06 19:08:21 -07:00
LexManos
2444a80bef Capture and fire the PlaySoundAtEntity event for The client entity. Minecraft does some odd bypasses for no good reason. Thanks iPixile for reporting this. 2013-05-04 17:39:10 -07:00
micdoodle8
b28910e722 Separate EQUIPPED and EQUIPPED_FIRST_PERSON Item Render Types 2013-05-04 16:59:47 -04:00
LexManos
2c05258205 Update to 1.5.2 PR. 
MinecraftForge/FML@f0bba74a47 Update for minecraft 1.5.2
MinecraftForge/FML@62fdbad74c Update MCP's md5 for the fixed srg files.
 2013-04-28 13:28:40 -07:00
King Lemming
b8a17e2748 -Add vanilla Ores to the Ore Dictionary. No recipe replacement required. 
-Add NBT-sensitive getMaxDamage() for ItemStack.

Signed-off-by: King Lemming <kinglemming@gmail.com>
 2013-04-25 21:36:51 -04:00
LexManos
15ffb962e4 Fix rotation issue with non-block items. 2013-04-23 19:05:35 -07:00
Christian
b56d05ef9d ItemStack delegation to Item for damage values. 2013-04-23 19:05:11 -04:00
LexManos
c0d7e23c8d Merge remote-tracking branch 'refs/remotes/origin/GuiIngame' 
Conflicts:
	patches/minecraft/net/minecraft/client/Minecraft.java.patch
 2013-04-21 10:42:17 -07:00
LexManos
960eaf99ef Allow spawning of Bonemeal particles even if block is not set. 2013-04-21 00:15:02 -07:00
LexManos
c998db6a86 Restore world unload event for client worlds Closes #531 2013-04-20 11:25:16 -07:00
LexManos
06727b965e Fix replaceable checks to work on blocks with a non-replacable material, Closes #532 2013-04-20 11:19:05 -07:00
LexManos
13ff75bd9c Fix the BLOCK_3D render helper for items that aren't an instance of ItemBlock Closes #533 2013-04-20 11:12:35 -07:00
LexManos
2d84dcd44e Fix logic issue in CrashReportCategory patch, blame Jadedcat for sloppy quick patch. 2013-04-19 22:08:07 -07:00
Christian
cf90eb37f7 Simple block recolouring API: closes #525 
Fix up documentation on "rotation" API: it is up to the mod to decide interpretation of "rotation" for the mod/block.
 2013-04-18 17:21:26 -04:00
LexManos
cb4a073f5d Adds a field to the player for maximum health. Player.dat additions are present, getMaxHealth() needs a magic number for spawning. Closes #527 2013-04-17 19:16:34 -07:00
LexManos
a0891d74a0 Fix return value of EnchantPower hook, closes #518 2013-04-17 19:08:50 -07:00
LexManos
11115d5f3a Forge now takes control of GuiIngame's renderGameOverlay, and spits out a ton of events to give modders control of how the screen is rendered. 
Inital draft for community feedback.
 2013-04-17 18:55:06 -07:00
LexManos
d3a2243799 New hook to allow Items to render Helmet overlays like pumpkins do. 2013-04-17 14:03:59 -07:00
ProgrammerHero
add399284b fixed a bug that prevented proper lava generation near bedrock 2013-04-15 10:14:16 -03:00
LexManos
560931a14a Fix AIOOB in crash report stack trimming. 2013-04-14 21:42:13 -07:00
LexManos
3818ffdf56 Cave and Ravine gen will now take into account the Biomes top and foller block, allowing them to break the surface in modded biomes. Beaches, MushroomIslands and Deserts are exempt from this check to preserve vanilla world gen functionality. Closes #491 2013-04-11 11:39:23 -07:00
LexManos
cb67c72cd7 Added a small method in the Block.java to specify the amount of enchanting power it can supply to an enchanting table. Closes #508 2013-04-10 16:56:31 -07:00
LexManos
969cd4e762 Add Item 'swing' callback for use when playing the arm swing animation. Closes #505 2013-04-10 16:33:16 -07:00
LexManos
395c537f2c Item callback for EntityItem update tick. Closes #426 2013-04-10 16:06:07 -07:00
Christian
7c6468a9ea Update MCP names to recent published names 
Updated FML:
MinecraftForge/FML@1774e2bf30 MCP names update
 2013-04-10 18:30:25 -04:00
Christian
cefcd8aee6 Fix performance of texture uploads 
Updated FML:
MinecraftForge/FML@00c7883088 Very significant improvement in performance by using glSubImage to upload data. Inspired by frequent complaints about performance of hires texture packs. They probably still need a beefy system but should work. Hopefully I can figure out why the subImage GL side copy isn't working properly for an even more significant speed boost. But this gets things started.
MinecraftForge/FML@57ad221cc6 And add the patches *sigh*
 2013-04-10 18:30:25 -04:00
LexManos
f755fb2ebb Optimize Texture loops a bit for non-rotated textures. Should help the FPS loss on higher resolution texture packs. If it becomes a major issue we may have to look into a more optimized animation system. 
https://mojang.atlassian.net/browse/MC-13206
 2013-04-10 18:30:24 -04:00
LexManos
dc047fcb7a Small bugfix in Stitcher that was preventing ti from fully filling the possible texture space. Should lower the amount of empty space in textures. 2013-04-10 18:30:24 -04:00
LexManos
2de6f297e1 Small optimization for usages of Minecraft.getGLMaximumTextureSize(), only need to calculate it once. 2013-04-10 18:30:24 -04:00
LexManos
9e35cdfa33 Fix scoreboard saving bug caused by our fix of vanilla map saves. 2013-04-10 18:30:24 -04:00
LexManos
2ee07bb250 New hook to allow Items to provide there own armor models. Closes #487 2013-04-10 18:30:24 -04:00
ChildWalrus
0034a0c6c2 This allows the result of the explosion to take into account metadata, 
tile entities, or even to cancel it altogether.

Allowed block exploding to take into account tile entity and metadata
 2013-04-10 18:30:24 -04:00
LexManos
5f44333b8f Untag NBTTagList.removeTag as client side only, allowing simple removal ont he server side. Closes #477 2013-04-10 18:30:24 -04:00
LexManos
02d0e5e9ed Fix item deletion in creative menu for items that are the same id/meta but differnet NBT's. Closes #479 2013-04-10 18:30:24 -04:00
LexManos
829a60722c Allow items to provide there own FontRenderer for there tooltips. Added for #463 2013-04-10 18:30:24 -04:00
Tarion
9b58fb9384 Clarify Factory call and Event Functionality 2013-04-10 18:30:24 -04:00
Tarion
aa202878e2 Added maxCanSpawnInChunk event to allow overriding of creature chunk spawn cap 2013-04-10 18:30:24 -04:00
LexManos
6b0d1bb319 Deprecate IArmorTextureProvider, moved to Item. And exposed more information to the function. Closes #365 2013-04-04 17:28:50 -07:00
LexManos
bbe0c3c4bb Revert MinecraftForge/MinecraftForge@f594109b30 If concurancy issues arise we will reassess. The provided solution caused entities to be removed incorrectly and cause 'invisible' entities client side. 2013-04-03 04:07:01 -07:00
LexManos
0b16831ce9 Fix EntityPlayer passed to Bonemeal event. 2013-04-03 02:27:07 -07:00
LexManos
42875b70d9 Removed index bounds checking in some chunk functions, if you error blame Grum. 2013-04-03 02:07:51 -07:00
LexManos
6df717db5a Fix off-by-one in rotated textures. 2013-04-03 01:32:33 -07:00
LexManos
39ccc2e150 Fix vanilla texture bug causing rotated textures to be placed wrong. 2013-04-02 23:51:53 -07:00
Christian
727e27e191 Removed obsolete patches 
Updated FML:
MinecraftForge/FML@26ccb9106e Change snooper/crash report brand handling. fmlbranding now loads another string!
MinecraftForge/FML@eff464cf0e And the core patches for that
 2013-03-30 12:18:10 -04:00
LexManos
dc05f210f5 Fix NPEs when modders stupidly register null texture names. 2013-03-26 11:11:31 -07:00
Christian
177b5123c9 Update patches! 2013-03-23 22:02:58 -04:00
Christian
300f471c57 Merge branch 'mithionchanges' of github.com:Mithion/MinecraftForge into mithionchanges 
Fix up code for minecraftforge style. Clean up patches.

Conflicts:
	common/forge_at.cfg
	patches/minecraft/net/minecraft/block/Block.java.patch
 2013-03-23 16:56:01 -04:00
Mithion
b8856e9ed9 quick bugfix in entityenderman 
reversed boolean check on event result
 2013-03-23 14:15:20 -04:00
Mithion
e13dff305e Ender Teleport Changes 
Renamed Ender Teleport Event and added it in to ender pearls.
 2013-03-23 14:12:42 -04:00
Mithion
81ff5d7896 Enderman attackEntityFrom changed 
Changed so that if the teleport fails upon being attacked, Endermen will
take damage as normal.
 2013-03-23 13:40:13 -04:00
Mithion
4de9793ec9 Enderman Teleport Event 
New event when an enderman teleports that allows the teleport location
to either be modified or completely cancelled.
 2013-03-23 12:59:06 -04:00
Mithion
833e9f0c88 Access Transformer Changes 
AT changes and corresponding class changes.
Additions (all made public):
EntityLiving.targetTasks
PotionHelper.potionRequirements
PotionHelper.potionAmplifiers
PotionEffect.duration
Potion.setIconIndex
Item.setPotionEffect
Block.blockHardness
Block.blockResistance
 2013-03-23 12:58:24 -04:00
Christian
4de9140a34 Add in block rotation support. It supports most vanilla blocks (hopefully), logs should be added soon. 2013-03-23 11:56:58 -04:00
Christian
88d3723e4e Fix itemframe render bug 2013-03-23 10:23:26 -04:00
Mithion
ee6dce2390 Player Flyable Fall Event 
Adds an event to EntityPlayer that is posted on player fall when the
player has flight capabilities.
 2013-03-22 15:05:58 -04:00
Mithion
fa2cbe2671 Brewing Stand Changes 
Added an event on potion ingredient applied.  Event contains the item
stacks of each of the potions being brewed as well as any remaining
ingredients.

Changed TileEntityBrewingStand and SlotBrewingStandPotion to look for
instanceof ItemPotion rather than potion.itemID
 2013-03-22 15:05:23 -04:00
Mithion
2a76f7740e Entity Extended Properties Changes 
Adds IExtendedEntityProperties interface, which specifies three methods
that are needed:  Init, Save, and Load.

Adds the EntityConstructing event, which is called during the
constructor of Entity.  It is needed there so that the reference is in
place during the ReadNBT call.

Adds hooks into Entity that allow registration of
IExtendedEntityProperties classes, as well as saving and loading to NBT.
 2013-03-22 15:04:00 -04:00
Christian
734f434f45 Allow itemstack sensitive damage computation for attacks. Should allow 
storing data in the nbt :)
 2013-03-22 14:05:56 -04:00
Christian
f6a2bf28fe Allow items to decide if they can or cannot have book enchantments applied 2013-03-22 12:34:19 -04:00
LexManos
342a33c142 MinecraftForge/FML@aaf02ea2ac Updated for new PR client jar. 2013-03-20 09:05:58 -07:00
LexManos
3d9629013b Update to 1.5.1 Pre-Release: 
MinecraftForge/FML@9565529baf Updated to latest MCP and Minecraft 1.5.1 Pre-release.
MinecraftForge/FML@a573faf92d Someone derped up this function bad, revert name.
 2013-03-19 18:09:48 -07:00
LexManos
f30f7cb4ab Change placement of ChunkDataEvent.Save call to apply before sending to worker thread. 2013-03-18 14:24:07 -07:00
LexManos
2395699afd New TextureStitchEvents called before and after a TextureMap gathers and stitches textures together. 
Also added a config option to diable the writing of resulting stitched textures to disc. Default disables the writing.
 2013-03-17 20:07:30 -07:00
LexManos
458a79611b Fix placing of certian items on Redstone Blocks. 2013-03-16 23:06:58 -07:00
LexManos
71127d1cc0 Fix equipment slots for items when right clicked, and dispensed using a dispensor. 2013-03-16 22:11:55 -07:00
LexManos
a30584cb64 Fix logic inversion that allowed SnowMen to create snow on hoppers. 2013-03-16 12:50:57 -07:00
LexManos
7588bec62e Prevent pistons from generating snowballs. 2013-03-16 12:50:30 -07:00
Christian
d52160919d Fix multipass item rendering so that it uses the right spritesheet for the item. 2013-03-16 13:44:32 -04:00
LexManos
90698d64b6 Fix Activator rails activating TNT carts, closes #458 2013-03-15 21:20:29 -07:00
LexManos
df1e32d7db Remove the block if TE errors. 2013-03-13 12:40:45 -07:00
LexManos
62cb053d5f Add config toggle to atempt to remove TileEntities and Entities that error during there update without fully crashing the server, use at your own risk. Closes #424 2013-03-13 12:20:57 -07:00
LexManos
58ad89ca90 Fix for nether quartz not generating in the nether, Closes #454 2013-03-13 11:51:36 -07:00
LexManos
81c00a89c5 Fix RedstoneBlock power issues, Closes #452 2013-03-13 11:49:10 -07:00
LexManos
3b40687f55 Fix bug with rendering one too many passes for ItemEntities Closes #450 2013-03-13 11:48:39 -07:00
LexManos
3e1949fc1c Add call to EntityLiving when counting entities for Spawning Cap. Closes #447 2013-03-12 19:41:51 -07:00
LexManos
2cd9382bfc Move the RenderWorldLastEvent back to before renderHand like it was in 1.4 Closes #444 2013-03-12 19:14:41 -07:00
LexManos
48e95f3d44 Fix RenderItem to work with items that use the terrain texture map that aren't in the block ID range. Close #443 2013-03-12 19:02:18 -07:00
LexManos
ee1460d8c4 Removed get/setTextureFile from Block, nolonger used. 2013-03-12 14:47:05 -07:00
Christian
170d22e5ac Refresh patch 2013-03-09 13:39:12 -05:00
LexManos
a91a50cd9d Deprecated Forge's ISidedInventroy, there is a vanilla solution. Added temporary config option to legacy furnace slot orientation. 2013-03-08 19:16:48 -08:00
LexManos
9f8a07f7d8 Fix typos. 2013-03-08 18:57:00 -08:00
LexManos
2488ad2826 Updated to 1.5 Pre-release 
Updated FML:
MinecraftForge/FML@2d98835db8 Scala support! It's still primitive, I hope that people will like it. I do :)
MinecraftForge/FML@5bfaf7c170 Global object registry, also, support the new itemblockwithmetadata constructor
MinecraftForge/FML@80a40c03e6 Update to MCP 1.5 and minecraft 1.5.
MinecraftForge/FML@b3e854a15d Update for new MCP with srg reobf.
 2013-03-08 18:48:52 -08:00
LexManos
6b5a086be3 Readd second render pass to TileEntities and Entities, patches were missed when merging in master branch. As note, CB can DIAF. 2013-03-06 19:18:26 -08:00
Christian
f5ba66068a let's do it right this time. Hmmm 2013-03-06 13:32:34 -05:00
Christian
101ae36f57 Call stitcher for non-existent textures as well. Probably allows 
for generated textures. Hmmm
 2013-03-06 10:29:25 -05:00
LexManos
c2b610d335 Fix ItemSeedFood respecting custom soils. 2013-03-05 15:44:31 -08:00
LexManos
43a1bf1425 Removed erroring imports and update build function to die on errors. 2013-03-04 20:57:42 -08:00
LexManos
20db933cee New world event for controlling potential entity spawnlists. For #430 2013-03-04 20:29:05 -08:00
LexManos
ebdc10eb1d Add callback on TextureStitched to control texture loading. 2013-03-04 19:36:19 -08:00
LexManos
2e947b364c Add helper functions for deling with custom TextureStitched 2013-03-04 18:55:15 -08:00
LexManos
88e44f0761 Fix animation location for textures with domains 2013-03-04 18:54:21 -08:00
Christian
59b8e5e93c Add in simple texture management for mods using the stitcher. Scope with "{domain}:{texture}" to 
get textures that are not at /textures/<item|block>/{texture}.png but /mods/{domain}/textures/<item|block>/{texture}.png
instead
 2013-03-03 14:11:31 -05:00
Christian
72e013fb66 Fix up patches for FML, also, add in FML as a submodule rather than a zip 2013-03-03 14:05:34 -05:00
LexManos
9bd8f2697c Updated Forge to s13w09c 2013-03-02 03:08:27 -08:00
LexManos
ed55969932 Not supposed to have debug stuff... 2013-02-28 03:59:57 -08:00
LexManos
a04e7912b0 Sync up with FML, Will not run nativly as you need deobfusication_data.zip in your libs folder. 
We have not setup the download for that yet, to make it yourself just zip joined.srg name it deobfusication_data.zip and put it in lib
 2013-02-28 03:53:42 -08:00
Christian
082ee1a5ea Merge branch 'master' into snapshot15 
Conflicts:
	fml-src-1.4.7-4.7.22.539-master.zip
	fml-src-1.4.7-4.7.35.556-master.zip
	fml-src-13w02b-4.99.16.541-snapshot15.zip
 2013-02-27 23:19:11 -05:00
LexManos
a766603b38 Merge commit '695b080197bd577cc34fe6dbc72b74f4a74b2d5c' into snapshot15 
Testing cherry picking.
 2013-02-27 00:57:35 -08:00
LexManos
a520e128d7 Fix TESR culling for beacons, and implement a good enough measure for Chests. 2013-02-24 22:55:48 -08:00
LexManos
f0ea9c9106 Store the glMultiTexCoord lightmap for later use with glDrawArrays closes #406 2013-02-23 13:50:12 -08:00
LexManos
3530e0d861 Added unload event for client worlds Closes #405 2013-02-23 13:41:43 -08:00
LexManos
a7cdcc1f33 WorldGen*Trees shoud not respect custom soils. Closes #355 2013-02-23 13:07:00 -08:00
LexManos
0396ba2252 ItemStack sensitive versions of Item.getPotionEffect and Item.isPotionIngredient Closes #321 2013-02-23 12:02:36 -08:00
LexManos
b754d6f301 Fix movement speed check, closes #420 2013-02-23 11:30:56 -08:00
LexManos
3945819851 Fixed entity colision above max world height, and below 0. Closes #400 2013-02-23 10:59:44 -08:00
LexManos
d50f150c56 Disable automatic equiti of pcke dup items for players, and fixed index issues in Player.setCurrentItemOrArmor. 2013-02-23 10:42:33 -08:00
LexManos
307dd48229 Fix profiler issue with RenderGlobal patch. Closes #414 2013-02-15 04:56:55 -08:00
LexManos
e11feec55f Fix fortune modifier always passed as 0 to idDropped closes #412 2013-02-15 04:49:33 -08:00
LexManos
dcdd7c6c0e Fixes comparison for items in creative inventory, closes #411 2013-02-15 04:43:20 -08:00
LexManos
ace8c29085 Added a hook into SlotArmor so Items can control if they are classified as a Armor type. Closes #408 2013-02-15 04:25:08 -08:00
Christian
6673844c54 Fix ServerBrand retriever- forge is now forge,fml! 
Update FML: cd96718
cd96718 Fix HD mob skins, FINALLY!!! Stupid eyes are stupid.
 2013-02-06 20:28:54 -05:00
Christian
afea4fce1d Remove the single use interface ITickingArmor, and apply to Item directly. 2013-02-04 17:53:47 -05:00
Christian
40a3660c93 Fix possible null case for collision bounding box. 2013-02-04 13:58:55 -05:00
Christian
7e5a9076f0 Fix TESR rendering for double chests 2013-02-04 11:19:39 -05:00
Christian
c5bb9fc78f Merge branch 'TESRculling' 2013-02-04 11:13:29 -05:00
Christian
fbf9527be3 Add in "armor ticking"- implement the interface and the armor piece will tick. 
Update FML:22dbe41
22dbe41 Fix up mistake that broke all modloading. Nice.
 2013-02-04 11:07:53 -05:00
Christian
fb46c7a01f Fix small derp in TE 2013-01-31 13:46:29 -05:00
Christian
0f3bd780e1 Merge branch 'master' into TESRculling 2013-01-29 10:01:00 -05:00
LexManos
1dc9ef9b08 Fix initalization issue with the clamping threshold config value. And remove vanilla console spam related to it. 2013-01-29 03:11:59 -08:00
LexManos
4299aa22ff Change WorldServer.allPlayersSleeping to public, and remove the SideOnly annotation on EntityPlayer.getSleepTimer() Closes #393 2013-01-28 18:12:29 -08:00
LexManos
6d6405973c Added catch to TileEntityChestRenderer for potential crash when modders do bad things -.- Closes #389 2013-01-28 18:05:38 -08:00
LexManos
704f879320 Rework canSilkHarvest hook to try and honor vanilla overrides, should close #391 2013-01-28 17:51:48 -08:00
Christian
f06e0be5e5 We try and log a message if we detect a world leak: it's probably not infallible, but it should 
help mod developers- if you see this when testing your mod with, say, mystcraft, you're probably
keeping a hold of an invalid handle to the World (either directly, or indirectly via Entity or TileEntity)
and you should look to refactor to wrap those handles in WeakReferences
 2013-01-27 10:43:35 -05:00
Christian
b386565881 Add in a mechanism for explicit subclassing of WeightedRandomChestItem to allow for 
generational style chest content generation rather than static. Cleans up some old code nicely
 2013-01-26 14:12:46 -05:00
Christian
b164f9b21e Merge branch 'renderpass' of https://github.com/Chicken-Bones/MinecraftForge into TESRculling 
Conflicts:
	patches/minecraft/net/minecraft/client/renderer/RenderGlobal.java.patch
	patches/minecraft/net/minecraft/entity/Entity.java.patch
	patches/minecraft/net/minecraft/tileentity/TileEntity.java.patch
 2013-01-26 12:12:21 -05:00
Christian
70ca0eeb74 Add in TESR culling, and a new TileEntity method to allow for differential sizing of the 
TESR view culling vs the TE collision bounding box (the former defaults to the latter)
Checked into a branch because it's likely to break expanded TileEntities.
 2013-01-26 11:11:20 -05:00
Christian
ae7e328228 Fix a potential problem with "Entity already added" when using the dormant 
chunk cache capability. The entities in the dormant chunk cache will get new
IDs prior to the cached chunk returning.
 2013-01-25 21:21:20 -05:00
Christian
78e192e28e Merge remote-tracking branch 'origin/master' into snapshot15 and fix patches 
Conflicts:
	fml-src-1.4.7-4.7.22.539-master.zip
	fml-src-1.4.7-4.7.4.520-master.zip
	fml-src-13w02b-4.99.16.541-snapshot15.zip
	patches/minecraft/net/minecraft/client/renderer/entity/RenderItem.java.patch
	patches/minecraft/net/minecraft/entity/item/EntityItem.java.patch
	patches/minecraft/net/minecraft/entity/item/EntityMinecart.java.patch
	patches/minecraft/net/minecraft/entity/player/EntityPlayerMP.java.patch
	patches/minecraft/net/minecraft/item/crafting/RecipeFireworks.java.patch
	patches/minecraft/net/minecraft/server/gui/GuiStatsComponent.java.patch
	patches/minecraft/net/minecraft/server/management/PlayerInstance.java.patch
	patches/minecraft/net/minecraft/server/management/ServerConfigurationManager.java.patch
	patches/minecraft/net/minecraft/world/World.java.patch
	patches/minecraft/net/minecraft/world/gen/feature/WorldGenDungeons.java.patch
	patches/minecraft/net/minecraft/world/gen/structure/ComponentMineshaftCorridor.java.patch
	patches/minecraft/net/minecraft/world/gen/structure/ComponentScatteredFeatureDesertPyramid.java.patch
 2013-01-22 17:28:28 -05:00
Christian
94eb5cc29b Fix a couple of forge patches 
Update FML: d075daf
d075daf Merge branch 'master' into snapshot15 Fix up compilation and patching errors
1bd6847 Fix up packages.csv ordering for easier diffing
dd832f2 Update for MCP7.30c - fixes redstone rendering issues
aebf6eb Add in a registry method to allow for alternative TileEntity names- they will be used to support loading maps containing the older definiti
8921cfe Remember to add the new patches!
cd67596 The "ServerStarting" event should now properly crash the server if it fails, so the client will properly exit. Also, added in a "pre-server
e1c6630 Javadoc cleanup
5ce4e31 Fix breaking change
a99c488 Merge branch 'patch-1' of https://github.com/bspkrs/FML into gh-updates
94282c5 Merge branch 'FMLLogFormatter' of https://github.com/donington/FML into gh-updates
7ad8529 Update MCP to MCP7.26a and refresh MCP names
15534ed Update address of the FML repository to the new location in all the files
aa822e3 Fix logical error in comment text
a14ab91 Update license text to make clear that FML is not a way to sidestep MCP licensing.
0165742 Fix mcp conf md5 signatures for the snapshot
26a5b31 FMLLogFormatter: dynamic log level name
 2013-01-22 17:03:33 -05:00
Chicken Bones
323517e88b Gave entities and tile entities access to the second render pass for translucency. 2013-01-23 03:07:00 +10:00
Christian
a1e57c068e Add in patch to change how playerinstance sends TE chunk updates. It should always send just the TEs 
that changed now, and not "ALL" TEs. Also, added configuration value to change the 64 threshold to a
configurable number
 2013-01-20 18:47:04 -05:00
Christian
8f6963fabf Merge branch 'worldtype_customize' of https://github.com/ExtrabiomesXL/forge into gh-updates 2013-01-20 15:24:10 -05:00
Christian
a004673567 Merge branch 'master' of https://github.com/CovertJaguar/MinecraftForge into gh-updates 2013-01-20 12:05:11 -05:00
Christian
5ea2d49915 Merge part of PR #375 related to ChunkEvent.Load for the client side 2013-01-20 12:03:42 -05:00
Christian
fe2d3244d7 Update licencing information to make clear that forge is allowed to redistribute and automatically 
download parts of MCP, but this permission is not transitive to people distributing MinecraftForge
source independently of the MinecraftForge project.

Update MCP to 7.26a and FML: 7ad8529
7ad8529 Update MCP to MCP7.26a and refresh MCP names
15534ed Update address of the FML repository to the new location in all the files
a14ab91 Update license text to make clear that FML is not a way to sidestep MCP licensing.
 2013-01-20 10:58:07 -05:00
CovertJaguar
78a3d1a656 Fixed render passes for EntityItems 
Should be < instead of <=
 2013-01-18 12:06:29 -08:00
CovertJaguar
46394174c5 MCL Update 2013-01-12 11:10:39 -08:00
LexManos
ea57a46227 Removed some dead code, We don't bind custom tessellators 2013-01-12 05:24:16 -08:00
LexManos
4ea34fe6af First patches updae to 1.5, Many rendeirng related changes, most notibly removed Item/Block's getTextureFile() functions. 2013-01-12 05:12:10 -08:00
LexManos
3fc95b71e2 Update patche for jad-style names. 2013-01-11 23:46:08 -08:00
LexManos
3a9c7b4532 Added event hooks to control to allow mod control of mob spawning. PR: #337 
Deprecated LivingSpecialSpawnEvent in favor of new LivingSpawnEvent.SpecialSpawn
 2013-01-01 22:20:30 -08:00
LexManos
3e484deafc Fixed incorrect lighting in some cases. Closes issue #349 2013-01-01 21:54:25 -08:00
LexManos
c523592522 Added getter for Metadata smelting list, because, why not.. PR: #352 2013-01-01 21:53:41 -08:00
Christian
5e4315415d Update FML:d9bfb29 
d9bfb29 Add in a "server stopped" event
 2012-12-31 00:03:09 -05:00
Christian
f594109b30 Attempt to resolve the entity concurrency issue, by simply deferring unload 
to the next tick
 2012-12-30 23:26:04 -05:00
Christian
e4a1693495 Fix a missed patch and cleaned up other patches 
Rollback a method name change that breaks a lot of mods
Update FML: fb701cd
fb701cd Revert MCP name change for canConnectRedstone - it conflicts with a forge method of the same name and breaks 1
 2012-12-29 00:29:15 -05:00
Christian
19347c5322 Update for MC 1.4.7 
Update FML: f7cc50b
 2012-12-28 12:06:56 -05:00
LexManos
0c5563fbf5 Attempt a fix for the new chunk compression changes. 2012-12-27 22:13:46 -08:00
LexManos
46440588fe Fix mobs spawning on inverted slabs/stairs. 2012-12-27 13:50:13 -08:00
Scott Killen
16543840a4 Add ability to WorldTypes to display the 'Customize' button and react to it 2012-12-26 11:35:49 -05:00
LexManos
081ec4b70a Fixed order <.< you saw nothing. 2012-12-25 22:28:16 -08:00
LexManos
a042453690 Use nanoTime instead of currentTimeMillis for potential performance increase. 2012-12-25 22:23:23 -08:00
LexManos
1a54bcd3dc Fixed EntityMinecard missed patch, Issue #338 2012-12-25 22:02:57 -08:00
LexManos
263e919384 Fixed issue with Efficancy enchatment when connected to vanilla servers. 2012-12-25 22:02:30 -08:00
Christian
7553f98367 Protect deflation with a simple semaphore. Should close #336 2012-12-25 22:06:20 -05:00
LexManos
6834cf2649 Fixes a vanilla bug where the player view would dip when stepping between certain blocks 
https://mojang.atlassian.net/browse/MC-1594
Issue #318, let me know if you notice any issue.
 2012-12-24 01:55:37 -08:00
LexManos
e78b825875 Re-write/Deprecated DungeonHooks loot tables, now uses ChestGenHooks like the rest of the world gen. Also fixes issue #330 by adding in enchanted books. 
Should be API compatible.
 2012-12-24 01:29:33 -08:00
LexManos
dedc02fa22 Move chunk compression to the network thread in Packet 51 and 56 
This will reduce the server load considerably by doing the chunk data compression in writePacketData, which will be run from the network thread.

The chunk compression can easily use 1/4th of the overall server thread CPU time if someone is exploring much, especially when moving quickly (e.g. with quantum leggings).

Player, this is how it's properly done.
 2012-12-23 23:31:13 -08:00
LexManos
0562fd85b9 Explicitly check if useItem is not denied, allows for denying the item without denying the block 2012-12-23 23:15:53 -08:00
LexManos
1c225a8d0d Fix missed patch in EntityMinecart, #334 2012-12-23 23:04:11 -08:00
LexManos
878d230189 Delete unneeded patch. 2012-12-23 21:49:16 -08:00
Christian
ca881a8153 Fix Fireworks to always work in SMP 2012-12-22 07:09:21 -05:00
Christian
51c19dd5f1 Fix up enchantment at the enchanting table vs via a book. Adds in a method 
that previously exists under a new name: canApplyAtEnchantingTable()
to determine enchantments that can apply at the enchanting table (a smaller
subset of all possible enchantments for an item, now). Also, add your
enchantments to the anvil book application list, if neccessary.
 2012-12-21 15:44:41 -05:00
Christian
ced432f31d Tweak packet56 to see if this resolves the apparent worldgen derpiness 2012-12-21 09:24:13 -05:00
Christian
3d5197ea33 Server side only item callback: allow a held item to decide if it wants to pass sneak-clicks through 
to a block, or not. Defaults false- the same as the new vanilla behaviour (sneak clicks with an item
in hand don't activateBlock anymore).
 2012-12-21 03:15:12 -05:00
Christian
708516e060 Move another patch up a bit - should actually close #329 2012-12-21 01:49:43 -05:00
Christian
b82cb25eea Add IPlantable to itemseedfood. Potato and carrot support! 2012-12-20 21:40:36 -05:00
LexManos
dd8893a65c Fixed cpw's derp in the PlayerInteractEvent logic. 2012-12-20 15:02:06 -08:00
LexManos
4cfffe784e Updated NetClientHandler for onConnectionClosed placement fix. 2012-12-20 15:00:35 -08:00
Christian
c9d9fe8e3a Fix ItemInWorldManager so that itemUseFirst works, and the playerinteractevent works. Minor patching mis hit. Apologies. 2012-12-20 10:52:08 -05:00
Christian
71fc299ac7 OK. AT the right thing, and add in a call to always get the right thing. Clean up patch fuzz too. 2012-12-20 08:48:14 -05:00
Christian
aed532636a Drop the item in onBlockHarvested, not breakBlock 2012-12-18 22:17:02 -05:00
Christian
aca35c7571 Fix up block drops for skulls and cocoa 2012-12-18 22:10:15 -05:00
Christian
18f77fb10f Fix binding the texture for multiple render passes. Thanks mdiyo! Closes #320 2012-12-18 13:32:48 -05:00
Christian
de15192bb8 Allow RenderItem to be easily overridden for things that need to render entityitems. IronChest, BuildCraft, RP2, whatever... 2012-12-18 10:57:04 -05:00
LexManos
d6c4f37eb5 Fixed items dieing improperly due to new EntityItem sync changes, also made items render offset when rendered in 3d. 2012-12-18 06:56:28 -08:00
Christian
efee38095b Fix RenderItem so that forge textures load for it 2012-12-18 09:19:05 -05:00
LexManos
9833c5652c Removed all functions marked as deperacted for the new MC version 2012-12-18 05:28:09 -08:00
LexManos
a2f4a0d2dd Inital update to 1.4.6, Version bumped to 6.5 2012-12-17 22:33:28 -08:00
LexManos
2bdcc3a23a Remove erronious double call to PlayerDestroyItemEvent 2012-12-16 18:02:45 -08:00
LexManos
be6667f733 Make PlaySoundAtEntityEvent fire for players as well 2012-12-16 18:02:11 -08:00
LexManos
ad42901b7e Update patches for repackage. 2012-12-12 23:45:35 -08:00
Christian
3ed793bce5 Merge branch 'terraingen' 2012-12-12 21:13:20 -05:00
LexManos
d4a5b7e3a5 Fix shouldRiderSit() to properly determine if rider is sitting. 2012-12-12 02:24:47 -08:00
LexManos
0e82a3952d Creative GUI will now remember what tab page you were on, thanks Matchlighter PR #290 2012-12-12 02:11:27 -08:00
LexManos
dfd9844c13 Pistons now respect world height a little better, for PR #286, will review Rotation event later. 2012-12-12 01:58:24 -08:00
LexManos
599591e883 New TileEntity function to determine if the TE should be destroied when Block/Meta changes, For Issue #300 2012-12-12 01:55:12 -08:00
LexManos
ee0763fb4a Add CloudRenderer for PR #304 2012-12-12 01:35:18 -08:00
LexManos
c48a15357b Moved check if map cursor should 'spin' and which world a player respawns in to WorldProvider for PR #308 2012-12-12 01:22:43 -08:00
LexManos
03f1418924 Updated FML to 486: 
02b54ca8: Add a modid on the mods list, should make it easier to do things like forge chunkloading config
70670f2f: Fix build eclipse extractor task
b9fa3fc9: Add in storage, detection and validation of the ItemID array between client and server
5e5d8206: Fixing id map generation - should validate correctly now
f9fc06a8: Remade python dist as 32-bit.
93d47a1c: Reenabled replacement of the eclipse folder.
 2012-12-10 15:53:30 -08:00
Christian
3909cdb3ec Fix RenderBlocks patch, touch branch 2012-12-07 16:43:15 -05:00
Scott Killen
768484d393 For @XCompWiz, added a hook to allow mods to dynamically change the color that water is rendered. 2012-12-07 16:43:15 -05:00
Scott Killen
079db5d854 Readded unchanged version 2012-12-07 16:43:15 -05:00
Scott Killen
f747a97b85 Removed unchanged file 2012-12-07 16:43:15 -05:00
Scott Killen
69ac1fa3a5 Added terrain gen events 
Added biome color events for @XCompWiz
 2012-12-07 16:43:15 -05:00
Chicken Bones
f1e3481c0a Add Chunk Watch and UnWatch events. 2012-12-06 09:11:20 -05:00
LexManos
0243df1c4a Fix issue where non-BlockContainer TEs would not be removed properly. 2012-11-30 20:22:50 -08:00
LexManos
e65c0a3d88 Fix issue where worlds were potentially unloaded improperly on server shutdown. 2012-11-29 04:05:00 -08:00
LexManos
e5231f306b Added section of the EntityData NBT that will be persisted for players across respawning. 2012-11-27 16:52:08 -08:00
LexManos
820aa195bd Merge pull request #269 from XCompWiz/chunkcon 
Adds a more intelligent chunk constructor
 2012-11-27 14:53:12 -08:00
LexManos
07a6e4ed5f Fixed random chest items not generating to there max stack sizes. 2012-11-26 20:25:35 -08:00
LexManos
4bf2dbaeb7 Fixed issue with abandoned chunks. 2012-11-26 20:06:23 -08:00
Zach Laster
17151718aa Fixes ordering for z & x loops (proper array increment order) 
The ordering before would skip about in the ids and metadata arrays.  This runs linearly and should improve performance.
Done live on github
 2012-11-21 14:56:17 +02:00
XCompWiz
e8aaf81627 Fixes some weird formatting 2012-11-21 05:15:20 +02:00
XCompWiz
0eba8eeaab Adds a more intelligent chunk constructor 
Adds a chunk constructor with full block id range, that's metadata
sensitive, has intelligent coord ordering, and which allows for
generation at greater heights than 127.
 2012-11-21 05:05:51 +02:00
Christian
957afc4d62 Move server specific patch back to common from minecraft. 
Update FML: 1f5c58b
1f5c58b Fix up MCP version
61e4db2 Merge joined.exc add update howto
5efc1eb Revert "Fix MC-2497 - derpy torch flames. Moved from forge. Everyone sho
3b3600d Modified merger to just consider all server classes as common. And moved
edcc5ca Forgot mcp.cfg
ca79dfe Updated to 1.4.5b
5945279 Fix python error
57bf643 Modified decompile so that we do not have to decompile the server, saves
d9d0a46 Cleaned up some tabs
2fac644 Change usage of ZipFile, fixes issues with Mac's default instation of py
 2012-11-20 09:09:06 -05:00
LexManos
2e2751e5c0 Fix TE Issue 2012-11-19 20:05:16 -08:00
LexManos
5bc4d22bdd Updated to MC 1.4.5b 2012-11-19 16:03:52 -08:00
Christian
f30daebbcb Update FML: 570592b 
570592b Attempt to fix a possible comodification risk
 2012-11-18 21:22:38 -05:00
LexManos
24f8d6be02 Fixed custom soil checks for NetherStalk and Reeds 2012-11-18 01:36:21 -08:00
LexManos
8bbe281de9 Fixed issue with default implementation of Beach plant type check 2012-11-18 01:35:48 -08:00
Christian
6a8a8a78c4 Update FML: f348496 
f348496 Fix mod display list. Shouldn't be derpy anymore.
a5c31b5 Fix World patch- workaround no longer required and leftovers are bad.
2dc3f0d Cleaned up the AT config updater, should work for any setup of the MCP w
 2012-11-18 00:17:21 -05:00
LexManos
5b324861a0 Fixed beds not working properly when respawning. 2012-11-17 17:52:37 -08:00
Christian
ba65c08f19 Remove EntityFX patch - moved to FML. Patch SuspiciousClasses to add "forge" 
Update FML: fa56701
fa56701 Fix MC-2497 - derpy torch flames. Moved from forge. Everyone should benefit.
96935bb Fix an NPE in TileEntity trying to generate a crash report. Make suspicious classes just return the obvious. Fix NPE for FML crash report on server. Clean up dead pa
 2012-11-16 23:06:37 -05:00
Christian
f13200e16a Fix the derpy torch flames properly. Closes MC-2497 properly ;) 2012-11-16 19:07:36 -05:00
Christian
7306c0c1f3 Update to MC 1.4.5 
Update FML: 43d3042
43d3042 Clean up a patch
fec221f Update FML for MC 1.4.5
b0f0635 Fix for ModLoader static overrides not displaying.
23a2513 Fix up derpy file name handling: closes #127 Fix up duping childmods: cl
a6eaa2b Fix spelling issue.
c6a0741 FML setup should now download and verify all the minecraft files needed
5a1930e Small fix to some MCP metadata for pre2
418deba Update to MC 1.4.4
4ff2cff Fix bug when a modloader mod is run on a dedicated server and has a conn
 2012-11-16 17:06:12 -05:00
Christian
5f2d1d1fc0 Add an ItemStack sensitive version of getIconForRenderPass, defers to 
existing by default. Should allow NBT data to affect multipass icon rendering.
 2012-11-13 16:01:57 -05:00
LexManos
2087b2b44e Allow for modders to decide whether or not players are positioned on ridingEntities similarly to pigs PR #244 2012-11-12 17:33:12 -08:00
LexManos
369f8ce38f Fix issue where players would spawn in the ground. 2012-11-12 17:29:14 -08:00
LexManos
5b82c5c20e Mods can use custom textures for Slot background overlay, instead of only items.png PR #245 and #246 2012-11-12 17:26:49 -08:00
LexManos
770585e731 Fix crops not droping seeds properly. 2012-11-09 16:21:41 -08:00
LexManos
ba6c4dd7df Fix entity items rendering on the ground. 2012-11-09 16:21:23 -08:00
LexManos
e73cbd088f Update to 1.4.4 2012-11-08 20:19:12 -08:00
LexManos
207843e279 Made Item constructor public, and made setTextureFile chainable, requires mods to recompile, but as this is for 1.4.3 i'm not concerned. 2012-11-04 15:42:04 -08:00
LexManos
2f0dcebbf9 Readdaed teleporter sensitive versions of the teleport function 
Added per-world list of custom teleporters, Modders, use World.Load to populate this list.
Changed the definition of our version schemes.
 2012-11-02 22:16:32 -07:00
Christian
0f3b030a1d Temporary update for 1.4.3 
Update FML: bd2123c
bd2123c Clean up some patch fuzz
c2a603c Update joined.exc file from latest conf
db12af4 Update to 1.4.3
 2012-11-02 18:40:43 -04:00
LexManos
c19ae55885 Update FML: Updated MCP mapings, and fixed StartServer 2012-10-31 10:16:46 -07:00
Christian
418a47976a This update fixes some world corrupting vanilla error handling, mostly caused by 
mods doing something derpy. Hopefully, your world saves will thank me.
Note that if the mod does derp, it's data is lost. It's not FML or Minecraft Forge's
responsibility if "DirtChest 2000 Mk5" can't write their TileEntity method correctly
and you lose your 100000 diamonds.

Update FML: a3a93f3
a3a93f3 Fix some whitespace issues, handle possibly bugged entities as well
a7eb5dc Vanilla/mod bug fixes: CME on entity processing, TileEntity resetting chunk on save/load.
 2012-10-30 09:27:34 -04:00
LexManos
d7adac4508 Fix a vanilla bug related to certian seeds and stronholds. 2012-10-28 23:42:19 -07:00
LexManos
f9ea207cdc Fix cast issue when mods attempt to make fake worlds. 2012-10-28 23:41:43 -07:00
LexManos
25941fd58c Fix compile issue. 2012-10-28 15:37:11 -07:00
LexManos
820d61d56d Added Stonghold, Village, and Spawn biome management helpers for PR 207 2012-10-28 07:38:38 -07:00
LexManos
31638a0697 New hook to allow for custom beacon support blocks. 2012-10-28 06:47:53 -07:00
LexManos
705509054a Added metadata sensitve experience to furnace recipies and added Item callback to determine experience gain. 2012-10-28 06:37:54 -07:00
LexManos
9aca08557d Fix issue where scroll bar would not render when switching tab pages. 2012-10-28 05:57:56 -07:00
LexManos
1a7e580f01 New hook to allow items to be on multiple creative tabs PR 176 2012-10-28 05:57:23 -07:00
LexManos
f6a7ea063b Changeable name tag render distance for PR: 174 2012-10-28 05:33:32 -07:00
ShadwDrgn
77bd22d3c1 Add event to cancel or change chat messages sent from server 2012-10-28 07:31:53 -04:00