From 7e1ef7aa7f0b7b172f9bd5ce524d4bf434429fc5 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 6 Feb 2016 23:54:28 -0600 Subject: [PATCH] Tweak gravityrod, terrapick, and tornadorod animation. Made terraform rod respect world specific sea level. Closes #102 --- .../botania/client/core/handler/ModelHandler.java | 1 - .../item/equipment/tool/terrasteel/ItemTerraPick.java | 2 +- .../botania/common/item/rod/ItemGravityRod.java | 5 +++++ .../botania/common/item/rod/ItemTerraformRod.java | 11 ++++++----- .../botania/common/item/rod/ItemTornadoRod.java | 6 ++++++ 5 files changed, 18 insertions(+), 7 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 8ffc5d3ff..119a13c90 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -517,7 +517,6 @@ public final class ModelHandler { registerItemModel(fireRod); registerItemModel(rainbowRod); registerItemModel(skyDirtRod); - registerItemModel(tornadoRod); registerItemModel(terraformRod); registerItemModel(diviningRod); registerItemModel(gravityRod); diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java index 9fd919201..85ced0aa8 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java @@ -270,7 +270,7 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ @Override public boolean shouldCauseReequipAnimation(ItemStack before, ItemStack after, boolean slotChanged) { - return isEnabled(before) != isEnabled(after); + return after.getItem() != this || isEnabled(before) != isEnabled(after); } } diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java index 52d1db68a..5cede98a0 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java @@ -51,6 +51,11 @@ public class ItemGravityRod extends ItemMod implements IManaUsingItem { setUnlocalizedName(LibItemNames.GRAVITY_ROD); } + @Override + public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) { + return newStack.getItem() != this; + } + @Override public void onUpdate(ItemStack stack, World world, Entity par3Entity, int p_77663_4_, boolean p_77663_5_) { if(!(par3Entity instanceof EntityPlayer)) diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java index e75e8abd2..1504d1ba2 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java @@ -14,6 +14,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import com.google.common.collect.ImmutableList; import net.minecraft.block.Block; import net.minecraft.block.BlockFlower; import net.minecraft.block.state.IBlockState; @@ -44,7 +45,7 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP private static final int COST_PER = 55; - static final List validBlocks = Arrays.asList(new String[] { + private static final List validBlocks = ImmutableList.of( "stone", "dirt", "grass", @@ -55,19 +56,19 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP "mycelium", "podzol", "sandstone", - - // Mod support "blockDiorite", "stoneDiorite", "blockGranite", "stoneGranite", "blockAndesite", "stoneAndesite", + + // Mod support "marble", "blockMarble", "limestone", "blockLimestone" - }); + ); public ItemTerraformRod() { super(); @@ -104,7 +105,7 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP int yCenter = (int) par3EntityPlayer.posY; int zCenter = (int) par3EntityPlayer.posZ; - if(yCenter < 62) // Not below sea level + if(yCenter < par2World.getSeaLevel()) // Not below sea level return; int yStart = yCenter + range; diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java index d386d4d74..64fb8069f 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java @@ -157,6 +157,12 @@ public class ItemTornadoRod extends ItemMod implements IManaUsingItem, IAvatarWi } } + @Override + public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) { + return newStack.getItem() != this || isFlying(oldStack) != isFlying(newStack); + } + + @Override public ResourceLocation getOverlayResource(IAvatarTile tile, ItemStack stack) { return avatarOverlay;