diff --git a/mcmod.info b/mcmod.info new file mode 100644 index 0000000..c460710 --- /dev/null +++ b/mcmod.info @@ -0,0 +1,14 @@ +[{ +"modid": "Divine_Equipment", +"name": "Divine Equipment", +"description": "This mod adds Holy and Unholy Equipment as well as Ender Infused Equipment", +"version": "@VERSION@", +"logoFile": "", +"mcversion": "1.6.4", +"url": "https://bitbucket.org/0rthus/divine-weaponary", +"updateUrl": "", +"authors": ["Zackyd666"], +"parent": "", +"screenshots": "", +"dependencies": "mod_MinecraftForge" +}] \ No newline at end of file diff --git a/src/divine_equipment/Divine_Equipment.java b/src/divine_equipment/Divine_Equipment.java index 3af1fe4..60c96b3 100644 --- a/src/divine_equipment/Divine_Equipment.java +++ b/src/divine_equipment/Divine_Equipment.java @@ -6,16 +6,10 @@ package divine_equipment; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.Instance; - import cpw.mods.fml.common.SidedProxy; - import cpw.mods.fml.common.*; - import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.network.NetworkMod; import cpw.mods.fml.common.registry.LanguageRegistry; import divine_equipment.items.*; - import divine_equipment.client.*; - import divine_equipment.common.*; - import net.minecraft.item.EnumArmorMaterial; import net.minecraft.item.EnumToolMaterial; import net.minecraft.item.Item; import net.minecraftforge.common.EnumHelper; @@ -29,8 +23,8 @@ public class Divine_Equipment @Instance("divine_equipment") public static Divine_Equipment INSTANCE; - @SidedProxy(clientSide = "divine_equipment.client.ClientProxy", serverSide = "divine_equipment.common.CommonProxy") - public static CommonProxy proxy; + // @SidedProxy(clientSide = "divine_equipment.client.ClientProxy", serverSide = "divine_equipment.common.CommonProxy") + // public static CommonProxy proxy; public static String imageFolder = "resources/textures"; @@ -70,11 +64,11 @@ public class Divine_Equipment EMERALD(3, 1561, 8.0F, 3, 10), GOLD(0, 32, 12.0F, 0, 22); */ - TaintedDiamond = addToolMaterial("Tainted Diamond", 3, 1003, 8.0F, 4, 15); - TaintedGold = addToolMaterial("Tainted Gold", 2, 20, 12.0F, 0, 27); - TaintedIron = addToolMaterial("Tainted Iron", 2, 75, 6.0F, 3, 19); - TaintedStone = addToolMaterial("Tainted Stone", 1, 88, 4.0F, 0, 10 ); - TaintedWood = addToolMaterial("Tainted Wood", 0, 40, 2.0F, 0, 20); + 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); // Blessed tool Material Properties (Subject to Change) @@ -85,14 +79,26 @@ public class Divine_Equipment BlessedWood = addToolMaterial("Blessed Wood", 0, 0, 0F, 0, 0); //Telling forge that we are creating stuff + + // Tainted Swords Item TaintedDiamondSword;{ - public void load(FMLInitializationEvent event); - { - //Create Item + Picture - TaintedDiamondSword = new TDSword(560, EnumToolMaterial.EMERALD).setUnlocalizedName("Tsword.Diamond"); - // Names - LanguageRegistry.addName(TaintedDiamondSword, "Tainted Diamond Sword"); - } + //Create Item + Picture + TaintedDiamondSword = new TaintedDiamondSword(560, TaintedDiamond).setUnlocalizedName("Tainted_Sword_Diamond"); + LanguageRegistry.addName(TaintedDiamondSword, "Tainted Diamond Sword"); + } + Item TaintedGoldSword;{ + TaintedGoldSword = new TaintedGoldSword(561, TaintedGold).setUnlocalizedName("Tainted_Sword_Gold"); + LanguageRegistry.addName(TaintedGoldSword, "Tainted Gold Sword"); + } + Item TaintedIronSword;{ + TaintedIronSword = new TaintedIronSword(562, TaintedIron).setUnlocalizedName("Tainted_Sword_Iron"); + LanguageRegistry.addName(TaintedIronSword, "Tainted Iron Sword"); + } + Item TaintedStoneSword;{ + TaintedStoneSword = new TaintedStoneSword(563, TaintedStone).setUnlocalizedName("Tainted_Sword_Stone"); + LanguageRegistry.addName(TaintedStoneSword, "Tainted Stone Sword"); + } + Item TaintedWoodSword;{} + } - } -} \ No newline at end of file + } \ No newline at end of file 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/items/TaintedGoldSword.java b/src/divine_equipment/items/TaintedGoldSword.java new file mode 100644 index 0000000..3f3df00 --- /dev/null +++ b/src/divine_equipment/items/TaintedGoldSword.java @@ -0,0 +1,18 @@ +package divine_equipment.items; + +import net.minecraft.item.EnumToolMaterial; +import net.minecraft.item.Item; +import cpw.mods.fml.relauncher.*; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.ItemSword; + +/** + * User: Orthus + * Date: 9/29/13 + */ +public class TaintedGoldSword extends ItemSword { + public TaintedGoldSword(int par1, EnumToolMaterial EMERALD){ + super(par1, EMERALD); + setCreativeTab(CreativeTabs.tabCombat); + } +} \ No newline at end of file diff --git a/src/divine_equipment/items/TaintedIronSword.java b/src/divine_equipment/items/TaintedIronSword.java new file mode 100644 index 0000000..d094b18 --- /dev/null +++ b/src/divine_equipment/items/TaintedIronSword.java @@ -0,0 +1,18 @@ +package divine_equipment.items; + +import net.minecraft.item.EnumToolMaterial; +import net.minecraft.item.Item; +import cpw.mods.fml.relauncher.*; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.ItemSword; + +/** + * User: Orthus + * Date: 9/30/13 + */ +public class TaintedIronSword extends ItemSword { + public TaintedIronSword(int par1, EnumToolMaterial EMERALD){ + super(par1, EMERALD); + setCreativeTab(CreativeTabs.tabCombat); + } +} \ No newline at end of file diff --git a/src/divine_equipment/items/TaintedStoneSword.java b/src/divine_equipment/items/TaintedStoneSword.java new file mode 100644 index 0000000..98ee0b4 --- /dev/null +++ b/src/divine_equipment/items/TaintedStoneSword.java @@ -0,0 +1,18 @@ +package divine_equipment.items; + +import net.minecraft.item.EnumToolMaterial; +import net.minecraft.item.Item; +import cpw.mods.fml.relauncher.*; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.ItemSword; + +/** + * User: Orthus + * Date: 9/30/13 + */ +public class TaintedStoneSword extends ItemSword { + public TaintedStoneSword(int par1, EnumToolMaterial EMERALD){ + super(par1, EMERALD); + setCreativeTab(CreativeTabs.tabCombat); + } +} \ No newline at end of file diff --git a/src/divine_equipment/resources/mcmod.info b/src/divine_equipment/resources/mcmod.info index 7439a0e..aeed831 100644 --- a/src/divine_equipment/resources/mcmod.info +++ b/src/divine_equipment/resources/mcmod.info @@ -1,14 +1,17 @@ -[{ -"modid": "divine_equipment", -"name": "Divine Equipment", -"description": "This mod adds Holy and Unholy Equipment as well as Ender Infused Equipment", -"version": "@VERSION@", -"logoFile": "", -"mcversion": "1.6.4", -"url": "https://bitbucket.org/0rthus/divine-weaponary", -"updateUrl": "", -"authors": ["Zackyd666"], -"parent": "", -"screenshots": "", -"dependencies": "mod_MinecraftForge" -}] \ No newline at end of file +[ + { + "modid": "divine_equipment", + "name": "Divine Equipment", + "description": "This mod adds Holy and Unholy Equipment as well as Ender Infused Equipment", + "version": "@VERSION@", + "mcversion": "@MCVERSION", + "url": "https://bitbucket.org/0rthus/divine-weaponary", + "updateUrl": "", + "authors": ["Zackyd666"], + "credits": "Test", + "logoFile": "", + "parent": "", + "screenshots": "[]", + "dependencies": "[]" + } +] \ No newline at end of file diff --git a/src/divine_equipment/resources/textures/items/Blessed_Sword_Diamond.png b/src/divine_equipment/resources/textures/items/Blessed_Sword_Diamond.png new file mode 100644 index 0000000..a2a827e Binary files /dev/null and b/src/divine_equipment/resources/textures/items/Blessed_Sword_Diamond.png differ diff --git a/src/divine_equipment/resources/textures/items/Blessed_Sword_Gold.png b/src/divine_equipment/resources/textures/items/Blessed_Sword_Gold.png new file mode 100644 index 0000000..ee1c92d Binary files /dev/null and b/src/divine_equipment/resources/textures/items/Blessed_Sword_Gold.png differ diff --git a/src/divine_equipment/resources/textures/items/Blessed_Sword_Iron.png b/src/divine_equipment/resources/textures/items/Blessed_Sword_Iron.png new file mode 100644 index 0000000..c87a08c Binary files /dev/null and b/src/divine_equipment/resources/textures/items/Blessed_Sword_Iron.png differ diff --git a/src/divine_equipment/resources/textures/items/Blessed_Sword_Stone.png b/src/divine_equipment/resources/textures/items/Blessed_Sword_Stone.png new file mode 100644 index 0000000..ea43ef5 Binary files /dev/null and b/src/divine_equipment/resources/textures/items/Blessed_Sword_Stone.png differ diff --git a/src/divine_equipment/resources/textures/items/Tainted_Sword_Diamond.png b/src/divine_equipment/resources/textures/items/Tainted_Sword_Diamond.png new file mode 100644 index 0000000..9370aef Binary files /dev/null and b/src/divine_equipment/resources/textures/items/Tainted_Sword_Diamond.png differ diff --git a/src/divine_equipment/resources/textures/items/Tainted_Sword_Gold.png b/src/divine_equipment/resources/textures/items/Tainted_Sword_Gold.png new file mode 100644 index 0000000..a64073a Binary files /dev/null and b/src/divine_equipment/resources/textures/items/Tainted_Sword_Gold.png differ diff --git a/src/divine_equipment/resources/textures/items/Tainted_Sword_Iron.png b/src/divine_equipment/resources/textures/items/Tainted_Sword_Iron.png new file mode 100644 index 0000000..eccd093 Binary files /dev/null and b/src/divine_equipment/resources/textures/items/Tainted_Sword_Iron.png differ diff --git a/src/divine_equipment/resources/textures/items/Tainted_Sword_Stone.png b/src/divine_equipment/resources/textures/items/Tainted_Sword_Stone.png new file mode 100644 index 0000000..f5ba19d Binary files /dev/null and b/src/divine_equipment/resources/textures/items/Tainted_Sword_Stone.png differ