diff --git a/src/divine_equipment/Divine_Equipment.java b/src/divine_equipment/Divine_Equipment.java index 45114b2..a2e8e16 100644 --- a/src/divine_equipment/Divine_Equipment.java +++ b/src/divine_equipment/Divine_Equipment.java @@ -7,16 +7,25 @@ import cpw.mods.fml.common.Mod.Instance; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.network.NetworkMod; + import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.LanguageRegistry; import items.*; + import net.minecraft.block.Block; + import net.minecraft.block.material.Material; import net.minecraft.item.EnumToolMaterial; import net.minecraft.item.Item; import net.minecraftforge.common.EnumHelper; + import blocks.*; @Mod(modid = "divine_equipment", name = "Divine Equipment",version = "V0.5") @NetworkMod(clientSideRequired = true, serverSideRequired = false, channels = { "DEquipment" }) public class Divine_Equipment { + public static final String modid = "divine_equipment"; + public static Block taintedstone; + + + @Instance("Divine_Equipment") public static Divine_Equipment INSTANCE; @@ -30,7 +39,7 @@ public class Divine_Equipment // Init All Tainted materials EnumToolMaterial TaintedDiamond; EnumToolMaterial TaintedGold; - EnumToolMaterial TaintedIron; + EnumToolMaterial TaintedIron = EnumHelper.addToolMaterial("Tainted Iron", 2, 75, 6.0F, 3, 19); EnumToolMaterial TaintedStone; EnumToolMaterial TaintedWood; @@ -49,8 +58,9 @@ public class Divine_Equipment @Mod.EventHandler public void preInit(FMLPreInitializationEvent event){ - - + taintedstone = new TaintedRock(2550, Material.rock).setUnlocalizedName("Tainted Stone"); + GameRegistry.registerBlock(taintedstone, modid+ taintedstone.getUnlocalizedName().substring(5)); + LanguageRegistry.addName(taintedstone, "Tainted Stone"); // Tainted Tool Material Properties (Subject to Change) // Name, Harvest Level, Uses, Dig Speed, Damage, Enchantablity /* @@ -63,7 +73,6 @@ public class Divine_Equipment */ TaintedDiamond = EnumHelper.addToolMaterial("Tainted Diamond", 3, 1003, 8.0F, 4, 15); TaintedGold = EnumHelper.addToolMaterial("Tainted Gold", 2, 20, 12.0F, 0, 27); - TaintedIron = EnumHelper.addToolMaterial("Tainted Iron", 2, 75, 6.0F, 3, 19); TaintedStone = EnumHelper.addToolMaterial("Tainted Stone", 1, 88, 4.0F, 0, 10 ); TaintedWood = EnumHelper.addToolMaterial("Tainted Wood", 0, 40, 2.0F, 0, 20); @@ -76,8 +85,7 @@ public class Divine_Equipment BlessedWood = EnumHelper.addToolMaterial("Blessed Wood", 0, 59, 4.0F, 0, 15); //Telling forge that we are creating stuff - - // Tainted Swords + // Tainted Swords Item TaintedDiamondSword;{ //Create Item + Picture TaintedDiamondSword = new TaintedDiamondSword(2560, TaintedDiamond).setUnlocalizedName("Tainted_Sword_Diamond").setTextureName("divine_equipment:Tainted_Sword_Diamond"); @@ -96,7 +104,6 @@ public class Divine_Equipment LanguageRegistry.addName(TaintedStoneSword, "Tainted Stone Sword"); } // Item TaintedWoodSword;{} - // Blessed Swords Item BlessedDiamondSword;{ //Create Item + Picture diff --git a/src/divine_equipment/assets/divine_equipment/textures/blocks/TaintedStone.png b/src/divine_equipment/assets/divine_equipment/textures/blocks/TaintedStone.png new file mode 100644 index 0000000..4766178 Binary files /dev/null and b/src/divine_equipment/assets/divine_equipment/textures/blocks/TaintedStone.png differ diff --git a/src/divine_equipment/assets/divine_equipment/textures/items/Blessed_Sword_Diamond.png b/src/divine_equipment/assets/divine_equipment/textures/items/Blessed_Sword_Diamond.png new file mode 100644 index 0000000..a2a827e Binary files /dev/null and b/src/divine_equipment/assets/divine_equipment/textures/items/Blessed_Sword_Diamond.png differ diff --git a/src/divine_equipment/assets/divine_equipment/textures/items/Blessed_Sword_Gold.png b/src/divine_equipment/assets/divine_equipment/textures/items/Blessed_Sword_Gold.png new file mode 100644 index 0000000..ee1c92d Binary files /dev/null and b/src/divine_equipment/assets/divine_equipment/textures/items/Blessed_Sword_Gold.png differ diff --git a/src/divine_equipment/assets/divine_equipment/textures/items/Blessed_Sword_Iron.png b/src/divine_equipment/assets/divine_equipment/textures/items/Blessed_Sword_Iron.png new file mode 100644 index 0000000..c87a08c Binary files /dev/null and b/src/divine_equipment/assets/divine_equipment/textures/items/Blessed_Sword_Iron.png differ diff --git a/src/divine_equipment/assets/divine_equipment/textures/items/Blessed_Sword_Stone.png b/src/divine_equipment/assets/divine_equipment/textures/items/Blessed_Sword_Stone.png new file mode 100644 index 0000000..ea43ef5 Binary files /dev/null and b/src/divine_equipment/assets/divine_equipment/textures/items/Blessed_Sword_Stone.png differ diff --git a/src/divine_equipment/assets/divine_equipment/textures/items/Readme.txt b/src/divine_equipment/assets/divine_equipment/textures/items/Readme.txt new file mode 100644 index 0000000..f3ca66f --- /dev/null +++ b/src/divine_equipment/assets/divine_equipment/textures/items/Readme.txt @@ -0,0 +1 @@ +These texture files are currently place holders. \ No newline at end of file diff --git a/src/divine_equipment/assets/divine_equipment/textures/items/Tainted_Sword_Diamond.png b/src/divine_equipment/assets/divine_equipment/textures/items/Tainted_Sword_Diamond.png new file mode 100644 index 0000000..9370aef Binary files /dev/null and b/src/divine_equipment/assets/divine_equipment/textures/items/Tainted_Sword_Diamond.png differ diff --git a/src/divine_equipment/assets/divine_equipment/textures/items/Tainted_Sword_Gold.png b/src/divine_equipment/assets/divine_equipment/textures/items/Tainted_Sword_Gold.png new file mode 100644 index 0000000..a64073a Binary files /dev/null and b/src/divine_equipment/assets/divine_equipment/textures/items/Tainted_Sword_Gold.png differ diff --git a/src/divine_equipment/assets/divine_equipment/textures/items/Tainted_Sword_Iron.png b/src/divine_equipment/assets/divine_equipment/textures/items/Tainted_Sword_Iron.png new file mode 100644 index 0000000..eccd093 Binary files /dev/null and b/src/divine_equipment/assets/divine_equipment/textures/items/Tainted_Sword_Iron.png differ diff --git a/src/divine_equipment/assets/divine_equipment/textures/items/Tainted_Sword_Stone.png b/src/divine_equipment/assets/divine_equipment/textures/items/Tainted_Sword_Stone.png new file mode 100644 index 0000000..f5ba19d Binary files /dev/null and b/src/divine_equipment/assets/divine_equipment/textures/items/Tainted_Sword_Stone.png differ diff --git a/src/divine_equipment/blocks/TaintedRock.java b/src/divine_equipment/blocks/TaintedRock.java new file mode 100644 index 0000000..796fbc4 --- /dev/null +++ b/src/divine_equipment/blocks/TaintedRock.java @@ -0,0 +1,25 @@ +package blocks; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.creativetab.CreativeTabs; + +/** + * User: Orthus + * Date: 10/1/13 + */ +public class TaintedRock extends Block { + + public TaintedRock (int par1, Material TaintedRock) + { + super(par1, TaintedRock); + setHardness(1.0F); + setStepSound(Block.soundStoneFootstep); + setUnlocalizedName("Tainted Stone"); + setCreativeTab(CreativeTabs.tabBlock); + setTextureName("divine_equipment:Tainted_Stone"); + } +} diff --git a/src/divine_equipment/items/BlessedDiamondSword.java b/src/divine_equipment/items/BlessedDiamondSword.java index 3323ed4..0ecab8d 100644 --- a/src/divine_equipment/items/BlessedDiamondSword.java +++ b/src/divine_equipment/items/BlessedDiamondSword.java @@ -9,8 +9,8 @@ import net.minecraft.item.ItemSword; * Date: 9/30/13 */ public class BlessedDiamondSword extends ItemSword { - public BlessedDiamondSword(int par1, EnumToolMaterial par2){ - super(par1, par2); + public BlessedDiamondSword(int id, EnumToolMaterial material){ + super(id, material); setCreativeTab(CreativeTabs.tabCombat); } } \ No newline at end of file