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
@@ -23,6 +23,8 @@ import java.util.EnumSet;
import java.util.List;
import java.util.Set;
import com.google.common.base.Optional;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.IInventory;
@@ -59,13 +61,13 @@ public class ItemBasicStorageCell extends AEBaseItem implements IStorageCell, II
final int perType;
final double idleDrain;
public ItemBasicStorageCell( MaterialType whichCell, int Kilobytes )
public ItemBasicStorageCell( MaterialType whichCell, int kilobytes )
{
super( ItemBasicStorageCell.class, Kilobytes + "k" );
super( ItemBasicStorageCell.class, Optional.of( kilobytes + "k" ) );
this.setFeature( EnumSet.of( AEFeature.StorageCells ) );
this.setMaxStackSize( 1 );
this.totalBytes = Kilobytes * 1024;
this.totalBytes = kilobytes * 1024;
this.component = whichCell;
switch ( this.component )
@@ -169,6 +171,18 @@ public class ItemBasicStorageCell extends AEBaseItem implements IStorageCell, II
return this.idleDrain;
}
@Override
public String getUnlocalizedGroupName( Set<ItemStack> others, ItemStack is )
{
return GuiText.StorageCells.getUnlocalized();
}
@Override
public boolean isEditable( ItemStack is )
{
return true;
}
@Override
public IInventory getUpgradesInventory( ItemStack is )
{
@@ -202,15 +216,10 @@ public class ItemBasicStorageCell extends AEBaseItem implements IStorageCell, II
}
@Override
public String getUnlocalizedGroupName( Set<ItemStack> others, ItemStack is )
public ItemStack onItemRightClick( ItemStack stack, World world, EntityPlayer player )
{
return GuiText.StorageCells.getUnlocalized();
}
@Override
public boolean isEditable( ItemStack is )
{
return true;
disassembleDrive( stack, world, player );
return stack;
}
private boolean disassembleDrive( ItemStack stack, World world, EntityPlayer player )
@@ -248,28 +257,21 @@ public class ItemBasicStorageCell extends AEBaseItem implements IStorageCell, II
return false;
}
@Override
public ItemStack onItemRightClick( ItemStack stack, World world, EntityPlayer player )
{
disassembleDrive( stack, world, player );
return stack;
}
@Override
public boolean onItemUseFirst( ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ )
{
return disassembleDrive( stack, world, player );
}
@Override
public boolean hasContainerItem( ItemStack stack )
{
return AEConfig.instance.isFeatureEnabled( AEFeature.enableDisassemblyCrafting );
}
@Override
public ItemStack getContainerItem( ItemStack itemStack )
{
return AEApi.instance().materials().materialEmptyStorageCell.stack( 1 );
}
@Override
public boolean hasContainerItem( ItemStack stack )
{
return AEConfig.instance.isFeatureEnabled( AEFeature.enableDisassemblyCrafting );
}
}