Updated redist, and Reorginized Textures.

mcmod.info

@@ -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"
-}]

module_divine_weaponary.xml

@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="module_divine_weaponary" default="compile.module.divine_weaponary">
+  <dirname property="module.divine_weaponary.basedir" file="${ant.file.module_divine_weaponary}"/>
+  
+  <property name="module.jdk.home.divine_weaponary" value="${project.jdk.home}"/>
+  <property name="module.jdk.bin.divine_weaponary" value="${project.jdk.bin}"/>
+  <property name="module.jdk.classpath.divine_weaponary" value="${project.jdk.classpath}"/>
+  
+  <property name="compiler.args.divine_weaponary" value="${compiler.args}"/>
+  
+  <property name="divine_weaponary.output.dir" value="${module.divine_weaponary.basedir}/../../out/production/Divine Weaponary"/>
+  <property name="divine_weaponary.testoutput.dir" value="${module.divine_weaponary.basedir}/../../out/test/Divine Weaponary"/>
+  
+  <path id="divine_weaponary.module.bootclasspath">
+    <!-- Paths to be included in compilation bootclasspath -->
+  </path>
+  
+  <path id="divine_weaponary.module.production.classpath">
+    <path refid="${module.jdk.classpath.divine_weaponary}"/>
+    <pathelement location="${basedir}/forge/mcp/jars/versions/1.6.4/1.6.4.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/argo/argo/2.25_fixed/argo-2.25_fixed.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/com/google/code/gson/gson/2.2.2/gson-2.2.2.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/com/paulscode/libraryjavasound/20101123/libraryjavasound-20101123.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/lzma/lzma/0.0.1/lzma-0.0.1.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/com/paulscode/soundsystem/20120107/soundsystem-20120107.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/com/paulscode/librarylwjglopenal/20100824/librarylwjglopenal-20100824.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/net/sf/jopt-simple/jopt-simple/4.5/jopt-simple-4.5.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/org/apache/commons/commons-lang3/3.1/commons-lang3-3.1.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/org/lwjgl/lwjgl/lwjgl/2.9.0/lwjgl-2.9.0.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/org/bouncycastle/bcprov-jdk15on/1.47/bcprov-jdk15on-1.47.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/net/minecraft/launchwrapper/1.7/launchwrapper-1.7.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/com/paulscode/codecjorbis/20101023/codecjorbis-20101023.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/net/java/jinput/jinput/2.0.5/jinput-2.0.5.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/org/lwjgl/lwjgl/lwjgl_util/2.9.0/lwjgl_util-2.9.0.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/org/scala-lang/scala-compiler/2.10.2/scala-compiler-2.10.2.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/commons-io/commons-io/2.4/commons-io-2.4.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/net/java/jutils/jutils/1.0.0/jutils-1.0.0.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/org/scala-lang/scala-library/2.10.2/scala-library-2.10.2.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/com/paulscode/codecwav/20101023/codecwav-20101023.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/com/google/guava/guava/14.0/guava-14.0.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/org/ow2/asm/asm-debug-all/4.1/asm-debug-all-4.1.jar"/>
+  </path>
+  
+  <path id="divine_weaponary.runtime.production.module.classpath">
+    <pathelement location="${divine_weaponary.output.dir}"/>
+    <pathelement location="${basedir}/forge/mcp/jars/versions/1.6.4/1.6.4.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/argo/argo/2.25_fixed/argo-2.25_fixed.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/com/google/code/gson/gson/2.2.2/gson-2.2.2.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/com/paulscode/libraryjavasound/20101123/libraryjavasound-20101123.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/lzma/lzma/0.0.1/lzma-0.0.1.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/com/paulscode/soundsystem/20120107/soundsystem-20120107.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/com/paulscode/librarylwjglopenal/20100824/librarylwjglopenal-20100824.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/net/sf/jopt-simple/jopt-simple/4.5/jopt-simple-4.5.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/org/apache/commons/commons-lang3/3.1/commons-lang3-3.1.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/org/lwjgl/lwjgl/lwjgl/2.9.0/lwjgl-2.9.0.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/org/bouncycastle/bcprov-jdk15on/1.47/bcprov-jdk15on-1.47.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/net/minecraft/launchwrapper/1.7/launchwrapper-1.7.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/com/paulscode/codecjorbis/20101023/codecjorbis-20101023.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/net/java/jinput/jinput/2.0.5/jinput-2.0.5.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/org/lwjgl/lwjgl/lwjgl_util/2.9.0/lwjgl_util-2.9.0.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/org/scala-lang/scala-compiler/2.10.2/scala-compiler-2.10.2.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/commons-io/commons-io/2.4/commons-io-2.4.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/net/java/jutils/jutils/1.0.0/jutils-1.0.0.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/org/scala-lang/scala-library/2.10.2/scala-library-2.10.2.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/com/paulscode/codecwav/20101023/codecwav-20101023.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/com/google/guava/guava/14.0/guava-14.0.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/org/ow2/asm/asm-debug-all/4.1/asm-debug-all-4.1.jar"/>
+  </path>
+  
+  <path id="divine_weaponary.module.classpath">
+    <path refid="${module.jdk.classpath.divine_weaponary}"/>
+    <pathelement location="${divine_weaponary.output.dir}"/>
+    <pathelement location="${basedir}/forge/mcp/jars/versions/1.6.4/1.6.4.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/argo/argo/2.25_fixed/argo-2.25_fixed.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/com/google/code/gson/gson/2.2.2/gson-2.2.2.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/com/paulscode/libraryjavasound/20101123/libraryjavasound-20101123.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/lzma/lzma/0.0.1/lzma-0.0.1.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/com/paulscode/soundsystem/20120107/soundsystem-20120107.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/com/paulscode/librarylwjglopenal/20100824/librarylwjglopenal-20100824.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/net/sf/jopt-simple/jopt-simple/4.5/jopt-simple-4.5.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/org/apache/commons/commons-lang3/3.1/commons-lang3-3.1.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/org/lwjgl/lwjgl/lwjgl/2.9.0/lwjgl-2.9.0.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/org/bouncycastle/bcprov-jdk15on/1.47/bcprov-jdk15on-1.47.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/net/minecraft/launchwrapper/1.7/launchwrapper-1.7.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/com/paulscode/codecjorbis/20101023/codecjorbis-20101023.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/net/java/jinput/jinput/2.0.5/jinput-2.0.5.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/org/lwjgl/lwjgl/lwjgl_util/2.9.0/lwjgl_util-2.9.0.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/org/scala-lang/scala-compiler/2.10.2/scala-compiler-2.10.2.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/commons-io/commons-io/2.4/commons-io-2.4.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/net/java/jutils/jutils/1.0.0/jutils-1.0.0.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/org/scala-lang/scala-library/2.10.2/scala-library-2.10.2.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/com/paulscode/codecwav/20101023/codecwav-20101023.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/com/google/guava/guava/14.0/guava-14.0.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/org/ow2/asm/asm-debug-all/4.1/asm-debug-all-4.1.jar"/>
+  </path>
+  
+  <path id="divine_weaponary.runtime.module.classpath">
+    <pathelement location="${divine_weaponary.testoutput.dir}"/>
+    <pathelement location="${divine_weaponary.output.dir}"/>
+    <pathelement location="${basedir}/forge/mcp/jars/versions/1.6.4/1.6.4.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/argo/argo/2.25_fixed/argo-2.25_fixed.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/com/google/code/gson/gson/2.2.2/gson-2.2.2.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/com/paulscode/libraryjavasound/20101123/libraryjavasound-20101123.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/lzma/lzma/0.0.1/lzma-0.0.1.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/com/paulscode/soundsystem/20120107/soundsystem-20120107.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/com/paulscode/librarylwjglopenal/20100824/librarylwjglopenal-20100824.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/net/sf/jopt-simple/jopt-simple/4.5/jopt-simple-4.5.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/org/apache/commons/commons-lang3/3.1/commons-lang3-3.1.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/org/lwjgl/lwjgl/lwjgl/2.9.0/lwjgl-2.9.0.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/org/bouncycastle/bcprov-jdk15on/1.47/bcprov-jdk15on-1.47.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/net/minecraft/launchwrapper/1.7/launchwrapper-1.7.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/com/paulscode/codecjorbis/20101023/codecjorbis-20101023.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/net/java/jinput/jinput/2.0.5/jinput-2.0.5.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/org/lwjgl/lwjgl/lwjgl_util/2.9.0/lwjgl_util-2.9.0.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/org/scala-lang/scala-compiler/2.10.2/scala-compiler-2.10.2.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/commons-io/commons-io/2.4/commons-io-2.4.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/net/java/jutils/jutils/1.0.0/jutils-1.0.0.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/org/scala-lang/scala-library/2.10.2/scala-library-2.10.2.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/com/paulscode/codecwav/20101023/codecwav-20101023.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/com/google/guava/guava/14.0/guava-14.0.jar"/>
+    <pathelement location="${basedir}/forge/mcp/jars/libraries/org/ow2/asm/asm-debug-all/4.1/asm-debug-all-4.1.jar"/>
+  </path>
+  
+  
+  <patternset id="excluded.from.module.divine_weaponary">
+    <patternset refid="ignored.files"/>
+  </patternset>
+  <patternset id="excluded.from.module.minecaft">
+    <patternset refid="ignored.files"/>
+  </patternset>
+  
+  <patternset id="excluded.from.compilation.divine_weaponary">
+    <patternset refid="excluded.from.module.divine_weaponary"/>
+    <patternset refid="excluded.from.module.minecaft"/>
+  </patternset>
+  
+  <path id="divine_weaponary.module.sourcepath">
+    <dirset dir="${module.divine_weaponary.basedir}">
+      <include name="src"/>
+    </dirset>
+    <dirset dir="${module.divine_weaponary.basedir}/../../forge/mcp/src">
+      <include name="minecraft"/>
+    </dirset>
+  </path>
+  
+  
+  <target name="compile.module.divine_weaponary" depends="compile.module.divine_weaponary.production,compile.module.divine_weaponary.tests" description="Compile modules Divine Weaponary"/>
+  
+  <target name="compile.module.divine_weaponary.production" depends="register.custom.compilers" description="Compile modules Divine Weaponary; production classes">
+    <mkdir dir="${divine_weaponary.output.dir}"/>
+    <javac2 destdir="${divine_weaponary.output.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memorymaximumsize="${compiler.max.memory}" fork="true" executable="${module.jdk.bin.divine_weaponary}/javac">
+      <compilerarg line="${compiler.args.divine_weaponary}"/>
+      <bootclasspath refid="divine_weaponary.module.bootclasspath"/>
+      <classpath refid="divine_weaponary.module.production.classpath"/>
+      <src refid="divine_weaponary.module.sourcepath"/>
+      <patternset refid="excluded.from.compilation.divine_weaponary"/>
+    </javac2>
+    
+    <copy todir="${divine_weaponary.output.dir}">
+      <fileset dir="${module.divine_weaponary.basedir}/src">
+        <patternset refid="compiler.resources"/>
+        <type type="file"/>
+      </fileset>
+      <fileset dir="${module.divine_weaponary.basedir}/../../forge/mcp/src/minecraft">
+        <patternset refid="compiler.resources"/>
+        <type type="file"/>
+      </fileset>
+    </copy>
+  </target>
+  
+  <target name="compile.module.divine_weaponary.tests" depends="register.custom.compilers,compile.module.divine_weaponary.production" description="compile modules Divine Weaponary; test classes" unless="skip.tests"/>
+  
+  <target name="clean.module.divine_weaponary" description="cleanup module">
+    <delete dir="${divine_weaponary.output.dir}"/>
+    <delete dir="${divine_weaponary.testoutput.dir}"/>
+  </target>
+</project>

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 items.*;
- import cpw.mods.fml.relauncher.SideOnly;
- import divine_equipment.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 = "divine_equipment", name = "Divine Equipment",version = "V0.5")
-
-@Mod(modid = "DEquipment", name = "Divine Equipment",version = "v0.1")
 @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);
+    BlessedGold = EnumHelper.addToolMaterial("Blessed Gold", 2, 32, 14.00F, 0, 22);
-    BlessedIron = EnumHelper.addToolMaterial("Blessed Iron", 0, 0, 0F, 0, 0);
+    BlessedIron = EnumHelper.addToolMaterial("Blessed Iron", 2, 250, 8.0F, 2, 14);
-    BlessedStone = EnumHelper.addToolMaterial("Blessed Stone", 0, 0, 0F, 0, 0);
+    BlessedStone = EnumHelper.addToolMaterial("Blessed Stone", 1, 131, 6.0F, 1, 5);
-    BlessedWood = EnumHelper.addToolMaterial("Blessed Wood", 0, 0, 0F, 0, 0);
+    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");
 
     }}}

src/divine_equipment/divine_weaponary.iml

@@ -3,13 +3,11 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/common" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/resources" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="minecaft" />
+    <orderEntry type="module" module-name="minecraft" />
   </component>
 </module>
 

src/divine_equipment/items/BlessedDiamond.java

@@ -1,4 +1,4 @@
-package divine_equipment.items;
+package items;
 
 /**
  * User: Orthus

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;
 

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){
+    public BlessedGoldSword(int par1, EnumToolMaterial BlessedGold){
-        super(par1, par2);
+        super(par1, BlessedGold);
         setCreativeTab(CreativeTabs.tabCombat);
     }
 }

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;

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;
 
 /**

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;
 
 /**

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){
+    public TaintedDiamondSword(int par1, EnumToolMaterial TaintedDiamond){
-        super(par1, EMERALD);
+        super(par1, TaintedDiamond);
         setCreativeTab(CreativeTabs.tabCombat);
+
     }
 }

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;
 
 /**

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;
 
 /**

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;
 
 /**

src/divine_equipment/mcmod.info

@@ -6,11 +6,9 @@
     "version": "@VERSION@",
     "mcversion": "@MCVERSION",
     "url": "https://bitbucket.org/0rthus/divine-weaponary",
-    "updateUrl": "",
+    "authors": [
-    "authors": ["Zackyd666"],
+      "0rthus"],
     "credits": "Test",
-    "logoFile": "",
-    "parent": "",
     "screenshots": "[]",
     "dependencies": "[]"
   }

src/divine_equipment/resources/textures/items/Readme.txt

@@ -1 +0,0 @@
-These texture files are currently place holders.