Move fml's PlayerEvent and TickEvent to forge. Update

`import net.minecraftforge.fml.common.gameevent.PlayerEvent;`
to
`import net.minecraftforge.event.entity.player.PlayerEvent;`
and
`import net.minecraftforge.fml.common.gameevent.TickEvent;`
to
`import net.minecraftforge.event.TickEvent;`

Signed-off-by: cpw <[email protected]>
This commit is contained in:
cpw committed 2019-08-04 22:34:14 -04:00
1 parent 0fd8fa2211
commit 1af7b7603d
9 files changed
+139 -174

No files matched your search

@@ -21,6 +21,10 @@ package net.minecraftforge.event.entity.player;
import java.io.File;
import net.minecraft.entity.item.ItemEntity;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.world.dimension.DimensionType;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.ForgeEventFactory;
import net.minecraftforge.eventbus.api.Cancelable;
@@ -31,6 +35,8 @@ import net.minecraft.util.math.BlockPos;
import net.minecraftforge.event.entity.living.LivingEvent;
import net.minecraftforge.eventbus.api.Event;
import javax.annotation.Nonnull;
/**
* PlayerEvent is fired whenever an event involving Living entities occurs. <br>
* If a method utilizes this {@link net.minecraftforge.eventbus.api.Event} as its parameter, the method will
@@ -382,4 +388,124 @@ public class PlayerEvent extends LivingEvent
return visibilityModifier;
}
}
public static class ItemPickupEvent extends PlayerEvent {
/**
* Original EntityItem with current remaining stack size
*/
private final ItemEntity originalEntity;
/**
* Clone item stack, containing the item and amount picked up
*/
private final ItemStack stack;
public ItemPickupEvent(PlayerEntity player, ItemEntity entPickedUp, ItemStack stack)
{
super(player);
this.originalEntity = entPickedUp;
this.stack = stack;
}
public ItemStack getStack() {
return stack;
}
public ItemEntity getOriginalEntity() {
return originalEntity;
}
}
public static class ItemCraftedEvent extends PlayerEvent {
@Nonnull
private final ItemStack crafting;
private final IInventory craftMatrix;
public ItemCraftedEvent(PlayerEntity player, @Nonnull ItemStack crafting, IInventory craftMatrix)
{
super(player);
this.crafting = crafting;
this.craftMatrix = craftMatrix;
}
@Nonnull
public ItemStack getCrafting()
{
return this.crafting;
}
public IInventory getInventory()
{
return this.craftMatrix;
}
}
public static class ItemSmeltedEvent extends PlayerEvent {
@Nonnull
private final ItemStack smelting;
public ItemSmeltedEvent(PlayerEntity player, @Nonnull ItemStack crafting)
{
super(player);
this.smelting = crafting;
}
@Nonnull
public ItemStack getSmelting()
{
return this.smelting;
}
}
public static class PlayerLoggedInEvent extends PlayerEvent {
public PlayerLoggedInEvent(PlayerEntity player)
{
super(player);
}
}
public static class PlayerLoggedOutEvent extends PlayerEvent {
public PlayerLoggedOutEvent(PlayerEntity player)
{
super(player);
}
}
public static class PlayerRespawnEvent extends PlayerEvent {
private final boolean endConquered;
public PlayerRespawnEvent(PlayerEntity player, boolean endConquered)
{
super(player);
this.endConquered = endConquered;
}
/**
* Did this respawn event come from the player conquering the end?
* @return if this respawn was because the player conquered the end
*/
public boolean isEndConquered()
{
return this.endConquered;
}
}
public static class PlayerChangedDimensionEvent extends PlayerEvent {
private final DimensionType fromDim;
private final DimensionType toDim;
public PlayerChangedDimensionEvent(PlayerEntity player, DimensionType fromDim, DimensionType toDim)
{
super(player);
this.fromDim = fromDim;
this.toDim = toDim;
}
public DimensionType getFrom()
{
return this.fromDim;
}
public DimensionType getTo()
{
return this.toDim;
}
}
}