1.15 port

This commit is contained in:
yueh
2020-05-18 14:02:45 +02:00
parent 0ea86c939c
commit 16d6d55d7f
630 changed files with 4211 additions and 12664 deletions
@@ -19,7 +19,7 @@
package appeng.util.inv;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack;
import net.minecraftforge.items.wrapper.PlayerMainInvWrapper;
@@ -28,7 +28,7 @@ import appeng.util.Platform;
public class AdaptorItemHandlerPlayerInv extends AdaptorItemHandler
{
public AdaptorItemHandlerPlayerInv( final EntityPlayer playerInv )
public AdaptorItemHandlerPlayerInv( final PlayerEntity playerInv )
{
super( new PlayerMainInvWrapper( playerInv.inventory ) );
}
@@ -19,20 +19,20 @@
package appeng.util.inv;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.entity.player.PlayerInventory;
import net.minecraftforge.items.ItemStackHandler;
public class WrapperCursorItemHandler extends ItemStackHandler
{
private final InventoryPlayer inv;
private final PlayerInventory inv;
public WrapperCursorItemHandler( InventoryPlayer inventoryPlayer )
public WrapperCursorItemHandler( PlayerInventory PlayerInventory )
{
super( 1 );
this.inv = inventoryPlayer;
this.setStackInSlot( 0, inventoryPlayer.getItemStack() );
this.inv = PlayerInventory;
this.setStackInSlot( 0, PlayerInventory.getItemStack() );
}
@Override
@@ -19,7 +19,7 @@
package appeng.util.inv;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.util.text.ITextComponent;
@@ -109,19 +109,19 @@ public class WrapperInvItemHandler implements IInventory
}
@Override
public boolean isUsableByPlayer( EntityPlayer player )
public boolean isUsableByPlayer( PlayerEntity player )
{
return false;
}
@Override
public void openInventory( EntityPlayer player )
public void openInventory( PlayerEntity player )
{
// NOP
}
@Override
public void closeInventory( EntityPlayer player )
public void closeInventory( PlayerEntity player )
{
// NOP
}