From 60ad0b1caafb4f8af0a16224ca2d1d0d1a03e35a Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Mon, 23 Nov 2015 19:06:07 +0100 Subject: [PATCH] Made Text for bugged items less dumb --- .../java/ellpeck/actuallyadditions/blocks/BlockCrystal.java | 3 ++- src/main/java/ellpeck/actuallyadditions/blocks/BlockMisc.java | 3 ++- .../java/ellpeck/actuallyadditions/blocks/BlockWildPlant.java | 3 ++- src/main/java/ellpeck/actuallyadditions/items/ItemCrystal.java | 3 ++- src/main/java/ellpeck/actuallyadditions/items/ItemDust.java | 3 ++- src/main/java/ellpeck/actuallyadditions/items/ItemFoods.java | 3 ++- src/main/java/ellpeck/actuallyadditions/items/ItemJams.java | 3 ++- src/main/java/ellpeck/actuallyadditions/items/ItemMisc.java | 3 ++- .../java/ellpeck/actuallyadditions/items/ItemPotionRing.java | 2 +- .../java/ellpeck/actuallyadditions/items/ItemSpecialDrop.java | 3 ++- src/main/java/ellpeck/actuallyadditions/util/StringUtil.java | 2 ++ src/main/resources/assets/actuallyadditions/lang/en_US.lang | 1 + 12 files changed, 22 insertions(+), 10 deletions(-) diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockCrystal.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockCrystal.java index c0fc7face..92dbc661a 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockCrystal.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockCrystal.java @@ -16,6 +16,7 @@ import ellpeck.actuallyadditions.items.ItemBlockBase; import ellpeck.actuallyadditions.items.metalists.TheCrystals; import ellpeck.actuallyadditions.util.IActAddItemOrBlock; import ellpeck.actuallyadditions.util.ModUtil; +import ellpeck.actuallyadditions.util.StringUtil; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -96,7 +97,7 @@ public class BlockCrystal extends Block implements IActAddItemOrBlock{ @Override public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName()+(stack.getItemDamage() >= allCrystals.length ? " ERROR!" : allCrystals[stack.getItemDamage()].name); + return stack.getItemDamage() >= allCrystals.length ? StringUtil.BUGGED_ITEM_NAME : this.getUnlocalizedName()+allCrystals[stack.getItemDamage()].name; } @Override diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockMisc.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockMisc.java index 0735686be..1f1db362d 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockMisc.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockMisc.java @@ -17,6 +17,7 @@ import ellpeck.actuallyadditions.items.ItemBlockBase; import ellpeck.actuallyadditions.proxy.ClientProxy; import ellpeck.actuallyadditions.util.IActAddItemOrBlock; import ellpeck.actuallyadditions.util.ModUtil; +import ellpeck.actuallyadditions.util.StringUtil; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -108,7 +109,7 @@ public class BlockMisc extends Block implements IActAddItemOrBlock{ @Override public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName()+(stack.getItemDamage() >= allMiscBlocks.length ? " ERROR!" : allMiscBlocks[stack.getItemDamage()].name); + return stack.getItemDamage() >= allMiscBlocks.length ? StringUtil.BUGGED_ITEM_NAME : this.getUnlocalizedName()+allMiscBlocks[stack.getItemDamage()].name; } @Override diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockWildPlant.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockWildPlant.java index 61abd430d..657ef5df4 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockWildPlant.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockWildPlant.java @@ -15,6 +15,7 @@ import cpw.mods.fml.relauncher.SideOnly; import ellpeck.actuallyadditions.blocks.metalists.TheWildPlants; import ellpeck.actuallyadditions.items.ItemBlockBase; import ellpeck.actuallyadditions.util.IActAddItemOrBlock; +import ellpeck.actuallyadditions.util.StringUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockBush; import net.minecraft.block.material.Material; @@ -106,7 +107,7 @@ public class BlockWildPlant extends BlockBush implements IActAddItemOrBlock{ @Override public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName()+(stack.getItemDamage() >= allWildPlants.length ? " ERROR!" : allWildPlants[stack.getItemDamage()].name); + return stack.getItemDamage() >= allWildPlants.length ? StringUtil.BUGGED_ITEM_NAME : this.getUnlocalizedName()+allWildPlants[stack.getItemDamage()].name; } @Override diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemCrystal.java b/src/main/java/ellpeck/actuallyadditions/items/ItemCrystal.java index 8902955be..b7ea90aeb 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemCrystal.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemCrystal.java @@ -15,6 +15,7 @@ import cpw.mods.fml.relauncher.SideOnly; import ellpeck.actuallyadditions.blocks.BlockCrystal; import ellpeck.actuallyadditions.util.IActAddItemOrBlock; import ellpeck.actuallyadditions.util.ModUtil; +import ellpeck.actuallyadditions.util.StringUtil; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; @@ -41,7 +42,7 @@ public class ItemCrystal extends Item implements IActAddItemOrBlock{ @Override public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName()+(stack.getItemDamage() >= BlockCrystal.allCrystals.length ? " ERROR!" : BlockCrystal.allCrystals[stack.getItemDamage()].name); + return stack.getItemDamage() >= BlockCrystal.allCrystals.length ? StringUtil.BUGGED_ITEM_NAME : this.getUnlocalizedName()+BlockCrystal.allCrystals[stack.getItemDamage()].name; } @Override diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemDust.java b/src/main/java/ellpeck/actuallyadditions/items/ItemDust.java index ac8d40333..50e93aca2 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemDust.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemDust.java @@ -15,6 +15,7 @@ import cpw.mods.fml.relauncher.SideOnly; import ellpeck.actuallyadditions.items.metalists.TheDusts; import ellpeck.actuallyadditions.util.IActAddItemOrBlock; import ellpeck.actuallyadditions.util.ModUtil; +import ellpeck.actuallyadditions.util.StringUtil; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; @@ -39,7 +40,7 @@ public class ItemDust extends Item implements IActAddItemOrBlock{ @Override public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName()+(stack.getItemDamage() >= allDusts.length ? " ERROR!" : allDusts[stack.getItemDamage()].name); + return stack.getItemDamage() >= allDusts.length ? StringUtil.BUGGED_ITEM_NAME : this.getUnlocalizedName()+allDusts[stack.getItemDamage()].name; } @Override diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemFoods.java b/src/main/java/ellpeck/actuallyadditions/items/ItemFoods.java index 0c4f8258e..5021cda07 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemFoods.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemFoods.java @@ -15,6 +15,7 @@ import cpw.mods.fml.relauncher.SideOnly; import ellpeck.actuallyadditions.items.metalists.TheFoods; import ellpeck.actuallyadditions.util.IActAddItemOrBlock; import ellpeck.actuallyadditions.util.ModUtil; +import ellpeck.actuallyadditions.util.StringUtil; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.item.EntityItem; @@ -87,7 +88,7 @@ public class ItemFoods extends ItemFood implements IActAddItemOrBlock{ @Override public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName()+(stack.getItemDamage() >= allFoods.length ? " ERROR!" : allFoods[stack.getItemDamage()].name); + return stack.getItemDamage() >= allFoods.length ? StringUtil.BUGGED_ITEM_NAME : this.getUnlocalizedName()+allFoods[stack.getItemDamage()].name; } @Override diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemJams.java b/src/main/java/ellpeck/actuallyadditions/items/ItemJams.java index 0d50b38dd..e63768104 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemJams.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemJams.java @@ -15,6 +15,7 @@ import cpw.mods.fml.relauncher.SideOnly; import ellpeck.actuallyadditions.items.metalists.TheJams; import ellpeck.actuallyadditions.util.IActAddItemOrBlock; import ellpeck.actuallyadditions.util.ModUtil; +import ellpeck.actuallyadditions.util.StringUtil; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.item.EntityItem; @@ -49,7 +50,7 @@ public class ItemJams extends ItemFood implements IActAddItemOrBlock{ @Override public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName()+(stack.getItemDamage() >= allJams.length ? " ERROR!" : allJams[stack.getItemDamage()].name); + return stack.getItemDamage() >= allJams.length ? StringUtil.BUGGED_ITEM_NAME : this.getUnlocalizedName()+allJams[stack.getItemDamage()].name; } @Override diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemMisc.java b/src/main/java/ellpeck/actuallyadditions/items/ItemMisc.java index 1fc0305d6..f321850a4 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemMisc.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemMisc.java @@ -15,6 +15,7 @@ import cpw.mods.fml.relauncher.SideOnly; import ellpeck.actuallyadditions.items.metalists.TheMiscItems; import ellpeck.actuallyadditions.util.IActAddItemOrBlock; import ellpeck.actuallyadditions.util.ModUtil; +import ellpeck.actuallyadditions.util.StringUtil; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; @@ -47,7 +48,7 @@ public class ItemMisc extends Item implements IActAddItemOrBlock{ @Override public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName()+(stack.getItemDamage() >= allMiscItems.length ? " ERROR!" : allMiscItems[stack.getItemDamage()].name); + return stack.getItemDamage() >= allMiscItems.length ? StringUtil.BUGGED_ITEM_NAME : this.getUnlocalizedName()+allMiscItems[stack.getItemDamage()].name; } @Override diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemPotionRing.java b/src/main/java/ellpeck/actuallyadditions/items/ItemPotionRing.java index e1dd906ef..dd7a21790 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemPotionRing.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemPotionRing.java @@ -48,7 +48,7 @@ public class ItemPotionRing extends Item implements IActAddItemOrBlock{ @Override public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName()+(stack.getItemDamage() >= allRings.length ? " ERROR!" : allRings[stack.getItemDamage()].name.substring("potion".length())); + return stack.getItemDamage() >= allRings.length ? StringUtil.BUGGED_ITEM_NAME : this.getUnlocalizedName()+allRings[stack.getItemDamage()].name; } @Override diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemSpecialDrop.java b/src/main/java/ellpeck/actuallyadditions/items/ItemSpecialDrop.java index 797b8fc04..2604bb915 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemSpecialDrop.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemSpecialDrop.java @@ -15,6 +15,7 @@ import cpw.mods.fml.relauncher.SideOnly; import ellpeck.actuallyadditions.items.metalists.TheSpecialDrops; import ellpeck.actuallyadditions.util.IActAddItemOrBlock; import ellpeck.actuallyadditions.util.ModUtil; +import ellpeck.actuallyadditions.util.StringUtil; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.item.EntityXPOrb; @@ -73,7 +74,7 @@ public class ItemSpecialDrop extends Item implements IActAddItemOrBlock{ @Override public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName()+(stack.getItemDamage() >= allDrops.length ? " ERROR!" : allDrops[stack.getItemDamage()].name); + return stack.getItemDamage() >= allDrops.length ? StringUtil.BUGGED_ITEM_NAME : this.getUnlocalizedName()+allDrops[stack.getItemDamage()].name; } @Override diff --git a/src/main/java/ellpeck/actuallyadditions/util/StringUtil.java b/src/main/java/ellpeck/actuallyadditions/util/StringUtil.java index 5dba58ca5..5d440954e 100644 --- a/src/main/java/ellpeck/actuallyadditions/util/StringUtil.java +++ b/src/main/java/ellpeck/actuallyadditions/util/StringUtil.java @@ -20,6 +20,8 @@ public class StringUtil{ public static final int DECIMAL_COLOR_WHITE = 16777215; public static final int DECIMAL_COLOR_GRAY_TEXT = 4210752; + public static final String BUGGED_ITEM_NAME = "lolWutHowUDoDis"; + /** * Localizes a given String via StatCollector */ diff --git a/src/main/resources/assets/actuallyadditions/lang/en_US.lang b/src/main/resources/assets/actuallyadditions/lang/en_US.lang index 375e37777..7ac162b2e 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_US.lang +++ b/src/main/resources/assets/actuallyadditions/lang/en_US.lang @@ -1,6 +1,7 @@ #General itemGroup.actuallyadditions=Actually Additions achievement.page.actuallyadditions=Actually Additions +lolWutHowUDoDis.name=This is bugged. Throw it away. Please. #Fluids fluid.actuallyadditions.oil=Oil