diff --git a/src/assets/divine_equipment/textures/items/BSword.Diamond.png b/src/assets/divine_equipment/textures/items/BSword.Diamond.png deleted file mode 100644 index a2a827e..0000000 Binary files a/src/assets/divine_equipment/textures/items/BSword.Diamond.png and /dev/null differ diff --git a/src/assets/divine_equipment/textures/items/BSword.Gold.png b/src/assets/divine_equipment/textures/items/BSword.Gold.png deleted file mode 100644 index ee1c92d..0000000 Binary files a/src/assets/divine_equipment/textures/items/BSword.Gold.png and /dev/null differ diff --git a/src/assets/divine_equipment/textures/items/BSword.Iron.png b/src/assets/divine_equipment/textures/items/BSword.Iron.png deleted file mode 100644 index c87a08c..0000000 Binary files a/src/assets/divine_equipment/textures/items/BSword.Iron.png and /dev/null differ diff --git a/src/assets/divine_equipment/textures/items/Blessed_Pickaxe_Diamond.png b/src/assets/divine_equipment/textures/items/Blessed_Pickaxe_Diamond.png new file mode 100644 index 0000000..2618e26 Binary files /dev/null and b/src/assets/divine_equipment/textures/items/Blessed_Pickaxe_Diamond.png differ diff --git a/src/assets/divine_equipment/textures/items/Blessed_Pickaxe_Gold.png b/src/assets/divine_equipment/textures/items/Blessed_Pickaxe_Gold.png new file mode 100644 index 0000000..2618e26 Binary files /dev/null and b/src/assets/divine_equipment/textures/items/Blessed_Pickaxe_Gold.png differ diff --git a/src/assets/divine_equipment/textures/items/Blessed_Pickaxe_Iron.png b/src/assets/divine_equipment/textures/items/Blessed_Pickaxe_Iron.png new file mode 100644 index 0000000..2618e26 Binary files /dev/null and b/src/assets/divine_equipment/textures/items/Blessed_Pickaxe_Iron.png differ diff --git a/src/assets/divine_equipment/textures/items/Blessed_Pickaxe_Stone.png b/src/assets/divine_equipment/textures/items/Blessed_Pickaxe_Stone.png new file mode 100644 index 0000000..2618e26 Binary files /dev/null and b/src/assets/divine_equipment/textures/items/Blessed_Pickaxe_Stone.png differ diff --git a/src/assets/divine_equipment/textures/items/Blessed_Pickaxe_Wood.png b/src/assets/divine_equipment/textures/items/Blessed_Pickaxe_Wood.png new file mode 100644 index 0000000..2618e26 Binary files /dev/null and b/src/assets/divine_equipment/textures/items/Blessed_Pickaxe_Wood.png differ diff --git a/src/assets/divine_equipment/textures/items/BSword.Stone.png b/src/assets/divine_equipment/textures/items/Blessed_Sword_Wood.png similarity index 100% rename from src/assets/divine_equipment/textures/items/BSword.Stone.png rename to src/assets/divine_equipment/textures/items/Blessed_Sword_Wood.png diff --git a/src/assets/divine_equipment/textures/items/TSword.Diamond.png b/src/assets/divine_equipment/textures/items/TSword.Diamond.png deleted file mode 100644 index 9370aef..0000000 Binary files a/src/assets/divine_equipment/textures/items/TSword.Diamond.png and /dev/null differ diff --git a/src/assets/divine_equipment/textures/items/TSword.Gold.png b/src/assets/divine_equipment/textures/items/TSword.Gold.png deleted file mode 100644 index a64073a..0000000 Binary files a/src/assets/divine_equipment/textures/items/TSword.Gold.png and /dev/null differ diff --git a/src/assets/divine_equipment/textures/items/TSword.Iron.png b/src/assets/divine_equipment/textures/items/TSword.Iron.png deleted file mode 100644 index eccd093..0000000 Binary files a/src/assets/divine_equipment/textures/items/TSword.Iron.png and /dev/null differ diff --git a/src/assets/divine_equipment/textures/items/Tainted_Pickaxe_Diamond.png b/src/assets/divine_equipment/textures/items/Tainted_Pickaxe_Diamond.png new file mode 100644 index 0000000..2618e26 Binary files /dev/null and b/src/assets/divine_equipment/textures/items/Tainted_Pickaxe_Diamond.png differ diff --git a/src/assets/divine_equipment/textures/items/Tainted_Pickaxe_Gold.png b/src/assets/divine_equipment/textures/items/Tainted_Pickaxe_Gold.png new file mode 100644 index 0000000..2618e26 Binary files /dev/null and b/src/assets/divine_equipment/textures/items/Tainted_Pickaxe_Gold.png differ diff --git a/src/assets/divine_equipment/textures/items/Tainted_Pickaxe_Iron.png b/src/assets/divine_equipment/textures/items/Tainted_Pickaxe_Iron.png new file mode 100644 index 0000000..2618e26 Binary files /dev/null and b/src/assets/divine_equipment/textures/items/Tainted_Pickaxe_Iron.png differ diff --git a/src/assets/divine_equipment/textures/items/Tainted_Pickaxe_Stone.png b/src/assets/divine_equipment/textures/items/Tainted_Pickaxe_Stone.png new file mode 100644 index 0000000..2618e26 Binary files /dev/null and b/src/assets/divine_equipment/textures/items/Tainted_Pickaxe_Stone.png differ diff --git a/src/assets/divine_equipment/textures/items/Tainted_Pickaxe_Wood.png b/src/assets/divine_equipment/textures/items/Tainted_Pickaxe_Wood.png new file mode 100644 index 0000000..2618e26 Binary files /dev/null and b/src/assets/divine_equipment/textures/items/Tainted_Pickaxe_Wood.png differ diff --git a/src/assets/divine_equipment/textures/items/TSword.Stone.png b/src/assets/divine_equipment/textures/items/Tainted_Sword_Wood.png similarity index 100% rename from src/assets/divine_equipment/textures/items/TSword.Stone.png rename to src/assets/divine_equipment/textures/items/Tainted_Sword_Wood.png diff --git a/src/divine_equipment/Divine_Equipment.java b/src/divine_equipment/Divine_Equipment.java index d17d6bc..b085f52 100644 --- a/src/divine_equipment/Divine_Equipment.java +++ b/src/divine_equipment/Divine_Equipment.java @@ -25,7 +25,8 @@ public class Divine_Equipment public static final String modid = "divine_equipment"; public static Block taintedstone; public static Block blessedstone; - + public static Block blessedwood; + public static Block taintedwood; @Instance("Divine_Equipment") @@ -64,6 +65,12 @@ public class Divine_Equipment blessedstone = new BlessedRock(2551, Material.rock).setUnlocalizedName("Blessed Stone").setTextureName("divine_equipment:BlessedStone"); GameRegistry.registerBlock(blessedstone, modid+ blessedstone.getUnlocalizedName().substring(5)); LanguageRegistry.addName(blessedstone, "Blessed Stone"); + blessedwood = new BlessedWood(2552, Material.wood).setUnlocalizedName("Blessed Wood").setTextureName("divine_equipment:BlessedWood"); + GameRegistry.registerBlock(blessedwood, modid+ blessedwood.getUnlocalizedName().substring(5)); + LanguageRegistry.addName(blessedwood, "Blessed Wood"); + taintedwood = new TaintedWood(2553, Material.wood).setUnlocalizedName("Tainted Wood").setTextureName("divine_equipment:TaintedWood"); + GameRegistry.registerBlock(taintedwood, modid+ taintedwood.getUnlocalizedName().substring(5)); + LanguageRegistry.addName(taintedwood, "Tainted Wood"); // Tainted Tool Material Properties (Subject to Change) // Name, Harvest Level, Uses, Dig Speed, Damage, Enchantablity /* @@ -109,7 +116,7 @@ public class Divine_Equipment TaintedWoodSword = new TaintedWoodSword(2564, TaintedWood).setUnlocalizedName("Tainted_Sword_Wood").setTextureName("divine_equipment:Tainted_Sword_Wood"); LanguageRegistry.addName(TaintedWoodSword, "Tainted Wood Sword"); } - + // Pickaxes Item TaintedDiamondPickaxe;{ TaintedDiamondPickaxe = new TaintedDiamondPickaxe(565, TaintedDiamond).setUnlocalizedName("Tainted_Pickaxe_Diamond").setTextureName("divine_equipment:Tainted_Pickaxe_Diamond"); LanguageRegistry.addName(TaintedDiamondPickaxe, "Tainted Diamond Pickaxe"); @@ -152,6 +159,8 @@ public class Divine_Equipment BlessedWoodSword = new BlessedWoodSword(2584, BlessedWood).setUnlocalizedName("Blessed_Sword_Wood").setTextureName("divine_equipment:Blessed_Sword_Wood"); LanguageRegistry.addName(BlessedWoodSword, "Blessed Wood Sword"); } + // Pickaxes + Item BlessedDiamondPickaxe;{ BlessedDiamondPickaxe = new BlessedDiamondPickaxe(585, BlessedDiamond).setUnlocalizedName("Blessed_Pickaxe_Diamond").setTextureName("divine_equipment:Blessed_Pickaxe_Diamond"); LanguageRegistry.addName(BlessedDiamondPickaxe, "Blessed Diamond Pickaxe"); diff --git a/src/divine_equipment/blocks/BlessedRock.java b/src/divine_equipment/blocks/BlessedRock.java index 58030e4..8190861 100644 --- a/src/divine_equipment/blocks/BlessedRock.java +++ b/src/divine_equipment/blocks/BlessedRock.java @@ -13,9 +13,9 @@ import net.minecraft.creativetab.CreativeTabs; */ public class BlessedRock extends Block { - public BlessedRock (int par1, Material BlessedRock) + public BlessedRock (int id, Material maeterial) { - super(par1, BlessedRock); + super(id, maeterial); setHardness(1.0F); setStepSound(Block.soundStoneFootstep); setUnlocalizedName("Blessed Stone"); diff --git a/src/divine_equipment/blocks/BlessedWood.java b/src/divine_equipment/blocks/BlessedWood.java new file mode 100644 index 0000000..a7ff817 --- /dev/null +++ b/src/divine_equipment/blocks/BlessedWood.java @@ -0,0 +1,26 @@ +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 BlessedWood extends Block { + + public BlessedWood (int id, Material maeterial) + { + super(id, maeterial); + setHardness(1.0F); + setStepSound(Block.soundWoodFootstep); + setUnlocalizedName("Blessed Wood"); + setCreativeTab(CreativeTabs.tabBlock); + setTextureName("divine_equipment:Blessed_Wood"); + } +} + diff --git a/src/divine_equipment/blocks/TaintedRock.java b/src/divine_equipment/blocks/TaintedRock.java index 796fbc4..51b9e6f 100644 --- a/src/divine_equipment/blocks/TaintedRock.java +++ b/src/divine_equipment/blocks/TaintedRock.java @@ -13,9 +13,9 @@ import net.minecraft.creativetab.CreativeTabs; */ public class TaintedRock extends Block { - public TaintedRock (int par1, Material TaintedRock) + public TaintedRock (int id, Material maeterial) { - super(par1, TaintedRock); + super(id, maeterial); setHardness(1.0F); setStepSound(Block.soundStoneFootstep); setUnlocalizedName("Tainted Stone"); diff --git a/src/divine_equipment/blocks/TaintedWood.java b/src/divine_equipment/blocks/TaintedWood.java new file mode 100644 index 0000000..1659306 --- /dev/null +++ b/src/divine_equipment/blocks/TaintedWood.java @@ -0,0 +1,26 @@ +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 TaintedWood extends Block { + + public TaintedWood (int id, Material material) + { + super(id, material); + setHardness(1.0F); + setStepSound(Block.soundWoodFootstep); + setUnlocalizedName("Tainted Wood"); + setCreativeTab(CreativeTabs.tabBlock); + setTextureName("divine_equipment:Tainted_Wood"); + } +} + diff --git a/src/divine_equipment/items/BlessedWood.java b/src/divine_equipment/items/BlessedWood.java deleted file mode 100644 index 824ab3b..0000000 --- a/src/divine_equipment/items/BlessedWood.java +++ /dev/null @@ -1,8 +0,0 @@ -package items; - -/** - * User: Orthus - * Date: 9/30/13 - */ -public class BlessedWood { -} diff --git a/src/divine_equipment/items/TaintedWood.java b/src/divine_equipment/items/TaintedWood.java deleted file mode 100644 index cf0c2fc..0000000 --- a/src/divine_equipment/items/TaintedWood.java +++ /dev/null @@ -1,8 +0,0 @@ -package items; - -/** - * User: Orthus - * Date: 9/30/13 - */ -public class TaintedWood { -} diff --git a/src/divine_equipment/mcmod.info b/src/divine_equipment/mcmod.info index 8803304..6a74a5a 100644 --- a/src/divine_equipment/mcmod.info +++ b/src/divine_equipment/mcmod.info @@ -2,14 +2,14 @@ { "modid": "divine_equipment", "name": "Divine Equipment", - "description": "Divine Equipment adds Tools, Armour, Blocks, and Items that are of Blessed,Ender, and Tainted Variations.", + "description": "Divine Equipment adds Tools, Armour, Blocks, and Items that are of Blessed, Ender, and Tainted Variations.", "version": "0.5", "mcversion": "1.6.4", "logoFile": "", "url": "https://bitbucket.org/0rthus/divine-equipment", "updateUrl": "", - "authors": ["Orthus"], - "credits": "Made by Orthus(zackyd)", + "authors": ["Zackyd"], + "credits": "Made by Zackyd", "parent": "", "screenshots": [], "dependencies": []