diff --git a/build.gradle b/build.gradle
index 3aa95d1..aa3ff34 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,6 +17,10 @@ buildscript {
apply plugin: 'forge'
+// Fix IntelliJ IDEA resources
+apply plugin: 'idea'
+idea { module { inheritOutputDirs = true } }
+
version = "2.0.0"
group = "jujuawesomebeans.jujusclothingcraft" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "JujusClothingCraft-1.7.10"
@@ -24,6 +28,9 @@ archivesBaseName = "JujusClothingCraft-1.7.10"
minecraft {
version = "1.7.10-10.13.4.1558-1.7.10"
runDir = "eclipse"
+
+ replaceIn "ClothingCraftInfo.java"
+ replace "@VERSION@", project.version
}
dependencies {
@@ -58,4 +65,4 @@ processResources {
from(sourceSets.main.resources.srcDirs) {
exclude 'mcmod.info'
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/clothingcraft/blocks/BlockCottonFabric.java b/src/main/java/clothingcraft/blocks/BlockCottonFabric.java
index 9e72dc8..a54e047 100644
--- a/src/main/java/clothingcraft/blocks/BlockCottonFabric.java
+++ b/src/main/java/clothingcraft/blocks/BlockCottonFabric.java
@@ -3,7 +3,7 @@
*/
package clothingcraft.blocks;
-import clothingcraft.core.ClothingCraft;
+import clothingcraft.client.ClientProxy;
import clothingcraft.core.ClothingCraftInfo;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
@@ -26,7 +26,7 @@ protected BlockCottonFabric(Material mat) {
this.setBlockTextureName(ClothingCraftInfo.MODID + ":cotton_fabric_bundle");
this.setLightOpacity(225);
this.setStepSound(Block.soundTypeGravel);
- this.setCreativeTab(ClothingCraft.tabCore);
+ this.setCreativeTab(ClientProxy.tabCore);
this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
this.setHarvestLevel("pickaxe", 0);
}
diff --git a/src/main/java/clothingcraft/blocks/BlockCottonPlant.java b/src/main/java/clothingcraft/blocks/BlockCottonPlant.java
index 36fc394..7c474e3 100644
--- a/src/main/java/clothingcraft/blocks/BlockCottonPlant.java
+++ b/src/main/java/clothingcraft/blocks/BlockCottonPlant.java
@@ -3,8 +3,8 @@
*/
package clothingcraft.blocks;
-import clothingcraft.core.ClothingCraft;
import clothingcraft.core.ClothingCraftInfo;
+import clothingcraft.core.CommonProxy;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
@@ -45,14 +45,14 @@ public int quantityDropped(int parMetadata, int parFortune, Random parRand) {
* @see clothingcraft.blocks.RecipeBlockCrops#getItemDropSeeds()
*/
public Item getItemDropSeeds() {
- return ClothingCraft.cottonSeeds;
+ return CommonProxy.cottonSeeds;
}
/**
* @see clothingcraft.blocks.RecipeBlockCrops#getItemDropProduce()
*/
public Item getItemDropProduce() {
- return ClothingCraft.cotton;
+ return CommonProxy.cotton;
}
@Override
diff --git a/src/main/java/clothingcraft/blocks/BlockCottonWildPlant.java b/src/main/java/clothingcraft/blocks/BlockCottonWildPlant.java
index 6632740..8c1acc7 100644
--- a/src/main/java/clothingcraft/blocks/BlockCottonWildPlant.java
+++ b/src/main/java/clothingcraft/blocks/BlockCottonWildPlant.java
@@ -1,7 +1,7 @@
package clothingcraft.blocks;
-import clothingcraft.core.ClothingCraft;
import clothingcraft.core.ClothingCraftInfo;
+import clothingcraft.core.CommonProxy;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
@@ -79,7 +79,7 @@ protected Item func_149866_i() {
* @see clothingcraft.blocks.RecipeBlockCrops#getItemDropSeeds()
*/
public Item getItemDropSeeds() {
- return ClothingCraft.cottonSeeds;
+ return CommonProxy.cottonSeeds;
}
@Override
@@ -92,7 +92,7 @@ protected Item func_149865_P() {
* @see clothingcraft.blocks.RecipeBlockCrops#getItemDropProduce()
*/
public Item getItemDropProduce() {
- return ClothingCraft.cotton;
+ return CommonProxy.cotton;
}
@Override
diff --git a/src/main/java/clothingcraft/blocks/BlockHaliteBlock.java b/src/main/java/clothingcraft/blocks/BlockHaliteBlock.java
index 8d2350d..c0805d6 100644
--- a/src/main/java/clothingcraft/blocks/BlockHaliteBlock.java
+++ b/src/main/java/clothingcraft/blocks/BlockHaliteBlock.java
@@ -3,7 +3,7 @@
*/
package clothingcraft.blocks;
-import clothingcraft.core.ClothingCraft;
+import clothingcraft.client.ClientProxy;
import clothingcraft.core.ClothingCraftInfo;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
@@ -26,7 +26,7 @@ protected BlockHaliteBlock(Material mat) {
this.setBlockTextureName(ClothingCraftInfo.MODID + ":halite_block");
this.setLightOpacity(225);
this.setStepSound(Block.soundTypeGravel);
- this.setCreativeTab(ClothingCraft.tabCore);
+ this.setCreativeTab(ClientProxy.tabCore);
this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
this.setHarvestLevel("pickaxe", 0);
}
diff --git a/src/main/java/clothingcraft/blocks/BlockHaliteOre.java b/src/main/java/clothingcraft/blocks/BlockHaliteOre.java
index 2587597..0b50365 100644
--- a/src/main/java/clothingcraft/blocks/BlockHaliteOre.java
+++ b/src/main/java/clothingcraft/blocks/BlockHaliteOre.java
@@ -1,6 +1,6 @@
package clothingcraft.blocks;
-import clothingcraft.core.ClothingCraft;
+import clothingcraft.client.ClientProxy;
import clothingcraft.core.ClothingCraftInfo;
import clothingcraft.items.ClothingCraftHaliteItemList;
import net.minecraft.block.Block;
@@ -21,7 +21,7 @@ public class BlockHaliteOre extends Block {
private int most_quantity;
public BlockHaliteOre() {
- this("halite_ore", Material.rock, ClothingCraft.tabCore, ClothingCraftHaliteItemList.rockSalt, 2, 2, 4);
+ this("halite_ore", Material.rock, ClientProxy.tabCore, ClothingCraftHaliteItemList.rockSalt, 2, 2, 4);
}
protected BlockHaliteOre(String unlocalizedName, Material mat, CreativeTabs tab, Item drop, int meta, int least_quantity, int most_quantity) {
diff --git a/src/main/java/clothingcraft/blocks/BlockSandCastle.java b/src/main/java/clothingcraft/blocks/BlockSandCastle.java
index b44628f..cc670d1 100644
--- a/src/main/java/clothingcraft/blocks/BlockSandCastle.java
+++ b/src/main/java/clothingcraft/blocks/BlockSandCastle.java
@@ -1,6 +1,6 @@
package clothingcraft.blocks;
-import clothingcraft.core.ClothingCraft;
+import clothingcraft.client.ClientProxy;
import clothingcraft.core.ClothingCraftInfo;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
@@ -19,7 +19,7 @@ protected BlockSandCastle() {
this.setBlockName("sandcastle");
this.setBlockTextureName(ClothingCraftInfo.MODID + ":sandcastle");
this.setStepSound(Block.soundTypeSand);
- this.setCreativeTab(ClothingCraft.tabAccessories);
+ this.setCreativeTab(ClientProxy.tabAccessories);
this.setHarvestLevel("shovel", 0);
this.setBlockBounds(
0.30000000000000004F,
diff --git a/src/main/java/clothingcraft/blocks/ClothingCraftCottonBlockList.java b/src/main/java/clothingcraft/blocks/ClothingCraftCottonBlockList.java
index 731fe11..62d4cc7 100644
--- a/src/main/java/clothingcraft/blocks/ClothingCraftCottonBlockList.java
+++ b/src/main/java/clothingcraft/blocks/ClothingCraftCottonBlockList.java
@@ -3,8 +3,9 @@
*/
package clothingcraft.blocks;
-import clothingcraft.core.ClothingCraft;
+import clothingcraft.client.ClientProxy;
import clothingcraft.core.ClothingCraftInfo;
+import clothingcraft.core.CommonProxy;
import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
@@ -33,7 +34,7 @@ public static void preInit() {
.setBlockTextureName(ClothingCraftInfo.MODID + ":cotton_bale")
.setLightOpacity(126)
.setStepSound(Block.soundTypeGrass)
- .setCreativeTab(ClothingCraft.tabCore);
+ .setCreativeTab(ClientProxy.tabCore);
cottonBale.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
//Block.blockRegistry.addObject(192, "cotton_bale", cottonBale);
cottonBale.setHarvestLevel("pickaxe", 0);
@@ -45,7 +46,7 @@ public static void preInit() {
.setStepSound(Block.soundTypeGrass)
.setResistance(0.0F)
.setBlockName("cottonplant")
- //.setCreativeTab(ClothingCraft.tabCore)
+// .setCreativeTab(ClientProxy.tabCore)
.setBlockTextureName(ClothingCraftInfo.MODID + ":cottonplant");
GameRegistry.registerBlock(cottonPlant, "cottonplant");
@@ -55,23 +56,22 @@ public static void preInit() {
.setStepSound(Block.soundTypeGrass)
.setResistance(0.0F)
.setBlockName("cottonwildplant")
- //.setCreativeTab(ClothingCraft.tabCore)
+// .setCreativeTab(ClientProxy.tabCore)
.setBlockTextureName(ClothingCraftInfo.MODID + ":cottonwildplant");
GameRegistry.registerBlock(cottonWildPlant, "cottonwildplant");
}
public static void init() {
GameRegistry.addRecipe(new ItemStack(cottonBale, 1),
- new Object[]{"012", "345", "678",
- Character.valueOf('0'), new ItemStack(ClothingCraft.cotton, 1),
- Character.valueOf('1'), new ItemStack(ClothingCraft.cotton, 1),
- Character.valueOf('2'), new ItemStack(ClothingCraft.cotton, 1),
- Character.valueOf('3'), new ItemStack(ClothingCraft.cotton, 1),
- Character.valueOf('4'), new ItemStack(ClothingCraft.cotton, 1),
- Character.valueOf('5'), new ItemStack(ClothingCraft.cotton, 1),
- Character.valueOf('6'), new ItemStack(ClothingCraft.cotton, 1),
- Character.valueOf('7'), new ItemStack(ClothingCraft.cotton, 1),
- Character.valueOf('8'), new ItemStack(ClothingCraft.cotton, 1),
- });
+ "012", "345", "678",
+ '0', new ItemStack(CommonProxy.cotton, 1),
+ '1', new ItemStack(CommonProxy.cotton, 1),
+ '2', new ItemStack(CommonProxy.cotton, 1),
+ '3', new ItemStack(CommonProxy.cotton, 1),
+ '4', new ItemStack(CommonProxy.cotton, 1),
+ '5', new ItemStack(CommonProxy.cotton, 1),
+ '6', new ItemStack(CommonProxy.cotton, 1),
+ '7', new ItemStack(CommonProxy.cotton, 1),
+ '8', new ItemStack(CommonProxy.cotton, 1));
}
}
diff --git a/src/main/java/clothingcraft/client/ClientProxy.java b/src/main/java/clothingcraft/client/ClientProxy.java
index c18e3ba..911b9fa 100644
--- a/src/main/java/clothingcraft/client/ClientProxy.java
+++ b/src/main/java/clothingcraft/client/ClientProxy.java
@@ -1,11 +1,42 @@
package clothingcraft.client;
import clothingcraft.core.CommonProxy;
+import clothingcraft.gui.CreativeTabsClothingCraft;
+import clothingcraft.items.ClothingCraftAccessoriesItemList;
+import clothingcraft.items.ClothingCraftFabricItemList;
+import clothingcraft.items.ClothingCraftToolsItemList;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
public class ClientProxy extends CommonProxy {
+ public static CreativeTabs tabCore = new CreativeTabsClothingCraft("tabClothingCraftCore") {
+ public Item getTabIconItem() {
+ return cotton;
+ }
+ };
+ public static CreativeTabs tabMaterials = new CreativeTabsClothingCraft("tabClothingCraftMaterials") {
+ public Item getTabIconItem() {
+ return ClothingCraftFabricItemList.cottonFabric;
+ }
+ };
+ public static CreativeTabs tabTools = new CreativeTabsClothingCraft("tabClothingCraftTools") {
+ public Item getTabIconItem() {
+ return ClothingCraftToolsItemList.sewingScissors;
+ }
+ };
+ public static CreativeTabs tabAccessories = new CreativeTabsClothingCraft("tabClothingCraftAccessories") {
+ public Item getTabIconItem() {
+ return ClothingCraftAccessoriesItemList.purse;
+ }
+ };
+ public static CreativeTabs tabWardrobe = new CreativeTabsClothingCraft("tabClothingCraftWardrobe") {
+ public Item getTabIconItem() {
+ return ClothingCraftToolsItemList.needleAndThread;
+ }
+ };
@Override
public void preInit(FMLPreInitializationEvent e) {
@@ -15,6 +46,12 @@ public void preInit(FMLPreInitializationEvent e) {
@Override
public void init(FMLInitializationEvent e) {
super.init(e);
+
+ // place armor pieces into core tab
+ cottonArmorHelmet.setCreativeTab(ClientProxy.tabCore);
+ cottonArmorChestPlate.setCreativeTab(ClientProxy.tabCore);
+ cottonArmorLeggings.setCreativeTab(ClientProxy.tabCore);
+ cottonArmorBoots.setCreativeTab(ClientProxy.tabCore);
}
@Override
diff --git a/src/main/java/clothingcraft/core/ClothingCraft.java b/src/main/java/clothingcraft/core/ClothingCraft.java
index 79db4de..21514f1 100644
--- a/src/main/java/clothingcraft/core/ClothingCraft.java
+++ b/src/main/java/clothingcraft/core/ClothingCraft.java
@@ -1,30 +1,13 @@
package clothingcraft.core;
-import clothingcraft.blocks.ClothingCraftCottonBlockList;
-import clothingcraft.blocks.ClothingCraftHaliteBlockList;
-import clothingcraft.generation.ClothingCraftWorldGen;
-import clothingcraft.gui.CreativeTabsClothingCraft;
-import clothingcraft.items.*;
-import cpw.mods.fml.common.IFuelHandler;
import cpw.mods.fml.common.Mod;
-import cpw.mods.fml.common.Mod.Instance;
import cpw.mods.fml.common.SidedProxy;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemArmor.ArmorMaterial;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.common.util.EnumHelper;
@Mod(modid = ClothingCraftInfo.MODID, name = ClothingCraftInfo.NAME, version = ClothingCraftInfo.VERSION)
-public class ClothingCraft implements IFuelHandler {
+public class ClothingCraft {
@SidedProxy(
clientSide = "clothingcraft.client.ClientProxy",
@@ -32,265 +15,18 @@ public class ClothingCraft implements IFuelHandler {
)
public static CommonProxy proxy;
- @Instance(ClothingCraftInfo.MODID)
- public static ClothingCraft instance;
-
- public static CreativeTabs tabCore;
- public static CreativeTabs tabMaterials;
- public static CreativeTabs tabTools;
- public static CreativeTabs tabAccessories;
- public static CreativeTabs tabWardrobe;
-
-
- public static ItemCottonSeeds cottonSeeds; // the seeds from the plant
- public static ClothingCraftWorldGen clothingCraftWorldGen; // generation of cotton plants in the world
-
- public static Item cotton; // the harvested product from the plant
-
- public static ArmorMaterial ARMOR = EnumHelper.addArmorMaterial(
- "cotton_armor", 16, new int[]{3, 8, 6, 3}, 30);
- public static Item cottonArmorHelmet; // cotton armor helmet
- public static Item cottonArmorChestPlate; // cotton armor chest plate
- public static Item cottonArmorLeggings; // cotton armor leggings
- public static Item cottonArmorBoots; // cotton armor boots
-
@Mod.EventHandler
public void preInit(FMLPreInitializationEvent event) {
proxy.preInit(event);
-
- tabCore = new CreativeTabsClothingCraft("tabClothingCraftCore") {
- @SideOnly(Side.CLIENT)
- public Item getTabIconItem() {
- return ClothingCraft.cotton;
- }
- };
- tabMaterials = new CreativeTabsClothingCraft("tabClothingCraftMaterials") {
- @SideOnly(Side.CLIENT)
- public Item getTabIconItem() {
- return ClothingCraftFabricItemList.cottonFabric;
- }
- };
- tabTools = new CreativeTabsClothingCraft("tabClothingCraftTools") {
- @SideOnly(Side.CLIENT)
- public Item getTabIconItem() {
- return ClothingCraftToolsItemList.sewingScissors;
- }
- };
- tabAccessories = new CreativeTabsClothingCraft("tabClothingCraftAccessories") {
- @SideOnly(Side.CLIENT)
- public Item getTabIconItem() {
- return ClothingCraftAccessoriesItemList.purse;
- }
- };
- tabWardrobe = new CreativeTabsClothingCraft("tabClothingCraftWardrobe") {
- @SideOnly(Side.CLIENT)
- public Item getTabIconItem() {
- return ClothingCraftToolsItemList.needleAndThread;
- }
- };
-
- /*
- * blocks
- */
-
- // cotton blocks
- ClothingCraftCottonBlockList.preInit();
- // halite ore and block
- ClothingCraftHaliteBlockList.preInit();
-
-
- /*
- * items
- */
-
- // cotton plant produce (harvested)
- cotton = (Item) new ItemCotton()
- .setMaxStackSize(64)
- .setUnlocalizedName("cotton_harvested")
- .setCreativeTab(ClothingCraft.tabCore)
- .setTextureName(ClothingCraftInfo.MODID + ":cotton_harvested");
- GameRegistry.registerItem(cotton, "cotton_harvested");
-
- // cotton seeds
- cottonSeeds = (ItemCottonSeeds) (new ItemCottonSeeds(ClothingCraftCottonBlockList.cottonPlant, Blocks.farmland)
- .setMaxStackSize(64)
- .setUnlocalizedName("cotton_seeds")
- .setCreativeTab(ClothingCraft.tabCore)
- .setTextureName(ClothingCraftInfo.MODID + ":cotton_seeds"));
- GameRegistry.registerItem(cottonSeeds, "cotton_seeds");
- // generate cotton seeds when grass is harvested
- MinecraftForge.addGrassSeed(new ItemStack(cottonSeeds), 5);
-
- // halite, rock salt...
- ClothingCraftHaliteItemList.preInit();
-
- // cotton fabric, including all other colors
- ClothingCraftFabricItemList.preInit();
-
- // tools: scissors, measuring tape, ...
- ClothingCraftToolsItemList.preInit();
-
- // tools > patterns ...
- ClothingCraftPatternItemList.preInit();
-
- // accessory items
- ClothingCraftAccessoriesItemList.preInit();
-
- // wardrobe items (armor)
- ClothingCraftWardrobeItemList.preInit();
-
- GameRegistry.registerItem(cottonArmorHelmet = new ItemCottonArmor(
- "cottonArmorHelmet", // unlocalizedName
- "cotton_armor_helmet", // itemTextureName
- ARMOR, // armor material
- "cottonarmor_layer", // armorTextureName
- 0 // armor type 0 = helmet
- ), "cottonArmorHelmet"); // name key for en_US.lang file
- GameRegistry.registerItem(cottonArmorChestPlate = new ItemCottonArmor(
- "cottonArmorChestPlate", // unlocalizedName
- "cotton_armor_chestplate", // itemTextureName
- ARMOR, // armor material
- "cottonarmor_layer", // armorTextureName
- 1 // armor type 1 = chest plate
- ), "cottonArmorChestPlate"); // name key for en_US.lang file
- GameRegistry.registerItem(cottonArmorLeggings = new ItemCottonArmor(
- "cottonArmorLeggings", // unlocalizedName
- "cotton_armor_leggings", // itemTextureName
- ARMOR, // armor material
- "cottonarmor_layer", // armorTextureName
- 2 // armor type 2 = leggings
- ), "cottonArmorLeggings"); // name key for en_US.lang file
- GameRegistry.registerItem(cottonArmorBoots = new ItemCottonArmor(
- "cottonArmorBoots", // unlocalizedName
- "cotton_armor_boots", // itemTextureName
- ARMOR, // armor material
- "cottonarmor_layer", // armorTextureName
- 3 // armor type 3 = boots
- ), "cottonArmorBoots"); // name key for en_US.lang file
}
-
@Mod.EventHandler
public void init(FMLInitializationEvent event) {
proxy.init(event);
-
- /*
- * world generator creates:
- * - wild cotton plants (used in Overworld)
- * - halite ore underground (used in Overworld)
- */
- clothingCraftWorldGen = new ClothingCraftWorldGen();
- // register generator for world
- GameRegistry.registerWorldGenerator(clothingCraftWorldGen, 10);
-
-
- GameRegistry.registerFuelHandler(this);
-
-
- GameRegistry.addRecipe(new ItemStack(cottonSeeds, 1),
- new Object[]{"0XX", "XXX", "XXX",
- Character.valueOf('0'), new ItemStack(cotton, 1),});
-
-
- GameRegistry.addRecipe(new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
- new Object[]{"012", "345", "XXX",
- Character.valueOf('0'), new ItemStack(cotton, 1),
- Character.valueOf('1'), new ItemStack(cotton, 1),
- Character.valueOf('2'), new ItemStack(cotton, 1),
- Character.valueOf('3'), new ItemStack(cotton, 1),
- Character.valueOf('4'), new ItemStack(cotton, 1),
- Character.valueOf('5'), new ItemStack(cotton, 1),
- });
-
- GameRegistry.addRecipe(new ItemStack(ClothingCraftHaliteBlockList.cottonFabricBundle, 1),
- new Object[]{"012", "345", "678",
- Character.valueOf('0'), new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
- Character.valueOf('1'), new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
- Character.valueOf('2'), new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
- Character.valueOf('3'), new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
- Character.valueOf('4'), new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
- Character.valueOf('5'), new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
- Character.valueOf('6'), new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
- Character.valueOf('7'), new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
- Character.valueOf('8'), new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
- });
-
- // cotton armor recipes
- GameRegistry.addRecipe(new ItemStack(cottonArmorHelmet, 1),
- new Object[]{"012", "3X5", "XXX",
- Character.valueOf('0'), new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
- Character.valueOf('1'), new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
- Character.valueOf('2'), new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
- Character.valueOf('3'), new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
- Character.valueOf('5'), new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
- });
- GameRegistry.addRecipe(new ItemStack(cottonArmorChestPlate, 1),
- new Object[]{"0X2", "345", "678",
- Character.valueOf('0'), new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
- Character.valueOf('2'), new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
- Character.valueOf('3'), new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
- Character.valueOf('4'), new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
- Character.valueOf('5'), new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
- Character.valueOf('6'), new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
- Character.valueOf('7'), new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
- Character.valueOf('8'), new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
- });
- GameRegistry.addRecipe(new ItemStack(cottonArmorLeggings, 1),
- new Object[]{"012", "3X5", "6X8",
- Character.valueOf('0'), new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
- Character.valueOf('1'), new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
- Character.valueOf('2'), new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
- Character.valueOf('3'), new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
- Character.valueOf('5'), new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
- Character.valueOf('6'), new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
- Character.valueOf('8'), new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
- });
- GameRegistry.addRecipe(new ItemStack(cottonArmorBoots, 1),
- new Object[]{"0X2", "3X5", "XXX",
- Character.valueOf('0'), new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
- Character.valueOf('2'), new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
- Character.valueOf('3'), new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
- Character.valueOf('5'), new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
- });
-
- // place armor pieces into core tab
- cottonArmorHelmet.setCreativeTab(ClothingCraft.tabCore);
- cottonArmorChestPlate.setCreativeTab(ClothingCraft.tabCore);
- cottonArmorLeggings.setCreativeTab(ClothingCraft.tabCore);
- cottonArmorBoots.setCreativeTab(ClothingCraft.tabCore);
-
- // register recipes for halite, rock salt...
- ClothingCraftHaliteItemList.init();
-
- // register recipes for cotton fabric, including all other colors
- ClothingCraftFabricItemList.init();
-
- // register recipes for tools: sewing scissors, measuring tape, ...
- ClothingCraftToolsItemList.init();
-
- // register recipes for tools: patterns by category (beach, career, casual, costume, formal, sleep)
- ClothingCraftPatternItemList.init();
-
- // register recipes for accessory items
- ClothingCraftAccessoriesItemList.init();
-
- // register recipes for wardrobe items
- ClothingCraftWardrobeItemList.init();
}
@Mod.EventHandler
public void postInit(FMLPostInitializationEvent event) {
proxy.postInit(event);
}
-
- /**
- * @see cpw.mods.fml.common.IFuelHandler#getBurnTime(net.minecraft.item.ItemStack)
- */
- @Override
- public int getBurnTime(ItemStack fuel) {
- // TODO Auto-generated method stub
- return 0;
- }
-
-
}
diff --git a/src/main/java/clothingcraft/core/CommonProxy.java b/src/main/java/clothingcraft/core/CommonProxy.java
index 571ff46..473f69b 100644
--- a/src/main/java/clothingcraft/core/CommonProxy.java
+++ b/src/main/java/clothingcraft/core/CommonProxy.java
@@ -1,17 +1,193 @@
package clothingcraft.core;
+import clothingcraft.blocks.ClothingCraftCottonBlockList;
+import clothingcraft.blocks.ClothingCraftHaliteBlockList;
+import clothingcraft.client.ClientProxy;
+import clothingcraft.generation.ClothingCraftWorldGen;
+import clothingcraft.items.*;
+import cpw.mods.fml.common.IFuelHandler;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+import cpw.mods.fml.common.registry.GameRegistry;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemArmor;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.common.util.EnumHelper;
+
+public class CommonProxy implements IFuelHandler {
+ public static ClothingCraftWorldGen clothingCraftWorldGen; // generation of cotton plants in the world
+
+ public static Item cotton; // the harvested product from the plant
+ public static Item cottonSeeds; // the seeds from the plant
+ public static Item cottonArmorHelmet; // cotton armor helmet
+ public static Item cottonArmorChestPlate; // cotton armor chest plate
+ public static Item cottonArmorLeggings; // cotton armor leggings
+ public static Item cottonArmorBoots; // cotton armor boots
-public class CommonProxy {
public void preInit(FMLPreInitializationEvent e) {
+ /*
+ * blocks
+ */
+
+ ClothingCraftCottonBlockList.preInit();
+ ClothingCraftHaliteBlockList.preInit();
+
+ /*
+ * items
+ */
+
+ // cotton plant produce (harvested)
+ cotton = new ItemCotton()
+ .setMaxStackSize(64)
+ .setUnlocalizedName("cotton_harvested")
+ .setCreativeTab(ClientProxy.tabCore)
+ .setTextureName(ClothingCraftInfo.MODID + ":cotton_harvested");
+ GameRegistry.registerItem(cotton, "cotton_harvested");
+
+ // cotton seeds
+ cottonSeeds = new ItemCottonSeeds(ClothingCraftCottonBlockList.cottonPlant, Blocks.farmland)
+ .setMaxStackSize(64)
+ .setUnlocalizedName("cotton_seeds")
+ .setCreativeTab(ClientProxy.tabCore)
+ .setTextureName(ClothingCraftInfo.MODID + ":cotton_seeds");
+ GameRegistry.registerItem(cottonSeeds, "cotton_seeds");
+
+ // generate cotton seeds when grass is harvested
+ MinecraftForge.addGrassSeed(new ItemStack(cottonSeeds), 5);
+
+ ClothingCraftHaliteItemList.preInit(); // halite, rock salt...
+ ClothingCraftFabricItemList.preInit(); // cotton fabric, including all other colors
+ ClothingCraftToolsItemList.preInit(); // tools: scissors, measuring tape, ...
+ ClothingCraftPatternItemList.preInit(); // tools > patterns ...
+ ClothingCraftAccessoriesItemList.preInit(); // accessory items
+ ClothingCraftWardrobeItemList.preInit(); // wardrobe items (armor)
+
+ ItemArmor.ArmorMaterial CottonArmorMaterial = EnumHelper.addArmorMaterial(
+ "cotton_armor", 16, new int[]{3, 8, 6, 3}, 30);
+
+ GameRegistry.registerItem(cottonArmorHelmet = new ItemCottonArmor(
+ "cottonArmorHelmet", // unlocalizedName
+ "cotton_armor_helmet", // itemTextureName
+ CottonArmorMaterial, // armor material
+ "cottonarmor_layer", // armorTextureName
+ 0 // armor type 0 = helmet
+ ), "cottonArmorHelmet"); // name key for en_US.lang file
+ GameRegistry.registerItem(cottonArmorChestPlate = new ItemCottonArmor(
+ "cottonArmorChestPlate", // unlocalizedName
+ "cotton_armor_chestplate", // itemTextureName
+ CottonArmorMaterial, // armor material
+ "cottonarmor_layer", // armorTextureName
+ 1 // armor type 1 = chest plate
+ ), "cottonArmorChestPlate"); // name key for en_US.lang file
+ GameRegistry.registerItem(cottonArmorLeggings = new ItemCottonArmor(
+ "cottonArmorLeggings", // unlocalizedName
+ "cotton_armor_leggings", // itemTextureName
+ CottonArmorMaterial, // armor material
+ "cottonarmor_layer", // armorTextureName
+ 2 // armor type 2 = leggings
+ ), "cottonArmorLeggings"); // name key for en_US.lang file
+ GameRegistry.registerItem(cottonArmorBoots = new ItemCottonArmor(
+ "cottonArmorBoots", // unlocalizedName
+ "cotton_armor_boots", // itemTextureName
+ CottonArmorMaterial, // armor material
+ "cottonarmor_layer", // armorTextureName
+ 3 // armor type 3 = boots
+ ), "cottonArmorBoots"); // name key for en_US.lang file
}
public void init(FMLInitializationEvent e) {
+ /*
+ * world generator creates:
+ * - wild cotton plants (used in Overworld)
+ * - halite ore underground (used in Overworld)
+ */
+ clothingCraftWorldGen = new ClothingCraftWorldGen();
+
+ // register generator for world
+ GameRegistry.registerWorldGenerator(clothingCraftWorldGen, 10);
+ GameRegistry.registerFuelHandler(this);
+
+ GameRegistry.addRecipe(new ItemStack(cottonSeeds, 1),
+ "0XX", "XXX", "XXX",
+ '0', new ItemStack(cotton, 1));
+
+ GameRegistry.addRecipe(new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
+ "012", "345", "XXX",
+ '0', new ItemStack(cotton, 1),
+ '1', new ItemStack(cotton, 1),
+ '2', new ItemStack(cotton, 1),
+ '3', new ItemStack(cotton, 1),
+ '4', new ItemStack(cotton, 1),
+ '5', new ItemStack(cotton, 1));
+
+ GameRegistry.addRecipe(new ItemStack(ClothingCraftHaliteBlockList.cottonFabricBundle, 1),
+ "012", "345", "678",
+ '0', new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
+ '1', new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
+ '2', new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
+ '3', new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
+ '4', new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
+ '5', new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
+ '6', new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
+ '7', new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
+ '8', new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1));
+
+ // cotton armor recipes
+ GameRegistry.addRecipe(new ItemStack(cottonArmorHelmet, 1),
+ "012", "3X5", "XXX",
+ '0', new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
+ '1', new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
+ '2', new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
+ '3', new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
+ '5', new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1));
+ GameRegistry.addRecipe(new ItemStack(cottonArmorChestPlate, 1),
+ "0X2", "345", "678",
+ '0', new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
+ '2', new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
+ '3', new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
+ '4', new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
+ '5', new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
+ '6', new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
+ '7', new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
+ '8', new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1));
+ GameRegistry.addRecipe(new ItemStack(cottonArmorLeggings, 1),
+ "012", "3X5", "6X8",
+ '0', new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
+ '1', new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
+ '2', new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
+ '3', new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
+ '5', new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
+ '6', new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
+ '8', new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1));
+ GameRegistry.addRecipe(new ItemStack(cottonArmorBoots, 1),
+ "0X2", "3X5", "XXX",
+ '0', new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
+ '2', new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
+ '3', new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1),
+ '5', new ItemStack(ClothingCraftFabricItemList.cottonFabric, 1));
+
+
+ ClothingCraftHaliteItemList.init(); // register recipes for halite, rock salt...
+ ClothingCraftFabricItemList.init(); // register recipes for cotton fabric, including all other colors
+ ClothingCraftToolsItemList.init(); // register recipes for tools: sewing scissors, measuring tape, ...
+ ClothingCraftPatternItemList.init(); // register recipes for tools: patterns by category (beach, career, casual, costume, formal, sleep)
+ ClothingCraftAccessoriesItemList.init(); // register recipes for accessory items
+ ClothingCraftWardrobeItemList.init(); // register recipes for wardrobe items
}
public void postInit(FMLPostInitializationEvent e) {
}
+
+ /**
+ * @see cpw.mods.fml.common.IFuelHandler#getBurnTime(net.minecraft.item.ItemStack)
+ */
+ @Override
+ public int getBurnTime(ItemStack fuel) {
+ // TODO Auto-generated method stub
+ return 0;
+ }
}
diff --git a/src/main/java/clothingcraft/generation/ClothingCraftWorldGen.java b/src/main/java/clothingcraft/generation/ClothingCraftWorldGen.java
index fa9486f..e19761c 100644
--- a/src/main/java/clothingcraft/generation/ClothingCraftWorldGen.java
+++ b/src/main/java/clothingcraft/generation/ClothingCraftWorldGen.java
@@ -21,7 +21,6 @@ public ClothingCraftWorldGen() {
}
-
@Override
public void generate(Random random, int chunkX, int chunkZ, World world, IChunkProvider chunkGenerator,
IChunkProvider chunkProvider) {
@@ -35,10 +34,8 @@ public void generate(Random random, int chunkX, int chunkZ, World world, IChunkP
runPlantGenerator(generatorCottonWildPlant, world, random, chunkX, chunkZ);
break;
case -1: //Nether
-
break;
case 1: //End
-
break;
}
}
diff --git a/src/main/java/clothingcraft/gui/CreativeTabsClothingCraft.java b/src/main/java/clothingcraft/gui/CreativeTabsClothingCraft.java
index 76623b6..339803c 100644
--- a/src/main/java/clothingcraft/gui/CreativeTabsClothingCraft.java
+++ b/src/main/java/clothingcraft/gui/CreativeTabsClothingCraft.java
@@ -1,6 +1,3 @@
-/**
- *
- */
package clothingcraft.gui;
import cpw.mods.fml.relauncher.Side;
diff --git a/src/main/java/clothingcraft/gui/ItemOreSorter.java b/src/main/java/clothingcraft/gui/ItemOreSorter.java
index 6b56c40..e90cb6a 100644
--- a/src/main/java/clothingcraft/gui/ItemOreSorter.java
+++ b/src/main/java/clothingcraft/gui/ItemOreSorter.java
@@ -1,6 +1,3 @@
-/**
- *
- */
package clothingcraft.gui;
import net.minecraft.item.ItemStack;
@@ -14,7 +11,7 @@
* Sorting comparator for displayed Items in a custom creative tab
*
* @author NinjaSoldier40
- * @see https://gist.github.com/Choonster/42602d38a94b915fc0b2
+ * @see https://gist.github.com/Choonster/42602d38a94b915fc0b2
* @since 02/12/2017 12:23 PM (-07:00 GMT)
*/
public class ItemOreSorter implements Comparator {
diff --git a/src/main/java/clothingcraft/items/ClothingCraftAccessoriesItemList.java b/src/main/java/clothingcraft/items/ClothingCraftAccessoriesItemList.java
index 42c0562..55c5a19 100644
--- a/src/main/java/clothingcraft/items/ClothingCraftAccessoriesItemList.java
+++ b/src/main/java/clothingcraft/items/ClothingCraftAccessoriesItemList.java
@@ -4,11 +4,11 @@
package clothingcraft.items;
-import clothingcraft.core.ClothingCraft;
+import clothingcraft.client.ClientProxy;
import clothingcraft.core.ClothingCraftInfo;
-import clothingcraft.items.ClothingCraftFabricItemList.COLORS;
-import clothingcraft.items.ClothingCraftPatternItemList.CATEGORY;
-import clothingcraft.items.ClothingCraftPatternItemList.PURPOSE;
+import clothingcraft.items.ClothingCraftFabricItemList.Colors;
+import clothingcraft.items.ClothingCraftPatternItemList.Category;
+import clothingcraft.items.ClothingCraftPatternItemList.Purpose;
import clothingcraft.util.RecipeUtil;
import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.init.Items;
@@ -95,9 +95,9 @@ public static void init() {
GameRegistry.addRecipe(new ItemStack(
getAccessoryItem("beachball"), 1),
RecipeUtil.createRecipeObject(new Item[]{
- null, getFabric(COLORS.white), null,
- getFabric(COLORS.bluedark), Items.slime_ball, getFabric(COLORS.red),
- null, getFabric(COLORS.yellow), null
+ null, getFabric(Colors.white), null,
+ getFabric(Colors.bluedark), Items.slime_ball, getFabric(Colors.red),
+ null, getFabric(Colors.yellow), null
})
);
@@ -117,7 +117,7 @@ private static void registerItemByKey(String itemKey) {
Item result = (Item) new Item()
.setMaxStackSize(64)
.setUnlocalizedName(ensurePrefix("accessory_", itemKey))
- .setCreativeTab(ClothingCraft.tabAccessories)
+ .setCreativeTab(ClientProxy.tabAccessories)
.setTextureName(ClothingCraftInfo.MODID + ":" + ensurePrefix("accessory_", itemKey));
accessoryItemMap.put("accessory_" + itemKey, result);
GameRegistry.registerItem(result, ensurePrefix("accessory_", itemKey));
@@ -163,7 +163,7 @@ private static String ensurePrefix(String prefix, String inStr) {
* @param enumPurpose ClothingCraftPatternItemList.PURPOSE enumeration element
* @return associated sewing pattern item, null if none exists
*/
- public static Item getPattern(CATEGORY enumCategory, PURPOSE enumPurpose) {
+ public static Item getPattern(Category enumCategory, Purpose enumPurpose) {
return ClothingCraftPatternItemList.patternsItemMap.get(enumCategory).get(enumPurpose);
}
@@ -173,7 +173,7 @@ public static Item getPattern(CATEGORY enumCategory, PURPOSE enumPurpose) {
* @param enumColor ClothingCraftFabricItemList.COLORS enumeration element
* @return associated sewing fabric item, null if none exists.
*/
- public static Item getFabric(COLORS enumColor) {
+ public static Item getFabric(Colors enumColor) {
return ClothingCraftFabricItemList.fabricItemsMap.get(enumColor);
}
}
diff --git a/src/main/java/clothingcraft/items/ClothingCraftFabricItemList.java b/src/main/java/clothingcraft/items/ClothingCraftFabricItemList.java
index aca1abd..a76999f 100644
--- a/src/main/java/clothingcraft/items/ClothingCraftFabricItemList.java
+++ b/src/main/java/clothingcraft/items/ClothingCraftFabricItemList.java
@@ -3,7 +3,7 @@
*/
package clothingcraft.items;
-import clothingcraft.core.ClothingCraft;
+import clothingcraft.client.ClientProxy;
import clothingcraft.core.ClothingCraftInfo;
import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.init.Items;
@@ -21,25 +21,25 @@
*/
public class ClothingCraftFabricItemList {
public static Item cottonFabric;
- public static LinkedHashMap dyeItemsMap = new LinkedHashMap();
+ public static LinkedHashMap dyeItemsMap = new LinkedHashMap();
- ; // pinklight removed (no fabric for it).
- public static LinkedHashMap fabricItemsMap = new LinkedHashMap();
- public static LinkedHashMap dyeRecipeMap = new LinkedHashMap();
+ // pinklight removed (no fabric for it).
+ public static LinkedHashMap fabricItemsMap = new LinkedHashMap();
+ public static LinkedHashMap dyeRecipeMap = new LinkedHashMap();
public static void preInit() {
buildRecipesByColor();
- cottonFabric = (Item) new ItemCottonFabric()
+ cottonFabric = new ItemCottonFabric()
.setMaxDamage(0)
.setMaxStackSize(64)
.setUnlocalizedName("cotton_fabric")
.setTextureName(ClothingCraftInfo.MODID + ":cotton_fabric")
- .setCreativeTab(ClothingCraft.tabCore);
+ .setCreativeTab(ClientProxy.tabCore);
GameRegistry.registerItem(cottonFabric, "cotton_fabric");
- for (COLORS enumColor : COLORS.values()) {
+ for (Colors enumColor : Colors.values()) {
dyeItemsMap.put(enumColor, new ItemDye(enumColor.toString()));
GameRegistry.registerItem((dyeItemsMap.get(enumColor)), "dye_" + enumColor.toString());
@@ -51,27 +51,24 @@ public static void preInit() {
public static void init() {
- for (COLORS enumColor : COLORS.values()) {
+ for (Colors enumColor : Colors.values()) {
// register dye recipes
ItemStack stack = new ItemStack(dyeItemsMap.get(enumColor), 1);
GameRegistry.addRecipe(stack, dyeRecipeMap.get(enumColor));
// register fabric recipes
GameRegistry.addRecipe(new ItemStack(fabricItemsMap.get(enumColor), 1),
- new Object[]{"01X", "XXX", "XXX",
- Character.valueOf('0'), new ItemStack(cottonFabric, 1),
- Character.valueOf('1'), new ItemStack(dyeItemsMap.get(enumColor), 1)
- });
+ "01X", "XXX", "XXX",
+ '0', new ItemStack(cottonFabric, 1),
+ '1', new ItemStack(dyeItemsMap.get(enumColor), 1));
}
}
/**
* builds the dye specific recipes according to effective color.
- *
- * @param enumColor COLORS enum value to key on.
*/
public static void buildRecipesByColor() {
int dyeMetaValue = 0;
- for (COLORS enumColor : COLORS.values()) {
+ for (Colors enumColor : Colors.values()) {
if (dyeMetaValue < 16) {
dyeRecipeMap.put(enumColor, getTemplateRecipe(dyeMetaValue));
} else {
@@ -115,93 +112,93 @@ public static void buildRecipesByColor() {
private static Object[] getTemplateRecipe(int dyeMetaValue) {
return new Object[]{"012", "XXX", "XXX",
- Character.valueOf('0'), new ItemStack(Items.potionitem, 1),
- Character.valueOf('1'), new ItemStack(ClothingCraftHaliteItemList.rockSalt, 1),
- Character.valueOf('2'), new ItemStack(Items.dye, 1, dyeMetaValue)
+ '0', new ItemStack(Items.potionitem, 1),
+ '1', new ItemStack(ClothingCraftHaliteItemList.rockSalt, 1),
+ '2', new ItemStack(Items.dye, 1, dyeMetaValue)
};
}
private static Object[] getCoralRecipe() {
return new Object[]{"012", "3XX", "XXX",
- Character.valueOf('0'), new ItemStack(Items.potionitem, 1),
- Character.valueOf('1'), new ItemStack(ClothingCraftHaliteItemList.rockSalt, 1),
- Character.valueOf('2'), new ItemStack(Items.dye, 1, 9), // pink
- Character.valueOf('3'), new ItemStack(Items.dye, 1, 14), // orange
+ '0', new ItemStack(Items.potionitem, 1),
+ '1', new ItemStack(ClothingCraftHaliteItemList.rockSalt, 1),
+ '2', new ItemStack(Items.dye, 1, 9), // pink
+ '3', new ItemStack(Items.dye, 1, 14), // orange
};
}
private static Object[] getGalaxyRecipe() {
return new Object[]{"012", "34X", "XXX",
- Character.valueOf('0'), new ItemStack(Items.potionitem, 1),
- Character.valueOf('1'), new ItemStack(ClothingCraftHaliteItemList.rockSalt, 1),
- Character.valueOf('2'), new ItemStack(Items.nether_star, 1), // netherstar item
- Character.valueOf('3'), new ItemStack(Items.dye, 1, 4), // bluedark
- Character.valueOf('4'), new ItemStack(Items.dye, 1, 5), // purple
+ '0', new ItemStack(Items.potionitem, 1),
+ '1', new ItemStack(ClothingCraftHaliteItemList.rockSalt, 1),
+ '2', new ItemStack(Items.nether_star, 1), // netherstar item
+ '3', new ItemStack(Items.dye, 1, 4), // bluedark
+ '4', new ItemStack(Items.dye, 1, 5), // purple
};
}
private static Object[] getGlowstoneRecipe() {
return new Object[]{"012", "XXX", "XXX",
- Character.valueOf('0'), new ItemStack(Items.potionitem, 1),
- Character.valueOf('1'), new ItemStack(ClothingCraftHaliteItemList.rockSalt, 1),
- Character.valueOf('2'), new ItemStack(Items.glowstone_dust, 1), // glowstone_dust item
+ '0', new ItemStack(Items.potionitem, 1),
+ '1', new ItemStack(ClothingCraftHaliteItemList.rockSalt, 1),
+ '2', new ItemStack(Items.glowstone_dust, 1), // glowstone_dust item
};
}
private static Object[] getLavenderRecipe() {
return new Object[]{"012", "3XX", "XXX",
- Character.valueOf('0'), new ItemStack(Items.potionitem, 1),
- Character.valueOf('1'), new ItemStack(ClothingCraftHaliteItemList.rockSalt, 1),
- Character.valueOf('2'), new ItemStack(Items.dye, 1, 5), // purple
- Character.valueOf('3'), new ItemStack(Items.dye, 1, 15), // white
+ '0', new ItemStack(Items.potionitem, 1),
+ '1', new ItemStack(ClothingCraftHaliteItemList.rockSalt, 1),
+ '2', new ItemStack(Items.dye, 1, 5), // purple
+ '3', new ItemStack(Items.dye, 1, 15), // white
};
}
private static Object[] getMintRecipe() {
return new Object[]{"012", "3XX", "XXX",
- Character.valueOf('0'), new ItemStack(Items.potionitem, 1),
- Character.valueOf('1'), new ItemStack(ClothingCraftHaliteItemList.rockSalt, 1),
- Character.valueOf('2'), new ItemStack(Items.dye, 1, 2), // green
- Character.valueOf('3'), new ItemStack(Items.dye, 1, 15), // white
+ '0', new ItemStack(Items.potionitem, 1),
+ '1', new ItemStack(ClothingCraftHaliteItemList.rockSalt, 1),
+ '2', new ItemStack(Items.dye, 1, 2), // green
+ '3', new ItemStack(Items.dye, 1, 15), // white
};
}
private static Object[] getRedstoneRecipe() {
return new Object[]{"012", "XXX", "XXX",
- Character.valueOf('0'), new ItemStack(Items.potionitem, 1),
- Character.valueOf('1'), new ItemStack(ClothingCraftHaliteItemList.rockSalt, 1),
- Character.valueOf('2'), new ItemStack(Items.redstone, 1), // redstone item
+ '0', new ItemStack(Items.potionitem, 1),
+ '1', new ItemStack(ClothingCraftHaliteItemList.rockSalt, 1),
+ '2', new ItemStack(Items.redstone, 1), // redstone item
};
}
private static Object[] getRainbowRecipe() {
return new Object[]{"012", "345", "67X",
- Character.valueOf('0'), new ItemStack(Items.potionitem, 1),
- Character.valueOf('1'), new ItemStack(ClothingCraftHaliteItemList.rockSalt, 1),
- Character.valueOf('2'), new ItemStack(Items.dye, 1, 1), // red
- Character.valueOf('3'), new ItemStack(Items.dye, 1, 14), // orange
- Character.valueOf('4'), new ItemStack(Items.dye, 1, 11), // yellow
- Character.valueOf('5'), new ItemStack(Items.dye, 1, 2), // green
- Character.valueOf('6'), new ItemStack(Items.dye, 1, 4), // bluedark
- Character.valueOf('7'), new ItemStack(Items.dye, 1, 5), // purple
+ '0', new ItemStack(Items.potionitem, 1),
+ '1', new ItemStack(ClothingCraftHaliteItemList.rockSalt, 1),
+ '2', new ItemStack(Items.dye, 1, 1), // red
+ '3', new ItemStack(Items.dye, 1, 14), // orange
+ '4', new ItemStack(Items.dye, 1, 11), // yellow
+ '5', new ItemStack(Items.dye, 1, 2), // green
+ '6', new ItemStack(Items.dye, 1, 4), // bluedark
+ '7', new ItemStack(Items.dye, 1, 5), // purple
};
}
private static Object[] getTanRecipe() {
return new Object[]{"012", "3XX", "XXX",
- Character.valueOf('0'), new ItemStack(Items.potionitem, 1),
- Character.valueOf('1'), new ItemStack(ClothingCraftHaliteItemList.rockSalt, 1),
- Character.valueOf('2'), new ItemStack(Items.dye, 1, 3), // brown
- Character.valueOf('3'), new ItemStack(Items.dye, 1, 15), // white
+ '0', new ItemStack(Items.potionitem, 1),
+ '1', new ItemStack(ClothingCraftHaliteItemList.rockSalt, 1),
+ '2', new ItemStack(Items.dye, 1, 3), // brown
+ '3', new ItemStack(Items.dye, 1, 15), // white
};
}
private static Object[] getPinkLightRecipe() {
return new Object[]{"012", "3XX", "XXX",
- Character.valueOf('0'), new ItemStack(Items.potionitem, 1),
- Character.valueOf('1'), new ItemStack(ClothingCraftHaliteItemList.rockSalt, 1),
- Character.valueOf('2'), new ItemStack(Items.dye, 1, 9), // pink
- Character.valueOf('3'), new ItemStack(Items.dye, 1, 15), // white
+ '0', new ItemStack(Items.potionitem, 1),
+ '1', new ItemStack(ClothingCraftHaliteItemList.rockSalt, 1),
+ '2', new ItemStack(Items.dye, 1, 9), // pink
+ '3', new ItemStack(Items.dye, 1, 15), // white
};
}
@@ -232,11 +229,9 @@ private static Object[] getPinkLightRecipe() {
* - redstone,
* - rainbow,
* - tan,
- * - pinklight,
- *
- * @param enumColor COLORS enum value to key on.
+ * - pinklight
*/
- public static enum COLORS {
+ public enum Colors {
black, red, green, brown, bluedark,
purple, cyan, graylight, graydark, pink,
lime, yellow, bluelight, magenta, orange, white,
diff --git a/src/main/java/clothingcraft/items/ClothingCraftHaliteItemList.java b/src/main/java/clothingcraft/items/ClothingCraftHaliteItemList.java
index 4e60e97..8ae53d2 100644
--- a/src/main/java/clothingcraft/items/ClothingCraftHaliteItemList.java
+++ b/src/main/java/clothingcraft/items/ClothingCraftHaliteItemList.java
@@ -26,25 +26,25 @@ public class ClothingCraftHaliteItemList {
public static Item haliteShovel;
public static void preInit() {
- rockSalt = (Item) new ItemRockSalt();
+ rockSalt = new ItemRockSalt();
GameRegistry.registerItem(rockSalt, "rock_salt");
- haliteIngot = (Item) new ItemHaliteIngot();
+ haliteIngot = new ItemHaliteIngot();
GameRegistry.registerItem(haliteIngot, "halite_ingot");
- haliteSword = (Item) new ItemHaliteSword();
+ haliteSword = new ItemHaliteSword();
GameRegistry.registerItem(haliteSword, "halite_sword");
- haliteAxe = (Item) new ItemHaliteAxe();
+ haliteAxe = new ItemHaliteAxe();
GameRegistry.registerItem(haliteAxe, "halite_axe");
- haliteHoe = (Item) new ItemHaliteHoe();
+ haliteHoe = new ItemHaliteHoe();
GameRegistry.registerItem(haliteHoe, "halite_hoe");
- halitePickaxe = (Item) new ItemHalitePickaxe();
+ halitePickaxe = new ItemHalitePickaxe();
GameRegistry.registerItem(halitePickaxe, "halite_pickaxe");
- haliteShovel = (Item) new ItemHaliteShovel();
+ haliteShovel = new ItemHaliteShovel();
GameRegistry.registerItem(haliteShovel, "halite_shovel");
}
@@ -52,42 +52,38 @@ public static void init() {
GameRegistry.addSmelting(rockSalt, new ItemStack(haliteIngot), 1.0f);
GameRegistry.addRecipe(new ItemStack(haliteSword, 1),
- new Object[]{"X1X", "X4X", "X7X",
- Character.valueOf('1'), new ItemStack(ClothingCraftHaliteBlockList.haliteBlock, 1),
- Character.valueOf('4'), new ItemStack(ClothingCraftHaliteBlockList.haliteBlock, 1),
- Character.valueOf('7'), new ItemStack(Items.stick, 1),
- });
+ "X1X", "X4X", "X7X",
+ '1', new ItemStack(ClothingCraftHaliteBlockList.haliteBlock, 1),
+ '4', new ItemStack(ClothingCraftHaliteBlockList.haliteBlock, 1),
+ '7', new ItemStack(Items.stick, 1));
GameRegistry.addRecipe(new ItemStack(haliteAxe, 1),
- new Object[]{"01X", "34X", "X7X",
- Character.valueOf('0'), new ItemStack(ClothingCraftHaliteBlockList.haliteBlock, 1),
- Character.valueOf('1'), new ItemStack(ClothingCraftHaliteBlockList.haliteBlock, 1),
- Character.valueOf('3'), new ItemStack(ClothingCraftHaliteBlockList.haliteBlock, 1),
- Character.valueOf('4'), new ItemStack(Items.stick, 1),
- Character.valueOf('7'), new ItemStack(Items.stick, 1),
- });
+ "01X", "34X", "X7X",
+ '0', new ItemStack(ClothingCraftHaliteBlockList.haliteBlock, 1),
+ '1', new ItemStack(ClothingCraftHaliteBlockList.haliteBlock, 1),
+ '3', new ItemStack(ClothingCraftHaliteBlockList.haliteBlock, 1),
+ '4', new ItemStack(Items.stick, 1),
+ '7', new ItemStack(Items.stick, 1));
GameRegistry.addRecipe(new ItemStack(halitePickaxe, 1),
- new Object[]{"012", "X4X", "X7X",
- Character.valueOf('0'), new ItemStack(ClothingCraftHaliteBlockList.haliteBlock, 1),
- Character.valueOf('1'), new ItemStack(ClothingCraftHaliteBlockList.haliteBlock, 1),
- Character.valueOf('2'), new ItemStack(ClothingCraftHaliteBlockList.haliteBlock, 1),
- Character.valueOf('4'), new ItemStack(Items.stick, 1),
- Character.valueOf('7'), new ItemStack(Items.stick, 1),
- });
+ "012", "X4X", "X7X",
+ '0', new ItemStack(ClothingCraftHaliteBlockList.haliteBlock, 1),
+ '1', new ItemStack(ClothingCraftHaliteBlockList.haliteBlock, 1),
+ '2', new ItemStack(ClothingCraftHaliteBlockList.haliteBlock, 1),
+ '4', new ItemStack(Items.stick, 1),
+ '7', new ItemStack(Items.stick, 1));
GameRegistry.addRecipe(new ItemStack(haliteShovel, 1),
- new Object[]{"X1X", "X4X", "X7X",
- Character.valueOf('1'), new ItemStack(ClothingCraftHaliteBlockList.haliteBlock, 1),
- Character.valueOf('4'), new ItemStack(Items.stick, 1),
- Character.valueOf('7'), new ItemStack(Items.stick, 1),
- });
+ "X1X", "X4X", "X7X",
+ '1', new ItemStack(ClothingCraftHaliteBlockList.haliteBlock, 1),
+ '4', new ItemStack(Items.stick, 1),
+ '7', new ItemStack(Items.stick, 1));
GameRegistry.addRecipe(new ItemStack(haliteHoe, 1),
- new Object[]{"01X", "X4X", "X7X",
- Character.valueOf('0'), new ItemStack(ClothingCraftHaliteBlockList.haliteBlock, 1),
- Character.valueOf('1'), new ItemStack(ClothingCraftHaliteBlockList.haliteBlock, 1),
- Character.valueOf('4'), new ItemStack(Items.stick, 1),
- Character.valueOf('7'), new ItemStack(Items.stick, 1),});
+ "01X", "X4X", "X7X",
+ '0', new ItemStack(ClothingCraftHaliteBlockList.haliteBlock, 1),
+ '1', new ItemStack(ClothingCraftHaliteBlockList.haliteBlock, 1),
+ '4', new ItemStack(Items.stick, 1),
+ '7', new ItemStack(Items.stick, 1));
}
}
diff --git a/src/main/java/clothingcraft/items/ClothingCraftPatternItemList.java b/src/main/java/clothingcraft/items/ClothingCraftPatternItemList.java
index 5beadea..21133ed 100644
--- a/src/main/java/clothingcraft/items/ClothingCraftPatternItemList.java
+++ b/src/main/java/clothingcraft/items/ClothingCraftPatternItemList.java
@@ -42,20 +42,20 @@ public class ClothingCraftPatternItemList {
* Item patternCasualHelm = patternsItemMap.get(CATEGORY.casual).get(PURPOSE.helm);
*
*/
- public static LinkedHashMap> patternsItemMap =
- new LinkedHashMap>();
+ public static LinkedHashMap> patternsItemMap =
+ new LinkedHashMap>();
;
public static void preInit() {
- for (CATEGORY enumCategory : CATEGORY.values()) {
- for (PURPOSE enumPurpose : PURPOSE.values()) {
+ for (Category enumCategory : Category.values()) {
+ for (Purpose enumPurpose : Purpose.values()) {
String unlocalizedName = "pattern_" + enumCategory.name() + "_" + enumPurpose.name();
Item patternItem = (Item) new ItemPattern(unlocalizedName);
GameRegistry.registerItem(patternItem, unlocalizedName);
// populate the patternsItemMap
if (patternsItemMap.get(enumCategory) == null) {
- patternsItemMap.put(enumCategory, new LinkedHashMap());
+ patternsItemMap.put(enumCategory, new LinkedHashMap());
}
patternsItemMap.get(enumCategory).put(enumPurpose, patternItem);
}
@@ -65,8 +65,8 @@ public static void preInit() {
;
public static void init() {
- for (CATEGORY enumCategory : CATEGORY.values()) {
- for (PURPOSE enumPurpose : PURPOSE.values()) {
+ for (Category enumCategory : Category.values()) {
+ for (Purpose enumPurpose : Purpose.values()) {
Item item = patternsItemMap.get(enumCategory).get(enumPurpose);
// boots recipe
ItemStack stack = new ItemStack(item, 1);
@@ -89,7 +89,7 @@ public static void init() {
* @param enumPurpose
* @return
*/
- public static Object[] getRecipe(CATEGORY enumCategory, PURPOSE enumPurpose) {
+ public static Object[] getRecipe(Category enumCategory, Purpose enumPurpose) {
Object[] result = null;
ItemStack specialIngredient = null;
@@ -119,34 +119,34 @@ public static Object[] getRecipe(CATEGORY enumCategory, PURPOSE enumPurpose) {
switch (enumPurpose) {
case helm:
result = new Object[]{"012", "3XX", "XXX",
- Character.valueOf('0'), new ItemStack(Items.paper, 1),
- Character.valueOf('1'), new ItemStack(Items.leather_helmet, 1),
- Character.valueOf('2'), new ItemStack(ClothingCraftToolsItemList.sewingScissors, 1),
- Character.valueOf('3'), specialIngredient,
+ '0', new ItemStack(Items.paper, 1),
+ '1', new ItemStack(Items.leather_helmet, 1),
+ '2', new ItemStack(ClothingCraftToolsItemList.sewingScissors, 1),
+ '3', specialIngredient,
};
break;
case chest:
result = new Object[]{"012", "3XX", "XXX",
- Character.valueOf('0'), new ItemStack(Items.paper, 1),
- Character.valueOf('1'), new ItemStack(Items.leather_chestplate, 1),
- Character.valueOf('2'), new ItemStack(ClothingCraftToolsItemList.sewingScissors, 1),
- Character.valueOf('3'), specialIngredient,
+ '0', new ItemStack(Items.paper, 1),
+ '1', new ItemStack(Items.leather_chestplate, 1),
+ '2', new ItemStack(ClothingCraftToolsItemList.sewingScissors, 1),
+ '3', specialIngredient,
};
break;
case pants:
result = new Object[]{"012", "3XX", "XXX",
- Character.valueOf('0'), new ItemStack(Items.paper, 1),
- Character.valueOf('1'), new ItemStack(Items.leather_leggings, 1),
- Character.valueOf('2'), new ItemStack(ClothingCraftToolsItemList.sewingScissors, 1),
- Character.valueOf('3'), specialIngredient,
+ '0', new ItemStack(Items.paper, 1),
+ '1', new ItemStack(Items.leather_leggings, 1),
+ '2', new ItemStack(ClothingCraftToolsItemList.sewingScissors, 1),
+ '3', specialIngredient,
};
break;
case boots:
result = new Object[]{"012", "3XX", "XXX",
- Character.valueOf('0'), new ItemStack(Items.paper, 1),
- Character.valueOf('1'), new ItemStack(Items.leather_boots, 1),
- Character.valueOf('2'), new ItemStack(ClothingCraftToolsItemList.sewingScissors, 1),
- Character.valueOf('3'), specialIngredient,
+ '0', new ItemStack(Items.paper, 1),
+ '1', new ItemStack(Items.leather_boots, 1),
+ '2', new ItemStack(ClothingCraftToolsItemList.sewingScissors, 1),
+ '3', specialIngredient,
};
break;
default:
@@ -155,7 +155,7 @@ public static Object[] getRecipe(CATEGORY enumCategory, PURPOSE enumPurpose) {
return result;
}
- public static enum CATEGORY {beach, career, casual, costume, formal, sleep}
+ public enum Category {beach, career, casual, costume, formal, sleep}
- public static enum PURPOSE {helm, chest, pants, boots}
+ public enum Purpose {helm, chest, pants, boots}
}
diff --git a/src/main/java/clothingcraft/items/ClothingCraftToolsItemList.java b/src/main/java/clothingcraft/items/ClothingCraftToolsItemList.java
index 1da9be1..0440a71 100644
--- a/src/main/java/clothingcraft/items/ClothingCraftToolsItemList.java
+++ b/src/main/java/clothingcraft/items/ClothingCraftToolsItemList.java
@@ -3,7 +3,7 @@
*/
package clothingcraft.items;
-import clothingcraft.core.ClothingCraft;
+import clothingcraft.core.CommonProxy;
import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
@@ -25,91 +25,86 @@ public class ClothingCraftToolsItemList {
public static Item knittingNeedles;
public static void preInit() {
- sewingScissors = (Item) new ItemToolScissors();
+ sewingScissors = new ItemToolScissors();
GameRegistry.registerItem(sewingScissors, "tools_scissors");
- needleAndThread = (Item) new ItemToolNeedleAndThread();
+ needleAndThread = new ItemToolNeedleAndThread();
GameRegistry.registerItem(needleAndThread, "tools_needle_thread");
- measuringTape = (Item) new ItemToolMeasuringTape();
+ measuringTape = new ItemToolMeasuringTape();
GameRegistry.registerItem(measuringTape, "tools_measuring_tape");
- pinCushion = (Item) new ItemToolPincushion();
+ pinCushion = new ItemToolPincushion();
GameRegistry.registerItem(pinCushion, "tools_pincushion");
- knittingNeedles = (Item) new ItemToolKnittingNeedles();
+ knittingNeedles = new ItemToolKnittingNeedles();
GameRegistry.registerItem(knittingNeedles, "tools_knitting_needles");
}
public static void init() {
ItemStack stack = new ItemStack(sewingScissors, 1);
GameRegistry.addRecipe(stack,
- new Object[]{"012", "345", "678",
- Character.valueOf('0'), new ItemStack(ClothingCraft.cotton, 1),
- Character.valueOf('1'), new ItemStack(ClothingCraft.cotton, 1),
- Character.valueOf('2'), new ItemStack(ClothingCraft.cotton, 1),
- Character.valueOf('3'), new ItemStack(ClothingCraft.cotton, 1),
- Character.valueOf('4'), new ItemStack(Items.shears, 1),
- Character.valueOf('5'), new ItemStack(ClothingCraft.cotton, 1),
- Character.valueOf('6'), new ItemStack(ClothingCraft.cotton, 1),
- Character.valueOf('7'), new ItemStack(ClothingCraft.cotton, 1),
- Character.valueOf('8'), new ItemStack(ClothingCraft.cotton, 1),
- });
+ "012", "345", "678",
+ '0', new ItemStack(CommonProxy.cotton, 1),
+ '1', new ItemStack(CommonProxy.cotton, 1),
+ '2', new ItemStack(CommonProxy.cotton, 1),
+ '3', new ItemStack(CommonProxy.cotton, 1),
+ '4', new ItemStack(Items.shears, 1),
+ '5', new ItemStack(CommonProxy.cotton, 1),
+ '6', new ItemStack(CommonProxy.cotton, 1),
+ '7', new ItemStack(CommonProxy.cotton, 1),
+ '8', new ItemStack(CommonProxy.cotton, 1));
stack = new ItemStack(needleAndThread, 1);
GameRegistry.addRecipe(stack,
- new Object[]{"012", "345", "678",
- Character.valueOf('0'), new ItemStack(ClothingCraft.cotton, 1),
- Character.valueOf('1'), new ItemStack(Items.string, 1),
- Character.valueOf('2'), new ItemStack(ClothingCraft.cotton, 1),
- Character.valueOf('3'), new ItemStack(Items.string, 1),
- Character.valueOf('4'), new ItemStack(Items.stick, 1),
- Character.valueOf('5'), new ItemStack(Items.string, 1),
- Character.valueOf('6'), new ItemStack(ClothingCraft.cotton, 1),
- Character.valueOf('7'), new ItemStack(Items.string, 1),
- Character.valueOf('8'), new ItemStack(ClothingCraft.cotton, 1),
- });
+ "012", "345", "678",
+ '0', new ItemStack(CommonProxy.cotton, 1),
+ '1', new ItemStack(Items.string, 1),
+ '2', new ItemStack(CommonProxy.cotton, 1),
+ '3', new ItemStack(Items.string, 1),
+ '4', new ItemStack(Items.stick, 1),
+ '5', new ItemStack(Items.string, 1),
+ '6', new ItemStack(CommonProxy.cotton, 1),
+ '7', new ItemStack(Items.string, 1),
+ '8', new ItemStack(CommonProxy.cotton, 1));
stack = new ItemStack(measuringTape, 1);
GameRegistry.addRecipe(stack,
- new Object[]{"012", "345", "678",
- Character.valueOf('0'), new ItemStack(ClothingCraft.cotton, 1),
- Character.valueOf('1'), new ItemStack(Items.string, 1),
- Character.valueOf('2'), new ItemStack(ClothingCraft.cotton, 1),
- Character.valueOf('3'), new ItemStack(Items.string, 1),
- Character.valueOf('4'), new ItemStack(Items.dye, 1, 11), // yellow
- Character.valueOf('5'), new ItemStack(Items.string, 1),
- Character.valueOf('6'), new ItemStack(ClothingCraft.cotton, 1),
- Character.valueOf('7'), new ItemStack(Items.string, 1),
- Character.valueOf('8'), new ItemStack(ClothingCraft.cotton, 1),
- });
+ "012", "345", "678",
+ '0', new ItemStack(CommonProxy.cotton, 1),
+ '1', new ItemStack(Items.string, 1),
+ '2', new ItemStack(CommonProxy.cotton, 1),
+ '3', new ItemStack(Items.string, 1),
+ '4', new ItemStack(Items.dye, 1, 11), // yellow
+ '5', new ItemStack(Items.string, 1),
+ '6', new ItemStack(CommonProxy.cotton, 1),
+ '7', new ItemStack(Items.string, 1),
+ '8', new ItemStack(CommonProxy.cotton, 1));
stack = new ItemStack(pinCushion, 1);
GameRegistry.addRecipe(stack,
- new Object[]{"012", "345", "678",
- Character.valueOf('0'), new ItemStack(ClothingCraft.cotton, 1),
- Character.valueOf('1'), new ItemStack(Items.stick, 1),
- Character.valueOf('2'), new ItemStack(ClothingCraft.cotton, 1),
- Character.valueOf('3'), new ItemStack(Items.stick, 1),
- Character.valueOf('4'), new ItemStack(Items.apple, 1),
- Character.valueOf('5'), new ItemStack(Items.stick, 1),
- Character.valueOf('6'), new ItemStack(ClothingCraft.cotton, 1),
- Character.valueOf('7'), new ItemStack(Items.stick, 1),
- Character.valueOf('8'), new ItemStack(ClothingCraft.cotton, 1),
- });
+ "012", "345", "678",
+ '0', new ItemStack(CommonProxy.cotton, 1),
+ '1', new ItemStack(Items.stick, 1),
+ '2', new ItemStack(CommonProxy.cotton, 1),
+ '3', new ItemStack(Items.stick, 1),
+ '4', new ItemStack(Items.apple, 1),
+ '5', new ItemStack(Items.stick, 1),
+ '6', new ItemStack(CommonProxy.cotton, 1),
+ '7', new ItemStack(Items.stick, 1),
+ '8', new ItemStack(CommonProxy.cotton, 1));
stack = new ItemStack(knittingNeedles, 1);
GameRegistry.addRecipe(stack,
- new Object[]{"012", "345", "678",
- Character.valueOf('0'), new ItemStack(ClothingCraft.cotton, 1),
- Character.valueOf('1'), new ItemStack(Items.stick, 1),
- Character.valueOf('2'), new ItemStack(ClothingCraft.cotton, 1),
- Character.valueOf('3'), new ItemStack(Items.stick, 1),
- Character.valueOf('4'), new ItemStack(Blocks.wool, 1, 2),
- Character.valueOf('5'), new ItemStack(Items.stick, 1),
- Character.valueOf('6'), new ItemStack(ClothingCraft.cotton, 1),
- Character.valueOf('7'), new ItemStack(Items.stick, 1),
- Character.valueOf('8'), new ItemStack(ClothingCraft.cotton, 1),
- });
+ "012", "345", "678",
+ '0', new ItemStack(CommonProxy.cotton, 1),
+ '1', new ItemStack(Items.stick, 1),
+ '2', new ItemStack(CommonProxy.cotton, 1),
+ '3', new ItemStack(Items.stick, 1),
+ '4', new ItemStack(Blocks.wool, 1, 2),
+ '5', new ItemStack(Items.stick, 1),
+ '6', new ItemStack(CommonProxy.cotton, 1),
+ '7', new ItemStack(Items.stick, 1),
+ '8', new ItemStack(CommonProxy.cotton, 1));
}
}
diff --git a/src/main/java/clothingcraft/items/ClothingCraftWardrobeItemList.java b/src/main/java/clothingcraft/items/ClothingCraftWardrobeItemList.java
index 1ea4758..5abdf76 100644
--- a/src/main/java/clothingcraft/items/ClothingCraftWardrobeItemList.java
+++ b/src/main/java/clothingcraft/items/ClothingCraftWardrobeItemList.java
@@ -4,9 +4,9 @@
package clothingcraft.items;
-import clothingcraft.items.ClothingCraftFabricItemList.COLORS;
-import clothingcraft.items.ClothingCraftPatternItemList.CATEGORY;
-import clothingcraft.items.ClothingCraftPatternItemList.PURPOSE;
+import clothingcraft.items.ClothingCraftFabricItemList.Colors;
+import clothingcraft.items.ClothingCraftPatternItemList.Category;
+import clothingcraft.items.ClothingCraftPatternItemList.Purpose;
import clothingcraft.util.RecipeUtil;
import cpw.mods.fml.client.registry.RenderingRegistry;
import cpw.mods.fml.common.FMLCommonHandler;
@@ -28,7 +28,7 @@
*
* @author JujuAwesomeBeans
* @author NinjaSoldier40
- * @since 02/12/2017 07:39 PM (-7:00 GMT)
+ * @since 2/12/217 7:39 PM (-7:0 GMT)
*/
public class ClothingCraftWardrobeItemList {
@@ -38,21 +38,21 @@ public class ClothingCraftWardrobeItemList {
public static LinkedHashMap armorPrefixMap =
new LinkedHashMap();
// outfitKey to armorType to Item map
- public static LinkedHashMap> outfitPurposeItemMap =
- new LinkedHashMap>();
+ public static LinkedHashMap> outfitPurposeItemMap =
+ new LinkedHashMap>();
public static void preInit() {
- registerArmorMaterialAndPrefix("apronbrown", 01, new int[]{0, 0, 1, 0}, 9); // recipe done
- registerArmorMaterialAndPrefix("apronbutcher", 01, new int[]{0, 0, 1, 0}, 9); // recipe done
- registerArmorMaterialAndPrefix("aprongreen", 01, new int[]{0, 0, 1, 0}, 9); // recipe done
- registerArmorMaterialAndPrefix("apronwhite", 01, new int[]{0, 0, 1, 0}, 9); // recipe done
- registerArmorMaterialAndPrefix("angelwings", 04, new int[]{0, 4, 0, 0}, 9); // recipe done
+ registerArmorMaterialAndPrefix("apronbrown", 1, new int[]{0, 0, 1, 0}, 9); // recipe done
+ registerArmorMaterialAndPrefix("apronbutcher", 1, new int[]{0, 0, 1, 0}, 9); // recipe done
+ registerArmorMaterialAndPrefix("aprongreen", 1, new int[]{0, 0, 1, 0}, 9); // recipe done
+ registerArmorMaterialAndPrefix("apronwhite", 1, new int[]{0, 0, 1, 0}, 9); // recipe done
+ registerArmorMaterialAndPrefix("angelwings", 4, new int[]{0, 4, 0, 0}, 9); // recipe done
registerArmorMaterialAndPrefix("artist", 10, new int[]{2, 7, 5, 0}, 9); // recipe done
- registerArmorMaterialAndPrefix("ballcapblack", 01, new int[]{1, 0, 0, 0}, 9);
- registerArmorMaterialAndPrefix("ballcapblue", 01, new int[]{1, 0, 0, 0}, 9);
- registerArmorMaterialAndPrefix("ballcappurple", 01, new int[]{1, 0, 0, 0}, 9);
- registerArmorMaterialAndPrefix("ballcapred", 01, new int[]{1, 0, 0, 0}, 9);
+ registerArmorMaterialAndPrefix("ballcapblack", 1, new int[]{1, 0, 0, 0}, 9);
+ registerArmorMaterialAndPrefix("ballcapblue", 1, new int[]{1, 0, 0, 0}, 9);
+ registerArmorMaterialAndPrefix("ballcappurple", 1, new int[]{1, 0, 0, 0}, 9);
+ registerArmorMaterialAndPrefix("ballcapred", 1, new int[]{1, 0, 0, 0}, 9);
registerArmorMaterialAndPrefix("businesssuit", 10, new int[]{0, 7, 5, 0}, 9);
registerArmorMaterialAndPrefix("construction", 10, new int[]{2, 7, 5, 0}, 9);
registerArmorMaterialAndPrefix("costumechicken", 10, new int[]{2, 7, 0, 1}, 9);
@@ -62,50 +62,50 @@ public static void preInit() {
registerArmorMaterialAndPrefix("costumedinored", 10, new int[]{2, 7, 5, 0}, 9);
registerArmorMaterialAndPrefix("costumehotdog", 10, new int[]{2, 7, 5, 0}, 9);
registerArmorMaterialAndPrefix("costumenyancat", 10, new int[]{2, 7, 5, 0}, 9);
- registerArmorMaterialAndPrefix("dresscoral", 04, new int[]{0, 0, 3, 0}, 9);
+ registerArmorMaterialAndPrefix("dresscoral", 4, new int[]{0, 0, 3, 0}, 9);
registerArmorMaterialAndPrefix("dressgalaxy", 12, new int[]{4, 8, 6, 0}, 9);
registerArmorMaterialAndPrefix("dressglowstone", 12, new int[]{3, 7, 5, 0}, 9);
- registerArmorMaterialAndPrefix("dresslavendar", 04, new int[]{0, 0, 3, 0}, 9);
- registerArmorMaterialAndPrefix("dressmint", 04, new int[]{0, 0, 3, 0}, 9);
+ registerArmorMaterialAndPrefix("dresslavendar", 4, new int[]{0, 0, 3, 0}, 9);
+ registerArmorMaterialAndPrefix("dressmint", 4, new int[]{0, 0, 3, 0}, 9);
registerArmorMaterialAndPrefix("dresswedding", 10, new int[]{2, 7, 5, 0}, 9);
- registerArmorMaterialAndPrefix("earmuffslavendar", 01, new int[]{1, 0, 0, 0}, 9);
- registerArmorMaterialAndPrefix("fairywings", 04, new int[]{0, 4, 0, 0}, 9);
+ registerArmorMaterialAndPrefix("earmuffslavendar", 1, new int[]{1, 0, 0, 0}, 9);
+ registerArmorMaterialAndPrefix("fairywings", 4, new int[]{0, 4, 0, 0}, 9);
registerArmorMaterialAndPrefix("farmer", 10, new int[]{2, 7, 5, 0}, 9);
- registerArmorMaterialAndPrefix("glassesblack", 01, new int[]{1, 0, 0, 0}, 9);
- registerArmorMaterialAndPrefix("glassesred", 01, new int[]{1, 0, 0, 0}, 9);
- registerArmorMaterialAndPrefix("hairbowcoral", 01, new int[]{1, 0, 0, 0}, 9);
- registerArmorMaterialAndPrefix("hairbowlavendar", 01, new int[]{1, 0, 0, 0}, 9);
- registerArmorMaterialAndPrefix("hairbowmint", 01, new int[]{1, 0, 0, 0}, 9);
- registerArmorMaterialAndPrefix("hairpiecerainbow", 01, new int[]{1, 0, 0, 0}, 9);
- registerArmorMaterialAndPrefix("hairpiecedaisychain", 01, new int[]{1, 0, 0, 0}, 9);
- registerArmorMaterialAndPrefix("hathalo", 01, new int[]{1, 0, 0, 0}, 9);
- registerArmorMaterialAndPrefix("hatmushroom", 01, new int[]{1, 0, 0, 0}, 9);
- registerArmorMaterialAndPrefix("hatpig", 01, new int[]{2, 0, 0, 0}, 9);
- registerArmorMaterialAndPrefix("hatsheep", 01, new int[]{2, 0, 0, 0}, 9);
- registerArmorMaterialAndPrefix("headphones", 01, new int[]{3, 0, 0, 0}, 9);
+ registerArmorMaterialAndPrefix("glassesblack", 1, new int[]{1, 0, 0, 0}, 9);
+ registerArmorMaterialAndPrefix("glassesred", 1, new int[]{1, 0, 0, 0}, 9);
+ registerArmorMaterialAndPrefix("hairbowcoral", 1, new int[]{1, 0, 0, 0}, 9);
+ registerArmorMaterialAndPrefix("hairbowlavendar", 1, new int[]{1, 0, 0, 0}, 9);
+ registerArmorMaterialAndPrefix("hairbowmint", 1, new int[]{1, 0, 0, 0}, 9);
+ registerArmorMaterialAndPrefix("hairpiecerainbow", 1, new int[]{1, 0, 0, 0}, 9);
+ registerArmorMaterialAndPrefix("hairpiecedaisychain", 1, new int[]{1, 0, 0, 0}, 9);
+ registerArmorMaterialAndPrefix("hathalo", 1, new int[]{1, 0, 0, 0}, 9);
+ registerArmorMaterialAndPrefix("hatmushroom", 1, new int[]{1, 0, 0, 0}, 9);
+ registerArmorMaterialAndPrefix("hatpig", 1, new int[]{2, 0, 0, 0}, 9);
+ registerArmorMaterialAndPrefix("hatsheep", 1, new int[]{2, 0, 0, 0}, 9);
+ registerArmorMaterialAndPrefix("headphones", 1, new int[]{3, 0, 0, 0}, 9);
registerArmorMaterialAndPrefix("longsleevegalaxy", 10, new int[]{0, 2, 0, 0}, 9);
registerArmorMaterialAndPrefix("lumberjack", 10, new int[]{2, 7, 5, 0}, 9);
registerArmorMaterialAndPrefix("king", 25, new int[]{2, 7, 5, 0}, 9);
registerArmorMaterialAndPrefix("mage", 10, new int[]{2, 7, 5, 0}, 9);
- registerArmorMaterialAndPrefix("pajamasblack", 02, new int[]{0, 3, 2, 0}, 9);
- registerArmorMaterialAndPrefix("pajamasblue", 02, new int[]{0, 3, 2, 0}, 9);
- registerArmorMaterialAndPrefix("pajamasgreen", 02, new int[]{0, 3, 2, 0}, 9);
- registerArmorMaterialAndPrefix("pajamasmint-w-flowers", 02, new int[]{0, 0, 2, 0}, 9);
- registerArmorMaterialAndPrefix("pajamasred", 02, new int[]{0, 3, 2, 0}, 9);
- registerArmorMaterialAndPrefix("pajamasyellow-w-orangedots", 02, new int[]{0, 0, 2, 0}, 9);
+ registerArmorMaterialAndPrefix("pajamasblack", 2, new int[]{0, 3, 2, 0}, 9);
+ registerArmorMaterialAndPrefix("pajamasblue", 2, new int[]{0, 3, 2, 0}, 9);
+ registerArmorMaterialAndPrefix("pajamasgreen", 2, new int[]{0, 3, 2, 0}, 9);
+ registerArmorMaterialAndPrefix("pajamasmint-w-flowers", 2, new int[]{0, 0, 2, 0}, 9);
+ registerArmorMaterialAndPrefix("pajamasred", 2, new int[]{0, 3, 2, 0}, 9);
+ registerArmorMaterialAndPrefix("pajamasyellow-w-orangedots", 2, new int[]{0, 0, 2, 0}, 9);
registerArmorMaterialAndPrefix("policeofficer", 10, new int[]{2, 7, 5, 0}, 9);
- registerArmorMaterialAndPrefix("pantsjeans", 03, new int[]{0, 0, 3, 0}, 9);
- registerArmorMaterialAndPrefix("pantskhaki", 03, new int[]{0, 0, 3, 0}, 9);
+ registerArmorMaterialAndPrefix("pantsjeans", 3, new int[]{0, 0, 3, 0}, 9);
+ registerArmorMaterialAndPrefix("pantskhaki", 3, new int[]{0, 0, 3, 0}, 9);
registerArmorMaterialAndPrefix("queen", 25, new int[]{2, 7, 5, 0}, 9);
registerArmorMaterialAndPrefix("scrubs", 10, new int[]{2, 3, 2, 2}, 9);
- registerArmorMaterialAndPrefix("shirt-w-bowtie", 02, new int[]{0, 3, 0, 0}, 9);
- registerArmorMaterialAndPrefix("slippersbunny", 02, new int[]{0, 0, 0, 1}, 9);
- registerArmorMaterialAndPrefix("slipperskitty", 02, new int[]{0, 0, 0, 1}, 9);
- registerArmorMaterialAndPrefix("slippersteddy", 02, new int[]{0, 0, 0, 1}, 9);
+ registerArmorMaterialAndPrefix("shirt-w-bowtie", 2, new int[]{0, 3, 0, 0}, 9);
+ registerArmorMaterialAndPrefix("slippersbunny", 2, new int[]{0, 0, 0, 1}, 9);
+ registerArmorMaterialAndPrefix("slipperskitty", 2, new int[]{0, 0, 0, 1}, 9);
+ registerArmorMaterialAndPrefix("slippersteddy", 2, new int[]{0, 0, 0, 1}, 9);
registerArmorMaterialAndPrefix("sushichef", 10, new int[]{2, 7, 5, 0}, 9);
- registerArmorMaterialAndPrefix("sweatercyan", 03, new int[]{0, 3, 0, 0}, 9);
- registerArmorMaterialAndPrefix("sweaterlavendar", 03, new int[]{0, 3, 0, 0}, 9);
- registerArmorMaterialAndPrefix("sweaterteddy", 03, new int[]{0, 3, 0, 0}, 9);
+ registerArmorMaterialAndPrefix("sweatercyan", 3, new int[]{0, 3, 0, 0}, 9);
+ registerArmorMaterialAndPrefix("sweaterlavendar", 3, new int[]{0, 3, 0, 0}, 9);
+ registerArmorMaterialAndPrefix("sweaterteddy", 3, new int[]{0, 3, 0, 0}, 9);
registerArmorMaterialAndPrefix("swimsuiteblue", 1, new int[]{0, 0, 2, 0}, 9);
registerArmorMaterialAndPrefix("swimsuitemagenta", 1, new int[]{0, 0, 2, 0}, 9);
registerArmorMaterialAndPrefix("tanktopwhite", 10, new int[]{0, 2, 0, 0}, 9);
@@ -122,34 +122,34 @@ public static void preInit() {
registerArmorMaterialAndPrefix("teetiedye", 10, new int[]{0, 2, 0, 0}, 9);
registerArmorMaterialAndPrefix("tuxedoblack", 10, new int[]{0, 7, 5, 0}, 9);
registerArmorMaterialAndPrefix("tuxedoglow", 12, new int[]{0, 7, 5, 0}, 9);
- registerArmorMaterialAndPrefix("workboots", 02, new int[]{0, 0, 0, 1}, 9);
+ registerArmorMaterialAndPrefix("workboots", 2, new int[]{0, 0, 0, 1}, 9);
registerArmorMaterialAndPrefix("scientist", 10, new int[]{2, 7, 5, 0}, 9);
- registerArmorMaterialAndPrefix("shoesblack", 02, new int[]{0, 0, 0, 1}, 9);
- registerArmorMaterialAndPrefix("shoesblue", 02, new int[]{0, 0, 0, 1}, 9);
- registerArmorMaterialAndPrefix("shoeslime", 02, new int[]{0, 0, 0, 1}, 9);
- registerArmorMaterialAndPrefix("shoesmagenta", 02, new int[]{0, 0, 0, 1}, 9);
- registerArmorMaterialAndPrefix("shoesorange", 02, new int[]{0, 0, 0, 1}, 9);
- registerArmorMaterialAndPrefix("shoespink", 02, new int[]{0, 0, 0, 1}, 9);
- registerArmorMaterialAndPrefix("shoespurple", 02, new int[]{0, 0, 0, 1}, 9);
- registerArmorMaterialAndPrefix("shoesred", 02, new int[]{0, 0, 0, 1}, 9);
- registerArmorMaterialAndPrefix("shoesruby", 02, new int[]{0, 0, 0, 1}, 9);
- registerArmorMaterialAndPrefix("shoeswhite", 02, new int[]{0, 0, 0, 1}, 9);
- registerArmorMaterialAndPrefix("shoesyellow", 02, new int[]{0, 0, 0, 1}, 9);
- registerArmorMaterialAndPrefix("shortsblue-w-flowers", 01, new int[]{0, 0, 2, 0}, 9);
- registerArmorMaterialAndPrefix("shortsblue-w-whitestripes", 01, new int[]{0, 0, 2, 0}, 9);
- registerArmorMaterialAndPrefix("shortsred-w-whitestripe", 01, new int[]{0, 0, 2, 0}, 9);
- registerArmorMaterialAndPrefix("shortswhite-w-reddots", 01, new int[]{0, 0, 2, 0}, 9);
- registerArmorMaterialAndPrefix("skirtgray", 03, new int[]{0, 0, 3, 0}, 9);
- registerArmorMaterialAndPrefix("skirtruffled", 03, new int[]{0, 0, 3, 0}, 9);
+ registerArmorMaterialAndPrefix("shoesblack", 2, new int[]{0, 0, 0, 1}, 9);
+ registerArmorMaterialAndPrefix("shoesblue", 2, new int[]{0, 0, 0, 1}, 9);
+ registerArmorMaterialAndPrefix("shoeslime", 2, new int[]{0, 0, 0, 1}, 9);
+ registerArmorMaterialAndPrefix("shoesmagenta", 2, new int[]{0, 0, 0, 1}, 9);
+ registerArmorMaterialAndPrefix("shoesorange", 2, new int[]{0, 0, 0, 1}, 9);
+ registerArmorMaterialAndPrefix("shoespink", 2, new int[]{0, 0, 0, 1}, 9);
+ registerArmorMaterialAndPrefix("shoespurple", 2, new int[]{0, 0, 0, 1}, 9);
+ registerArmorMaterialAndPrefix("shoesred", 2, new int[]{0, 0, 0, 1}, 9);
+ registerArmorMaterialAndPrefix("shoesruby", 2, new int[]{0, 0, 0, 1}, 9);
+ registerArmorMaterialAndPrefix("shoeswhite", 2, new int[]{0, 0, 0, 1}, 9);
+ registerArmorMaterialAndPrefix("shoesyellow", 2, new int[]{0, 0, 0, 1}, 9);
+ registerArmorMaterialAndPrefix("shortsblue-w-flowers", 1, new int[]{0, 0, 2, 0}, 9);
+ registerArmorMaterialAndPrefix("shortsblue-w-whitestripes", 1, new int[]{0, 0, 2, 0}, 9);
+ registerArmorMaterialAndPrefix("shortsred-w-whitestripe", 1, new int[]{0, 0, 2, 0}, 9);
+ registerArmorMaterialAndPrefix("shortswhite-w-reddots", 1, new int[]{0, 0, 2, 0}, 9);
+ registerArmorMaterialAndPrefix("skirtgray", 3, new int[]{0, 0, 3, 0}, 9);
+ registerArmorMaterialAndPrefix("skirtruffled", 3, new int[]{0, 0, 3, 0}, 9);
}
public static void init() {
- // angelwings", 04, new int[] { 0, 4, 0, 0 }, 9);
+ // angelwings", 4, new int[] { 0, 4, 0, 0 }, 9);
GameRegistry.addRecipe(new ItemStack(
getOutfitItem("angelwings", getPurposeByArmorType(BODY)), 1),
RecipeUtil.createRecipeObject(new Item[]{
- getPattern(CATEGORY.costume, PURPOSE.chest),
- getFabric(COLORS.bluelight),
+ getPattern(Category.costume, Purpose.chest),
+ getFabric(Colors.bluelight),
ClothingCraftToolsItemList.needleAndThread,
Items.feather, Items.string, Items.feather
})
@@ -159,8 +159,8 @@ public static void init() {
GameRegistry.addRecipe(new ItemStack(
getOutfitItem("construction", getPurposeByArmorType(HEAD)), 1),
RecipeUtil.createRecipeObject(new Item[]{
- getPattern(CATEGORY.career, PURPOSE.helm),
- getFabric(COLORS.yellow),
+ getPattern(Category.career, Purpose.helm),
+ getFabric(Colors.yellow),
ClothingCraftToolsItemList.measuringTape,
Items.iron_helmet
})
@@ -168,9 +168,9 @@ public static void init() {
GameRegistry.addRecipe(new ItemStack(
getOutfitItem("construction", getPurposeByArmorType(BODY)), 1),
RecipeUtil.createRecipeObject(new Item[]{
- getPattern(CATEGORY.career, PURPOSE.chest),
- getFabric(COLORS.yellow),
- getFabric(COLORS.orange),
+ getPattern(Category.career, Purpose.chest),
+ getFabric(Colors.yellow),
+ getFabric(Colors.orange),
ClothingCraftToolsItemList.needleAndThread,
Items.iron_pickaxe
})
@@ -178,8 +178,8 @@ public static void init() {
GameRegistry.addRecipe(new ItemStack(
getOutfitItem("construction", getPurposeByArmorType(LEGS)), 1),
RecipeUtil.createRecipeObject(new Item[]{
- getPattern(CATEGORY.career, PURPOSE.pants),
- getFabric(COLORS.bluedark),
+ getPattern(Category.career, Purpose.pants),
+ getFabric(Colors.bluedark),
ClothingCraftToolsItemList.needleAndThread,
Items.iron_pickaxe
})
@@ -187,54 +187,54 @@ public static void init() {
GameRegistry.addRecipe(new ItemStack(
getOutfitItem("construction", getPurposeByArmorType(FEET)), 1),
RecipeUtil.createRecipeObject(new Item[]{
- getPattern(CATEGORY.career, PURPOSE.boots),
- getFabric(COLORS.brown),
+ getPattern(Category.career, Purpose.boots),
+ getFabric(Colors.brown),
ClothingCraftToolsItemList.needleAndThread,
Items.leather
})
);
- // apronbrown", 01, new int[] { 0, 1, 0, 0 }, 9);
+ // apronbrown", 1, new int[] { 0, 1, 0, 0 }, 9);
GameRegistry.addRecipe(new ItemStack(
getOutfitItem("apronbrown", getPurposeByArmorType(LEGS)), 1),
RecipeUtil.createRecipeObject(new Item[]{
- getPattern(CATEGORY.career, PURPOSE.pants),
- getFabric(COLORS.brown),
+ getPattern(Category.career, Purpose.pants),
+ getFabric(Colors.brown),
ClothingCraftToolsItemList.needleAndThread,
Items.string
})
);
- // apronbutcher", 01, new int[] { 0, 1, 0, 0 }, 9);
+ // apronbutcher", 1, new int[] { 0, 1, 0, 0 }, 9);
GameRegistry.addRecipe(new ItemStack(
getOutfitItem("apronbutcher", getPurposeByArmorType(LEGS)), 1),
RecipeUtil.createRecipeObject(new Item[]{
- getPattern(CATEGORY.career, PURPOSE.pants),
- getFabric(COLORS.white),
+ getPattern(Category.career, Purpose.pants),
+ getFabric(Colors.white),
ClothingCraftToolsItemList.needleAndThread,
Items.string,
Items.cooked_porkchop
})
);
- // aprongreen", 01, new int[] { 0, 1, 0, 0 }, 9);
+ // aprongreen", 1, new int[] { 0, 1, 0, 0 }, 9);
GameRegistry.addRecipe(new ItemStack(
getOutfitItem("aprongreen", getPurposeByArmorType(LEGS)), 1),
RecipeUtil.createRecipeObject(new Item[]{
- getPattern(CATEGORY.career, PURPOSE.pants),
- getFabric(COLORS.green),
+ getPattern(Category.career, Purpose.pants),
+ getFabric(Colors.green),
ClothingCraftToolsItemList.needleAndThread,
Items.string,
Items.cooked_porkchop
})
);
- // apronwhite", 01, new int[] { 0, 1, 0, 0 }, 9);
+ // apronwhite", 1, new int[] { 0, 1, 0, 0 }, 9);
GameRegistry.addRecipe(new ItemStack(
getOutfitItem("apronwhite", getPurposeByArmorType(LEGS)), 1),
RecipeUtil.createRecipeObject(new Item[]{
- getPattern(CATEGORY.career, PURPOSE.pants),
- getFabric(COLORS.white),
+ getPattern(Category.career, Purpose.pants),
+ getFabric(Colors.white),
ClothingCraftToolsItemList.needleAndThread,
Items.string
})
@@ -244,97 +244,97 @@ public static void init() {
GameRegistry.addRecipe(new ItemStack(
getOutfitItem("construction", getPurposeByArmorType(HEAD)), 1),
RecipeUtil.createRecipeObject(new Item[]{
- getPattern(CATEGORY.career, PURPOSE.helm),
- getFabric(COLORS.black),
+ getPattern(Category.career, Purpose.helm),
+ getFabric(Colors.black),
ClothingCraftToolsItemList.measuringTape
})
);
GameRegistry.addRecipe(new ItemStack(
getOutfitItem("construction", getPurposeByArmorType(BODY)), 1),
RecipeUtil.createRecipeObject(new Item[]{
- getPattern(CATEGORY.career, PURPOSE.chest),
- getFabric(COLORS.white),
+ getPattern(Category.career, Purpose.chest),
+ getFabric(Colors.white),
ClothingCraftToolsItemList.needleAndThread
})
);
GameRegistry.addRecipe(new ItemStack(
getOutfitItem("construction", getPurposeByArmorType(LEGS)), 1),
RecipeUtil.createRecipeObject(new Item[]{
- getPattern(CATEGORY.career, PURPOSE.pants),
- getFabric(COLORS.bluedark),
+ getPattern(Category.career, Purpose.pants),
+ getFabric(Colors.bluedark),
ClothingCraftToolsItemList.needleAndThread
})
);
- // ballcapblack", 01, new int[] { 1, 0, 0, 0 }, 9);
+ // ballcapblack", 1, new int[] { 1, 0, 0, 0 }, 9);
GameRegistry.addRecipe(new ItemStack(
getOutfitItem("ballcapblack", getPurposeByArmorType(HEAD)), 1),
RecipeUtil.createRecipeObject(new Item[]{
- getPattern(CATEGORY.casual, PURPOSE.helm),
- getFabric(COLORS.black),
+ getPattern(Category.casual, Purpose.helm),
+ getFabric(Colors.black),
ClothingCraftToolsItemList.measuringTape
})
);
- // ballcapblue", 01, new int[] { 1, 0, 0, 0 }, 9);
+ // ballcapblue", 1, new int[] { 1, 0, 0, 0 }, 9);
GameRegistry.addRecipe(new ItemStack(
getOutfitItem("ballcapblue", getPurposeByArmorType(HEAD)), 1),
RecipeUtil.createRecipeObject(new Item[]{
- getPattern(CATEGORY.casual, PURPOSE.helm),
- getFabric(COLORS.bluedark),
+ getPattern(Category.casual, Purpose.helm),
+ getFabric(Colors.bluedark),
ClothingCraftToolsItemList.measuringTape
})
);
- // ballcappurple",01, new int[] { 1, 0, 0, 0 }, 9);
+ // ballcappurple",1, new int[] { 1, 0, 0, 0 }, 9);
GameRegistry.addRecipe(new ItemStack(
getOutfitItem("ballcappurple", getPurposeByArmorType(HEAD)), 1),
RecipeUtil.createRecipeObject(new Item[]{
- getPattern(CATEGORY.casual, PURPOSE.helm),
- getFabric(COLORS.purple),
+ getPattern(Category.casual, Purpose.helm),
+ getFabric(Colors.purple),
ClothingCraftToolsItemList.measuringTape
})
);
- // ballcapred", 01, new int[] { 1, 0, 0, 0 }, 9);
+ // ballcapred", 1, new int[] { 1, 0, 0, 0 }, 9);
GameRegistry.addRecipe(new ItemStack(
getOutfitItem("ballcapred", getPurposeByArmorType(HEAD)), 1),
RecipeUtil.createRecipeObject(new Item[]{
- getPattern(CATEGORY.casual, PURPOSE.helm),
- getFabric(COLORS.red),
+ getPattern(Category.casual, Purpose.helm),
+ getFabric(Colors.red),
ClothingCraftToolsItemList.measuringTape
})
);
// businesssuit", 10, new int[] { 0, 7, 5, 0 }, 9);
// costumecreeper",10, new int[] { 2, 7, 5, 0 }, 9);
- // dresscoral", 04, new int[] { 0, 0, 3, 0 }, 9);
- // dresslavendar",04, new int[] { 0, 0, 3, 0 }, 9);
- // dressmint", 04, new int[] { 0, 0, 3, 0 }, 9);
- // earmuffslavendar" , 01, new int[] { 1, 0, 0, 0 }, 9);
+ // dresscoral", 4, new int[] { 0, 0, 3, 0 }, 9);
+ // dresslavendar",4, new int[] { 0, 0, 3, 0 }, 9);
+ // dressmint", 4, new int[] { 0, 0, 3, 0 }, 9);
+ // earmuffslavendar" , 1, new int[] { 1, 0, 0, 0 }, 9);
// farmer", 10, new int[] { 2, 7, 5, 0 }, 9);
- // glassesblack", 01, new int[] { 1, 0, 0, 0 }, 9);
+ // glassesblack", 1, new int[] { 1, 0, 0, 0 }, 9);
GameRegistry.addRecipe(new ItemStack(
getOutfitItem("ballcapred", getPurposeByArmorType(HEAD)), 1),
RecipeUtil.createRecipeObject(new Item[]{
- null, getPattern(CATEGORY.career, PURPOSE.helm), null,
- Items.glass_bottle, getFabric(COLORS.black), Items.glass_bottle
+ null, getPattern(Category.career, Purpose.helm), null,
+ Items.glass_bottle, getFabric(Colors.black), Items.glass_bottle
})
);
- // glassesred", 01, new int[] { 1, 0, 0, 0 }, 9);
- // hairbowcoral", 01, new int[] { 1, 0, 0, 0 }, 9);
- // hairbowlavendar", 01, new int[] { 1, 0, 0, 0 }, 9);
- // hairbowmint", 01, new int[] { 1, 0, 0, 0 }, 9);
- // hairpiecerainbow" , 01, new int[] { 1, 0, 0, 0 }, 9);
+ // glassesred", 1, new int[] { 1, 0, 0, 0 }, 9);
+ // hairbowcoral", 1, new int[] { 1, 0, 0, 0 }, 9);
+ // hairbowlavendar", 1, new int[] { 1, 0, 0, 0 }, 9);
+ // hairbowmint", 1, new int[] { 1, 0, 0, 0 }, 9);
+ // hairpiecerainbow" , 1, new int[] { 1, 0, 0, 0 }, 9);
// longsleevegalaxy", 10, new int[] { 0, 2, 0, 0 }, 9);
// lumberjack", 10, new int[] { 2, 7, 5, 0 }, 9);
// mage", 10, new int[] { 2, 7, 5, 0 }, 9);
- // pajamasblack", 02, new int[] { 0, 3, 2, 0 }, 9);
- // pajamasblue", 02, new int[] { 0, 3, 2, 0 }, 9);
- // pajamasgreen", 02, new int[] { 0, 3, 2, 0 }, 9);
- // pajamasred", 02, new int[] { 0, 3, 2, 0 }, 9);
+ // pajamasblack", 2, new int[] { 0, 3, 2, 0 }, 9);
+ // pajamasblue", 2, new int[] { 0, 3, 2, 0 }, 9);
+ // pajamasgreen", 2, new int[] { 0, 3, 2, 0 }, 9);
+ // pajamasred", 2, new int[] { 0, 3, 2, 0 }, 9);
// policeofficer",10, new int[] { 2, 7, 5, 0 }, 9);
// scrubs", 10, new int[] { 2, 3, 2, 2 }, 9);
- // slippersbunny",02, new int[] { 0, 0, 0, 1 }, 9);
- // slipperskitty",02, new int[] { 0, 0, 0, 1 }, 9);
- // slippersteddy",02, new int[] { 0, 0, 0, 1 }, 9);
+ // slippersbunny",2, new int[] { 0, 0, 0, 1 }, 9);
+ // slipperskitty",2, new int[] { 0, 0, 0, 1 }, 9);
+ // slippersteddy",2, new int[] { 0, 0, 0, 1 }, 9);
// sushichef", 10, new int[] { 2, 7, 5, 0 }, 9);
// tanktopwhite", 10, new int[] { 0, 2, 0, 0 }, 9);
// tanktoporange",10, new int[] { 0, 2, 0, 0 }, 9);
@@ -348,28 +348,28 @@ Items.glass_bottle, getFabric(COLORS.black), Items.glass_bottle
// teemushroom", 10, new int[] { 0, 2, 0, 0 }, 9);
// tuxedoblack", 10, new int[] { 0, 7, 5, 0 }, 9);
// tuxedoglow", 12, new int[] { 0, 7, 5, 0 }, 9);
- // workboots", 02, new int[] { 0, 0, 0, 1 }, 9);
- // shoesblack", 02, new int[] { 0, 0, 0, 1 }, 9);
- // shoesblue", 02, new int[] { 0, 0, 0, 1 }, 9);
- // shoeslime", 02, new int[] { 0, 0, 0, 1 }, 9);
- // shoesmagenta", 02, new int[] { 0, 0, 0, 1 }, 9);
- // shoesorange", 02, new int[] { 0, 0, 0, 1 }, 9);
- // shoespink", 02, new int[] { 0, 0, 0, 1 }, 9);
- // shoespurple", 02, new int[] { 0, 0, 0, 1 }, 9);
- // shoesred", 02, new int[] { 0, 0, 0, 1 }, 9);
- // shoesruby", 02, new int[] { 0, 0, 0, 1 }, 9);
- // shoeswhite", 02, new int[] { 0, 0, 0, 1 }, 9);
- // shoesyellow", 02, new int[] { 0, 0, 0, 1 }, 9);
+ // workboots", 2, new int[] { 0, 0, 0, 1 }, 9);
+ // shoesblack", 2, new int[] { 0, 0, 0, 1 }, 9);
+ // shoesblue", 2, new int[] { 0, 0, 0, 1 }, 9);
+ // shoeslime", 2, new int[] { 0, 0, 0, 1 }, 9);
+ // shoesmagenta", 2, new int[] { 0, 0, 0, 1 }, 9);
+ // shoesorange", 2, new int[] { 0, 0, 0, 1 }, 9);
+ // shoespink", 2, new int[] { 0, 0, 0, 1 }, 9);
+ // shoespurple", 2, new int[] { 0, 0, 0, 1 }, 9);
+ // shoesred", 2, new int[] { 0, 0, 0, 1 }, 9);
+ // shoesruby", 2, new int[] { 0, 0, 0, 1 }, 9);
+ // shoeswhite", 2, new int[] { 0, 0, 0, 1 }, 9);
+ // shoesyellow", 2, new int[] { 0, 0, 0, 1 }, 9);
}
private static void registerArmorMaterialAndPrefix(String outfitKey, int durability, int[] reductions, int enchatability) {
ArmorMaterial enumArmorMaterial =
- EnumHelper.addArmorMaterial(outfitKey.toString().toUpperCase(), durability, reductions, enchatability);
+ EnumHelper.addArmorMaterial(outfitKey.toUpperCase(), durability, reductions, enchatability);
armorMaterialMap.put(outfitKey, enumArmorMaterial);
int armorPrefix = 0;
if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT)
armorPrefix = RenderingRegistry.addNewArmourRendererPrefix("angelwings");
- armorPrefixMap.put(outfitKey, new Integer(armorPrefix));
+ armorPrefixMap.put(outfitKey, armorPrefix);
int armorType = 0;
for (int reductionValue : reductions) {
@@ -387,23 +387,23 @@ private static void createRegisterWardrobeArmorItem(String outfitKey, int armorT
Item outfitItem = new ItemWardrobeArmor(
outfitKey,
/*
- * outfitKey populates the following within the ItemWardrobeArmor class
+ * outfitKey populates the following within the ItemWardrobeArmor class
* unlocalizedName = item.[unlocalizedName].name=[displayedItemName]
* itemTextureName = ClothingCraftInfo.MODID + ":textures/items/[imageName]"
* armorTextureName textures/models/wardrobe/..._layer_[1 or 2]
*/
armorMaterialMap.get(outfitKey),
- armorPrefixMap.get(outfitKey).intValue(), // renderIndex: 0 = cloth, 1 = chain, 2 = iron, 3 = diamond, 4 = gold
+ armorPrefixMap.get(outfitKey), // renderIndex: 0 = cloth, 1 = chain, 2 = iron, 3 = diamond, 4 = gold
armorType // armorType: 0=helmet, 1=chestplate, 2=leggings, 3=boots
);
// load the outfitKey to armorType to Item map
if (outfitPurposeItemMap.get(outfitKey) == null) {
- outfitPurposeItemMap.put(outfitKey, new LinkedHashMap());
+ outfitPurposeItemMap.put(outfitKey, new LinkedHashMap());
}
outfitPurposeItemMap.get(outfitKey).put(getPurposeByArmorType(armorType), outfitItem);
// register item with game environment
String registerItemKey = "wardrobe_" +
- outfitKey.toString().toLowerCase() +
+ outfitKey.toLowerCase() +
ItemWardrobeArmor.getTextureSuffix(armorType);
GameRegistry.registerItem(outfitItem, registerItemKey);
@@ -416,7 +416,7 @@ private static void createRegisterWardrobeArmorItem(String outfitKey, int armorT
* @param enumPurpose ClothingCraftPatternItemList.PURPOSE enumeration element
* @return associated sewing pattern item, null if none exists
*/
- public static Item getPattern(CATEGORY enumCategory, PURPOSE enumPurpose) {
+ public static Item getPattern(Category enumCategory, Purpose enumPurpose) {
return ClothingCraftPatternItemList.patternsItemMap.get(enumCategory).get(enumPurpose);
}
@@ -426,7 +426,7 @@ public static Item getPattern(CATEGORY enumCategory, PURPOSE enumPurpose) {
* @param enumColor ClothingCraftFabricItemList.COLORS enumeration element
* @return associated sewing fabric item, null if none exists.
*/
- public static Item getFabric(COLORS enumColor) {
+ public static Item getFabric(Colors enumColor) {
return ClothingCraftFabricItemList.fabricItemsMap.get(enumColor);
}
@@ -439,9 +439,9 @@ public static Item getFabric(COLORS enumColor) {
* REQUIRED, null value will throw an IlleagalArgumentException
* @return associated wardrobe (outfit) item, null if none exists
*/
- public static Item getOutfitItem(String outfitKey, PURPOSE purpose) {
+ public static Item getOutfitItem(String outfitKey, Purpose purpose) {
Item result = null;
- LinkedHashMap outfitMap = outfitPurposeItemMap.get(outfitKey);
+ LinkedHashMap outfitMap = outfitPurposeItemMap.get(outfitKey);
if (outfitMap != null && purpose != null) {
result = outfitMap.get(purpose);
} else {
@@ -465,20 +465,20 @@ public static Item getOutfitItem(String outfitKey, PURPOSE purpose) {
* FEET (3) = PURPOSE.boots
*
*/
- public static PURPOSE getPurposeByArmorType(int armorType) {
- PURPOSE result = null;
+ public static Purpose getPurposeByArmorType(int armorType) {
+ Purpose result = null;
switch (armorType) {
case 0:
- result = PURPOSE.helm;
+ result = Purpose.helm;
break;
case 1:
- result = PURPOSE.chest;
+ result = Purpose.chest;
break;
case 2:
- result = PURPOSE.pants;
+ result = Purpose.pants;
break;
case 3:
- result = PURPOSE.boots;
+ result = Purpose.boots;
break;
default:
}
diff --git a/src/main/java/clothingcraft/items/ItemCottonArmor.java b/src/main/java/clothingcraft/items/ItemCottonArmor.java
index 0fc8125..b82a68a 100644
--- a/src/main/java/clothingcraft/items/ItemCottonArmor.java
+++ b/src/main/java/clothingcraft/items/ItemCottonArmor.java
@@ -3,8 +3,8 @@
*/
package clothingcraft.items;
-import clothingcraft.core.ClothingCraft;
import clothingcraft.core.ClothingCraftInfo;
+import clothingcraft.core.CommonProxy;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
@@ -41,7 +41,7 @@ public String getArmorTexture(ItemStack stack, Entity entity, int slot, String t
@Override
public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack) {
- if (player.getCurrentArmor(1) != null && player.getCurrentArmor(1).getItem().equals(ClothingCraft.cottonArmorBoots)) {
+ if (player.getCurrentArmor(1) != null && player.getCurrentArmor(1).getItem() == CommonProxy.cottonArmorBoots) {
player.addPotionEffect(new PotionEffect(Potion.moveSpeed.id, 40));
}
}
diff --git a/src/main/java/clothingcraft/items/ItemCottonSeeds.java b/src/main/java/clothingcraft/items/ItemCottonSeeds.java
index 2875e2e..cbf2421 100644
--- a/src/main/java/clothingcraft/items/ItemCottonSeeds.java
+++ b/src/main/java/clothingcraft/items/ItemCottonSeeds.java
@@ -1,7 +1,7 @@
package clothingcraft.items;
import clothingcraft.blocks.BlockCottonPlant;
-import clothingcraft.core.ClothingCraft;
+import clothingcraft.client.ClientProxy;
import clothingcraft.core.ClothingCraftInfo;
import net.minecraft.block.Block;
@@ -16,6 +16,6 @@ public ItemCottonSeeds(BlockCottonPlant cottonPlant, Block farmland) {
super(cottonPlant, farmland);
setUnlocalizedName("cotton_harvested");
setTextureName(ClothingCraftInfo.MODID + ":cotton_harvested");
- setCreativeTab(ClothingCraft.tabCore);
+ setCreativeTab(ClientProxy.tabCore);
}
}
\ No newline at end of file
diff --git a/src/main/java/clothingcraft/items/ItemDye.java b/src/main/java/clothingcraft/items/ItemDye.java
index 4c637f3..f80d103 100644
--- a/src/main/java/clothingcraft/items/ItemDye.java
+++ b/src/main/java/clothingcraft/items/ItemDye.java
@@ -3,7 +3,7 @@
*/
package clothingcraft.items;
-import clothingcraft.core.ClothingCraft;
+import clothingcraft.client.ClientProxy;
import clothingcraft.core.ClothingCraftInfo;
import net.minecraft.block.Block;
import net.minecraft.entity.EntityLivingBase;
@@ -32,7 +32,7 @@ protected ItemDye(String unlocalizedName) {
EnumHelper.addToolMaterial("DYE_" + unlocalizedName.toUpperCase(), 1, 12, 4F, 5, 2);
setUnlocalizedName("dye_" + unlocalizedName);
setTextureName(ClothingCraftInfo.MODID + ":dye_" + unlocalizedName.toLowerCase());
- setCreativeTab(ClothingCraft.tabMaterials);
+ setCreativeTab(ClientProxy.tabMaterials);
setMaxDamage(12);
setMaxStackSize(1);
}
diff --git a/src/main/java/clothingcraft/items/ItemDyedFabric.java b/src/main/java/clothingcraft/items/ItemDyedFabric.java
index 2a72fd3..0086b61 100644
--- a/src/main/java/clothingcraft/items/ItemDyedFabric.java
+++ b/src/main/java/clothingcraft/items/ItemDyedFabric.java
@@ -1,6 +1,6 @@
package clothingcraft.items;
-import clothingcraft.core.ClothingCraft;
+import clothingcraft.client.ClientProxy;
import clothingcraft.core.ClothingCraftInfo;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
@@ -14,7 +14,7 @@ public ItemDyedFabric(String unlocalizedName) {
setMaxStackSize(64);
setUnlocalizedName("fabric_" + unlocalizedName);
setTextureName(ClothingCraftInfo.MODID + ":fabric_" + unlocalizedName);
- setCreativeTab(ClothingCraft.tabMaterials);
+ setCreativeTab(ClientProxy.tabMaterials);
}
public int getItemEnchantability() {
diff --git a/src/main/java/clothingcraft/items/ItemHaliteAxe.java b/src/main/java/clothingcraft/items/ItemHaliteAxe.java
index 42073c8..2cd4056 100644
--- a/src/main/java/clothingcraft/items/ItemHaliteAxe.java
+++ b/src/main/java/clothingcraft/items/ItemHaliteAxe.java
@@ -3,7 +3,7 @@
*/
package clothingcraft.items;
-import clothingcraft.core.ClothingCraft;
+import clothingcraft.client.ClientProxy;
import clothingcraft.core.ClothingCraftInfo;
import net.minecraft.item.ItemAxe;
@@ -25,7 +25,7 @@ public ItemHaliteAxe() {
setMaxStackSize(1);
setUnlocalizedName("halite_axe");
setTextureName(ClothingCraftInfo.MODID + ":halite_axe");
- setCreativeTab(ClothingCraft.tabCore);
+ setCreativeTab(ClientProxy.tabCore);
}
}
diff --git a/src/main/java/clothingcraft/items/ItemHaliteHoe.java b/src/main/java/clothingcraft/items/ItemHaliteHoe.java
index 1a38e85..e7779ce 100644
--- a/src/main/java/clothingcraft/items/ItemHaliteHoe.java
+++ b/src/main/java/clothingcraft/items/ItemHaliteHoe.java
@@ -3,7 +3,7 @@
*/
package clothingcraft.items;
-import clothingcraft.core.ClothingCraft;
+import clothingcraft.client.ClientProxy;
import clothingcraft.core.ClothingCraftInfo;
import net.minecraft.item.ItemHoe;
@@ -25,7 +25,7 @@ public ItemHaliteHoe() {
setMaxStackSize(1);
setUnlocalizedName("halite_hoe");
setTextureName(ClothingCraftInfo.MODID + ":halite_hoe");
- setCreativeTab(ClothingCraft.tabCore);
+ setCreativeTab(ClientProxy.tabCore);
}
}
diff --git a/src/main/java/clothingcraft/items/ItemHaliteIngot.java b/src/main/java/clothingcraft/items/ItemHaliteIngot.java
index a965d5c..db5b692 100644
--- a/src/main/java/clothingcraft/items/ItemHaliteIngot.java
+++ b/src/main/java/clothingcraft/items/ItemHaliteIngot.java
@@ -3,7 +3,7 @@
*/
package clothingcraft.items;
-import clothingcraft.core.ClothingCraft;
+import clothingcraft.client.ClientProxy;
import clothingcraft.core.ClothingCraftInfo;
import net.minecraft.item.Item;
@@ -23,7 +23,7 @@ public ItemHaliteIngot() {
super();
this.setMaxStackSize(64);
this.setUnlocalizedName("halite_ingot");
- this.setCreativeTab(ClothingCraft.tabCore);
+ this.setCreativeTab(ClientProxy.tabCore);
this.setTextureName(ClothingCraftInfo.MODID + ":halite_ingot");
}
diff --git a/src/main/java/clothingcraft/items/ItemHalitePickaxe.java b/src/main/java/clothingcraft/items/ItemHalitePickaxe.java
index c97336d..7dc6bbc 100644
--- a/src/main/java/clothingcraft/items/ItemHalitePickaxe.java
+++ b/src/main/java/clothingcraft/items/ItemHalitePickaxe.java
@@ -3,7 +3,7 @@
*/
package clothingcraft.items;
-import clothingcraft.core.ClothingCraft;
+import clothingcraft.client.ClientProxy;
import clothingcraft.core.ClothingCraftInfo;
import net.minecraft.item.ItemPickaxe;
@@ -25,7 +25,7 @@ public ItemHalitePickaxe() {
setMaxStackSize(1);
setUnlocalizedName("halite_pickaxe");
setTextureName(ClothingCraftInfo.MODID + ":halite_pickaxe");
- setCreativeTab(ClothingCraft.tabCore);
+ setCreativeTab(ClientProxy.tabCore);
}
}
diff --git a/src/main/java/clothingcraft/items/ItemHaliteShovel.java b/src/main/java/clothingcraft/items/ItemHaliteShovel.java
index cccb557..be64c9f 100644
--- a/src/main/java/clothingcraft/items/ItemHaliteShovel.java
+++ b/src/main/java/clothingcraft/items/ItemHaliteShovel.java
@@ -3,7 +3,7 @@
*/
package clothingcraft.items;
-import clothingcraft.core.ClothingCraft;
+import clothingcraft.client.ClientProxy;
import clothingcraft.core.ClothingCraftInfo;
import net.minecraft.item.ItemSpade;
@@ -25,7 +25,7 @@ public ItemHaliteShovel() {
setMaxStackSize(1);
setUnlocalizedName("halite_shovel");
setTextureName(ClothingCraftInfo.MODID + ":halite_shovel");
- setCreativeTab(ClothingCraft.tabCore);
+ setCreativeTab(ClientProxy.tabCore);
}
}
diff --git a/src/main/java/clothingcraft/items/ItemHaliteSword.java b/src/main/java/clothingcraft/items/ItemHaliteSword.java
index 0dd36cc..32ed95b 100644
--- a/src/main/java/clothingcraft/items/ItemHaliteSword.java
+++ b/src/main/java/clothingcraft/items/ItemHaliteSword.java
@@ -3,7 +3,7 @@
*/
package clothingcraft.items;
-import clothingcraft.core.ClothingCraft;
+import clothingcraft.client.ClientProxy;
import clothingcraft.core.ClothingCraftInfo;
import net.minecraft.item.ItemSword;
@@ -25,7 +25,7 @@ public ItemHaliteSword() {
setMaxStackSize(1);
setUnlocalizedName("halite_sword");
setTextureName(ClothingCraftInfo.MODID + ":halite_sword");
- setCreativeTab(ClothingCraft.tabCore);
+ setCreativeTab(ClientProxy.tabCore);
}
}
diff --git a/src/main/java/clothingcraft/items/ItemPattern.java b/src/main/java/clothingcraft/items/ItemPattern.java
index eec7a60..3d11b8f 100644
--- a/src/main/java/clothingcraft/items/ItemPattern.java
+++ b/src/main/java/clothingcraft/items/ItemPattern.java
@@ -1,6 +1,6 @@
package clothingcraft.items;
-import clothingcraft.core.ClothingCraft;
+import clothingcraft.client.ClientProxy;
import clothingcraft.core.ClothingCraftInfo;
import net.minecraft.block.Block;
import net.minecraft.entity.EntityLivingBase;
@@ -22,7 +22,7 @@ protected ItemPattern(String unlocalizedName) {
setMaxStackSize(1);
setUnlocalizedName(unlocalizedName);
setTextureName(ClothingCraftInfo.MODID + ":" + unlocalizedName);
- setCreativeTab(ClothingCraft.tabTools);
+ setCreativeTab(ClientProxy.tabTools);
}
/**
diff --git a/src/main/java/clothingcraft/items/ItemRockSalt.java b/src/main/java/clothingcraft/items/ItemRockSalt.java
index 92bd497..18637b6 100644
--- a/src/main/java/clothingcraft/items/ItemRockSalt.java
+++ b/src/main/java/clothingcraft/items/ItemRockSalt.java
@@ -3,7 +3,7 @@
*/
package clothingcraft.items;
-import clothingcraft.core.ClothingCraft;
+import clothingcraft.client.ClientProxy;
import clothingcraft.core.ClothingCraftInfo;
import net.minecraft.item.Item;
@@ -23,7 +23,7 @@ public ItemRockSalt() {
super();
this.setMaxStackSize(64);
this.setUnlocalizedName("rock_salt");
- this.setCreativeTab(ClothingCraft.tabCore);
+ this.setCreativeTab(ClientProxy.tabCore);
this.setTextureName(ClothingCraftInfo.MODID + ":rock_salt");
}
diff --git a/src/main/java/clothingcraft/items/ItemToolKnittingNeedles.java b/src/main/java/clothingcraft/items/ItemToolKnittingNeedles.java
index 5be755a..64094ed 100644
--- a/src/main/java/clothingcraft/items/ItemToolKnittingNeedles.java
+++ b/src/main/java/clothingcraft/items/ItemToolKnittingNeedles.java
@@ -1,6 +1,6 @@
package clothingcraft.items;
-import clothingcraft.core.ClothingCraft;
+import clothingcraft.client.ClientProxy;
import clothingcraft.core.ClothingCraftInfo;
import net.minecraft.block.Block;
import net.minecraft.entity.EntityLivingBase;
@@ -22,7 +22,7 @@ protected ItemToolKnittingNeedles() {
setMaxStackSize(1);
setUnlocalizedName("tools_knitting_needles");
setTextureName(ClothingCraftInfo.MODID + ":tools_knitting_needles");
- setCreativeTab(ClothingCraft.tabTools);
+ setCreativeTab(ClientProxy.tabTools);
}
/**
diff --git a/src/main/java/clothingcraft/items/ItemToolMeasuringTape.java b/src/main/java/clothingcraft/items/ItemToolMeasuringTape.java
index 68b566b..d05667a 100644
--- a/src/main/java/clothingcraft/items/ItemToolMeasuringTape.java
+++ b/src/main/java/clothingcraft/items/ItemToolMeasuringTape.java
@@ -1,6 +1,6 @@
package clothingcraft.items;
-import clothingcraft.core.ClothingCraft;
+import clothingcraft.client.ClientProxy;
import clothingcraft.core.ClothingCraftInfo;
import net.minecraft.block.Block;
import net.minecraft.entity.EntityLivingBase;
@@ -22,7 +22,7 @@ protected ItemToolMeasuringTape() {
setMaxStackSize(1);
setUnlocalizedName("tools_measuring_tape");
setTextureName(ClothingCraftInfo.MODID + ":tools_measuring_tape");
- setCreativeTab(ClothingCraft.tabTools);
+ setCreativeTab(ClientProxy.tabTools);
}
/**
diff --git a/src/main/java/clothingcraft/items/ItemToolNeedleAndThread.java b/src/main/java/clothingcraft/items/ItemToolNeedleAndThread.java
index f6ca167..ec4bc50 100644
--- a/src/main/java/clothingcraft/items/ItemToolNeedleAndThread.java
+++ b/src/main/java/clothingcraft/items/ItemToolNeedleAndThread.java
@@ -1,6 +1,6 @@
package clothingcraft.items;
-import clothingcraft.core.ClothingCraft;
+import clothingcraft.client.ClientProxy;
import clothingcraft.core.ClothingCraftInfo;
import net.minecraft.block.Block;
import net.minecraft.entity.EntityLivingBase;
@@ -22,7 +22,7 @@ protected ItemToolNeedleAndThread() {
setMaxStackSize(1);
setUnlocalizedName("tools_needle_thread");
setTextureName(ClothingCraftInfo.MODID + ":tools_needle_thread");
- setCreativeTab(ClothingCraft.tabTools);
+ setCreativeTab(ClientProxy.tabTools);
}
/**
diff --git a/src/main/java/clothingcraft/items/ItemToolPincushion.java b/src/main/java/clothingcraft/items/ItemToolPincushion.java
index 935dd88..7c62c1a 100644
--- a/src/main/java/clothingcraft/items/ItemToolPincushion.java
+++ b/src/main/java/clothingcraft/items/ItemToolPincushion.java
@@ -1,6 +1,6 @@
package clothingcraft.items;
-import clothingcraft.core.ClothingCraft;
+import clothingcraft.client.ClientProxy;
import clothingcraft.core.ClothingCraftInfo;
import net.minecraft.block.Block;
import net.minecraft.entity.EntityLivingBase;
@@ -22,7 +22,7 @@ protected ItemToolPincushion() {
setMaxStackSize(1);
setUnlocalizedName("tools_pincushion");
setTextureName(ClothingCraftInfo.MODID + ":tools_pincushion");
- setCreativeTab(ClothingCraft.tabTools);
+ setCreativeTab(ClientProxy.tabTools);
}
/**
diff --git a/src/main/java/clothingcraft/items/ItemToolScissors.java b/src/main/java/clothingcraft/items/ItemToolScissors.java
index 2e4ee3e..6417c38 100644
--- a/src/main/java/clothingcraft/items/ItemToolScissors.java
+++ b/src/main/java/clothingcraft/items/ItemToolScissors.java
@@ -1,6 +1,6 @@
package clothingcraft.items;
-import clothingcraft.core.ClothingCraft;
+import clothingcraft.client.ClientProxy;
import clothingcraft.core.ClothingCraftInfo;
import net.minecraft.block.Block;
import net.minecraft.entity.EntityLivingBase;
@@ -22,7 +22,7 @@ protected ItemToolScissors() {
setMaxStackSize(1);
setUnlocalizedName("tools_scissors");
setTextureName(ClothingCraftInfo.MODID + ":tools_scissors");
- setCreativeTab(ClothingCraft.tabTools);
+ setCreativeTab(ClientProxy.tabTools);
}
/**
diff --git a/src/main/java/clothingcraft/items/ItemWardrobeArmor.java b/src/main/java/clothingcraft/items/ItemWardrobeArmor.java
index ab50a27..c06383b 100644
--- a/src/main/java/clothingcraft/items/ItemWardrobeArmor.java
+++ b/src/main/java/clothingcraft/items/ItemWardrobeArmor.java
@@ -1,6 +1,6 @@
package clothingcraft.items;
-import clothingcraft.core.ClothingCraft;
+import clothingcraft.client.ClientProxy;
import clothingcraft.core.ClothingCraftInfo;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -52,7 +52,7 @@ public ItemWardrobeArmor(
this.textureName = armorTextureName;
this.itemTextureName = itemTextureName;
this.setUnlocalizedName("wardrobe_" + unlocalizedName + getTextureSuffix(armorType));
- this.setCreativeTab(ClothingCraft.tabWardrobe);
+ this.setCreativeTab(ClientProxy.tabWardrobe);
}
public static String getTextureSuffix(int armorType) {
diff --git a/src/main/java/clothingcraft/server/ServerProxy.java b/src/main/java/clothingcraft/server/ServerProxy.java
deleted file mode 100644
index 3b5db85..0000000
--- a/src/main/java/clothingcraft/server/ServerProxy.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package clothingcraft.server;
-
-import clothingcraft.core.CommonProxy;
-import cpw.mods.fml.common.event.FMLInitializationEvent;
-import cpw.mods.fml.common.event.FMLPostInitializationEvent;
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-
-public class ServerProxy extends CommonProxy {
-
- @Override
- public void preInit(FMLPreInitializationEvent e) {
- super.preInit(e);
- }
-
- @Override
- public void init(FMLInitializationEvent e) {
- super.init(e);
- }
-
- @Override
- public void postInit(FMLPostInitializationEvent e) {
- super.postInit(e);
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/clothingcraft/util/RecipeUtil.java b/src/main/java/clothingcraft/util/RecipeUtil.java
index 3dd43aa..19f53a0 100644
--- a/src/main/java/clothingcraft/util/RecipeUtil.java
+++ b/src/main/java/clothingcraft/util/RecipeUtil.java
@@ -1,6 +1,3 @@
-/**
- *
- */
package clothingcraft.util;
import net.minecraft.item.Item;