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
@@ -25,12 +25,12 @@ import java.util.List;
import net.minecraft.client.util.ITooltipFlag;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.util.NonNullList;
import net.minecraft.world.World;
import net.minecraftforge.common.capabilities.ICapabilityProvider;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import appeng.api.config.AccessRestriction;
import appeng.api.config.Actionable;
@@ -57,11 +57,11 @@ public abstract class AEBasePoweredItem extends AEBaseItem implements IAEItemPow
this.powerCapacity = powerCapacity;
}
@SideOnly( Side.CLIENT )
@OnlyIn( Dist.CLIENT )
@Override
public void addCheckedInformation( final ItemStack stack, final World world, final List<String> lines, final ITooltipFlag advancedTooltips )
{
final NBTTagCompound tag = stack.getTagCompound();
final CompoundNBT tag = stack.getTagCompound();
double internalCurrentPower = 0;
final double internalMaxPower = this.getAEMaxPower( stack );
@@ -88,7 +88,7 @@ public abstract class AEBasePoweredItem extends AEBaseItem implements IAEItemPow
super.getCheckedSubItems( creativeTab, itemStacks );
final ItemStack charged = new ItemStack( this, 1 );
final NBTTagCompound tag = Platform.openNbtData( charged );
final CompoundNBT tag = Platform.openNbtData( charged );
tag.setDouble( CURRENT_POWER_NBT_KEY, this.getAEMaxPower( charged ) );
tag.setDouble( MAX_POWER_NBT_KEY, this.getAEMaxPower( charged ) );
@@ -129,7 +129,7 @@ public abstract class AEBasePoweredItem extends AEBaseItem implements IAEItemPow
if( mode == Actionable.MODULATE )
{
final NBTTagCompound data = Platform.openNbtData( is );
final CompoundNBT data = Platform.openNbtData( is );
final double toAdd = Math.min( amount, required );
data.setDouble( CURRENT_POWER_NBT_KEY, currentStorage + toAdd );
@@ -146,7 +146,7 @@ public abstract class AEBasePoweredItem extends AEBaseItem implements IAEItemPow
if( mode == Actionable.MODULATE )
{
final NBTTagCompound data = Platform.openNbtData( is );
final CompoundNBT data = Platform.openNbtData( is );
data.setDouble( CURRENT_POWER_NBT_KEY, currentStorage - fulfillable );
}
@@ -163,7 +163,7 @@ public abstract class AEBasePoweredItem extends AEBaseItem implements IAEItemPow
@Override
public double getAECurrentPower( final ItemStack is )
{
final NBTTagCompound data = Platform.openNbtData( is );
final CompoundNBT data = Platform.openNbtData( is );
return data.getDouble( CURRENT_POWER_NBT_KEY );
}
@@ -175,7 +175,7 @@ public abstract class AEBasePoweredItem extends AEBaseItem implements IAEItemPow
}
@Override
public ICapabilityProvider initCapabilities( ItemStack stack, NBTTagCompound nbt )
public ICapabilityProvider initCapabilities( ItemStack stack, CompoundNBT nbt )
{
return new PoweredItemCapabilities( stack, this );
}