From aa2001e0105d0ad15d7ebf18b0509e92fa1f7915 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Mon, 16 Jun 2014 17:42:44 +0100 Subject: [PATCH] Portal Logic. Elven Knowledge is now unlockable. --- .../vazkii/botania/api/recipe/IElvenItem.java | 14 +++ .../common/block/tile/TileAlfPortal.java | 118 ++++++++++++++++-- .../botania/common/item/ItemLexicon.java | 8 +- .../botania/common/item/ItemManaResource.java | 12 +- 4 files changed, 142 insertions(+), 10 deletions(-) create mode 100644 MODSRC/vazkii/botania/api/recipe/IElvenItem.java diff --git a/MODSRC/vazkii/botania/api/recipe/IElvenItem.java b/MODSRC/vazkii/botania/api/recipe/IElvenItem.java new file mode 100644 index 000000000..270cf7956 --- /dev/null +++ b/MODSRC/vazkii/botania/api/recipe/IElvenItem.java @@ -0,0 +1,14 @@ +package vazkii.botania.api.recipe; + +import net.minecraft.item.ItemStack; + +/** + * Any Item that implements this is classified as an "Elven Item", by which, + * it'll not go through the alfheim portal. Any item that comes out of it + * must implement this or it'll just go back in. + */ +public interface IElvenItem { + + public boolean isElvenItem(ItemStack stack); + +} diff --git a/MODSRC/vazkii/botania/common/block/tile/TileAlfPortal.java b/MODSRC/vazkii/botania/common/block/tile/TileAlfPortal.java index 03fe8d935..8e99a7a48 100644 --- a/MODSRC/vazkii/botania/common/block/tile/TileAlfPortal.java +++ b/MODSRC/vazkii/botania/common/block/tile/TileAlfPortal.java @@ -11,11 +11,19 @@ */ package vazkii.botania.common.block.tile; +import java.util.ArrayList; +import java.util.List; + import net.minecraft.block.Block; +import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.lexicon.ILexicon; +import vazkii.botania.api.recipe.IElvenItem; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TilePool; @@ -45,8 +53,14 @@ public class TileAlfPortal extends TileMod { }; private static final String TAG_TICKS_OPEN = "ticksOpen"; - + private static final String TAG_TICKS_SINCE_LAST_ITEM = "ticksSinceLastItem"; + private static final String TAG_STACK_COUNT = "stackCount"; + private static final String TAG_STACK = "portalStack"; + + List stacksIn = new ArrayList(); + public int ticksOpen = 0; + int ticksSinceLastItem = 0; private boolean closeNow = false; private static final Function CONVERTER_X_Z = new Function() { @@ -56,10 +70,10 @@ public class TileAlfPortal extends TileMod { } }; - private static final Function CONVERTER_X_Z_FLOAT = new Function() { + private static final Function CONVERTER_X_Z_FP = new Function() { @Override - public float[] apply(float[] input) { - return new float[] { input[2], input[1], input[0] }; + public double[] apply(double[] input) { + return new double[] { input[2], input[1], input[0] }; } }; @@ -79,9 +93,34 @@ public class TileAlfPortal extends TileMod { } ticksOpen++; - if(ticksOpen > 60) + + if(ticksOpen > 60) { + ticksSinceLastItem++; blockParticle(meta); + AxisAlignedBB aabb = getPortalAABB(); + List items = worldObj.getEntitiesWithinAABB(EntityItem.class, aabb); + if(!worldObj.isRemote) + for(EntityItem item : items) { + if(item.isDead) + continue; + + ItemStack stack = item.getEntityItem(); + if(stack != null && (!(stack.getItem() instanceof IElvenItem) || !((IElvenItem) stack.getItem()).isElvenItem(stack))) { + item.setDead(); + addItem(stack); + ticksSinceLastItem = 0; + } + } + + if(ticksSinceLastItem >= 20) { + if(!worldObj.isRemote) + resolveRecipes(); + + ticksSinceLastItem = 0; + } + } + int newMeta = getValidMetadata(); if(closeNow) { worldObj.setBlockMetadataWithNotify(xCoord, yCoord, zCoord, 0, 1 | 2); @@ -98,11 +137,11 @@ public class TileAlfPortal extends TileMod { private void blockParticle(int meta) { int i = worldObj.rand.nextInt(AIR_POSITIONS.length); - float[] pos = new float[] { + double[] pos = new double[] { AIR_POSITIONS[i][0] + 0.5F, AIR_POSITIONS[i][1] + 0.5F, AIR_POSITIONS[i][2] + 0.5F }; if(meta == 2) - pos = CONVERTER_X_Z_FLOAT.apply(pos); + pos = CONVERTER_X_Z_FP.apply(pos); float motionMul = 0.2F; Botania.proxy.wispFX(getWorldObj(), xCoord + pos[0], yCoord + pos[1], zCoord + pos[2], (float) (Math.random() * 0.25F), (float) (Math.random() * 0.5F + 0.5F), (float) (Math.random() * 0.25F), (float) (Math.random() * 0.15F + 0.1F), (float) (Math.random() - 0.5F) * motionMul, (float) (Math.random() - 0.5F) * motionMul, (float) (Math.random() - 0.5F) * motionMul); @@ -126,14 +165,79 @@ public class TileAlfPortal extends TileMod { return false; } + AxisAlignedBB getPortalAABB() { + AxisAlignedBB aabb = AxisAlignedBB.getBoundingBox(xCoord - 1, yCoord + 1, zCoord, xCoord + 2, yCoord + 4, zCoord + 1); + if(getBlockMetadata() == 2) + aabb = AxisAlignedBB.getBoundingBox(xCoord, yCoord + 1, zCoord - 1, xCoord + 1, yCoord + 4, zCoord + 2); + + return aabb; + } + + void addItem(ItemStack stack) { + int size = stack.stackSize; + stack.stackSize = 1; + for(int i = 0; i < size; i++) + stacksIn.add(stack.copy()); + } + + void resolveRecipes() { + int i = 0; + for(ItemStack stack : stacksIn) { + if(stack.getItem() instanceof ILexicon) { + ((ILexicon) stack.getItem()).unlockKnowledge(stack, BotaniaAPI.elvenKnowledge); + spawnItem(stack); + stacksIn.remove(i); + return; + } + i++; + } + + + // Handle recipe registry here + } + + void spawnItem(ItemStack stack) { + EntityItem item = new EntityItem(worldObj, xCoord + 0.5, yCoord + 1.5, zCoord + 0.5, stack); + worldObj.spawnEntityInWorld(item); + } + + @Override + public void writeToNBT(NBTTagCompound cmp) { + super.writeToNBT(cmp); + + cmp.setInteger(TAG_STACK_COUNT, stacksIn.size()); + int i = 0; + for(ItemStack stack : stacksIn) { + NBTTagCompound stackcmp = new NBTTagCompound(); + stack.writeToNBT(stackcmp); + cmp.setTag(TAG_STACK + i, stackcmp); + i++; + } + } + + @Override + public void readFromNBT(NBTTagCompound cmp) { + super.readFromNBT(cmp); + + int count = cmp.getInteger(TAG_STACK_COUNT); + stacksIn.clear(); + for(int i = 0; i < count; i++) { + NBTTagCompound stackcmp = cmp.getCompoundTag(TAG_STACK + i); + ItemStack stack = ItemStack.loadItemStackFromNBT(stackcmp); + stacksIn.add(stack); + } + } + @Override public void writeCustomNBT(NBTTagCompound cmp) { cmp.setInteger(TAG_TICKS_OPEN, ticksOpen); + cmp.setInteger(TAG_TICKS_SINCE_LAST_ITEM, ticksSinceLastItem); } @Override public void readCustomNBT(NBTTagCompound cmp) { ticksOpen = cmp.getInteger(TAG_TICKS_OPEN); + ticksSinceLastItem = cmp.getInteger(TAG_TICKS_SINCE_LAST_ITEM); } private int getValidMetadata() { diff --git a/MODSRC/vazkii/botania/common/item/ItemLexicon.java b/MODSRC/vazkii/botania/common/item/ItemLexicon.java index ba52087af..a73433dba 100644 --- a/MODSRC/vazkii/botania/common/item/ItemLexicon.java +++ b/MODSRC/vazkii/botania/common/item/ItemLexicon.java @@ -34,6 +34,7 @@ import vazkii.botania.api.lexicon.ILexicon; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.KnowledgeType; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.recipe.IElvenItem; import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.core.helper.MathHelper; @@ -41,7 +42,7 @@ import vazkii.botania.common.lib.LibGuiIDs; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; -public class ItemLexicon extends ItemMod implements ILexicon { +public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { private static final String TAG_KNOWLEDGE_PREFIX = "knowledge."; @@ -134,4 +135,9 @@ public class ItemLexicon extends ItemMod implements ILexicon { ItemNBTHelper.setBoolean(stack, TAG_KNOWLEDGE_PREFIX + knowledge.id, true); } + @Override + public boolean isElvenItem(ItemStack stack) { + return isKnowledgeUnlocked(stack, BotaniaAPI.elvenKnowledge); + } + } diff --git a/MODSRC/vazkii/botania/common/item/ItemManaResource.java b/MODSRC/vazkii/botania/common/item/ItemManaResource.java index 7388ff530..8d166f4bf 100644 --- a/MODSRC/vazkii/botania/common/item/ItemManaResource.java +++ b/MODSRC/vazkii/botania/common/item/ItemManaResource.java @@ -19,11 +19,12 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import vazkii.botania.api.recipe.IElvenItem; import vazkii.botania.api.recipe.IFlowerComponent; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.lib.LibItemNames; -public class ItemManaResource extends ItemMod implements IFlowerComponent { +public class ItemManaResource extends ItemMod implements IFlowerComponent, IElvenItem { final int types = 10; IIcon[] icons; @@ -59,11 +60,18 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent { @Override public boolean canFit(ItemStack stack, IInventory apothecary) { - return stack.getItemDamage() == 6 || stack.getItemDamage() == 8; + int meta = stack.getItemDamage(); + return meta == 6 || meta == 8; } @Override public int getParticleColor(ItemStack stack) { return 0x9b0000; } + + @Override + public boolean isElvenItem(ItemStack stack) { + int meta = stack.getItemDamage(); + return meta == 7 || meta == 8 || meta == 9; + } }