mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-22 13:09:59 +00:00
Updated to latest mappings. Exc is broken, some anonymous classes didn't map to srg names.
This commit is contained in:
1 parent
52e877bdd0
commit
4650ee2789
61 files changed
+400
-311
No files matched your search
@@ -366,7 +366,7 @@ public class ForgeEventFactory
|
||||
{
|
||||
for (EntityItem item : capturedDrops)
|
||||
{
|
||||
player.func_184816_a(item);
|
||||
player.dropItemAndGetStack(item);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -31,7 +31,7 @@ public class PlayerDropsEvent extends LivingDropsEvent
|
||||
{
|
||||
super(entity, source, drops,
|
||||
(source.getEntity() instanceof EntityPlayer) ?
|
||||
EnchantmentHelper.func_185283_h(((EntityPlayer)source.getEntity())) : 0,
|
||||
EnchantmentHelper.getLootingModifier(((EntityPlayer)source.getEntity())) : 0,
|
||||
recentlyHit);
|
||||
|
||||
this.entityPlayer = entity;
|
||||
|
||||
@@ -79,13 +79,13 @@ public class BlockEvent extends Event
|
||||
this.player = player;
|
||||
|
||||
if (state == null || !ForgeHooks.canHarvestBlock(state.getBlock(), player, world, pos) || // Handle empty block or player unable to break block scenario
|
||||
(state.getBlock().canSilkHarvest(world, pos, world.getBlockState(pos), player) && EnchantmentHelper.getEnchantmentLevel(Enchantments.field_185306_r, player.func_184614_ca()) > 0)) // If the block is being silk harvested, the exp dropped is 0
|
||||
(state.getBlock().canSilkHarvest(world, pos, world.getBlockState(pos), player) && EnchantmentHelper.getEnchantmentLevel(Enchantments.silkTouch, player.getHeldItemMainhand()) > 0)) // If the block is being silk harvested, the exp dropped is 0
|
||||
{
|
||||
this.exp = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
int bonusLevel = EnchantmentHelper.getEnchantmentLevel(Enchantments.field_185308_t, player.func_184614_ca());
|
||||
int bonusLevel = EnchantmentHelper.getEnchantmentLevel(Enchantments.fortune, player.getHeldItemMainhand());
|
||||
this.exp = state.getBlock().getExpDrop(state, world, pos, bonusLevel);
|
||||
}
|
||||
}
|
||||
@@ -134,7 +134,7 @@ public class BlockEvent extends Event
|
||||
{
|
||||
super(blockSnapshot.world, blockSnapshot.pos, blockSnapshot.getCurrentBlock());
|
||||
this.player = player;
|
||||
this.itemInHand = player.func_184614_ca();
|
||||
this.itemInHand = player.getHeldItemMainhand();
|
||||
this.blockSnapshot = blockSnapshot;
|
||||
this.placedBlock = blockSnapshot.getCurrentBlock();
|
||||
this.placedAgainst = placedAgainst;
|
||||
|
||||
Reference in new issue
Block a user