From b8a4b0c28277d937552a54f9f57beb761d09c554 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Tue, 23 Dec 2014 21:46:42 +0000 Subject: [PATCH] Sparks now properly check against how much space is left on the target block and don't try to put in more mana than available, actually making spark networks viable. Closes #433 --- .../vazkii/botania/api/mana/spark/ISparkAttachable.java | 6 ++++++ src/main/java/vazkii/botania/api/package-info.java | 2 +- .../vazkii/botania/common/block/tile/TileEnchanter.java | 5 +++++ .../vazkii/botania/common/block/tile/TileTerraPlate.java | 5 +++++ .../vazkii/botania/common/block/tile/mana/TilePool.java | 5 +++++ .../java/vazkii/botania/common/entity/EntitySpark.java | 8 ++++++-- 6 files changed, 28 insertions(+), 3 deletions(-) diff --git a/src/main/java/vazkii/botania/api/mana/spark/ISparkAttachable.java b/src/main/java/vazkii/botania/api/mana/spark/ISparkAttachable.java index 4353f01ce..087c9b677 100644 --- a/src/main/java/vazkii/botania/api/mana/spark/ISparkAttachable.java +++ b/src/main/java/vazkii/botania/api/mana/spark/ISparkAttachable.java @@ -31,6 +31,12 @@ public interface ISparkAttachable extends IManaReceiver { */ public void attachSpark(ISparkEntity entity); + /** + * Returns how much space for mana is available in this block, normally the total - the current. + * Should NEVER return negative values. Make sure to check against that. + */ + public int getAvailableSpaceForMana(); + /** * Gets the Spark that is attached to this block. A common implementation is * to check for Spark entities above: diff --git a/src/main/java/vazkii/botania/api/package-info.java b/src/main/java/vazkii/botania/api/package-info.java index 128b2cab7..10a46db5e 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 = "27", provides = "BotaniaAPI") +@API(owner = "Botania", apiVersion = "28", provides = "BotaniaAPI") package vazkii.botania.api; import cpw.mods.fml.common.API; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java index 3afd817e4..6517af4f0 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -393,4 +393,9 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { return stage == 3; } + @Override + public int getAvailableSpaceForMana() { + return Math.max(0, manaRequired - getCurrentMana()); + } + } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java index 4f530a839..8f725944e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java @@ -218,4 +218,9 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable { return !areItemsValid(getItems()); } + @Override + public int getAvailableSpaceForMana() { + return Math.max(0, MAX_MANA - getCurrentMana()); + } + } diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java index 1df112700..3c8d894ec 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java @@ -361,4 +361,9 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt public boolean areIncomingTranfersDone() { return false; } + + @Override + public int getAvailableSpaceForMana() { + return Math.max(0, manaCap - getCurrentMana()); + } } diff --git a/src/main/java/vazkii/botania/common/entity/EntitySpark.java b/src/main/java/vazkii/botania/common/entity/EntitySpark.java index a5d5f45b5..be8c32f47 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySpark.java @@ -185,6 +185,8 @@ public class EntitySpark extends Entity implements ISparkEntity { if(!transfers.isEmpty()) { int manaTotal = Math.min(TRANSFER_RATE * transfers.size(), tile.getCurrentMana()); int manaForEach = manaTotal / transfers.size(); + int manaSpent = 0; + if(manaForEach > transfers.size()) { for(ISparkEntity spark : transfers) { if(spark.getAttachedTile() == null || spark.getAttachedTile().isFull() || spark.areIncomingTransfersDone()) { @@ -193,11 +195,13 @@ public class EntitySpark extends Entity implements ISparkEntity { } ISparkAttachable attached = spark.getAttachedTile(); - attached.recieveMana(manaForEach); + int spend = Math.min(attached.getAvailableSpaceForMana(), manaForEach); + attached.recieveMana(spend); + manaSpent += spend; particlesTowards((Entity) spark); } - tile.recieveMana(-manaTotal); + tile.recieveMana(-manaSpent); } }