Update forge mappings to 20201028-1.16.3 (#7435)

This commit is contained in:
David Quintana authored and GitHub committed 2020-10-29 01:11:57 +01:00
1 parent 6e0e67b14d
commit 53eedb0f10
93 files changed
+598 -588

No files matched your search

@@ -542,13 +542,13 @@ public class ForgeEventFactory
@OnlyIn(Dist.CLIENT)
public static boolean renderFireOverlay(PlayerEntity player, MatrixStack mat)
{
return renderBlockOverlay(player, mat, OverlayType.FIRE, Blocks.FIRE.getDefaultState(), player.func_233580_cy_());
return renderBlockOverlay(player, mat, OverlayType.FIRE, Blocks.FIRE.getDefaultState(), player.getPosition());
}
@OnlyIn(Dist.CLIENT)
public static boolean renderWaterOverlay(PlayerEntity player, MatrixStack mat)
{
return renderBlockOverlay(player, mat, OverlayType.WATER, Blocks.WATER.getDefaultState(), player.func_233580_cy_());
return renderBlockOverlay(player, mat, OverlayType.WATER, Blocks.WATER.getDefaultState(), player.getPosition());
}
@OnlyIn(Dist.CLIENT)
@@ -78,7 +78,7 @@ public class PlayerInteractEvent extends PlayerEvent
public EntityInteractSpecific(PlayerEntity player, Hand hand, Entity target, Vector3d localPos)
{
super(player, hand, target.func_233580_cy_(), null);
super(player, hand, target.getPosition(), null);
this.localPos = localPos;
this.target = target;
}
@@ -118,7 +118,7 @@ public class PlayerInteractEvent extends PlayerEvent
public EntityInteract(PlayerEntity player, Hand hand, Entity target)
{
super(player, hand, target.func_233580_cy_(), null);
super(player, hand, target.getPosition(), null);
this.target = target;
}
@@ -210,7 +210,7 @@ public class PlayerInteractEvent extends PlayerEvent
{
public RightClickItem(PlayerEntity player, Hand hand)
{
super(player, hand, player.func_233580_cy_(), null);
super(player, hand, player.getPosition(), null);
}
}
@@ -223,7 +223,7 @@ public class PlayerInteractEvent extends PlayerEvent
{
public RightClickEmpty(PlayerEntity player, Hand hand)
{
super(player, hand, player.func_233580_cy_(), null);
super(player, hand, player.getPosition(), null);
}
}
@@ -297,7 +297,7 @@ public class PlayerInteractEvent extends PlayerEvent
{
public LeftClickEmpty(PlayerEntity player)
{
super(player, Hand.MAIN_HAND, player.func_233580_cy_(), null);
super(player, Hand.MAIN_HAND, player.getPosition(), null);
}
}
@@ -37,7 +37,7 @@ import net.minecraftforge.fml.event.server.FMLServerAboutToStartEvent;
* Villagers pick two trades from their trade map, based on their level.
* Villager level is increased by successful trades.
* The map is populated for levels 1-5 (inclusive), so Map#get will never return null for those keys.
* Levels outside of this range do nothing, as specified by {@link VillagerData#func_221128_d(int)} which is called before attempting to level up.
* Levels outside of this range do nothing, as specified by {@link VillagerData#canLevelUp(int)} which is called before attempting to level up.
* To add trades to the merchant, simply add new trades to the list. {@link BasicTrade} provides a default implementation.
*/
public class VillagerTradesEvent extends Event