From a7080b243974720cbf093ef05ef337452b62ccf6 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 25 Jan 2016 12:35:39 -0600 Subject: [PATCH] Working! now need to smooth it out --- .../vazkii/botania/common/block/mana/BlockPump.java | 8 -------- .../botania/common/block/tile/mana/TilePump.java | 12 +++++++----- .../resources/assets/botania/asms/block/pump.json | 2 +- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java index 87121e6a9..7213a62f5 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java @@ -88,14 +88,6 @@ public class BlockPump extends BlockModContainer implements ILexiconable { } } - @Override - public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumFacing side, float hitX, float hitY, float hitZ) { - if (worldIn.isRemote && worldIn.getTileEntity(pos) instanceof TilePump) { - ((TilePump) worldIn.getTileEntity(pos)).asm().transition("moving"); - } - return true; - } - @Override public boolean isOpaqueCube() { return false; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java index a47e4409e..7f25aca3e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java @@ -46,7 +46,7 @@ public class TilePump extends TileMod implements IAnimationProvider { public TilePump() { if (FMLCommonHandler.instance().getSide() == Side.CLIENT) { move = new TimeValues.VariableValue(0); - asm = Animation.INSTANCE.load(new ResourceLocation("botania", "asms/block/pump.json"), ImmutableMap.of()); + asm = Animation.INSTANCE.load(new ResourceLocation("botania", "asms/block/pump.json"), ImmutableMap.of("move", move)); } else { move = null; asm = null; @@ -86,15 +86,13 @@ public class TilePump extends TileMod implements IAnimationProvider { moving = 0F; } } - move.setValue(innerRingPos); + move.setValue(innerRingPos / 8 * 0.5F); // rescale to 0 - 0.5 for json animation if(!hasCartOnTop) comparator = 0; - if(!hasCart && active) { - + if(!hasCart && active) setActive(false); - } if(active && hasRedstone) setActive(false); @@ -113,7 +111,11 @@ public class TilePump extends TileMod implements IAnimationProvider { @Override public void readCustomNBT(NBTTagCompound cmp) { + boolean prevActive = active; active = cmp.getBoolean(TAG_ACTIVE); + if(worldObj != null && worldObj.isRemote) + if(prevActive != active) + asm.transition(active ? "moving" : "default"); } public void setActive(boolean active) { diff --git a/src/main/resources/assets/botania/asms/block/pump.json b/src/main/resources/assets/botania/asms/block/pump.json index 6a1a4063d..f1217ed0c 100644 --- a/src/main/resources/assets/botania/asms/block/pump.json +++ b/src/main/resources/assets/botania/asms/block/pump.json @@ -2,7 +2,7 @@ "parameters": {}, "clips": { "default": "botania:block/pump_head@default", - "moving": "botania:block/pump_head@moving" + "moving": [ "apply", "botania:block/pump_head@moving", "#move" ] }, "states": [ "default", "moving" ], "transitions": {