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

311 commits

Author SHA1 Message Date
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