diff --git a/Redist/divine_equipment.zip b/Redist/divine_equipment.zip new file mode 100644 index 0000000..f535d8c Binary files /dev/null and b/Redist/divine_equipment.zip differ diff --git a/mcmod.info b/mcmod.info deleted file mode 100644 index c460710..0000000 --- a/mcmod.info +++ /dev/null @@ -1,14 +0,0 @@ -[{ -"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/module_divine_weaponary.xml b/module_divine_weaponary.xml new file mode 100644 index 0000000..4d3fbe6 --- /dev/null +++ b/module_divine_weaponary.xml @@ -0,0 +1,177 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/divine_equipment/resources/textures/items/BSword.Diamond.png b/src/assets/textures/items/BSword.Diamond.png similarity index 100% rename from src/divine_equipment/resources/textures/items/BSword.Diamond.png rename to src/assets/textures/items/BSword.Diamond.png diff --git a/src/divine_equipment/resources/textures/items/BSword.Gold.png b/src/assets/textures/items/BSword.Gold.png similarity index 100% rename from src/divine_equipment/resources/textures/items/BSword.Gold.png rename to src/assets/textures/items/BSword.Gold.png diff --git a/src/divine_equipment/resources/textures/items/BSword.Iron.png b/src/assets/textures/items/BSword.Iron.png similarity index 100% rename from src/divine_equipment/resources/textures/items/BSword.Iron.png rename to src/assets/textures/items/BSword.Iron.png diff --git a/src/divine_equipment/resources/textures/items/BSword.Stone.png b/src/assets/textures/items/BSword.Stone.png similarity index 100% rename from src/divine_equipment/resources/textures/items/BSword.Stone.png rename to src/assets/textures/items/BSword.Stone.png diff --git a/src/divine_equipment/assets/divine_equipment/textures/items/Blessed_Sword_Diamond.png b/src/assets/textures/items/Blessed_Sword_Diamond.png similarity index 100% rename from src/divine_equipment/assets/divine_equipment/textures/items/Blessed_Sword_Diamond.png rename to src/assets/textures/items/Blessed_Sword_Diamond.png diff --git a/src/divine_equipment/assets/divine_equipment/textures/items/Blessed_Sword_Gold.png b/src/assets/textures/items/Blessed_Sword_Gold.png similarity index 100% rename from src/divine_equipment/assets/divine_equipment/textures/items/Blessed_Sword_Gold.png rename to src/assets/textures/items/Blessed_Sword_Gold.png diff --git a/src/divine_equipment/assets/divine_equipment/textures/items/Blessed_Sword_Iron.png b/src/assets/textures/items/Blessed_Sword_Iron.png similarity index 100% rename from src/divine_equipment/assets/divine_equipment/textures/items/Blessed_Sword_Iron.png rename to src/assets/textures/items/Blessed_Sword_Iron.png diff --git a/src/divine_equipment/assets/divine_equipment/textures/items/Blessed_Sword_Stone.png b/src/assets/textures/items/Blessed_Sword_Stone.png similarity index 100% rename from src/divine_equipment/assets/divine_equipment/textures/items/Blessed_Sword_Stone.png rename to src/assets/textures/items/Blessed_Sword_Stone.png diff --git a/src/divine_equipment/assets/divine_equipment/textures/items/Readme.txt b/src/assets/textures/items/Readme.txt similarity index 100% rename from src/divine_equipment/assets/divine_equipment/textures/items/Readme.txt rename to src/assets/textures/items/Readme.txt diff --git a/src/divine_equipment/resources/textures/items/TSword.Diamond.png b/src/assets/textures/items/TSword.Diamond.png similarity index 100% rename from src/divine_equipment/resources/textures/items/TSword.Diamond.png rename to src/assets/textures/items/TSword.Diamond.png diff --git a/src/divine_equipment/resources/textures/items/TSword.Gold.png b/src/assets/textures/items/TSword.Gold.png similarity index 100% rename from src/divine_equipment/resources/textures/items/TSword.Gold.png rename to src/assets/textures/items/TSword.Gold.png diff --git a/src/divine_equipment/resources/textures/items/TSword.Iron.png b/src/assets/textures/items/TSword.Iron.png similarity index 100% rename from src/divine_equipment/resources/textures/items/TSword.Iron.png rename to src/assets/textures/items/TSword.Iron.png diff --git a/src/divine_equipment/resources/textures/items/TSword.Stone.png b/src/assets/textures/items/TSword.Stone.png similarity index 100% rename from src/divine_equipment/resources/textures/items/TSword.Stone.png rename to src/assets/textures/items/TSword.Stone.png diff --git a/src/divine_equipment/assets/divine_equipment/textures/items/Tainted_Sword_Diamond.png b/src/assets/textures/items/Tainted_Sword_Diamond.png similarity index 100% rename from src/divine_equipment/assets/divine_equipment/textures/items/Tainted_Sword_Diamond.png rename to src/assets/textures/items/Tainted_Sword_Diamond.png diff --git a/src/divine_equipment/assets/divine_equipment/textures/items/Tainted_Sword_Gold.png b/src/assets/textures/items/Tainted_Sword_Gold.png similarity index 100% rename from src/divine_equipment/assets/divine_equipment/textures/items/Tainted_Sword_Gold.png rename to src/assets/textures/items/Tainted_Sword_Gold.png diff --git a/src/divine_equipment/assets/divine_equipment/textures/items/Tainted_Sword_Iron.png b/src/assets/textures/items/Tainted_Sword_Iron.png similarity index 100% rename from src/divine_equipment/assets/divine_equipment/textures/items/Tainted_Sword_Iron.png rename to src/assets/textures/items/Tainted_Sword_Iron.png diff --git a/src/divine_equipment/assets/divine_equipment/textures/items/Tainted_Sword_Stone.png b/src/assets/textures/items/Tainted_Sword_Stone.png similarity index 100% rename from src/divine_equipment/assets/divine_equipment/textures/items/Tainted_Sword_Stone.png rename to src/assets/textures/items/Tainted_Sword_Stone.png diff --git a/src/divine_equipment/Divine_Equipment.java b/src/divine_equipment/Divine_Equipment.java index 84fd4a2..45114b2 100644 --- a/src/divine_equipment/Divine_Equipment.java +++ b/src/divine_equipment/Divine_Equipment.java @@ -2,27 +2,22 @@ * Author: Orthus * Date: 9/29/13 */ -package divine_equipment; import cpw.mods.fml.common.Mod; 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.LanguageRegistry; - import cpw.mods.fml.relauncher.Side; - import cpw.mods.fml.relauncher.SideOnly; - import divine_equipment.items.*; + import items.*; import net.minecraft.item.EnumToolMaterial; import net.minecraft.item.Item; import net.minecraftforge.common.EnumHelper; - import static net.minecraftforge.common.EnumHelper.addToolMaterial; - -@Mod(modid = "DEquipment", name = "Divine Equipment",version = "v0.1") +@Mod(modid = "divine_equipment", name = "Divine Equipment",version = "V0.5") @NetworkMod(clientSideRequired = true, serverSideRequired = false, channels = { "DEquipment" }) public class Divine_Equipment { - @Instance("divine_equipment") + @Instance("Divine_Equipment") public static Divine_Equipment INSTANCE; // @SidedProxy(clientSide = "divine_equipment.client.ClientProxy", serverSide = "divine_equipment.common.CommonProxy") @@ -75,29 +70,29 @@ public class Divine_Equipment // Blessed tool Material Properties (Subject to Change) BlessedDiamond = EnumHelper.addToolMaterial("Blessed Diamond", 3, 2029, 10.0F, 3, 10); - BlessedGold = EnumHelper.addToolMaterial("Blessed Gold", 0, 0, 0F, 0, 0); - BlessedIron = EnumHelper.addToolMaterial("Blessed Iron", 0, 0, 0F, 0, 0); - BlessedStone = EnumHelper.addToolMaterial("Blessed Stone", 0, 0, 0F, 0, 0); - BlessedWood = EnumHelper.addToolMaterial("Blessed Wood", 0, 0, 0F, 0, 0); + BlessedGold = EnumHelper.addToolMaterial("Blessed Gold", 2, 32, 14.00F, 0, 22); + BlessedIron = EnumHelper.addToolMaterial("Blessed Iron", 2, 250, 8.0F, 2, 14); + BlessedStone = EnumHelper.addToolMaterial("Blessed Stone", 1, 131, 6.0F, 1, 5); + BlessedWood = EnumHelper.addToolMaterial("Blessed Wood", 0, 59, 4.0F, 0, 15); //Telling forge that we are creating stuff // Tainted Swords Item TaintedDiamondSword;{ //Create Item + Picture - TaintedDiamondSword = new TaintedDiamondSword(560, TaintedDiamond).setUnlocalizedName("Tainted_Sword_Diamond").setTextureName("divine_equipment:Tainted_Sword_Diamond"); + TaintedDiamondSword = new TaintedDiamondSword(2560, TaintedDiamond).setUnlocalizedName("Tainted_Sword_Diamond").setTextureName("divine_equipment:Tainted_Sword_Diamond"); LanguageRegistry.addName(TaintedDiamondSword, "Tainted Diamond Sword"); } Item TaintedGoldSword;{ - TaintedGoldSword = new TaintedGoldSword(561, TaintedGold).setUnlocalizedName("Tainted_Sword_Gold").setTextureName("divine_equipment:Tainted_Sword_Gold"); + TaintedGoldSword = new TaintedGoldSword(2561, TaintedGold).setUnlocalizedName("Tainted_Sword_Gold").setTextureName("divine_equipment:Tainted_Sword_Gold"); LanguageRegistry.addName(TaintedGoldSword, "Tainted Gold Sword"); } Item TaintedIronSword;{ - TaintedIronSword = new TaintedIronSword(562, TaintedIron).setUnlocalizedName("Tainted_Sword_Iron").setTextureName("divine_equipment:Tainted_Sword_Iron"); + TaintedIronSword = new TaintedIronSword(2562, TaintedIron).setUnlocalizedName("Tainted_Sword_Iron").setTextureName("divine_equipment:Tainted_Sword_Iron"); LanguageRegistry.addName(TaintedIronSword, "Tainted Iron Sword"); } Item TaintedStoneSword;{ - TaintedStoneSword = new TaintedStoneSword(563, TaintedStone).setUnlocalizedName("Tainted_Sword_Stone").setTextureName("divine_equipment:Tainted_Sword_Stone"); + TaintedStoneSword = new TaintedStoneSword(2563, TaintedStone).setUnlocalizedName("Tainted_Sword_Stone").setTextureName("divine_equipment:Tainted_Sword_Stone"); LanguageRegistry.addName(TaintedStoneSword, "Tainted Stone Sword"); } // Item TaintedWoodSword;{} @@ -105,19 +100,19 @@ public class Divine_Equipment // Blessed Swords Item BlessedDiamondSword;{ //Create Item + Picture - BlessedDiamondSword = new BlessedDiamondSword(555, BlessedDiamond).setUnlocalizedName("Blessed_Sword_Diamond").setTextureName("divine_equipment:Blessed_Sword_Diamond"); + BlessedDiamondSword = new BlessedDiamondSword(2555, BlessedDiamond).setUnlocalizedName("Blessed_Sword_Diamond").setTextureName("divine_equipment:Blessed_Sword_Diamond"); LanguageRegistry.addName(BlessedDiamondSword, "Blessed Diamond Sword"); } Item BlessedGoldSword;{ - BlessedGoldSword = new BlessedGoldSword(556, BlessedGold).setUnlocalizedName("Blessed_Sword_Gold").setTextureName("divine_equipment:Blessed_Sword_Gold"); + BlessedGoldSword = new BlessedGoldSword(2556, BlessedGold).setUnlocalizedName("Blessed_Sword_Gold").setTextureName("divine_equipment:Blessed_Sword_Gold"); LanguageRegistry.addName(BlessedGoldSword, "Blessed Gold Sword"); } Item BlessedIronSword;{ - BlessedIronSword = new BlessedIronSword(557, BlessedIron).setUnlocalizedName("Blessed_Sword_Iron").setTextureName("divine_equipment:Blessed_Sword_Iron"); + BlessedIronSword = new BlessedIronSword(2557, BlessedIron).setUnlocalizedName("Blessed_Sword_Iron").setTextureName("divine_equipment:Blessed_Sword_Iron"); LanguageRegistry.addName(BlessedIronSword, "Blessed Iron Sword"); } Item BlessedStoneSword;{ - BlessedStoneSword = new BlessedStoneSword(558, BlessedStone).setUnlocalizedName("Blessed_Sword_Stone").setTextureName("divine_equipment:Blessed_Sword_Stone"); + BlessedStoneSword = new BlessedStoneSword(2558, BlessedStone).setUnlocalizedName("Blessed_Sword_Stone").setTextureName("divine_equipment:Blessed_Sword_Stone"); LanguageRegistry.addName(BlessedStoneSword, "Blessed Stone Sword"); }}} \ No newline at end of file diff --git a/Divine Weaponary.iml b/src/divine_equipment/divine_weaponary.iml similarity index 55% rename from Divine Weaponary.iml rename to src/divine_equipment/divine_weaponary.iml index cab9483..a63637e 100644 --- a/Divine Weaponary.iml +++ b/src/divine_equipment/divine_weaponary.iml @@ -3,13 +3,11 @@ - - - + - + diff --git a/src/divine_equipment/items/BlessedDiamond.java b/src/divine_equipment/items/BlessedDiamond.java index b3e79ca..5324aee 100644 --- a/src/divine_equipment/items/BlessedDiamond.java +++ b/src/divine_equipment/items/BlessedDiamond.java @@ -1,4 +1,4 @@ -package divine_equipment.items; +package items; /** * User: Orthus diff --git a/src/divine_equipment/items/BlessedDiamondSword.java b/src/divine_equipment/items/BlessedDiamondSword.java index 66829d4..3323ed4 100644 --- a/src/divine_equipment/items/BlessedDiamondSword.java +++ b/src/divine_equipment/items/BlessedDiamondSword.java @@ -1,6 +1,6 @@ -package divine_equipment.items; +package items; -import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.creativetab.*; import net.minecraft.item.EnumToolMaterial; import net.minecraft.item.ItemSword; diff --git a/src/divine_equipment/items/BlessedGoldSword.java b/src/divine_equipment/items/BlessedGoldSword.java index b0c5a1c..4ff6837 100644 --- a/src/divine_equipment/items/BlessedGoldSword.java +++ b/src/divine_equipment/items/BlessedGoldSword.java @@ -1,6 +1,6 @@ -package divine_equipment.items; +package items; -import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.creativetab.*; import net.minecraft.item.EnumToolMaterial; import net.minecraft.item.ItemSword; @@ -9,8 +9,8 @@ import net.minecraft.item.ItemSword; * Date: 9/30/13 */ public class BlessedGoldSword extends ItemSword { - public BlessedGoldSword(int par1, EnumToolMaterial par2){ - super(par1, par2); + public BlessedGoldSword(int par1, EnumToolMaterial BlessedGold){ + super(par1, BlessedGold); setCreativeTab(CreativeTabs.tabCombat); } } \ No newline at end of file diff --git a/src/divine_equipment/items/BlessedIronSword.java b/src/divine_equipment/items/BlessedIronSword.java index 21bb4e3..d82bfee 100644 --- a/src/divine_equipment/items/BlessedIronSword.java +++ b/src/divine_equipment/items/BlessedIronSword.java @@ -1,4 +1,4 @@ -package divine_equipment.items; +package items; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumToolMaterial; diff --git a/src/divine_equipment/items/BlessedStoneSword.java b/src/divine_equipment/items/BlessedStoneSword.java index 6d06b1e..b3f6ee8 100644 --- a/src/divine_equipment/items/BlessedStoneSword.java +++ b/src/divine_equipment/items/BlessedStoneSword.java @@ -1,9 +1,7 @@ -package divine_equipment.items; +package 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.EnumToolMaterial; import net.minecraft.item.ItemSword; /** diff --git a/src/divine_equipment/items/TDSword.java b/src/divine_equipment/items/TDSword.java index d65a7a7..fe40e07 100644 --- a/src/divine_equipment/items/TDSword.java +++ b/src/divine_equipment/items/TDSword.java @@ -1,9 +1,7 @@ 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.EnumToolMaterial; import net.minecraft.item.ItemSword; /** diff --git a/src/divine_equipment/items/TaintedDiamondSword.java b/src/divine_equipment/items/TaintedDiamondSword.java index 8d0228e..029d1f2 100644 --- a/src/divine_equipment/items/TaintedDiamondSword.java +++ b/src/divine_equipment/items/TaintedDiamondSword.java @@ -1,9 +1,7 @@ -package divine_equipment.items; +package 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.EnumToolMaterial; import net.minecraft.item.ItemSword; /** @@ -11,8 +9,9 @@ import net.minecraft.item.ItemSword; * Date: 9/29/13 */ public class TaintedDiamondSword extends ItemSword { - public TaintedDiamondSword(int par1, EnumToolMaterial EMERALD){ - super(par1, EMERALD); + public TaintedDiamondSword(int par1, EnumToolMaterial TaintedDiamond){ + super(par1, TaintedDiamond); setCreativeTab(CreativeTabs.tabCombat); + } } diff --git a/src/divine_equipment/items/TaintedGoldSword.java b/src/divine_equipment/items/TaintedGoldSword.java index 3f3df00..ad81e8d 100644 --- a/src/divine_equipment/items/TaintedGoldSword.java +++ b/src/divine_equipment/items/TaintedGoldSword.java @@ -1,9 +1,7 @@ -package divine_equipment.items; +package 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.EnumToolMaterial; import net.minecraft.item.ItemSword; /** diff --git a/src/divine_equipment/items/TaintedIronSword.java b/src/divine_equipment/items/TaintedIronSword.java index d094b18..2fbe398 100644 --- a/src/divine_equipment/items/TaintedIronSword.java +++ b/src/divine_equipment/items/TaintedIronSword.java @@ -1,9 +1,7 @@ -package divine_equipment.items; +package 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.EnumToolMaterial; import net.minecraft.item.ItemSword; /** diff --git a/src/divine_equipment/items/TaintedStoneSword.java b/src/divine_equipment/items/TaintedStoneSword.java index 98ee0b4..4415230 100644 --- a/src/divine_equipment/items/TaintedStoneSword.java +++ b/src/divine_equipment/items/TaintedStoneSword.java @@ -1,9 +1,7 @@ -package divine_equipment.items; +package 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.EnumToolMaterial; import net.minecraft.item.ItemSword; /** diff --git a/src/divine_equipment/resources/mcmod.info b/src/divine_equipment/mcmod.info similarity index 80% rename from src/divine_equipment/resources/mcmod.info rename to src/divine_equipment/mcmod.info index aeed831..81397a3 100644 --- a/src/divine_equipment/resources/mcmod.info +++ b/src/divine_equipment/mcmod.info @@ -6,11 +6,9 @@ "version": "@VERSION@", "mcversion": "@MCVERSION", "url": "https://bitbucket.org/0rthus/divine-weaponary", - "updateUrl": "", - "authors": ["Zackyd666"], + "authors": [ + "0rthus"], "credits": "Test", - "logoFile": "", - "parent": "", "screenshots": "[]", "dependencies": "[]" } diff --git a/src/divine_equipment/resources/textures/items/Blessed_Sword_Diamond.png b/src/divine_equipment/resources/textures/items/Blessed_Sword_Diamond.png deleted file mode 100644 index a2a827e..0000000 Binary files a/src/divine_equipment/resources/textures/items/Blessed_Sword_Diamond.png and /dev/null 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 deleted file mode 100644 index ee1c92d..0000000 Binary files a/src/divine_equipment/resources/textures/items/Blessed_Sword_Gold.png and /dev/null 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 deleted file mode 100644 index c87a08c..0000000 Binary files a/src/divine_equipment/resources/textures/items/Blessed_Sword_Iron.png and /dev/null 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 deleted file mode 100644 index ea43ef5..0000000 Binary files a/src/divine_equipment/resources/textures/items/Blessed_Sword_Stone.png and /dev/null differ diff --git a/src/divine_equipment/resources/textures/items/Readme.txt b/src/divine_equipment/resources/textures/items/Readme.txt deleted file mode 100644 index f3ca66f..0000000 --- a/src/divine_equipment/resources/textures/items/Readme.txt +++ /dev/null @@ -1 +0,0 @@ -These texture files are currently place holders. \ No newline at end of file diff --git a/src/divine_equipment/resources/textures/items/Tainted_Sword_Diamond.png b/src/divine_equipment/resources/textures/items/Tainted_Sword_Diamond.png deleted file mode 100644 index 9370aef..0000000 Binary files a/src/divine_equipment/resources/textures/items/Tainted_Sword_Diamond.png and /dev/null 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 deleted file mode 100644 index a64073a..0000000 Binary files a/src/divine_equipment/resources/textures/items/Tainted_Sword_Gold.png and /dev/null 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 deleted file mode 100644 index eccd093..0000000 Binary files a/src/divine_equipment/resources/textures/items/Tainted_Sword_Iron.png and /dev/null 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 deleted file mode 100644 index f5ba19d..0000000 Binary files a/src/divine_equipment/resources/textures/items/Tainted_Sword_Stone.png and /dev/null differ