Updated redist, and Reorginized Textures.

This commit is contained in:
Zachary Daltorio
2013-09-30 18:31:56 -04:00
parent 90122d6700
commit 597699630d
42 changed files with 218 additions and 76 deletions

View File

Before

Width:  |  Height:  |  Size: 446 B

After

Width:  |  Height:  |  Size: 446 B

View File

Before

Width:  |  Height:  |  Size: 513 B

After

Width:  |  Height:  |  Size: 513 B

View File

Before

Width:  |  Height:  |  Size: 469 B

After

Width:  |  Height:  |  Size: 469 B

View File

Before

Width:  |  Height:  |  Size: 504 B

After

Width:  |  Height:  |  Size: 504 B

View File

Before

Width:  |  Height:  |  Size: 513 B

After

Width:  |  Height:  |  Size: 513 B

View File

Before

Width:  |  Height:  |  Size: 469 B

After

Width:  |  Height:  |  Size: 469 B

View File

Before

Width:  |  Height:  |  Size: 504 B

After

Width:  |  Height:  |  Size: 504 B

View File

Before

Width:  |  Height:  |  Size: 503 B

After

Width:  |  Height:  |  Size: 503 B

View File

Before

Width:  |  Height:  |  Size: 467 B

After

Width:  |  Height:  |  Size: 467 B

View File

Before

Width:  |  Height:  |  Size: 460 B

After

Width:  |  Height:  |  Size: 460 B

View File

Before

Width:  |  Height:  |  Size: 474 B

After

Width:  |  Height:  |  Size: 474 B

View File

Before

Width:  |  Height:  |  Size: 467 B

After

Width:  |  Height:  |  Size: 467 B

View File

Before

Width:  |  Height:  |  Size: 460 B

After

Width:  |  Height:  |  Size: 460 B

View File

Before

Width:  |  Height:  |  Size: 474 B

After

Width:  |  Height:  |  Size: 474 B

View File

@@ -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");
}}}

View File

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="minecraft" />
</component>
</module>

View File

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

View File

@@ -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;

View File

@@ -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);
}
}

View File

@@ -1,4 +1,4 @@
package divine_equipment.items;
package items;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.EnumToolMaterial;

View File

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

View File

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

View File

@@ -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);
}
}

View File

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

View File

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

View File

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

View File

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 446 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 513 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 469 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 504 B

View File

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 503 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 467 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 460 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 474 B