Commit graph

229 commits

Author SHA1 Message Date
Christian
6c45b43eee And set the RIGHT variable *sigh* 2013-10-13 11:55:15 -04:00
Christian
de69b7dfd0 And allow for tweaking baby chance as well. 2013-10-13 11:53:48 -04:00
Christian
5f5b509c7a Allow configuration of the zombie additional summoning mechanic. The vanilla mechanic is a little borked at times. 2013-10-13 11:39:23 -04:00
Eurymachus
8d0b58ee6f Added PlayerOpenContainerEvent and added ForgeHooks.canInteractWith
- Used to override the canInteractWith during player tick
- setResult to ALLOW/DENY as required
- Defaults to Vanilla behaviour in any other instance.

Required for LittleBlocks Mod and to Assist Gullivers Mod
2013-10-06 03:58:13 +01:00
Lex Manos
2e3d1a3c09 Add cancelable EntityStructByLightningEvent, Closes #789 2013-09-30 16:56:34 -07:00
LexManos
d3c80c326a Merge pull request #772 from Lomeli12/master
Villager Trading GUI will now not open if Player is sneaking. Allowing for bypassing of the GUI.
2013-09-30 16:01:51 -07:00
Lex Manos
6c5ef9347c Updated FML:
MinecraftForge/FML@da70cdd35a Update tweaker for new Launcher API
MinecraftForge/FML@352117fd78 Update for new installer and thank you.
MinecraftForge/FML@40a34af431 Merge branch 'master' into newtweak
MinecraftForge/FML@e77d2547ad Update for pre-ninja 1.6.3 update
MinecraftForge/FML@34493b0d99 Update for real 1.6.3 update
MinecraftForge/FML@95afc95b24 Update mcp mod info
MinecraftForge/FML@ff75416a32 Update mc_versions data and commands patch and eclipse workspace
MinecraftForge/FML@8f2e675581 Update the src distro's eclipse workspace.
2013-09-18 16:10:38 -07:00
Lomeli12
c0164f29cd Villager Trading GUI will not open if Player is sneaking. 2013-09-10 14:08:29 -07:00
Christian
6b54b52ec4 Change trigger calculation so entities get some time to age before refiring the event. 2013-09-06 16:46:44 -04:00
Christian
d9ca67e162 Change from Cancelable to using a Result. This means you can force despawn mobs you
don't want around anymore. Also, deferred check to once every 20 ticks. May tune it
down further or make it a config if this event is a lag issue.
2013-09-06 16:05:29 -04:00
Christian
6da6e9da07 Add a cancellable despawn event- allows mods to decide to prevent the despawning
of certain otherwise normally despawnable mobs.
2013-09-06 13:19:51 -04:00
Christian
7544055fa4 Clean up some formatting. 2013-09-05 13:16:01 -04:00
Christian
7549eb90a7 Add a bit of javadoc 2013-09-05 08:22:28 -04:00
Christian
df132a0296 Merge branch 'displayname' of github.com:MachineMuse/MinecraftForge into sometweaks
Conflicts:
	patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch
2013-09-05 08:20:49 -04:00
iChun
6cf8408752 Fix player push out of blocks clientside being hardcoded and not based on entity size.
Added player eyeHeight field to allow changeable eye heights of players rather than being hardcoded per player class as well as add a getDefaultEyeHeight function.
2013-09-05 14:57:34 +08:00
MachineMuse
cb9c26d49c Memoization of display name result 2013-09-04 14:22:22 -06:00
Christian
0d44234239 Update forge for MCP naming updates
Updated FML:
MinecraftForge/FML@d0c6e92900 Update MCP data
2013-09-03 18:04:12 -04:00
MachineMuse
0e3037e85d Added display name hook 2013-09-03 14:55:11 -06:00
Christian
5c334d7627 Fix possible NPE in searching code. 2013-09-02 15:44:27 -04:00
Christian
8fed427251 In the time honoured tradition of trying to fix vanilla, we today attempt to patch the pathfinding AI so that it doesn't lag when
there's a lot of entities. Basically, if the zombie can't reach the villager, backoff subsequent pathfinding attempts. Hopefully
should really help with lag caused by zombie swarms.
2013-08-20 11:55:57 -04:00
LexManos
461a30812b Fix bug with custom Fluids. You can now drown in them! 2013-08-18 23:16:36 -07:00
MrMasochism
9564575d77 Added a new function to allow control over whether an entity is dismounted when the entity it is riding goes under water 2013-08-01 08:02:19 +12:00
LexManos
70a6a316d7 Updated FML:
MinecraftForge/FML@7348929819 Kill release time scala libraries, to be re-evaluated after all movement is done and shit is fixed. May require manual instalation for mods that use scala.
MinecraftForge/FML@6de36d78f5 Coremods now have a primitive dependency capability. Also, we search mods dir for special "TweakClass" manifests. These are using the vanilla tweak mechanism to inject into Minecraft. Helpful for other "platform" systems, when you don't want to have to deal with json changes!
MinecraftForge/FML@d4b30422b6 Update build and eclipse workspaces for debug asm.
2013-07-12 00:34:32 -07:00
Adubbz
c4ad7c3e2c Made eating particles compatible with metadata
Removed extra spaces

Made eating particles compatible with metadata
2013-07-10 20:39:15 +10:00
Christian
561b0fbe55 Allow optional rider interaction for entities, thanks for the suggestion Vswe.
Updated FML:
MinecraftForge/FML@7af5c21d74 @InstanceFactory was set to look for Fields instead of methods
MinecraftForge/FML@bc9d1fe657 Merge pull request #254 from CaptainShadows/patch-1
2013-07-09 11:23:49 -04:00
LexManos
85fd1d010d Updated FML:
MinecraftForge/FML@1d0384f8f6 Update for 1.6.2 and MCP 8.04
MinecraftForge/FML@111b0216fd Add the jsons for 1.6.2
MinecraftForge/FML@6f96d89e2b Update eclipse workspaces for 1.6.2
2013-07-07 14:03:26 -07:00
XCompWiz
5f203ce808 Makes player-specific spawnpoints dimension aware
Makes ServerConfigurationManager correctly get player-specific spawn
point for the target dimension
Changes EntityPlayer to store and save a (bed) spawn point for every
dimension, as well as transfer them to respawn "clones"
2013-07-06 16:24:37 +03:00
LexManos
d4ba95f606 Add hook for EntityWither trying to destroy a block. 2013-07-03 20:29:41 -07:00
LexManos
125b134d87 Updated FML:
MinecraftForge/FML@155e846818 Add in support for mods/<mcversion> as a mod location. Also drop coremods as a location. They go in mods too now.
MinecraftForge/FML@3f4bf61ae6 Update key
MinecraftForge/FML@4545beb49d Add deobf-data to setup env.
MinecraftForge/FML@e24f949517 Fix eclipse workspaces and launch configurations.
MinecraftForge/FML@532bee7ce1 Update to new MCP bugfix version, Fixes: Missing Armor/Item rendering, and Boss health mapping issues.
2013-07-03 18:54:47 -07:00
LexManos
02e857827d TEMPORARY fix for MCP mapping issue. 2013-07-03 06:26:12 -07:00
LexManos
d2144f274b Initial patch update to 1.6, Does not compile, need to update references to the old TexturePack system. 2013-06-30 05:50:11 -07:00
LexManos
0ec313abb1 Added EntityLiving to Block.isLadder arguments, deperacating older version. New parameter has the possibility of being null, so modders must take care. Closes #608 2013-06-14 11:51:28 -07: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
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
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
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
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
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
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
90698d64b6 Fix Activator rails activating TNT carts, closes #458 2013-03-15 21:20:29 -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
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
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
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
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
Christian
afea4fce1d Remove the single use interface ITickingArmor, and apply to Item directly. 2013-02-04 17:53:47 -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
0f3bd780e1 Merge branch 'master' into TESRculling 2013-01-29 10:01:00 -05: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
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
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
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
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
46394174c5 MCL Update 2013-01-12 11:10:39 -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
Christian
19347c5322 Update for MC 1.4.7
Update FML: f7cc50b
2012-12-28 12:06:56 -05: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
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
1c225a8d0d Fix missed patch in EntityMinecart, #334 2012-12-23 23:04:11 -08: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
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
LexManos
a2f4a0d2dd Inital update to 1.4.6, Version bumped to 6.5 2012-12-17 22:33:28 -08:00
LexManos
ad42901b7e Update patches for repackage. 2012-12-12 23:45:35 -08:00