Added Comparator Support to the Crafty Crate.

This commit is contained in:
Lizbeth Rika committed 2014-08-05 21:59:11 +01:00
1 parent 46861e0ca6
commit 7c43ee6460
3 files changed
+35 -2

No files matched your search

@@ -32,6 +32,7 @@ import vazkii.botania.api.wand.IWandable;
import vazkii.botania.client.core.helper.IconHelper;
import vazkii.botania.common.block.tile.TileCraftCrate;
import vazkii.botania.common.block.tile.TileOpenCrate;
import vazkii.botania.common.block.tile.TileRuneAltar;
import vazkii.botania.common.block.tile.TileSimpleInventory;
import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName;
import vazkii.botania.common.lexicon.LexiconData;
@@ -80,6 +81,18 @@ public class BlockOpenCrate extends BlockModContainer implements ILexiconable, I
return meta;
}
@Override
public boolean hasComparatorInputOverride() {
return true;
}
@Override
public int getComparatorInputOverride(World par1World, int par2, int par3, int par4, int par5) {
TileOpenCrate crate = (TileOpenCrate) par1World.getTileEntity(par2, par3, par4);
return crate.getSignal();
}
@Override
public void breakBlock(World par1World, int par2, int par3, int par4, Block par5, int par6) {
TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(par2, par3, par4);
@@ -23,6 +23,8 @@ import vazkii.botania.common.item.ModItems;
public class TileCraftCrate extends TileOpenCrate {
int signal = 0;
@Override
public int getSizeInventory() {
return 10;
@@ -42,6 +44,16 @@ public class TileCraftCrate extends TileOpenCrate {
public void updateEntity() {
if(!worldObj.isRemote && craft(true) && canEject())
ejectAll();
int newSignal = 0;
for(; newSignal < 9; newSignal++) // dis for loop be derpy
if(getStackInSlot(newSignal) == null)
break;
if(newSignal != signal) {
signal = newSignal;
worldObj.func_147453_f(xCoord, yCoord, zCoord, worldObj.getBlock(xCoord, yCoord, zCoord));
}
}
boolean craft(boolean fullCheck) {
@@ -91,7 +103,7 @@ public class TileCraftCrate extends TileOpenCrate {
}
void ejectAll() {
for(int i = 0; i < getSizeInventory(); i++) {
for(int i = 0; i < getSizeInventory(); ++i) {
ItemStack stack = getStackInSlot(i);
if(stack != null)
eject(stack, false);
@@ -105,4 +117,9 @@ public class TileCraftCrate extends TileOpenCrate {
ejectAll();
return true;
}
@Override
public int getSignal() {
return signal;
}
}
@@ -65,8 +65,11 @@ public class TileOpenCrate extends TileSimpleInventory {
worldObj.spawnEntityInWorld(item);
}
public boolean onWanded(EntityPlayer player, ItemStack stack) {
return false;
}
public int getSignal() {
return 0;
}
}