From ee9c86d864e561095b2fa42b7d1e689fe51986da Mon Sep 17 00:00:00 2001
From: Zerotheliger <Zerotheliger098@gmail.com>
Date: Thu, 29 May 2014 02:43:09 -0700
Subject: [PATCH] Added Flour :3

---
 .../languages/en_US.properties                |   6 ++
 .../textures/items/dough.png                  | Bin 0 -> 327 bytes
 .../textures/items/flour.png                  | Bin 0 -> 325 bytes
 .../core/ResonantInduction.java               |  17 ++++
 .../core/items/ItemBakingTrayWithBread.java   |  28 ++++++
 .../core/items/ItemFlour.java                 |  95 ++++++++++++++++++
 6 files changed, 146 insertions(+)
 create mode 100644 src/main/resources/assets/resonantinduction/textures/items/dough.png
 create mode 100644 src/main/resources/assets/resonantinduction/textures/items/flour.png
 create mode 100644 src/main/scala/resonantinduction/core/items/ItemBakingTrayWithBread.java
 create mode 100644 src/main/scala/resonantinduction/core/items/ItemFlour.java

diff --git a/src/main/resources/assets/resonantinduction/languages/en_US.properties b/src/main/resources/assets/resonantinduction/languages/en_US.properties
index e86f2fe6f..f0f3dab73 100644
--- a/src/main/resources/assets/resonantinduction/languages/en_US.properties
+++ b/src/main/resources/assets/resonantinduction/languages/en_US.properties
@@ -46,6 +46,12 @@ item.resonantinduction\:imprint.name=Imprint
 item.resonantinduction\:hammer.name=Hammer
 item.resonantinduction\:handCrank.name=Hand Crank
 item.resonantinduction\:devStaff.name=Staff of Devs
+item.resonantinduction\:flour.name=Flour
+item.dough.name=Dough
+item.bakingtray.name=Baking Tray
+item.bakingtraywithdough.name=Baking Tray With Dough
+item.resonantinduction\:bakingTrayWithBread.name=Baking Tray With Bread
+
 
 ## Machines
 tile.resonantinduction\:castingMold.name=Casting Mold
diff --git a/src/main/resources/assets/resonantinduction/textures/items/dough.png b/src/main/resources/assets/resonantinduction/textures/items/dough.png
new file mode 100644
index 0000000000000000000000000000000000000000..154f9cd8980aeedc5c782a1da8534ebb77680b81
GIT binary patch
literal 327
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYmNj^kiEpy*OmPqD?dAnq07A4NkE}1o-U3d7N_q{G~_yDAkt=kdztQw
z2UD%A*!dqQRWv;iymN=kvZ1?z`5<>i!@E2^D~&1J0@yP%76%pz{a5`k>HX=)wm;ry
zsMfAs^53-P#J7uzx7(vmp7^@%c>`-eL~8!78&~pKqfSaCn9Q6VRcE<5dO3rS`0RPX
z3#P8Qoe&)`m9>%M=Gx1BM~V-o*0CyZJpQfe#4zdOnUb4=Hx_jKW(aZ3d$(#+#fx*B
zqeTnv|H)eZ^3hYCNgsI{Dhya26j@1K5Es0Cb(1mkb1|vF$^F|t_*^-{R<CY8g)4Ba
U_u79)fc|6fboFyt=akR{0C$gs9smFU

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/resonantinduction/textures/items/flour.png b/src/main/resources/assets/resonantinduction/textures/items/flour.png
new file mode 100644
index 0000000000000000000000000000000000000000..027e418a6ae7e99cfbeb34ee6725673bc2de5c00
GIT binary patch
literal 325
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYmNj^kiEpy*OmPqD?h8D;62y1ML?lTo-U3d7N_q{+RJswK%~|Fw|khn
zyu*jeIWco;x_w;d)=atNSi^d7=Y@}cwXJ%s7x)S%cu22aH2H_G=LyU2ckUdhpPZE&
zy!P$&B*BeJpLTk#+PZetsjd#))0f0tKVC^OQj5zsYu>yplfmMt<?q9Z3pnp}%En&b
z7_;`nWR~+sj!7^~Qejl+OKxDFd|>^P7B5YPTiaxpeBk^OH#O+{Dmy*b`4@E0O+TGy
zHaG8iH|wz(yFFvCw>*3sCE_ZxIp@QK#lZ!8zga%DJaAY<ZT&x|`uE)R?b^X!sjvOb
SrJI4iWAJqKb6Mw<&;$VV?u3#6

literal 0
HcmV?d00001

diff --git a/src/main/scala/resonantinduction/core/ResonantInduction.java b/src/main/scala/resonantinduction/core/ResonantInduction.java
index d2a976eea..687bcaf64 100644
--- a/src/main/scala/resonantinduction/core/ResonantInduction.java
+++ b/src/main/scala/resonantinduction/core/ResonantInduction.java
@@ -8,8 +8,11 @@ import net.minecraft.command.ICommandManager;
 import net.minecraft.command.ServerCommandManager;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.item.crafting.FurnaceRecipes;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fluids.BlockFluidFinite;
+import net.minecraftforge.oredict.OreDictionary;
+import net.minecraftforge.oredict.ShapelessOreRecipe;
 
 import org.modstats.ModstatInfo;
 import org.modstats.Modstats;
@@ -22,6 +25,7 @@ import resonant.lib.network.PacketTile;
 import resonant.lib.prefab.item.ItemBlockMetadata;
 import resonant.lib.utility.LanguageUtility;
 import resonantinduction.core.handler.TextureHookHandler;
+import resonantinduction.core.items.ItemBakingTrayWithBread;
 import resonantinduction.core.items.ItemDevStaff;
 import resonantinduction.core.prefab.part.PacketMultiPart;
 import resonantinduction.core.resource.BlockDust;
@@ -46,6 +50,7 @@ import cpw.mods.fml.common.event.FMLServerStartingEvent;
 import cpw.mods.fml.common.network.NetworkMod;
 import cpw.mods.fml.common.network.NetworkRegistry;
 import cpw.mods.fml.common.registry.GameRegistry;
+import resonantinduction.core.items.ItemFlour;
 
 /** The core module of Resonant Induction
  * 
@@ -77,8 +82,10 @@ public class ResonantInduction
     public static ItemOreResource itemRubble, itemDust, itemRefinedDust;
     public static ItemOreResourceBucket itemBucketMixture, itemBucketMolten;
     public static Item itemBiomass, itemDevStaff;
+    public static Item itemFlour, itemBakingTrayWithBread;
     public static Block blockDust, blockRefinedDust;
     public static Block blockMachinePart;
+    
 
     @EventHandler
     public void preInit(FMLPreInitializationEvent evt)
@@ -105,6 +112,8 @@ public class ResonantInduction
         itemBucketMolten = new ItemOreResourceBucket(Settings.getNextItemID("bucketMolten"), "bucketMolten", true);
         itemBiomass = contentRegistry.createItem(ItemBiomass.class);
         itemDevStaff = contentRegistry.createItem(ItemDevStaff.class);
+        itemFlour = contentRegistry.createItem(ItemFlour.class);
+        itemBakingTrayWithBread = contentRegistry.createItem(ItemBakingTrayWithBread.class);
 
         GameRegistry.registerItem(itemRubble, itemRubble.getUnlocalizedName());
         GameRegistry.registerItem(itemDust, itemDust.getUnlocalizedName());
@@ -137,6 +146,14 @@ public class ResonantInduction
 
         // Generate Resources
         ResourceGenerator.generateOreResources();
+        // These are from zeros flour stuffs :3
+		GameRegistry.addRecipe(new ShapelessOreRecipe(itemFlour, new Object []{Item.wheat}));
+		FurnaceRecipes.smelting().addSmelting(itemFlour.itemID, 1, new ItemStack (Item.bread), 50f);
+		GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack (itemFlour ,1,1),new Object []{itemFlour, Item.bucketWater}));
+		GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack (itemFlour ,1,3),new Object []{new ItemStack (itemFlour,1,1),new ItemStack (itemFlour,1,2)}));
+		FurnaceRecipes.smelting().addSmelting(itemFlour.itemID, 3, new ItemStack (itemBakingTrayWithBread), 50f);
+		GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack (Item.bread,2), new Object []{new ItemStack (itemBakingTrayWithBread)}));
+		
         proxy.postInit();
         Settings.CONFIGURATION.save();
     }
diff --git a/src/main/scala/resonantinduction/core/items/ItemBakingTrayWithBread.java b/src/main/scala/resonantinduction/core/items/ItemBakingTrayWithBread.java
new file mode 100644
index 000000000..28ba34eab
--- /dev/null
+++ b/src/main/scala/resonantinduction/core/items/ItemBakingTrayWithBread.java
@@ -0,0 +1,28 @@
+package resonantinduction.core.items;
+
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import resonantinduction.core.Reference;
+import resonantinduction.core.ResonantInduction;
+
+public class ItemBakingTrayWithBread extends Item{
+	
+	public ItemBakingTrayWithBread(int par1) {
+		super(par1);
+		this.setCreativeTab(CreativeTabs.tabFood);
+		this.setTextureName(Reference.DOMAIN + ":itemBakingTrayWithBread");
+		this.setUnlocalizedName("itemBakingTrayWithBread");
+	}
+		
+		public ItemStack getContainerItemStack(ItemStack itemStack)
+		{
+	       return new ItemStack(ResonantInduction.itemFlour,1,2);
+	    }
+		
+		public boolean hasContainerItem()
+	    {
+	        return true;
+	    }
+		
+}
diff --git a/src/main/scala/resonantinduction/core/items/ItemFlour.java b/src/main/scala/resonantinduction/core/items/ItemFlour.java
new file mode 100644
index 000000000..a8c7b509a
--- /dev/null
+++ b/src/main/scala/resonantinduction/core/items/ItemFlour.java
@@ -0,0 +1,95 @@
+package resonantinduction.core.items;
+
+import java.util.List;
+
+import net.minecraft.client.renderer.texture.IconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.Icon;
+import resonantinduction.core.Reference;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+/**
+ * Derp
+ * 
+ * @author Zerotheliger
+ * 
+ */
+
+
+public class ItemFlour extends Item {
+
+	@SideOnly(Side.CLIENT)
+	Icon doughIcon;
+
+	@SideOnly(Side.CLIENT)
+	Icon bakingtrayIcon;
+
+	@SideOnly(Side.CLIENT)
+	Icon bakingtraywithdoughIcon;
+
+
+	public ItemFlour(int par1) {
+		super(par1);
+		this.setHasSubtypes(true);
+	}
+
+	@Override
+	public Icon getIconFromDamage(int meta) {
+		switch (meta) {
+		case 1:
+			return doughIcon;
+
+		case 2:
+			return bakingtrayIcon;
+
+		case 3:
+			return bakingtraywithdoughIcon;
+
+		default:
+			return super.getIconFromDamage(meta);
+
+		}
+
+	}
+
+	@Override
+	public void registerIcons(IconRegister iconRegister) {
+		super.registerIcons(iconRegister);
+		this.doughIcon = iconRegister.registerIcon(Reference.PREFIX + "dough");
+		this.bakingtrayIcon = iconRegister.registerIcon(Reference.PREFIX + "bakingtray");
+		this.bakingtraywithdoughIcon = iconRegister.registerIcon(Reference.PREFIX + "bakingtraywithdough");
+
+		
+
+	}
+
+	public String getUnlocalizedName(ItemStack par1ItemStack) {
+		switch (par1ItemStack.getItemDamage()) {
+
+		case 1:
+			return "item.dough";
+		case 2:
+			return "item.bakingtray";
+		case 3:
+			return "item.bakingtraywithdough";
+
+
+		default:
+			return super.getUnlocalizedName();
+
+		}
+	}
+
+	@Override
+	public void getSubItems(int par1, CreativeTabs tab, List items) {
+		super.getSubItems(par1, tab, items);
+		items.add(new ItemStack(par1, 1, 1));
+		items.add(new ItemStack(par1, 1, 2));
+		items.add(new ItemStack(par1, 1, 3));
+	
+	}
+	
+	}