Commit Graph

1289 Commits

Author SHA1 Message Date
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
Christian f483adf8bb Updated FML:
MinecraftForge/FML@82bc9f1b35 Add some information, and a log message letting you know it worked
2013-03-23 16:01:49 -04:00
Christian d8a1cb87ca Updated FML:
MinecraftForge/FML@ede93d438f Validate supplied stack size
MinecraftForge/FML@d73ac867df Add a mechanism to dump the registry- useful for mod developers.
2013-03-23 15:40:05 -04:00
Christian 541425309b Updated FML:
MinecraftForge/FML@5e1949eb0e Clone the itemstack, and allow for passing in a stacksize
2013-03-23 14:58:56 -04:00
Christian 23f4c8d817 Updated FML:
MinecraftForge/FML@2d368c4c2e Itemstacks in the GameRegistry (manual registration by mods)
2013-03-23 14:49:33 -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
Christian baf43da9a0 Fix AT config for texturemap 2013-03-22 16:54:42 -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
Christian d6b70f7b66 Updated FML:
MinecraftForge/FML@d9db27275e Fix mismatch screen a bit. Should render more correctly now and at least not be blank in a lot of circumstances..
2013-03-22 10:21:34 -04:00
Christian c38467c577 Updated FML:
MinecraftForge/FML@d1ff1967b5 Fixed FMLRelaunchLog's Newline Handling
MinecraftForge/FML@591a25722b Merge pull request #208 from jrtc27/patch-1
2013-03-22 09:29:09 -04:00
Christian a754724f7f Updated FML:
MinecraftForge/FML@f709ce7579 Fix missing block world rendering
MinecraftForge/FML@748eece456 Merge pull request #206 from mDiyo/patch-1
MinecraftForge/FML@012a755bb9 Fix up patch properly. Also, fix md5s for the jars.
2013-03-22 01:51:23 -04:00
LexManos 411696f6b8 Merge MC 1.5.1 branch to master. 2013-03-21 04:24:44 -07:00
LexManos 727c042a0e Updated FML:
MinecraftForge/FML@625da6492d Fix install.py --mcp-dir option. Fixes #204.
MinecraftForge/FML@687d3c059d Merge pull request #204 from agaricusb/fix-mcpdir
2013-03-20 18:49:36 -07: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 8aca6b4193 Updated FML:
MinecraftForge/FML@3c346247e1 Fix NPE with CoreMods who do not have the new MCVersion annotation.
2013-03-19 13:49:31 -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
Christian 8ab1e918f6 Updated FML:
MinecraftForge/FML@5cc90f060c Fix the logger to treat newlines better, hopefully. Closes #199
MinecraftForge/FML@5e3af8ac0e Use the relaunch log, for class circularity safety.
MinecraftForge/FML@ce949e6099 Support simple mc version test in coremods, only effective through jar loading. Also, log some more data about the environment.
2013-03-18 08:04:05 -04: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 a964725d46 Updated FML:
MinecraftForge/FML@24022ab6ba Added comments to note FML-only methods
MinecraftForge/FML@8905237306 Merge pull request #200 from bspkrs/patch-2
MinecraftForge/FML@577b19c1cf Fix potential NPE in class loading and add extra debug information.
2013-03-17 12:01:41 -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
LexManos 6636a2913e Merge pull request #460 from LepkoQQ/master
Shaped Ore Recipe mirroring issue
2013-03-16 11:27:22 -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
LepkoQQ f1b32126c5 Fix ShapedOreRecipe checking mirrored recipes 2013-03-16 11:57:11 +01:00
LexManos 304421a4c9 Merge pull request #459 from ChildWalrus/sleep
Made some sleep-related fields public to allow fixing of sleeping bug in new dimensions
2013-03-15 21:32:30 -07:00
LexManos 90698d64b6 Fix Activator rails activating TNT carts, closes #458 2013-03-15 21:20:29 -07:00
LexManos 66a2081d2e Merge pull request #455 from Corax/patch-1
Update ForgeDummyContainer.java
2013-03-15 20:28:02 -07:00
ChildWalrus 3e6ca3a740 Made WorldServer.allPlayersSleeping public
Made EntityPlayer.sleepTimer public

Sleep changes
2013-03-15 21:54:06 +00:00
Christian ed8d51b021 Updated FML:
MinecraftForge/FML@c5d5f4e516 Fix AllPublic access transformer not affecting methods. Should fix modloader compatibility
2013-03-14 16:00:40 -04:00
Corax de0910b4fb Update ForgeDummyContainer.java 2013-03-14 10:02:17 +01:00
LexManos 8f5f4f7385 Updated FML:
MinecraftForge/FML@4762d4d8ef Allocate more ram {typically 256 is defailt} to fermflower, should fix decomplication issues on OSX
MinecraftForge/FML@6370c242f0 OS X's python 2.6.1 has a bug in zipfile.extractall that makes it unzip directories as regular files. So switch to extract
2013-03-13 13:15:39 -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
Christian 981310c5a3 Updated FML:
MinecraftForge/FML@8f2dbf7046 Fix up stupid derp in IMC code: actually reset the IMC list after each delivery. Fixes a bunch of mods. Sorry everyone.
2013-03-13 15:11:07 -04:00
LexManos 95a7ec3f08 Merge pull request #449 from iChun/patch-5
[Bugfix] One should not assume an item would use the item spritesheet.
2013-03-13 11:53:50 -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