Mana Bursts that have been teleported by a Warp Lens can no longer deliver mana to receiving blocks.

This commit is contained in:
Vasco Lavos committed 2016-10-22 12:51:43 +01:00
1 parent 7fbaea8d1e
commit 5f56dfb511
8 files changed
+44 -4

No files matched your search

@@ -10,7 +10,9 @@
*/
package vazkii.botania.api.mana;
import net.minecraft.entity.projectile.EntityThrowable;
import net.minecraft.item.ItemStack;
import vazkii.botania.api.internal.IManaBurst;
/**
* Have an Item implement this to be counted as a lens for the mana spreader.
@@ -10,6 +10,7 @@
*/
package vazkii.botania.api.mana;
import net.minecraft.entity.projectile.EntityThrowable;
import net.minecraft.item.ItemStack;
import net.minecraft.util.math.RayTraceResult;
import vazkii.botania.api.internal.IManaBurst;
@@ -45,4 +46,11 @@ public interface ILensEffect {
*/
public boolean doParticles(IManaBurst burst, ItemStack stack);
/**
* Gets the amount of mana to transfer to the passed in mana receiver block.
*/
public default int getManaToTransfer(IManaBurst burst, EntityThrowable entity, ItemStack stack, IManaReceiver receiver) {
return burst.getMana();
}
}
@@ -1,4 +1,4 @@
@API(owner = "Botania", apiVersion = "84", provides = "BotaniaAPI")
@API(owner = "Botania", apiVersion = "85", provides = "BotaniaAPI")
package vazkii.botania.api;
import net.minecraftforge.fml.common.API;
@@ -591,11 +591,19 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst {
}
private void onRecieverImpact(IManaReceiver tile, BlockPos pos) {
ILensEffect lens = getLensInstance();
int mana = getMana();
if(lens != null) {
ItemStack stack = getSourceLens();
mana = lens.getManaToTransfer(this, this, stack, tile);
}
if(tile instanceof IManaCollector)
mana *= ((IManaCollector) tile).getManaYieldMultiplier(this);
tile.recieveMana(mana);
if(tile instanceof IThrottledPacket)
((IThrottledPacket) tile).markDispatchable();
else VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, pos);
@@ -34,6 +34,7 @@ import vazkii.botania.api.mana.BurstProperties;
import vazkii.botania.api.mana.ICompositableLens;
import vazkii.botania.api.mana.ILens;
import vazkii.botania.api.mana.ILensControl;
import vazkii.botania.api.mana.IManaReceiver;
import vazkii.botania.api.mana.IManaSpreader;
import vazkii.botania.api.mana.ITinyPlanetExcempt;
import vazkii.botania.client.core.handler.ModelHandler;
@@ -310,6 +311,11 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens
return sourceLens;
}
@Override
public int getManaToTransfer(IManaBurst burst, EntityThrowable entity, ItemStack stack, IManaReceiver receiver) {
return lenses[stack.getItemDamage()].getManaToTransfer(burst, entity, stack, receiver);
}
@Override
public boolean shouldPull(ItemStack stack) {
return stack.getItemDamage() != STORM;
@@ -15,6 +15,8 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.math.RayTraceResult;
import vazkii.botania.api.internal.IManaBurst;
import vazkii.botania.api.mana.BurstProperties;
import vazkii.botania.api.mana.IManaBlock;
import vazkii.botania.api.mana.IManaReceiver;
import vazkii.botania.api.mana.IManaSpreader;
public class Lens {
@@ -34,6 +36,9 @@ public class Lens {
public void onControlledSpreaderTick(ItemStack stack, IManaSpreader spreader, boolean redstone) {}
public void onControlledSpreaderPulse(ItemStack stack, IManaSpreader spreader, boolean redstone) {}
public int getManaToTransfer(IManaBurst burst, EntityThrowable entity, ItemStack stack, IManaReceiver receiver) {
return burst.getMana();
}
}
@@ -15,16 +15,19 @@ import net.minecraft.entity.projectile.EntityThrowable;
import net.minecraft.item.ItemStack;
import net.minecraft.util.math.RayTraceResult;
import vazkii.botania.api.internal.IManaBurst;
import vazkii.botania.api.mana.IManaReceiver;
import vazkii.botania.common.block.BlockPistonRelay;
import vazkii.botania.common.block.ModBlocks;
public class LensWarp extends Lens {
private static final String TAG_WARPED = "botania:warped";
@Override
public boolean collideBurst(IManaBurst burst, EntityThrowable entity, RayTraceResult pos, boolean isManaBlock, boolean dead, ItemStack stack) {
if(burst.isFake() || pos.getBlockPos() == null)
return dead;
Block block = entity.worldObj.getBlockState(pos.getBlockPos()).getBlock();
if(block == ModBlocks.pistonRelay) {
BlockPistonRelay.DimWithPos key = ((BlockPistonRelay) ModBlocks.pistonRelay).mappedPositions.get(new BlockPistonRelay.DimWithPos(entity.worldObj.provider.getDimension(), pos.getBlockPos()));
@@ -32,11 +35,19 @@ public class LensWarp extends Lens {
if(key.dim == entity.worldObj.provider.getDimension()) {
entity.setPosition(key.blockPos.getX() + 0.5, key.blockPos.getY() + 0.5, key.blockPos.getZ() + 0.5);
burst.setCollidedAt(key.blockPos);
entity.getEntityData().setBoolean(TAG_WARPED, true);
return false;
}
}
}
return dead;
}
@Override
public int getManaToTransfer(IManaBurst burst, EntityThrowable entity, ItemStack stack, IManaReceiver receiver) {
return entity.getEntityData().getBoolean(TAG_WARPED) ? 0 : burst.getMana();
}
}