From 853c7bfdb0df276c9629b0884d4f5421cd2ea614 Mon Sep 17 00:00:00 2001 From: Calclavia Date: Mon, 14 Apr 2014 20:53:13 +0800 Subject: [PATCH] Fixed #455 - EM Levitator item dupe --- .../electrical/levitator/PartLevitator.java | 88 ++++++++++--------- 1 file changed, 48 insertions(+), 40 deletions(-) diff --git a/electrical/src/main/scala/resonantinduction/electrical/levitator/PartLevitator.java b/electrical/src/main/scala/resonantinduction/electrical/levitator/PartLevitator.java index d78026507..ab0af5491 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/levitator/PartLevitator.java +++ b/electrical/src/main/scala/resonantinduction/electrical/levitator/PartLevitator.java @@ -1,13 +1,15 @@ package resonantinduction.electrical.levitator; -import java.lang.ref.WeakReference; -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockFluid; -import net.minecraft.block.BlockLadder; -import net.minecraft.block.BlockSnow; -import net.minecraft.block.BlockVine; +import calclavia.lib.render.EnumColor; +import calclavia.lib.utility.LinkUtility; +import calclavia.lib.utility.WrenchUtility; +import calclavia.lib.utility.inventory.InventoryUtility; +import codechicken.lib.data.MCDataInput; +import codechicken.lib.data.MCDataOutput; +import codechicken.multipart.TMultiPart; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.block.*; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -28,28 +30,23 @@ import resonantinduction.electrical.Electrical; import resonantinduction.electrical.tesla.TileTesla; import universalelectricity.api.vector.Vector3; import universalelectricity.api.vector.VectorWorld; -import calclavia.lib.render.EnumColor; -import calclavia.lib.utility.LinkUtility; -import calclavia.lib.utility.WrenchUtility; -import calclavia.lib.utility.inventory.InventoryUtility; -import codechicken.lib.data.MCDataInput; -import codechicken.lib.data.MCDataOutput; -import codechicken.multipart.TMultiPart; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.lang.ref.WeakReference; +import java.util.List; public class PartLevitator extends PartFace { - private int pushDelay; - - private AxisAlignedBB operationBounds; - private AxisAlignedBB suckBounds; - /** * true = suck, false = push */ public boolean input = true; - + /** + * Client Side Only + */ + public float renderRotation = 0; + private int pushDelay; + private AxisAlignedBB operationBounds; + private AxisAlignedBB suckBounds; /** * Pathfinding */ @@ -57,20 +54,21 @@ public class PartLevitator extends PartFace private PathfinderLevitator pathfinder; private WeakReference linked; private int lastCalcTime = 0; - - /** Color of beam */ + /** + * Color of beam + */ private int dyeID = TileTesla.DEFAULT_COLOR; - /** * Linking */ private byte saveLinkSide; private VectorWorld saveLinkVector; - /** - * Client Side Only - */ - public float renderRotation = 0; + public static boolean canBePath(World world, Vector3 position) + { + Block block = Block.blocksList[position.getBlockID(world)]; + return block == null || (block instanceof BlockSnow || block instanceof BlockVine || block instanceof BlockLadder || ((block instanceof BlockFluid || block instanceof IFluidBlock) && block.blockID != Block.lavaMoving.blockID && block.blockID != Block.lavaStill.blockID)); + } @Override public boolean activate(EntityPlayer player, MovingObjectPosition part, ItemStack itemStack) @@ -80,13 +78,17 @@ public class PartLevitator extends PartFace if (tryLink(LinkUtility.getLink(itemStack), LinkUtility.getSide(itemStack))) { if (world().isRemote) + { player.addChatMessage("Successfully linked devices."); + } LinkUtility.clearLink(itemStack); } else { if (world().isRemote) + { player.addChatMessage("Marked link for device."); + } LinkUtility.setLink(itemStack, new VectorWorld(world(), x(), y(), z())); LinkUtility.setSide(itemStack, (byte) placementSide.ordinal()); @@ -111,7 +113,9 @@ public class PartLevitator extends PartFace } if (player.isSneaking()) + { input = !input; + } updateBounds(); updatePath(); @@ -152,18 +156,18 @@ public class PartLevitator extends PartFace */ if (!world().isRemote && input && canFunction() && entity instanceof EntityItem) { - EntityItem item = (EntityItem) entity; + EntityItem entityItem = (EntityItem) entity; IInventory inventory = (IInventory) getLatched(); - ItemStack remains = InventoryUtility.putStackInInventory(inventory, item.getEntityItem(), placementSide.getOpposite().getOpposite().ordinal(), false); + ItemStack remains = InventoryUtility.putStackInInventory(inventory, entityItem.getEntityItem(), placementSide.getOpposite().getOpposite().ordinal(), false); if (remains == null) { - item.setDead(); + entityItem.setDead(); } else { - item.setEntityItemStack(remains); + entityItem.getEntityItem().stackSize = remains.stackSize; } // TODO: Add redstone pulse and reaction? @@ -174,7 +178,9 @@ public class PartLevitator extends PartFace public void update() { if (ticks % 60 == 0) + { updateBounds(); + } super.update(); @@ -277,7 +283,9 @@ public class PartLevitator extends PartFace final ForgeDirection direction = difference.toForgeDirection(); if (renderBeam) + { Electrical.proxy.renderElectricShock(world(), prevResult.clone().translate(0.5), result.clone().translate(0.5), EnumColor.DYES[dyeID].toColor(), world().rand.nextFloat() > 0.9); + } AxisAlignedBB bounds = AxisAlignedBB.getAABBPool().getAABB(result.x, result.y, result.z, result.x + 1, result.y + 1, result.z + 1); List entities = world().getEntitiesWithinAABB(EntityItem.class, bounds); @@ -313,7 +321,9 @@ public class PartLevitator extends PartFace } if (ticks % renderPeriod == 0) + { Electrical.proxy.renderElectricShock(world(), getBeamSpawnPosition(), new Vector3(operationBounds.maxX - 0.5 - placementSide.offsetX / 3f, operationBounds.maxY - 0.5 - placementSide.offsetY / 3f, operationBounds.maxZ - 0.5 - placementSide.offsetZ / 3f), EnumColor.DYES[dyeID].toColor(), world().rand.nextFloat() > 0.9); + } } } @@ -325,21 +335,19 @@ public class PartLevitator extends PartFace { TMultiPart partSelf = MultipartUtility.getMultipart(new VectorWorld(world, position), placementSide.ordinal()); if (partSelf == this) + { return true; + } TMultiPart partLink = MultipartUtility.getMultipart(new VectorWorld(world, position), getLink().placementSide.ordinal()); if (partLink == getLink()) + { return true; + } return canBePath(world, position); } - public static boolean canBePath(World world, Vector3 position) - { - Block block = Block.blocksList[position.getBlockID(world)]; - return block == null || (block instanceof BlockSnow || block instanceof BlockVine || block instanceof BlockLadder || ((block instanceof BlockFluid || block instanceof IFluidBlock) && block.blockID != Block.lavaMoving.blockID && block.blockID != Block.lavaStill.blockID)); - } - private boolean hasLink() { return getLink() != null && getLink().getLink() == this;