diff options
62 files changed, 384 insertions, 548 deletions
diff --git a/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java b/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java index 4f8ac3b4e7..975ddd3d0f 100644 --- a/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java +++ b/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java @@ -13,7 +13,6 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.api.objects.Logger; @@ -34,7 +33,6 @@ public class BlockSuperLight extends BlockContainer { this.setBlockName("blockSuperLight"); this.setCreativeTab(CreativeTabs.tabRedstone); GameRegistry.registerBlock(this, "blockSuperLight"); - LanguageRegistry.addName(this, "Shining Star"); } /** diff --git a/src/main/java/gtPlusPlus/core/block/general/BlockTankXpConverter.java b/src/main/java/gtPlusPlus/core/block/general/BlockTankXpConverter.java index e0feb70497..6a92c92453 100644 --- a/src/main/java/gtPlusPlus/core/block/general/BlockTankXpConverter.java +++ b/src/main/java/gtPlusPlus/core/block/general/BlockTankXpConverter.java @@ -13,7 +13,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.creative.AddToCreativeTab; @@ -37,7 +36,6 @@ public class BlockTankXpConverter extends BlockContainer { this.setBlockName("blockTankXpConverter"); this.setCreativeTab(AddToCreativeTab.tabMachines); GameRegistry.registerBlock(this, ItemBlockEntityBase.class, "blockTankXpConverter"); - LanguageRegistry.addName(this, "Xp Converter"); this.generateRainbowMap(); if (!this.getTickRandomly()) { this.setTickRandomly(true); diff --git a/src/main/java/gtPlusPlus/core/block/general/FirePit.java b/src/main/java/gtPlusPlus/core/block/general/FirePit.java index 0ac8f240c1..6c93fdf2cf 100644 --- a/src/main/java/gtPlusPlus/core/block/general/FirePit.java +++ b/src/main/java/gtPlusPlus/core/block/general/FirePit.java @@ -18,7 +18,6 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.block.base.BasicBlock; @@ -40,7 +39,6 @@ public class FirePit extends BasicBlock { this.setResistance(35.0F); this.setStepSound(Block.soundTypeWood); GameRegistry.registerBlock(this, "blockFirePit"); - LanguageRegistry.addName(this, "Fire Pit"); } @Override diff --git a/src/main/java/gtPlusPlus/core/block/general/HellFire.java b/src/main/java/gtPlusPlus/core/block/general/HellFire.java index 4942d9555c..235b7db07a 100644 --- a/src/main/java/gtPlusPlus/core/block/general/HellFire.java +++ b/src/main/java/gtPlusPlus/core/block/general/HellFire.java @@ -21,7 +21,6 @@ import net.minecraftforge.common.util.ForgeDirection; import com.google.common.collect.Maps; import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.api.objects.random.XSTR; @@ -48,7 +47,6 @@ public class HellFire extends BlockFire { this.setBlockName("blockHellFire"); this.setCreativeTab(AddToCreativeTab.tabBlock); GameRegistry.registerBlock(this, "blockHellFire"); - LanguageRegistry.addName(this, "Hellish Fire"); this.enableBrutalFire(); } diff --git a/src/main/java/gtPlusPlus/core/block/general/MiningExplosives.java b/src/main/java/gtPlusPlus/core/block/general/MiningExplosives.java index b254caadf3..8dfe5eb367 100644 --- a/src/main/java/gtPlusPlus/core/block/general/MiningExplosives.java +++ b/src/main/java/gtPlusPlus/core/block/general/MiningExplosives.java @@ -15,7 +15,6 @@ import net.minecraft.world.Explosion; import net.minecraft.world.World; import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.creative.AddToCreativeTab; @@ -33,7 +32,6 @@ public class MiningExplosives extends BlockTNT { public MiningExplosives() { this.setBlockName("blockMiningExplosives"); GameRegistry.registerBlock(this, "blockMiningExplosives"); - LanguageRegistry.addName(this, "Earth Blasting Explosives"); this.setCreativeTab(AddToCreativeTab.tabMachines); } diff --git a/src/main/java/gtPlusPlus/core/block/machine/CircuitProgrammer.java b/src/main/java/gtPlusPlus/core/block/machine/CircuitProgrammer.java index b25b24302f..5f353f2590 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/CircuitProgrammer.java +++ b/src/main/java/gtPlusPlus/core/block/machine/CircuitProgrammer.java @@ -11,7 +11,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import cpw.mods.fml.common.registry.LanguageRegistry; import gregtech.common.items.GT_MetaGenerated_Tool_01; import gtPlusPlus.GTplusplus; import gtPlusPlus.api.objects.minecraft.CubicObject; @@ -37,7 +36,6 @@ public class CircuitProgrammer extends BasicTileBlockWithTooltip { @SuppressWarnings("deprecation") public CircuitProgrammer() { super(Material.iron); - LanguageRegistry.addName(this, "Circuit Programmer"); } /** diff --git a/src/main/java/gtPlusPlus/core/block/machine/DecayablesChest.java b/src/main/java/gtPlusPlus/core/block/machine/DecayablesChest.java index 7ca23df3f9..28690e7972 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/DecayablesChest.java +++ b/src/main/java/gtPlusPlus/core/block/machine/DecayablesChest.java @@ -14,7 +14,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.GTplusplus; @@ -58,7 +57,6 @@ public class DecayablesChest extends BlockContainer implements ITileTooltip { this.setHardness(5f); this.setResistance(1f); GameRegistry.registerBlock(this, ItemBlockBasicTile.class, "blockDecayablesChest"); - LanguageRegistry.addName(this, "Lead Lined Box"); this.setBlockBounds(0.0625F, 0.0F, 0.0625F, 0.9375F, 0.875F, 0.9375F); } diff --git a/src/main/java/gtPlusPlus/core/block/machine/EggBox.java b/src/main/java/gtPlusPlus/core/block/machine/EggBox.java index f4de81cbd4..7cc444e7d0 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/EggBox.java +++ b/src/main/java/gtPlusPlus/core/block/machine/EggBox.java @@ -14,7 +14,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.GTplusplus; @@ -57,7 +56,6 @@ public class EggBox extends BlockContainer implements ITileTooltip { this.setHardness(5f); this.setResistance(1f); GameRegistry.registerBlock(this, ItemBlockBasicTile.class, "blockEggBox"); - LanguageRegistry.addName(this, "Egg Box"); } /** diff --git a/src/main/java/gtPlusPlus/core/block/machine/FishTrap.java b/src/main/java/gtPlusPlus/core/block/machine/FishTrap.java index 5571a4eb41..f016681b77 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/FishTrap.java +++ b/src/main/java/gtPlusPlus/core/block/machine/FishTrap.java @@ -14,7 +14,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.GTplusplus; @@ -54,7 +53,6 @@ public class FishTrap extends BlockContainer implements ITileTooltip { this.setResistance(1f); this.setCreativeTab(AddToCreativeTab.tabMachines); GameRegistry.registerBlock(this, ItemBlockBasicTile.class, "blockFishTrap"); - LanguageRegistry.addName(this, "Fish Catcher"); } /** diff --git a/src/main/java/gtPlusPlus/core/block/machine/HeliumGenerator.java b/src/main/java/gtPlusPlus/core/block/machine/HeliumGenerator.java index 8eaa331c12..610c7307f6 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/HeliumGenerator.java +++ b/src/main/java/gtPlusPlus/core/block/machine/HeliumGenerator.java @@ -9,7 +9,6 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.GTplusplus; @@ -34,7 +33,6 @@ public class HeliumGenerator extends BlockContainer { this.setBlockName("blockHeliumGenerator"); this.setCreativeTab(AddToCreativeTab.tabMachines); GameRegistry.registerBlock(this, "blockHeliumGenerator"); - LanguageRegistry.addName(this, "Helium Generator"); } /** diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java b/src/main/java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java index 14c54b1040..0d6ed29e78 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java +++ b/src/main/java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java @@ -11,7 +11,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.GTplusplus; @@ -49,7 +48,6 @@ public class Machine_ModularityTable extends BlockContainer implements ITileTool this.setBlockName("blockModularity"); this.setCreativeTab(AddToCreativeTab.tabMachines); GameRegistry.registerBlock(this, ItemBlockBasicTile.class, "blockModularity"); - LanguageRegistry.addName(this, "Modularity Configurator"); } /** diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_PestKiller.java b/src/main/java/gtPlusPlus/core/block/machine/Machine_PestKiller.java index 895bc8847f..4058196e21 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/Machine_PestKiller.java +++ b/src/main/java/gtPlusPlus/core/block/machine/Machine_PestKiller.java @@ -14,7 +14,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.GTplusplus; @@ -55,7 +54,6 @@ public class Machine_PestKiller extends BlockContainer implements ITileTooltip { this.setResistance(1f); this.setCreativeTab(AddToCreativeTab.tabMachines); GameRegistry.registerBlock(this, ItemBlockBasicTile.class, "blockPestKiller"); - LanguageRegistry.addName(this, "Pest Killer"); } /** diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java b/src/main/java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java index 1f0f03f0f0..c334802f21 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java +++ b/src/main/java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java @@ -13,7 +13,6 @@ import net.minecraft.world.World; import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.GTplusplus; @@ -56,7 +55,6 @@ public class Machine_ProjectTable extends BlockContainer implements ITileTooltip this.setBlockName("blockProjectBench"); this.setCreativeTab(AddToCreativeTab.tabMachines); GameRegistry.registerBlock(this, ItemBlockBasicTile.class, "blockProjectBench"); - LanguageRegistry.addName(this, "Project Workbench"); } /** diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_SuperJukebox.java b/src/main/java/gtPlusPlus/core/block/machine/Machine_SuperJukebox.java index b79edd3fd9..5dcba9131c 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/Machine_SuperJukebox.java +++ b/src/main/java/gtPlusPlus/core/block/machine/Machine_SuperJukebox.java @@ -16,7 +16,6 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.util.GT_Utility; @@ -40,7 +39,6 @@ public class Machine_SuperJukebox extends BlockJukebox { setStepSound(soundTypePiston); setBlockTextureName("jukebox"); GameRegistry.registerBlock(this, "blockSuperJukebox"); - LanguageRegistry.addName(this, "Sir Mixalot [Jukebox]"); } /** diff --git a/src/main/java/gtPlusPlus/core/block/machine/VolumetricFlaskSetter.java b/src/main/java/gtPlusPlus/core/block/machine/VolumetricFlaskSetter.java index a25dd12e83..5619e55739 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/VolumetricFlaskSetter.java +++ b/src/main/java/gtPlusPlus/core/block/machine/VolumetricFlaskSetter.java @@ -12,7 +12,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import cpw.mods.fml.common.registry.LanguageRegistry; import gregtech.common.items.GT_MetaGenerated_Tool_01; import gtPlusPlus.GTplusplus; import gtPlusPlus.api.objects.minecraft.CubicObject; @@ -44,7 +43,6 @@ public class VolumetricFlaskSetter extends BasicTileBlockWithTooltip { @SuppressWarnings("deprecation") public VolumetricFlaskSetter() { super(Material.iron); - LanguageRegistry.addName(this, "Volumetric Flask Configurator"); } /** diff --git a/src/main/java/gtPlusPlus/core/item/ModItems.java b/src/main/java/gtPlusPlus/core/item/ModItems.java index 9c843943a4..e9bb6e1bf6 100644 --- a/src/main/java/gtPlusPlus/core/item/ModItems.java +++ b/src/main/java/gtPlusPlus/core/item/ModItems.java @@ -722,8 +722,8 @@ public final class ModItems { shardDull = new BaseItemTCShard( "Drained", Utils.rgbtoHexValue(75, 75, 75), - "Can be infused to create a magical shard.", - "Obtained from Mining Stone/SandStone, Chopping Logs or Shovelling Dirt."); + new String[] { "Can be infused to create a magical shard.", + "Obtained from Mining Stone/SandStone, Chopping Logs or Shovelling Dirt." }); // Generates four elemental shards when TC is not installed. if (!LoadedMods.Thaumcraft) { diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseEuItem.java b/src/main/java/gtPlusPlus/core/item/base/BaseEuItem.java index 154c1652ce..2b057ae416 100644 --- a/src/main/java/gtPlusPlus/core/item/base/BaseEuItem.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseEuItem.java @@ -15,6 +15,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IIcon; +import net.minecraft.util.StatCollector; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; @@ -101,12 +102,9 @@ public class BaseEuItem extends Item implements ISpecialElectricItem, IElectricI public void registerItem(final int id, final String localizedName, final long euStorage, final short tier, final String description, final EnumRarity regRarity, final EnumChatFormatting colour, final boolean Effect) { - this.addItem(id, localizedName, EnumChatFormatting.YELLOW + "Electric", new Object[] {}); + this.addItem(id, localizedName, colour + description, new Object[] {}); this.setElectricStats(this.mOffset + id, euStorage, GT_Values.V[tier], tier, -3L, true); this.rarity.add(new Pair<>(id, regRarity)); - this.itemName.add(new Pair<>(id, localizedName)); - this.itemDescription.add(new Pair<>(id, description)); - this.descColour.add(new Pair<>(id, colour)); this.hasEffect.add(new Pair<>(id, Effect)); } @@ -131,40 +129,34 @@ public class BaseEuItem extends Item implements ISpecialElectricItem, IElectricI @Override public void addInformation(final ItemStack aStack, final EntityPlayer aPlayer, List aList, final boolean aF3_H) { // aList.add("Meta: "+(aStack.getItemDamage()-mOffset)); - if ((this.descColour.get(aStack.getItemDamage() - this.mOffset) != null) - && (this.itemDescription.get(aStack.getItemDamage() - this.mOffset) != null)) { - aList.add( - this.descColour.get(aStack.getItemDamage() - this.mOffset).getValue() - + this.itemDescription.get(aStack.getItemDamag |