From 59533fee9b3c7d24e43f7a79b224c4c8982da4a2 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Wed, 30 Dec 2015 00:16:42 +0000 Subject: [PATCH] Added a flower slowdown/delay system. --- .../java/vazkii/botania/api/package-info.java | 2 +- .../subtile/ISubTileSlowableContainer.java | 26 +++++++++++++++++++ .../botania/api/subtile/SubTileEntity.java | 13 ++++++++++ .../common/block/BlockSpecialFlower.java | 3 ++- .../subtile/functional/SubTileDaffomill.java | 12 +++++---- .../subtile/functional/SubTileHopperhock.java | 4 ++- .../functional/SubTilePollidisiac.java | 4 ++- .../functional/SubTileRannuncarpus.java | 3 ++- .../functional/SubTileSpectranthemum.java | 4 ++- .../subtile/generating/SubTileEndoflame.java | 4 ++- .../generating/SubTileGourmaryllis.java | 4 ++- .../subtile/generating/SubTileSpectrolus.java | 4 ++- .../block/tile/TileFloatingSpecialFlower.java | 9 +++++++ .../common/block/tile/TileSpecialFlower.java | 20 ++++++++++++-- .../botania/common/lexicon/LexiconData.java | 5 ++++ .../vazkii/botania/common/lib/LibLexicon.java | 1 + .../resources/assets/botania/lang/en_US.lang | 6 +++++ 17 files changed, 108 insertions(+), 16 deletions(-) create mode 100644 src/main/java/vazkii/botania/api/subtile/ISubTileSlowableContainer.java diff --git a/src/main/java/vazkii/botania/api/package-info.java b/src/main/java/vazkii/botania/api/package-info.java index 41ba6ab53..afc095ad3 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 = "74", provides = "BotaniaAPI") +@API(owner = "Botania", apiVersion = "75", provides = "BotaniaAPI") package vazkii.botania.api; import cpw.mods.fml.common.API; diff --git a/src/main/java/vazkii/botania/api/subtile/ISubTileSlowableContainer.java b/src/main/java/vazkii/botania/api/subtile/ISubTileSlowableContainer.java new file mode 100644 index 000000000..6092cd618 --- /dev/null +++ b/src/main/java/vazkii/botania/api/subtile/ISubTileSlowableContainer.java @@ -0,0 +1,26 @@ +/** + * 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 @ [29/12/2015, 23:00:06 (GMT)] + */ +package vazkii.botania.api.subtile; + +/** + * An extension of ISubTileContainer that allows for the SubTile to be "slowed down". + * Slowing down is the action that happens when a flower is planted in Podzol or Mycellium. + * Any flowers that pick up items from the ground should have a delay on the time the item + * needs to be on the floor equal to the value of getSlowDownFactor(). + */ +public interface ISubTileSlowableContainer extends ISubTileContainer { + + public static final int SLOWDOWN_FACTOR_PODZOL = 5; + public static final int SLOWDOWN_FACTOR_MYCEL = 10; + + public int getSlowdownFactor(); + +} diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java b/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java index da1ce2dc8..2b98121c1 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java @@ -225,6 +225,19 @@ public class SubTileEntity { public boolean isOvergrowthAffected() { return true; } + + /** + * Gets ths slowdown factor of this SubTile. + * @see ISubTileSlowableContainer + */ + public int getSlowdownFactor() { + if(supertile instanceof ISubTileSlowableContainer) { + ISubTileSlowableContainer slowable = (ISubTileSlowableContainer) supertile; + return slowable.getSlowdownFactor(); + } + + return 0; + } } diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 4819abd34..e44ac4941 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -26,6 +26,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -192,7 +193,7 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid @Override protected boolean canPlaceBlockOn(Block block) { - return super.canPlaceBlockOn(block) || block == ModBlocks.redStringRelay; + return super.canPlaceBlockOn(block) || block == ModBlocks.redStringRelay || block == Blocks.mycelium; } @Override diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java index 564a41bc9..a4fd3f0b3 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java @@ -50,11 +50,13 @@ public class SubTileDaffomill extends SubTileFunctional { if(axis != null) { List items = supertile.getWorldObj().getEntitiesWithinAABB(EntityItem.class, axis); - for(EntityItem item : items) { - item.motionX += dir.offsetX * 0.05; - item.motionY += dir.offsetY * 0.05; - item.motionZ += dir.offsetZ * 0.05; - } + int slowdown = getSlowdownFactor(); + for(EntityItem item : items) + if(!item.isDead && item.age >= slowdown) { + item.motionX += dir.offsetX * 0.05; + item.motionY += dir.offsetY * 0.05; + item.motionZ += dir.offsetZ * 0.05; + } } windTicks--; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java index d2e736385..dbaa47f0c 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java @@ -70,8 +70,10 @@ public class SubTileHopperhock extends SubTileFunctional { int z = supertile.zCoord; List items = supertile.getWorldObj().getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(x - range, y - range, z - range, x + range + 1, y + range + 1, z + range + 1)); + int slowdown = getSlowdownFactor(); + for(EntityItem item : items) { - if(item.age < 60 || item.age >= 105 && item.age < 110 || item.isDead) + if(item.age < (60 + slowdown) || item.age >= 105 && item.age < 110 || item.isDead) continue; ItemStack stack = item.getEntityItem(); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java index 95d81b8e9..485c81318 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java @@ -36,6 +36,8 @@ public class SubTilePollidisiac extends SubTileFunctional { List items = supertile.getWorldObj().getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(supertile.xCoord - RANGE, supertile.yCoord, supertile.zCoord - RANGE, supertile.xCoord + 1 + RANGE, supertile.yCoord + 1, supertile.zCoord + 1 +RANGE)); List animals = supertile.getWorldObj().getEntitiesWithinAABB(EntityAnimal.class, AxisAlignedBB.getBoundingBox(supertile.xCoord - RANGE, supertile.yCoord, supertile.zCoord - RANGE, supertile.xCoord + 1 +RANGE, supertile.yCoord + 1, supertile.zCoord + 1 +RANGE)); + int slowdown = getSlowdownFactor(); + for(EntityAnimal animal : animals) { if(mana < manaCost) break; @@ -43,7 +45,7 @@ public class SubTilePollidisiac extends SubTileFunctional { int love = ReflectionHelper.getPrivateValue(EntityAnimal.class, animal, LibObfuscation.IN_LOVE); if(animal.getGrowingAge() == 0 && love <= 0) { for(EntityItem item : items) { - if(item.age < 60 || item.isDead) + if(item.age < (60 + slowdown) || item.isDead) continue; ItemStack stack = item.getEntityItem(); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java index 043ff78a0..f890fd778 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java @@ -78,8 +78,9 @@ public class SubTileRannuncarpus extends SubTileFunctional { int z = supertile.zCoord; List items = supertile.getWorldObj().getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(x - RANGE, y - RANGE_Y, z - RANGE, x + RANGE + 1, y + RANGE_Y, z + RANGE + 1)); + int slowdown = getSlowdownFactor(); for(EntityItem item : items) { - if(item.age < 60 || item.isDead) + if(item.age < (60 + slowdown) || item.isDead) continue; ItemStack stack = item.getEntityItem(); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java index 7bc96f133..d89696490 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java @@ -54,8 +54,10 @@ public class SubTileSpectranthemum extends SubTileFunctional { boolean did = false; List items = supertile.getWorldObj().getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(x - RANGE, y - RANGE, z - RANGE, x + RANGE + 1, y + RANGE, z + RANGE + 1)); + int slowdown = getSlowdownFactor(); + for(EntityItem item : items) { - if(item.age < 60 || item.isDead || item.getEntityData().getBoolean(TAG_TELEPORTED)) + if(item.age < (60 + slowdown) || item.isDead || item.getEntityData().getBoolean(TAG_TELEPORTED)) continue; ItemStack stack = item.getEntityItem(); diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java index 03bb46cd5..9210b93e6 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java @@ -42,9 +42,11 @@ public class SubTileEndoflame extends SubTileGenerating { if(mana < getMaxMana()) { boolean didSomething = false; + int slowdown = getSlowdownFactor(); + List items = supertile.getWorldObj().getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(supertile.xCoord - RANGE, supertile.yCoord - RANGE, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + RANGE + 1, supertile.zCoord + RANGE + 1)); for(EntityItem item : items) { - if(item.age >= 59 && !item.isDead) { + if(item.age >= (59 + slowdown) && !item.isDead) { ItemStack stack = item.getEntityItem(); if(stack.getItem().hasContainerItem(stack)) continue; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java index 7ac01a56e..5109539e7 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java @@ -43,11 +43,13 @@ public class SubTileGourmaryllis extends SubTileGenerating { sync(); } + int slowdown = getSlowdownFactor(); + boolean remote = supertile.getWorldObj().isRemote; List items = supertile.getWorldObj().getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(supertile.xCoord - RANGE, supertile.yCoord - RANGE, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + RANGE + 1, supertile.zCoord + RANGE + 1)); for(EntityItem item : items) { ItemStack stack = item.getEntityItem(); - if(stack != null && stack.getItem() instanceof ItemFood && !item.isDead) { + if(stack != null && stack.getItem() instanceof ItemFood && !item.isDead && item.age >= slowdown) { if(cooldown == 0) { if(!remote) { int val = ((ItemFood) stack.getItem()).func_150905_g(stack); diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java index d85671bda..1bfeb03ed 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java @@ -46,9 +46,11 @@ public class SubTileSpectrolus extends SubTileGenerating { boolean remote = supertile.getWorldObj().isRemote; Item wool = Item.getItemFromBlock(Blocks.wool); List items = supertile.getWorldObj().getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(supertile.xCoord - RANGE, supertile.yCoord - RANGE, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + RANGE + 1, supertile.zCoord + RANGE + 1)); + int slowdown = getSlowdownFactor(); + for(EntityItem item : items) { ItemStack stack = item.getEntityItem(); - if(stack != null && stack.getItem() == wool) { + if(stack != null && stack.getItem() == wool && !item.isDead && item.age >= slowdown) { int meta = stack.getItemDamage(); if(meta == nextColor) { if(!remote) { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/tile/TileFloatingSpecialFlower.java index a68e4a943..92d2af39f 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileFloatingSpecialFlower.java @@ -52,4 +52,13 @@ public class TileFloatingSpecialFlower extends TileSpecialFlower implements IFlo type = IslandType.ofType(cmp.getString(TAG_ISLAND_TYPE)); } + @Override + public int getSlowdownFactor() { + switch(getIslandType()) { + case MYCEL: return SLOWDOWN_FACTOR_MYCEL; + case PODZOL: return SLOWDOWN_FACTOR_PODZOL; + default: return 0; + } + } + } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java b/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java index 3f3fa1b56..34dbfb26f 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.tile; import java.util.ArrayList; +import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.entity.EntityLivingBase; @@ -25,13 +26,13 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.subtile.ISubTileContainer; +import vazkii.botania.api.subtile.ISubTileSlowableContainer; import vazkii.botania.api.subtile.SubTileEntity; import vazkii.botania.api.wand.IWandBindable; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.string.TileRedStringRelay; -public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTileContainer { +public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTileSlowableContainer { private static final String TAG_SUBTILE_NAME = "subTileName"; private static final String TAG_SUBTILE_CMP = "subTileCmp"; @@ -219,4 +220,19 @@ public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTil return 0; return subTile.getPowerLevel(side); } + + @Override + public int getSlowdownFactor() { + Block below = worldObj.getBlock(xCoord, yCoord - 1, zCoord); + if(below == Blocks.mycelium) + return SLOWDOWN_FACTOR_MYCEL; + + if(below == Blocks.dirt) { + int meta = worldObj.getBlockMetadata(xCoord, yCoord - 1, zCoord); + if(meta == 2) + return SLOWDOWN_FACTOR_PODZOL; + } + + return 0; + } } diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 4635cb557..7983815f9 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -93,6 +93,7 @@ public final class LexiconData { public static LexiconEntry functionalIntro; public static LexiconEntry flowerShrinking; + public static LexiconEntry flowerSpeed; public static LexiconEntry jadedAmaranthus; public static LexiconEntry bellethorne; public static LexiconEntry dreadthorne; @@ -451,6 +452,10 @@ public final class LexiconData { flowerShrinking = new BLexiconEntry(LibLexicon.FFLOWER_SHRINKING, categoryFunctionalFlowers); flowerShrinking.setPriority().setLexiconPages(new PageText("0"), new PageManaInfusionRecipe("1", BotaniaAPI.miniFlowerRecipes)).setIcon(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_BELLETHORN + "Chibi")); + flowerSpeed = new BLexiconEntry(LibLexicon.FFLOWER_SPEED, categoryFunctionalFlowers); + flowerSpeed.setPriority().setLexiconPages(new PageText("0"), new PageText("1")); + flowerSpeed.setIcon(new ItemStack(Blocks.dirt, 1, 2)); + jadedAmaranthus = new BLexiconEntry(LibLexicon.FFLOWER_JADED_AMARANTHUS, categoryFunctionalFlowers); jadedAmaranthus.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.jadedAmaranthusRecipe), new PageText("2")); diff --git a/src/main/java/vazkii/botania/common/lib/LibLexicon.java b/src/main/java/vazkii/botania/common/lib/LibLexicon.java index a02891387..8b6013961 100644 --- a/src/main/java/vazkii/botania/common/lib/LibLexicon.java +++ b/src/main/java/vazkii/botania/common/lib/LibLexicon.java @@ -64,6 +64,7 @@ public final class LibLexicon { public static final String FFLOWER_INTRO = "fIntro"; public static final String FFLOWER_SHRINKING = "flowerShrinking"; + public static final String FFLOWER_SPEED = "flowerSpeed"; public static final String FFLOWER_JADED_AMARANTHUS = "jadedAmaranthus"; public static final String FFLOWER_BELLETHORNE = "bellethorne"; public static final String FFLOWER_DREADTHORNE = "dreadthorne"; diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 884f42499..78d0818e9 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -2325,6 +2325,12 @@ botania.tagline.flowerShrinking=Smaller flowers with a smaller range botania.page.flowerShrinking0=Some functional flowers have a bit too much reach. Sometimes one might not want that to be the case. Tossing one of those few flowers into a &1Mana Pool&0 with an &1Alchemy Catalyst&0 will, at the cost of some &4Mana&0, shrink it, making its radius smaller. Every other function remains the same.
This can also be done for passive generating flowers, turning them into decorative versions that don't decay. botania.page.flowerShrinking1=Like a nendoroid +# -- MODULATING DELAY +botania.entry.flowerSpeed=Modulating Delay +botania.tagline.flowerSpeed=Changing how long flowers take to work +botania.page.flowerSpeed0=A problem with &4Functional Flowers&0 that interact with dropped items on the floor is making sure the items are interacted with in the right order.
Planting the relevant flowers under &1Podzol&0 will add a small delay before they can pick up items, allowing for a "priority" system of sorts. Planting a flower on &1Mycellium&0 will create a larger delay. +botania.page.flowerSpeed1=This system also extends to &1Floating Flowers&0, via the use of &1Boreal Seeds&0 and &1Infestation Spores&0.
Given two flowers with the same delay (or none), a &4Generating Flower&0 (e.g. &1Endoflame&0) will pick up an item before a &4Functional One&0. (e.g. &1Hopperhock&0). For two flowers of the same type, it's a secret to everybody. + # -- JADED AMARANTHUS botania.entry.jadedAmaranthus=Jaded Amaranthus botania.tagline.jadedAmaranthus=Creates more Mystical Flowers