diff options
| author | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2018-05-26 13:29:15 +1000 |
|---|---|---|
| committer | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2018-05-26 13:29:15 +1000 |
| commit | 6388f9b1e24ac2352ebb9ac1b18940d863e8199b (patch) | |
| tree | c7c992f50a754ed9075ab248fe621a63ba2af424 | |
| parent | 07057093486610bd952a61862c0ea098af853f2a (diff) | |
| download | GT5-Unofficial-6388f9b1e24ac2352ebb9ac1b18940d863e8199b.tar.gz GT5-Unofficial-6388f9b1e24ac2352ebb9ac1b18940d863e8199b.tar.bz2 GT5-Unofficial-6388f9b1e24ac2352ebb9ac1b18940d863e8199b.zip | |
% Made Large Eggs have a random size.
$ Fixed invalid localization of Large Chickens.
| -rw-r--r-- | src/Java/gtPlusPlus/core/item/ModItems.java | 2 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/item/general/ItemGiantEgg.java | 31 | ||||
| -rw-r--r-- | src/resources/assets/miscutils/lang/en_US.lang | 2 |
3 files changed, 33 insertions, 2 deletions
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java index 0e9d11dd3c..919ad74374 100644 --- a/src/Java/gtPlusPlus/core/item/ModItems.java +++ b/src/Java/gtPlusPlus/core/item/ModItems.java @@ -275,7 +275,7 @@ public final class ModItems { public static final void init(){ itemAlkalusDisk = new BaseItemDamageable("itemAlkalusDisk", AddToCreativeTab.tabMisc, 1, 0, "Unknown Use", EnumRarity.rare, EnumChatFormatting.AQUA, false, null); - itemBigEgg = new BaseItemBurnable("itemBigEgg", "Ginourmous Chicken Egg", tabMisc, 64, 0, "I had best try disassemble this.. for science!", "fuelLargeChickenEgg", 5000, 0).setTextureName(CORE.MODID + ":itemBigEgg"); + itemBigEgg = new ItemGiantEgg("itemBigEgg", "Ginourmous Chicken Egg", tabMisc, 64, 0, "I had best try disassemble this.. for science!", "fuelLargeChickenEgg", 5000, 0).setTextureName(CORE.MODID + ":itemBigEgg"); //Debug Loading if (CORE.DEBUG){ diff --git a/src/Java/gtPlusPlus/core/item/general/ItemGiantEgg.java b/src/Java/gtPlusPlus/core/item/general/ItemGiantEgg.java new file mode 100644 index 0000000000..155950eb75 --- /dev/null +++ b/src/Java/gtPlusPlus/core/item/general/ItemGiantEgg.java @@ -0,0 +1,31 @@ +package gtPlusPlus.core.item.general; + +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.ItemStack; + +import gtPlusPlus.core.item.base.BaseItemBurnable; +import gtPlusPlus.core.util.math.MathUtils; +import gtPlusPlus.core.util.minecraft.NBTUtils; + +public class ItemGiantEgg extends BaseItemBurnable { + + public ItemGiantEgg(String unlocalizedName, String displayName, CreativeTabs creativeTab, int stackSize, int maxDmg, + String description, String oredictName, int burnTime, int meta) { + super(unlocalizedName, displayName, creativeTab, stackSize, maxDmg, description, oredictName, burnTime, meta); + } + + @Override + public String getItemStackDisplayName(ItemStack aStack) { + String localName = super.getItemStackDisplayName(aStack); + int size = 1; + if (NBTUtils.hasKey(aStack, "size")) { + size = NBTUtils.getInteger(aStack, "size"); + } + else { + NBTUtils.setInteger(aStack, "size", MathUtils.randInt(1, 8)); + size = NBTUtils.getInteger(aStack, "size"); + } + return ""+size+localName; + } + +} diff --git a/src/resources/assets/miscutils/lang/en_US.lang b/src/resources/assets/miscutils/lang/en_US.lang index 43dac005d4..a59efde1c6 100644 --- a/src/resources/assets/miscutils/lang/en_US.lang +++ b/src/resources/assets/miscutils/lang/en_US.lang @@ -1982,4 +1982,4 @@ entity.throwablePotionSulfuric.name=Flask of Sulfuric Acid entity.throwablePotionHydrofluoric.name=Flask of Hydrofluoric Acid entity.toxinBall.name=Toxin globule entity.plasmaBolt.name=Plasma -entity.MiningbigChickenFriendlyCharge.name=Giant Chicken +entity.bigChickenFriendly.name=Giant Chicken |