From 63685de43a732ef1fe66f7b3caedf29d7d3ea85d Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Thu, 6 Nov 2014 22:42:19 +0000 Subject: [PATCH] Increased the max amount of mana a Terra Shatterer can hold up to 2147483647. If you manage to reach this value you also get a fancy congratulatory message. --- .../botania/common/item/equipment/tool/ItemTerraPick.java | 7 +++++-- src/main/resources/assets/botania/lang/en_US.lang | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemTerraPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemTerraPick.java index 31aebe84d..44e01ebc6 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemTerraPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemTerraPick.java @@ -23,6 +23,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.StatCollector; @@ -51,7 +52,7 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem { private static final String TAG_MANA = "mana"; private static final String TAG_TIPPED = "tipped"; - private static final int MAX_MANA = 2000000000; + private static final int MAX_MANA = Integer.MAX_VALUE; private static final Material[] MATERIALS = new Material[] { Material.rock, Material.iron, Material.ice, Material.glass, Material.piston, Material.anvil, Material.grass, Material.ground, Material.sand, Material.snow, Material.craftedSnow, Material.clay }; @@ -60,7 +61,7 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem { }; private static final int[] CREATIVE_MANA = new int[] { - 10000 - 1, 1000000 - 1, 10000000 - 1, 100000000 - 1, 1000000000 - 1, MAX_MANA + 10000 - 1, 1000000 - 1, 10000000 - 1, 100000000 - 1, 1000000000 - 1, MAX_MANA - 1 }; IIcon iconTool, iconOverlay, iconTipped; @@ -85,6 +86,8 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem { String rankFormat = StatCollector.translateToLocal("botaniamisc.toolRank"); String rank = StatCollector.translateToLocal("botania.rank" + getLevel(par1ItemStack)); par3List.add(String.format(rankFormat, rank).replaceAll("&", "\u00a7")); + if(getMana(par1ItemStack) == Integer.MAX_VALUE) + par3List.add(EnumChatFormatting.RED + StatCollector.translateToLocal("botaniamisc.getALife")); } @Override diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index d897fe45f..1ff69052c 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -67,6 +67,7 @@ botaniamisc.brewOf=Brew of %s botaniamisc.needsCatalysts=No matter how hard you try to push the Terrasteel Ingot into the Beacon, nothing seems to happen, perhaps your configuration of catalyst pylons might be off. botaniamisc.peacefulNoob=You try to offer the Terrasteel Ingot, but the peaceful vibes of your world prevent you from doing so. Perhaps you should do something about that. botaniamisc.notInfused=Not Infused +botaniamisc.getALife=Get a Life # NEI INTEGRATION botania.nei.brewery=Botanical Brewery