mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-19 03:39:17 +00:00
Tweak gravityrod, terrapick, and tornadorod animation. Made terraform rod respect world specific sea level. Closes #102
This commit is contained in:
1 parent
fe1d88379d
commit
7e1ef7aa7f
5 files changed
+18
-7
No files matched your search
@@ -517,7 +517,6 @@ public final class ModelHandler {
|
||||
registerItemModel(fireRod);
|
||||
registerItemModel(rainbowRod);
|
||||
registerItemModel(skyDirtRod);
|
||||
registerItemModel(tornadoRod);
|
||||
registerItemModel(terraformRod);
|
||||
registerItemModel(diviningRod);
|
||||
registerItemModel(gravityRod);
|
||||
|
||||
+1
-1
@@ -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);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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))
|
||||
|
||||
@@ -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<String> validBlocks = Arrays.asList(new String[] {
|
||||
private static final List<String> 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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in new issue
Block a user