From d97b2ceb1df61f5092bff7c0963db3edf4e89310 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 9 Apr 2016 22:43:50 -0500 Subject: [PATCH] Fix pool's north wall being slightly taller, Fix pump item model --- .../client/core/handler/ModelHandler.java | 1 + .../botania/common/block/mana/BlockPool.java | 2 +- .../common/block/tile/mana/TilePump.java | 26 +++++++++++++++---- 3 files changed, 23 insertions(+), 6 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java index c0b78ba38..914955f39 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -309,6 +309,7 @@ public final class ModelHandler { registerItemModel(ModBlocks.manaVoid); registerItemModel(ModBlocks.prism); registerItemModel(ModBlocks.pistonRelay); + registerItemModel(ModBlocks.pump); registerItemModel(ModBlocks.redStringComparator); registerItemModel(ModBlocks.redStringContainer); registerItemModel(ModBlocks.redStringDispenser); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java index 83bf2a955..a1eb184c1 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -146,7 +146,7 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon private static final AxisAlignedBB BOTTOM_AABB = new AxisAlignedBB(0, 0, 0, 1, 1/16.0, 1); private static final AxisAlignedBB NORTH_AABB = new AxisAlignedBB(0, 0, 15/16.0, 1, 0.5, 1); - private static final AxisAlignedBB SOUTH_AABB = new AxisAlignedBB(0, 0, 0, 1, 0.7, 1/16.0); + private static final AxisAlignedBB SOUTH_AABB = new AxisAlignedBB(0, 0, 0, 1, 0.5, 1/16.0); private static final AxisAlignedBB WEST_AABB = new AxisAlignedBB(0, 0, 0, 1/16.0, 0.5, 1); private static final AxisAlignedBB EAST_AABB = new AxisAlignedBB(15/16.0, 0, 0, 1, 0.5, 1); 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 de4e37d56..de355de06 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 @@ -15,8 +15,11 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.model.ModelLoaderRegistry; import net.minecraftforge.client.model.animation.Animation; import net.minecraftforge.common.animation.TimeValues; +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.common.model.animation.CapabilityAnimation; import net.minecraftforge.common.model.animation.IAnimationStateMachine; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.relauncher.Side; @@ -35,21 +38,34 @@ public class TilePump extends TileMod { public int comparator; public boolean hasRedstone = false; - int lastComparator = 0; + private int lastComparator = 0; private final TimeValues.VariableValue move; - //private final IAnimationStateMachine asm; + private final IAnimationStateMachine asm; public TilePump() { if (FMLCommonHandler.instance().getSide() == Side.CLIENT) { - move = new TimeValues.VariableValue(0); //todo 1.9 - //asm = Animation.INSTANCE.load(new ResourceLocation("botania", "asms/block/pump.json"), ImmutableMap.of("move", move)); + move = new TimeValues.VariableValue(0); + asm = ModelLoaderRegistry.loadASM(new ResourceLocation("botania", "asms/block/pump.json"), ImmutableMap.of("move", move)); } else { move = null; - //asm = null; + asm = null; } } + @Override + public boolean hasCapability(Capability cap, EnumFacing side) { + return cap == CapabilityAnimation.ANIMATION_CAPABILITY || super.hasCapability(cap, side); + } + + @Override + public T getCapability(Capability cap, EnumFacing side) { + if (cap == CapabilityAnimation.ANIMATION_CAPABILITY) { + return CapabilityAnimation.ANIMATION_CAPABILITY.cast(asm); + } + return super.getCapability(cap, side); + } + @Override public void updateEntity() { hasRedstone = false;