diff --git a/src/main/java/techreborn/blocks/BlockOre.java b/src/main/java/techreborn/blocks/BlockOre.java index 61031be53..4387f6633 100644 --- a/src/main/java/techreborn/blocks/BlockOre.java +++ b/src/main/java/techreborn/blocks/BlockOre.java @@ -30,7 +30,7 @@ public class BlockOre extends Block{ public BlockOre(Material material) { super(material); - setBlockName("ore"); + setBlockName("techreborn.ore"); setCreativeTab(TechRebornCreativeTab.instance); setHardness(1f); } diff --git a/src/main/java/techreborn/init/ModBlocks.java b/src/main/java/techreborn/init/ModBlocks.java index ec81a91d8..7d155071c 100644 --- a/src/main/java/techreborn/init/ModBlocks.java +++ b/src/main/java/techreborn/init/ModBlocks.java @@ -36,7 +36,7 @@ public class ModBlocks { GameRegistry.registerTileEntity(TileQuantumChest.class, "TileQuantumChest"); ore = new BlockOre(Material.rock); - GameRegistry.registerBlock(ore, ItemBlockOre.class, "ore"); + GameRegistry.registerBlock(ore, ItemBlockOre.class, "techreborn.ore"); } diff --git a/src/main/java/techreborn/items/ItemDusts.java b/src/main/java/techreborn/items/ItemDusts.java index 8448c2b67..d8e7e4d72 100644 --- a/src/main/java/techreborn/items/ItemDusts.java +++ b/src/main/java/techreborn/items/ItemDusts.java @@ -4,6 +4,7 @@ import java.util.List; import techreborn.Core; import techreborn.client.TechRebornCreativeTab; +import techreborn.lib.ModInfo; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -40,7 +41,7 @@ public class ItemDusts extends ItemTR for (int i = 0; i < types.length; ++i) { - textures[i] = iconRegister.registerIcon("techreborn" + "dust"); + textures[i] = iconRegister.registerIcon(ModInfo.MOD_ID + "dust"); } } diff --git a/src/main/java/techreborn/items/ItemTR.java b/src/main/java/techreborn/items/ItemTR.java index a62b7cab6..7192a97b5 100644 --- a/src/main/java/techreborn/items/ItemTR.java +++ b/src/main/java/techreborn/items/ItemTR.java @@ -1,6 +1,7 @@ package techreborn.items; import techreborn.client.TechRebornCreativeTab; +import techreborn.lib.ModInfo; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.Item; @@ -15,7 +16,7 @@ public class ItemTR extends Item{ @Override public void registerIcons(IIconRegister iconRegister) { - itemIcon = iconRegister.registerIcon("techreborn" + ":" + getUnlocalizedName().toLowerCase().substring(5)); + itemIcon = iconRegister.registerIcon(ModInfo.MOD_ID + ":" + getUnlocalizedName().toLowerCase().substring(5)); } } diff --git a/src/main/resources/assets/techreborn/lang/en_US.lang b/src/main/resources/assets/techreborn/lang/en_US.lang index 4b0d818e6..a4a97f22c 100644 --- a/src/main/resources/assets/techreborn/lang/en_US.lang +++ b/src/main/resources/assets/techreborn/lang/en_US.lang @@ -2,4 +2,18 @@ itemGroup.techreborn=Tech Reborn tile.techreborn.thermalGenerator.name=Thermal Generator tile.techreborn.quantumTank.name=Quantum Tank -tile.techreborn.quantumChest.name=Quantum Chest \ No newline at end of file +tile.techreborn.quantumChest.name=Quantum Chest + +#Ores +tile.techreborn.ore.Galena.name=Galena Ore +tile.techreborn.ore.Iridium.name=Iridium Ore +tile.techreborn.ore.Ruby.name=Ruby Ore +tile.techreborn.ore.Sapphire.name=Sapphire Ore +tile.techreborn.ore.Bauxite.name=Bauxite Ore +tile.techreborn.ore.Pyrite.name=Pyrite Ore +tile.techreborn.ore.Cinnabar.name=Cinnabar Ore +tile.techreborn.ore.Sphalerite.name=Sphalerite Ore +tile.techreborn.ore.Tungston.name=Tungston Ore +tile.techreborn.ore.Sheldonite.name=Sheldonite Ore +tile.techreborn.ore.Olivine.name=Olivine Ore +tile.techreborn.ore.Sodalite.name=Sodalite Ore \ No newline at end of file