diff --git a/src/main/java/gregtechmod/GT_Mod.java b/src/main/java/gregtechmod/GT_Mod.java index f265ec5..0d87565 100644 --- a/src/main/java/gregtechmod/GT_Mod.java +++ b/src/main/java/gregtechmod/GT_Mod.java @@ -21,6 +21,7 @@ import gregtechmod.common.blocks.GT_BlockMetaID_Block; import gregtechmod.common.blocks.GT_BlockMetaID_Block2; import gregtechmod.common.blocks.GT_BlockMetaID_Machine; import gregtechmod.common.blocks.GT_BlockMetaID_Ore; +import gregtechmod.common.blocks.GT_BlockMetaID_Stone1; import gregtechmod.common.blocks.GT_Block_LightSource; import gregtechmod.common.covers.GT_Cover_Generic; import gregtechmod.common.covers.GT_Cover_None; @@ -29,6 +30,7 @@ import gregtechmod.common.items.GT_MetaBlock2_Item; import gregtechmod.common.items.GT_MetaBlock_Item; import gregtechmod.common.items.GT_MetaMachine_Item; import gregtechmod.common.items.GT_MetaOre_Item; +import gregtechmod.common.items.GT_MetaStone1_Item; import gregtechmod.common.render.GT_Block_Renderer; import gregtechmod.loaders.misc.GT_CoverLoader; import gregtechmod.loaders.misc.GT_TooEasyModeLoader; @@ -473,8 +475,8 @@ public class GT_Mod implements IGT_Mod, IGT_RecipeAdder { GameRegistry.registerBlock(GregTech_API.sBlockList[2] = new GT_BlockMetaID_Ore (), GT_MetaOre_Item.class , GT_LanguageManager.mNameList2[0]); GameRegistry.registerBlock(GregTech_API.sBlockList[4] = new GT_BlockMetaID_Block2 (), GT_MetaBlock2_Item.class , GT_LanguageManager.mNameList3[0]); GameRegistry.registerBlock(GregTech_API.sBlockList[3] = new GT_Block_LightSource (), ItemBlock.class , "GT_TransparentTileEntity" ); -// GameRegistry.registerBlock(GregTech_API.sBlockList[5] = new GT_BlockMetaID_Stone1 (), GT_MetaStone1_Item.class , GT_LanguageManager.mNameList4[0]); -// + GameRegistry.registerBlock(GregTech_API.sBlockList[5] = new GT_BlockMetaID_Stone1 (), GT_MetaStone1_Item.class , GT_LanguageManager.mNameList4[0]); + // LanguageRegistry.addName(GregTech_API.sBlockList[0], GT_LanguageManager.mRegionalNameList0[0]); // LanguageRegistry.addName(GregTech_API.sBlockList[1], GT_LanguageManager.mRegionalNameList1[0]); // LanguageRegistry.addName(GregTech_API.sBlockList[2], GT_LanguageManager.mRegionalNameList2[0]); diff --git a/src/main/java/gregtechmod/common/blocks/GT_BlockMetaID_Stone1.java b/src/main/java/gregtechmod/common/blocks/GT_BlockMetaID_Stone1.java index f8719c9..7792532 100644 --- a/src/main/java/gregtechmod/common/blocks/GT_BlockMetaID_Stone1.java +++ b/src/main/java/gregtechmod/common/blocks/GT_BlockMetaID_Stone1.java @@ -1,60 +1,62 @@ package gregtechmod.common.blocks; import gregtechmod.api.GregTech_API; +import gregtechmod.api.util.GT_Config; import java.util.List; import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EnumCreatureType; +import net.minecraft.init.Blocks; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; public class GT_BlockMetaID_Stone1 extends Block { public static final int Metablockcount = 16; - public static Icon[] mIcons = new Icon[Metablockcount]; + public static IIcon[] mIcons = new IIcon[Metablockcount]; - public GT_BlockMetaID_Stone1(int aID) { - super(aID, Material.rock); + public GT_BlockMetaID_Stone1() { + super(Material.rock); setResistance(60.0F); - setUnlocalizedName("BlockMetaID_Stone1"); - setStepSound(Block.soundStoneFootstep); + setBlockName("BlockMetaID_Stone1"); + setStepSound(Block.soundTypeStone); setCreativeTab(GregTech_API.TAB_GREGTECH); - for (int i = 0; i < 16; i++) MinecraftForge.setBlockHarvestLevel(this, i, "pickaxe", 3); + for (int i = 0; i < 16; i++) setHarvestLevel("pickaxe", 3, i); } @Override public float getBlockHardness(World par1World, int par2, int par3, int par4) { - return blockHardness = Block.stone.blockHardness * 3.0F; + return blockHardness = Blocks.stone.getBlockHardness(par1World, par2, par3, par4) * 3.0F; } @Override @SideOnly(Side.CLIENT) - public void registerIcons(IconRegister par1IconRegister) { - for (int i = 0; i < mIcons.length; i++) mIcons[i] = par1IconRegister.registerIcon(GregTech_API.TEXTURE_PATH_BLOCK + (GregTech_API.sConfiguration.system?"troll":getUnlocalizedName() + "/" + i)); + public void registerBlockIcons(IIconRegister par1IconRegister) { + for (int i = 0; i < mIcons.length; i++) mIcons[i] = par1IconRegister.registerIcon(GregTech_API.TEXTURE_PATH_BLOCK + (GT_Config.system ? "troll" : getUnlocalizedName() + "/" + i)); } @Override - public boolean canCreatureSpawn(EnumCreatureType type, World world, int x, int y, int z) { + public boolean canCreatureSpawn(EnumCreatureType type, IBlockAccess world, int x, int y, int z) { return world.getBlockMetadata(x, y, z) % 8 < 3; } @Override - public Icon getBlockTexture(IBlockAccess aWorld, int xCoord, int yCoord, int zCoord, int aSide) { + public IIcon getIcon(IBlockAccess aWorld, int xCoord, int yCoord, int zCoord, int aSide) { return this.getIcon(aSide, aWorld.getBlockMetadata(xCoord, yCoord, zCoord)); } @Override - public Icon getIcon(int aSide, int aMeta) { + public IIcon getIcon(int aSide, int aMeta) { if (aMeta < 0 || aMeta >= mIcons.length) return null; return mIcons[aMeta]; } @@ -74,13 +76,9 @@ public class GT_BlockMetaID_Stone1 extends Block { return 1; } - @Override - public int idDropped(int par1, Random par2Random, int par3) { - return blockID; - } - + @SuppressWarnings({ "rawtypes", "unchecked" }) @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(int par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { for (int i = 0; i < Metablockcount; ++i) { par3List.add(new ItemStack(par1, 1, i)); } diff --git a/src/main/java/gregtechmod/common/items/GT_MetaStone1_Item.java b/src/main/java/gregtechmod/common/items/GT_MetaStone1_Item.java index 3a433ae..018730b 100644 --- a/src/main/java/gregtechmod/common/items/GT_MetaStone1_Item.java +++ b/src/main/java/gregtechmod/common/items/GT_MetaStone1_Item.java @@ -5,12 +5,13 @@ import gregtechmod.api.util.GT_LanguageManager; import java.util.List; +import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; public class GT_MetaStone1_Item extends ItemBlock { - public GT_MetaStone1_Item(int par1) { + public GT_MetaStone1_Item(Block par1) { super(par1); setMaxDamage(0); setHasSubtypes(true); @@ -23,6 +24,7 @@ public class GT_MetaStone1_Item extends ItemBlock { return par1; } + @SuppressWarnings({ "rawtypes", "unchecked" }) @Override public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean par4) { if (aStack.getItemDamage() % 8 > 2) aList.add("Mobs can't spawn on this Block");