diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 711b39113..35fbdc48c 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -19,6 +19,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.client.lib.LibResources; +import vazkii.botania.common.block.corporea.BlockCorporeaFunnel; import vazkii.botania.common.block.corporea.BlockCorporeaIndex; import vazkii.botania.common.block.decor.BlockBuriedPetals; import vazkii.botania.common.block.decor.BlockCustomBrick; @@ -118,6 +119,7 @@ import vazkii.botania.common.block.tile.TileStarfield; import vazkii.botania.common.block.tile.TileTerraPlate; import vazkii.botania.common.block.tile.TileTinyPlanet; import vazkii.botania.common.block.tile.TileTinyPotato; +import vazkii.botania.common.block.tile.corporea.TileCorporeaFunnel; import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; import vazkii.botania.common.block.tile.mana.TileDistributor; import vazkii.botania.common.block.tile.mana.TileManaDetector; @@ -197,6 +199,7 @@ public final class ModBlocks { public static Block enchantedSoil; public static Block petalBlock; public static Block corporeaIndex; + public static Block corporeaFunnel; public static void init() { flower = new BlockModFlower(); @@ -257,6 +260,7 @@ public final class ModBlocks { enchantedSoil = new BlockEnchantedSoil(); petalBlock = new BlockPetalBlock(); corporeaIndex = new BlockCorporeaIndex(); + corporeaFunnel = new BlockCorporeaFunnel(); ModFluffBlocks.init(); @@ -324,6 +328,7 @@ public final class ModBlocks { registerTile(TileManaFlame.class, LibBlockNames.MANA_FLAME); registerTile(TilePrism.class, LibBlockNames.PRISM); registerTile(TileCorporeaIndex.class, LibBlockNames.CORPOREA_INDEX); + registerTile(TileCorporeaFunnel.class, LibBlockNames.CORPOREA_FUNNEL); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_PUREDAISY, SubTilePureDaisy.class); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_MANASTAR, SubTileManastar.class); diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporea.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java similarity index 94% rename from src/main/java/vazkii/botania/common/block/corporea/BlockCorporea.java rename to src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java index 99804548c..e3dc5d942 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporea.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java @@ -22,11 +22,11 @@ import vazkii.botania.common.block.BlockModContainer; import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.block.tile.corporea.TileCorporeaBase; -public abstract class BlockCorporea extends BlockModContainer { +public abstract class BlockCorporeaBase extends BlockModContainer { Random random; - public BlockCorporea(Material material, String name) { + public BlockCorporeaBase(Material material, String name) { super(material); setBlockName(name); diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java new file mode 100644 index 000000000..5563636cb --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java @@ -0,0 +1,63 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Feb 16, 2015, 2:17:05 PM (GMT)] + */ +package vazkii.botania.common.block.corporea; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; +import vazkii.botania.client.core.helper.IconHelper; +import vazkii.botania.common.block.tile.corporea.TileCorporeaBase; +import vazkii.botania.common.block.tile.corporea.TileCorporeaFunnel; +import vazkii.botania.common.lib.LibBlockNames; + +public class BlockCorporeaFunnel extends BlockCorporeaBase { + + IIcon[] icons; + + public BlockCorporeaFunnel() { + super(Material.iron, LibBlockNames.CORPOREA_FUNNEL); + setHardness(5.5F); + setStepSound(soundTypeMetal); + } + + @Override + public void registerBlockIcons(IIconRegister par1IconRegister) { + icons = new IIcon[3]; + for(int i = 0; i < icons.length; i++) + icons[i] = IconHelper.forBlock(par1IconRegister, this, i); + } + + @Override + public void onNeighborBlockChange(World world, int x, int y, int z, Block block) { + boolean power = world.isBlockIndirectlyGettingPowered(x, y, z) || world.isBlockIndirectlyGettingPowered(x, y + 1, z); + int meta = world.getBlockMetadata(x, y, z); + boolean powered = (meta & 8) != 0; + + if(power && !powered) { + ((TileCorporeaFunnel) world.getTileEntity(x, y, z)).doRequest(); + world.setBlockMetadataWithNotify(x, y, z, meta | 8, 4); + } else if(!power && powered) + world.setBlockMetadataWithNotify(x, y, z, meta & -9, 4); + } + + @Override + public IIcon getIcon(int par1, int par2) { + return icons[Math.min(2, par1)]; + } + + @Override + public TileCorporeaBase createNewTileEntity(World world, int meta) { + return new TileCorporeaFunnel(); + } + +} diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java index 0f1eba254..fe37bf633 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java @@ -19,7 +19,7 @@ import net.minecraft.block.material.Material; import net.minecraft.util.IIcon; import net.minecraft.world.World; -public class BlockCorporeaIndex extends BlockCorporea { +public class BlockCorporeaIndex extends BlockCorporeaBase { public BlockCorporeaIndex() { super(Material.iron, LibBlockNames.CORPOREA_INDEX); diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java new file mode 100644 index 000000000..5524e4d18 --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java @@ -0,0 +1,88 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Feb 16, 2015, 2:18:30 PM (GMT)] + */ +package vazkii.botania.common.block.tile.corporea; + +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.item.EntityItemFrame; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.tileentity.TileEntityChest; +import net.minecraft.util.AxisAlignedBB; +import net.minecraftforge.common.util.ForgeDirection; +import vazkii.botania.api.corporea.CorporeaHelper; +import vazkii.botania.api.corporea.ICorporeaSpark; +import vazkii.botania.common.core.helper.InventoryHelper; +import vazkii.botania.common.lib.LibBlockNames; +import vazkii.botania.common.lib.LibMisc; + +public class TileCorporeaFunnel extends TileCorporeaBase { + + public void doRequest() { + ICorporeaSpark spark = getSpark(); + if(spark != null && spark.getMaster() != null) { + IInventory inv = InventoryHelper.getInventory(worldObj, xCoord, yCoord - 1, zCoord); + if(inv == null) + inv = InventoryHelper.getInventory(worldObj, xCoord, yCoord - 2, zCoord); + + List filter = getFilter(); + if(!filter.isEmpty()) { + ItemStack stack = filter.get(worldObj.rand.nextInt(filter.size())); + + List stacks = CorporeaHelper.requestItem(stack, spark, true, true); + spark.onItemsRequested(stacks); + for(ItemStack reqStack : stacks) + if(stack != null) { + if(inv != null && reqStack.stackSize == InventoryHelper.testInventoryInsertion(inv, stack, ForgeDirection.UP)) + InventoryHelper.insertItemIntoInventory(inv, reqStack); + else { + EntityItem item = new EntityItem(worldObj, xCoord + 0.5, yCoord + 1.5, zCoord + 0.5, stack); + worldObj.spawnEntityInWorld(item); + } + } + } + } + } + + public List getFilter() { + List filter = new ArrayList(); + + final int[] orientationToDir = new int[] { + 3, 4, 2, 5 + }; + + for(ForgeDirection dir : LibMisc.CARDINAL_DIRECTIONS) { + List frames = worldObj.getEntitiesWithinAABB(EntityItemFrame.class, AxisAlignedBB.getBoundingBox(xCoord + dir.offsetX, yCoord + dir.offsetY, zCoord + dir.offsetZ, xCoord + dir.offsetX + 1, yCoord + dir.offsetY + 1, zCoord + dir.offsetZ + 1)); + for(EntityItemFrame frame : frames) { + int orientation = frame.hangingDirection; + if(orientationToDir[orientation] == dir.ordinal()) + filter.add(frame.getDisplayedItem()); + } + } + + return filter; + } + + @Override + public int getSizeInventory() { + return 1; + } + + @Override + public String getInventoryName() { + return LibBlockNames.CORPOREA_FUNNEL; + } + +} diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java index 5de3afd36..7b15a8f4a 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java @@ -34,6 +34,7 @@ import net.minecraftforge.event.ServerChatEvent; import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.common.core.helper.MathHelper; +import vazkii.botania.common.lib.LibBlockNames; import cpw.mods.fml.common.eventhandler.SubscribeEvent; public class TileCorporeaIndex extends TileCorporeaBase { @@ -185,12 +186,12 @@ public class TileCorporeaIndex extends TileCorporeaBase { @Override public int getSizeInventory() { - return 1; + return 0; } @Override public String getInventoryName() { - return null; + return LibBlockNames.CORPOREA_INDEX; } public static boolean isInRangeOfIndex(EntityPlayer player, TileCorporeaIndex index) { diff --git a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java index 9dd3464a8..4b0193e3d 100644 --- a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java @@ -73,6 +73,7 @@ public final class LibBlockNames { public static final String BIOME_STONE_B = "biomeStoneB"; public static final String PETAL_BLOCK = "petalBlock"; public static final String CORPOREA_INDEX = "corporeaIndex"; + public static final String CORPOREA_FUNNEL = "corporeaFunnel"; public static final String SUBTILE_PUREDAISY = "puredaisy"; public static final String SUBTILE_MANASTAR = "manastar"; diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 465eb68b1..cb80dce66 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -689,6 +689,7 @@ tile.botania:petalBlock13.name=Green Petal Block tile.botania:petalBlock14.name=Red Petal Block tile.botania:petalBlock15.name=Black Petal Block tile.botania:corporeaIndex.name=Corporea Index +tile.botania:corporeaFunnel.name=Corporea Funnel # FLOWER NAMES tile.botania:flower..name=Botania Flower diff --git a/src/main/resources/assets/botania/textures/blocks/unused/corporeaFunnel1.png b/src/main/resources/assets/botania/textures/blocks/corporeaFunnel0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/corporeaFunnel1.png rename to src/main/resources/assets/botania/textures/blocks/corporeaFunnel0.png diff --git a/src/main/resources/assets/botania/textures/blocks/unused/corporeaFunnel2.png b/src/main/resources/assets/botania/textures/blocks/corporeaFunnel1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/corporeaFunnel2.png rename to src/main/resources/assets/botania/textures/blocks/corporeaFunnel1.png diff --git a/src/main/resources/assets/botania/textures/blocks/unused/corporeaFunnel0.png b/src/main/resources/assets/botania/textures/blocks/corporeaFunnel2.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/corporeaFunnel0.png rename to src/main/resources/assets/botania/textures/blocks/corporeaFunnel2.png