diff --git a/src/main/java/vazkii/botania/api/internal/IManaBurst.java b/src/main/java/vazkii/botania/api/internal/IManaBurst.java index 735a1796d..19a79f8af 100644 --- a/src/main/java/vazkii/botania/api/internal/IManaBurst.java +++ b/src/main/java/vazkii/botania/api/internal/IManaBurst.java @@ -56,6 +56,8 @@ public interface IManaBurst { public boolean hasAlreadyCollidedAt(int x, int y, int z); + public void setCollidedAt(int x, int y, int z); + public int getTicksExisted(); } diff --git a/src/main/java/vazkii/botania/api/package-info.java b/src/main/java/vazkii/botania/api/package-info.java index 2db13b135..c58b509ac 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 = "30", provides = "BotaniaAPI") +@API(owner = "Botania", apiVersion = "31", provides = "BotaniaAPI") package vazkii.botania.api; import cpw.mods.fml.common.API; diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java index cf4a8395b..dcf290136 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java @@ -756,6 +756,12 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { return alreadyCollidedAt.contains(getCollisionLocString(x, y, z)); } + @Override + public void setCollidedAt(int x, int y, int z) { + if(!hasAlreadyCollidedAt(x, y, z)) + alreadyCollidedAt.add(getCollisionLocString(x, y, z)); + } + private String getCollisionLocString(int x, int y, int z) { return x + ":" + y + ":" + z; } diff --git a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java index b0e24b94e..5b6e8cfad 100644 --- a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java +++ b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java @@ -40,9 +40,9 @@ import cpw.mods.fml.common.registry.GameRegistry; public class ItemLens extends ItemMod implements ILens { - public static final int SUBTYPES = 18; + public static final int SUBTYPES = 19; - private static final int NORMAL = 0, + public static final int NORMAL = 0, SPEED = 1, POWER = 2, TIME = 3, @@ -59,7 +59,8 @@ public class ItemLens extends ItemMod implements ILens { PAINT = 14, FIRE = 15, PISTON = 16, - LIGHT = 17; + LIGHT = 17, + WARP = 18; private static final int PROP_NONE = 0, PROP_POWER = 1, @@ -91,6 +92,7 @@ public class ItemLens extends ItemMod implements ILens { setProps(FIRE, PROP_DAMAGE | PROP_TOUCH | PROP_INTERACTION); setProps(PISTON, PROP_TOUCH | PROP_INTERACTION); setProps(LIGHT, PROP_TOUCH | PROP_INTERACTION); + setProps(WARP, PROP_NONE); setLens(NORMAL, fallbackLens); setLens(SPEED, new LensSpeed()); @@ -110,6 +112,7 @@ public class ItemLens extends ItemMod implements ILens { setLens(FIRE, new LensFire()); setLens(PISTON, new LensPiston()); setLens(LIGHT, new LensLight()); + setLens(WARP, new LensWarp()); } private static final String TAG_COLOR = "color"; diff --git a/src/main/java/vazkii/botania/common/item/lens/Lens.java b/src/main/java/vazkii/botania/common/item/lens/Lens.java index a6f616222..502cc3d11 100644 --- a/src/main/java/vazkii/botania/common/item/lens/Lens.java +++ b/src/main/java/vazkii/botania/common/item/lens/Lens.java @@ -17,7 +17,7 @@ import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.mana.BurstProperties; public class Lens { - + public void apply(ItemStack stack, BurstProperties props) { // NO-OP } @@ -29,5 +29,5 @@ public class Lens { public void updateBurst(IManaBurst burst, EntityThrowable entity, ItemStack stack) { // NO-OP } - + } diff --git a/src/main/java/vazkii/botania/common/item/lens/LensMine.java b/src/main/java/vazkii/botania/common/item/lens/LensMine.java index d0e7c1cd8..9bb0ed231 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensMine.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensMine.java @@ -16,6 +16,7 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.projectile.EntityThrowable; +import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChunkCoordinates; @@ -23,7 +24,9 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.mana.IManaBlock; +import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.handler.ConfigHandler; +import vazkii.botania.common.item.ModItems; public class LensMine extends Lens { @@ -34,6 +37,13 @@ public class LensMine extends Lens { int y = pos.blockY; int z = pos.blockZ; Block block = world.getBlock(x, y, z); + + ItemStack composite = ((ItemLens) ModItems.lens).getCompositeLens(stack); + boolean warp = composite != null && composite.getItem() == ModItems.lens && composite.getItemDamage() == ItemLens.WARP; + + if(warp && (block == ModBlocks.pistonRelay || block == Blocks.piston || block == Blocks.piston_extension || block == Blocks.piston_head)) + return false; + TileEntity tile = world.getTileEntity(x, y, z); int meta = world.getBlockMetadata(x, y, z); @@ -52,8 +62,13 @@ public class LensMine extends Lens { if(ConfigHandler.blockBreakParticles) entity.worldObj.playAuxSFX(2001, x, y, z, Block.getIdFromBlock(block) + (meta << 12)); + int dropX = warp ? coords.posX : x; + int dropY = warp ? coords.posY : y; + int dropZ = warp ? coords.posZ : z; + for(ItemStack stack_ : items) - world.spawnEntityInWorld(new EntityItem(world, x + 0.5, y + 0.5, z + 0.5, stack_)); + world.spawnEntityInWorld(new EntityItem(world, dropX + 0.5, dropY + 0.5, dropZ + 0.5, stack_)); + burst.setMana(mana - 24); } } diff --git a/src/main/java/vazkii/botania/common/item/lens/LensWarp.java b/src/main/java/vazkii/botania/common/item/lens/LensWarp.java new file mode 100644 index 000000000..f049a3bdf --- /dev/null +++ b/src/main/java/vazkii/botania/common/item/lens/LensWarp.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 @ [Feb 8, 2015, 2:17:01 PM (GMT)] + */ +package vazkii.botania.common.item.lens; + +import net.minecraft.block.Block; +import net.minecraft.entity.projectile.EntityThrowable; +import net.minecraft.item.ItemStack; +import net.minecraft.util.MovingObjectPosition; +import vazkii.botania.api.internal.IManaBurst; +import vazkii.botania.common.block.BlockPistonRelay; +import vazkii.botania.common.block.ModBlocks; + +public class LensWarp extends Lens { + + @Override + public boolean collideBurst(IManaBurst burst, EntityThrowable entity, MovingObjectPosition pos, boolean isManaBlock, boolean dead, ItemStack stack) { + if(burst.isFake()) + return dead; + + Block block = entity.worldObj.getBlock(pos.blockX, pos.blockY, pos.blockZ); + if(block == ModBlocks.pistonRelay) { + String key = BlockPistonRelay.mappedPositions.get(BlockPistonRelay.getCoordsAsString(entity.worldObj.provider.dimensionId, pos.blockX, pos.blockY, pos.blockZ)); + String[] tokens = key.split(":"); + int worldId = Integer.parseInt(tokens[0]), x = Integer.parseInt(tokens[1]), y = Integer.parseInt(tokens[2]), z = Integer.parseInt(tokens[3]); + if(worldId == entity.worldObj.provider.dimensionId) { + entity.setPosition(x + 0.5, y + 0.5, z + 0.5); + burst.setCollidedAt(x, y, z); + return false; + } + } + return dead; + } + +} diff --git a/src/main/java/vazkii/botania/common/lib/LibItemNames.java b/src/main/java/vazkii/botania/common/lib/LibItemNames.java index 6e133db23..743cf4774 100644 --- a/src/main/java/vazkii/botania/common/lib/LibItemNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibItemNames.java @@ -139,7 +139,8 @@ public final class LibItemNames { "lensPaint", "lensFire", "lensPiston", - "lensLight" + "lensLight", + "lensWarp" }; public static final String[] MANA_RESOURCE_NAMES = new String[] { diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 1cdce7150..f117126aa 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -824,6 +824,8 @@ item.botania:lensPiston.name=Mana Lens: Force item.botania:lensPiston.short=Force item.botania:lensLight.name=Mana Lens: Flash item.botania:lensLight.short=Flash +item.botania:lensWarp.name=Mana Lens: Warp +item.botania:lensWarp.short=Warp item.botania:manaPetal0.name=White Mana Petal item.botania:manaPetal1.name=Orange Mana Petal item.botania:manaPetal2.name=Magenta Mana Petal diff --git a/src/main/resources/assets/botania/textures/items/unused/lensWarp.png b/src/main/resources/assets/botania/textures/items/lensWarp.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/unused/lensWarp.png rename to src/main/resources/assets/botania/textures/items/lensWarp.png