Added skystone, skystone block, skystone brick, skystone small brick, certus quartz, certus quartz pillar, chiseled certus quartz and fluix stars

To integrate these into the current system, some changes to the background had to be done, especially to the feature handler. It now uses an interface to work against which you can implement to get your own feature handler instead modifying the base one and add several special cases code
This commit is contained in:
thatsIch
2014-11-18 16:47:30 +01:00
parent 1572351a54
commit 56aad10ffe
46 changed files with 2624 additions and 1401 deletions
@@ -18,27 +18,34 @@
package appeng.items.tools.powered.powersink;
import ic2.api.item.IElectricItemManager;
import ic2.api.item.ISpecialElectricItem;
import com.google.common.base.Optional;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import ic2.api.item.IElectricItemManager;
import ic2.api.item.ISpecialElectricItem;
import appeng.api.config.PowerUnits;
import appeng.transformer.annotations.integration.Interface;
import appeng.transformer.annotations.integration.InterfaceList;
import appeng.transformer.annotations.integration.Method;
@InterfaceList(value = { @Interface(iface = "ic2.api.item.ISpecialElectricItem", iname = "IC2"),
@Interface(iface = "ic2.api.item.IElectricItemManager", iname = "IC2") })
@InterfaceList( value = { @Interface( iface = "ic2.api.item.ISpecialElectricItem", iname = "IC2" ),
@Interface( iface = "ic2.api.item.IElectricItemManager", iname = "IC2" ) } )
public class IC2 extends AERootPoweredItem implements IElectricItemManager, ISpecialElectricItem
{
public IC2(Class c, String subName) {
public IC2( Class c, Optional<String> subName )
{
super( c, subName );
}
@Override
public double charge(ItemStack is, double amount, int tier, boolean ignoreTransferLimit, boolean simulate)
public double charge( ItemStack is, double amount, int tier, boolean ignoreTransferLimit, boolean simulate )
{
double addedAmt = amount;
double limit = getTransferLimit( is );
@@ -46,29 +53,29 @@ public class IC2 extends AERootPoweredItem implements IElectricItemManager, ISpe
if ( !ignoreTransferLimit && amount > limit )
addedAmt = limit;
return addedAmt - ((int) injectExternalPower( PowerUnits.EU, is, addedAmt, simulate ));
return addedAmt - ( ( int ) injectExternalPower( PowerUnits.EU, is, addedAmt, simulate ) );
}
@Override
public double discharge(ItemStack itemStack, double amount, int tier, boolean ignoreTransferLimit, boolean externally, boolean simulate)
public double discharge( ItemStack itemStack, double amount, int tier, boolean ignoreTransferLimit, boolean externally, boolean simulate )
{
return 0;
}
@Override
public double getCharge(ItemStack is)
public double getCharge( ItemStack is )
{
return (int) PowerUnits.AE.convertTo( PowerUnits.EU, getAECurrentPower( is ) );
return ( int ) PowerUnits.AE.convertTo( PowerUnits.EU, getAECurrentPower( is ) );
}
@Override
public boolean canUse(ItemStack is, double amount)
public boolean canUse( ItemStack is, double amount )
{
return getCharge( is ) > amount;
}
@Override
public boolean use(ItemStack is, double amount, EntityLivingBase entity)
public boolean use( ItemStack is, double amount, EntityLivingBase entity )
{
if ( canUse( is, amount ) )
{
@@ -80,56 +87,56 @@ public class IC2 extends AERootPoweredItem implements IElectricItemManager, ISpe
}
@Override
public void chargeFromArmor(ItemStack itemStack, EntityLivingBase entity)
public void chargeFromArmor( ItemStack itemStack, EntityLivingBase entity )
{
// wtf?
}
@Override
public String getToolTip(ItemStack itemStack)
public String getToolTip( ItemStack itemStack )
{
return null;
}
@Override
public boolean canProvideEnergy(ItemStack itemStack)
public boolean canProvideEnergy( ItemStack itemStack )
{
return false;
}
@Override
public Item getChargedItem(ItemStack itemStack)
public Item getChargedItem( ItemStack itemStack )
{
return itemStack.getItem();
}
@Override
public Item getEmptyItem(ItemStack itemStack)
public Item getEmptyItem( ItemStack itemStack )
{
return itemStack.getItem();
}
@Override
public double getMaxCharge(ItemStack itemStack)
public double getMaxCharge( ItemStack itemStack )
{
return PowerUnits.AE.convertTo( PowerUnits.EU, getAEMaxPower( itemStack ) );
}
@Override
public int getTier(ItemStack itemStack)
public int getTier( ItemStack itemStack )
{
return 1;
}
@Override
public double getTransferLimit(ItemStack itemStack)
public double getTransferLimit( ItemStack itemStack )
{
return Math.max( 32, getMaxCharge( itemStack ) / 200 );
}
@Override
@Method(iname = "IC2")
public IElectricItemManager getManager(ItemStack itemStack)
@Method( iname = "IC2" )
public IElectricItemManager getManager( ItemStack itemStack )
{
return this;
}