From 442301946c843b9b0c4e4f9778af5f381797dab2 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Fri, 17 Apr 2015 17:03:28 +0100 Subject: [PATCH] Added ElvenPortalUpdateEvent to the API. --- .../java/vazkii/botania/api/package-info.java | 2 +- .../api/recipe/ElvenPortalUpdateEvent.java | 42 +++++++++++++++++++ .../common/block/tile/TileAlfPortal.java | 9 +++- 3 files changed, 50 insertions(+), 3 deletions(-) create mode 100644 src/main/java/vazkii/botania/api/recipe/ElvenPortalUpdateEvent.java diff --git a/src/main/java/vazkii/botania/api/package-info.java b/src/main/java/vazkii/botania/api/package-info.java index 0b80a96e1..ebcdd58f3 100644 --- a/src/main/java/vazkii/botania/api/package-info.java +++ b/src/main/java/vazkii/botania/api/package-info.java @@ -1,4 +1,4 @@ -@API(owner = "Botania", apiVersion = "39", provides = "BotaniaAPI") +@API(owner = "Botania", apiVersion = "40", provides = "BotaniaAPI") package vazkii.botania.api; import cpw.mods.fml.common.API; diff --git a/src/main/java/vazkii/botania/api/recipe/ElvenPortalUpdateEvent.java b/src/main/java/vazkii/botania/api/recipe/ElvenPortalUpdateEvent.java new file mode 100644 index 000000000..6395a43b1 --- /dev/null +++ b/src/main/java/vazkii/botania/api/recipe/ElvenPortalUpdateEvent.java @@ -0,0 +1,42 @@ +/** + * 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 @ [Apr 17, 2015, 4:58:30 PM (GMT)] + */ +package vazkii.botania.api.recipe; + +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.AxisAlignedBB; +import cpw.mods.fml.common.eventhandler.Event; + +/** + * An event fired when an Elven Portal TE updates. The portal's + * relevant AABB and other stuff is passed in for convenience. This + * is fired in MinecraftForge.EVENT_BUS. + */ +public class ElvenPortalUpdateEvent extends Event { + + /** + * May be casted to TileAlfPortal if you have botania code access aside from the API. + */ + public final TileEntity portalTile; + public final AxisAlignedBB aabb; + public boolean open; + public final List stacksInside; + + public ElvenPortalUpdateEvent(TileEntity te, AxisAlignedBB aabb, boolean open, List stacks) { + portalTile = te; + this.aabb = aabb; + this.open = open; + stacksInside = stacks; + } + +} diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java index 1780d7e0a..fdaac4745 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java @@ -14,6 +14,7 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; @@ -22,6 +23,7 @@ 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.ElvenPortalUpdateEvent; import vazkii.botania.api.recipe.IElvenItem; import vazkii.botania.api.recipe.RecipeElvenTrade; import vazkii.botania.common.Botania; @@ -100,13 +102,16 @@ public class TileAlfPortal extends TileMod { if(!hasUnloadedParts) { ticksOpen++; - + + AxisAlignedBB aabb = getPortalAABB(); + boolean open = ticksOpen > 60; + ElvenPortalUpdateEvent event = new ElvenPortalUpdateEvent(this, aabb, open, stacksIn); + if(ticksOpen > 60) { ticksSinceLastItem++; if(ConfigHandler.elfPortalParticlesEnabled) blockParticle(meta); - AxisAlignedBB aabb = getPortalAABB(); List items = worldObj.getEntitiesWithinAABB(EntityItem.class, aabb); if(!worldObj.isRemote) for(EntityItem item : items) {