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
@@ -21,10 +21,10 @@ package appeng.container.implementations;
import javax.annotation.Nonnull;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.PlayerInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.CompoundNBT;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent;
import net.minecraftforge.items.IItemHandler;
@@ -46,7 +46,7 @@ public class ContainerQuartzKnife extends AEBaseContainer
private final IItemHandler inSlot = new AppEngInternalInventory( null, 1, 1 );
private String myName = "";
public ContainerQuartzKnife( final InventoryPlayer ip, final QuartzKnifeObj te )
public ContainerQuartzKnife( final PlayerInventory ip, final QuartzKnifeObj te )
{
super( ip, null, null );
this.toolInv = te;
@@ -92,11 +92,11 @@ public class ContainerQuartzKnife extends AEBaseContainer
}
@Override
public void onContainerClosed( final EntityPlayer par1EntityPlayer )
public void onContainerClosed( final PlayerEntity par1PlayerEntity )
{
if( this.inSlot.getStackInSlot( 0 ) != null )
{
par1EntityPlayer.dropItem( this.inSlot.getStackInSlot( 0 ), false );
par1PlayerEntity.dropItem( this.inSlot.getStackInSlot( 0 ), false );
}
}
@@ -123,7 +123,7 @@ public class ContainerQuartzKnife extends AEBaseContainer
{
return AEApi.instance().definitions().materials().namePress().maybeStack( 1 ).map( namePressStack ->
{
final NBTTagCompound compound = Platform.openNbtData( namePressStack );
final CompoundNBT compound = Platform.openNbtData( namePressStack );
compound.setString( "InscribeName", ContainerQuartzKnife.this.myName );
return namePressStack;