From 6d366c047520cbd46841610708e38cc5f9202d60 Mon Sep 17 00:00:00 2001
From: Aidan Brady <aidancbrady@aol.com>
Date: Thu, 16 Jan 2014 16:47:35 -0500
Subject: [PATCH] Brine Buckets!

---
 common/mekanism/common/Mekanism.java             |   8 ++++++++
 resources/assets/mekanism/lang/en_US.lang        |   1 +
 .../mekanism/textures/items/BrineBucket.png      | Bin 0 -> 1502 bytes
 3 files changed, 9 insertions(+)
 create mode 100644 resources/assets/mekanism/textures/items/BrineBucket.png

diff --git a/common/mekanism/common/Mekanism.java b/common/mekanism/common/Mekanism.java
index 8eb497ce0..70eb4b6e1 100644
--- a/common/mekanism/common/Mekanism.java
+++ b/common/mekanism/common/Mekanism.java
@@ -116,6 +116,7 @@ import mekanism.common.util.MekanismUtils.ResourceType;
 import mekanism.common.voice.VoiceServerManager;
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
+import net.minecraft.item.ItemBucket;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.CraftingManager;
 import net.minecraft.item.crafting.FurnaceRecipes;
@@ -125,6 +126,7 @@ import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.ForgeSubscribe;
 import net.minecraftforge.event.world.ChunkEvent;
 import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidContainerRegistry;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.oredict.OreDictionary;
 import net.minecraftforge.oredict.ShapelessOreRecipe;
@@ -248,6 +250,7 @@ public class Mekanism
 	public static Item CompressedRedstone;
 	public static Item Sawdust;
 	public static Item Salt;
+	public static Item BrineBucket;
 
 	//Blocks
 	public static Block BasicBlock;
@@ -741,9 +744,13 @@ public class Mekanism
 		CompressedRedstone = new ItemMekanism(configuration.getItem("CompressedRedstone", 11229).getInt()).setUnlocalizedName("CompressedRedstone");
 		Sawdust = new ItemMekanism(configuration.getItem("Sawdust", 11230).getInt()).setUnlocalizedName("Sawdust");
 		Salt = new ItemMekanism(configuration.getItem("Salt", 11231).getInt()).setUnlocalizedName("Salt");
+		BrineBucket = new ItemMekanism(configuration.getItem("BrineBucket", 11232).getInt()).setUnlocalizedName("BrineBucket");
 
 		configuration.save();
 		
+		//Fluid Container stuff
+		FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluid("brine"), new ItemStack(BrineBucket), FluidContainerRegistry.EMPTY_BUCKET);
+		
 		//Registrations
 		GameRegistry.registerItem(ElectricBow, "ElectricBow");
 		GameRegistry.registerItem(Dust, "Dust");
@@ -776,6 +783,7 @@ public class Mekanism
 		GameRegistry.registerItem(CompressedRedstone, "CompressedRedstone");
 		GameRegistry.registerItem(Sawdust, "Sawdust");
 		GameRegistry.registerItem(Salt, "Salt");
+		GameRegistry.registerItem(BrineBucket, "BrineBucket");
 	}
 	
 	/**
diff --git a/resources/assets/mekanism/lang/en_US.lang b/resources/assets/mekanism/lang/en_US.lang
index b505e7dff..690762e5e 100644
--- a/resources/assets/mekanism/lang/en_US.lang
+++ b/resources/assets/mekanism/lang/en_US.lang
@@ -30,6 +30,7 @@ item.ElectrolyticCore.name=Electrolytic Core
 item.CompressedRedstone.name=Compressed Redstone
 item.Sawdust.name=Sawdust
 item.Salt.name=Salt
+item.BrineBucket.name=Brine Bucket
 
 //Gas Tank
 tile.GasTank.GasTank.name=Gas Tank
diff --git a/resources/assets/mekanism/textures/items/BrineBucket.png b/resources/assets/mekanism/textures/items/BrineBucket.png
new file mode 100644
index 0000000000000000000000000000000000000000..0bc485addb1e4ec1662077c33b981e9873af4572
GIT binary patch
literal 1502
zcmV<41tI#0P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV000CeX+uL$Nkc;*
zP;zf(X>4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH
z<T^KrsT&8|>9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK
zVkc9?T=n|PIo~<wJLg{8L_J?=wVD}Kh?c9aozEndlcyGxo=u9<v(!ri)T`-EEs@L3
z5-!0N_s;9#9f}Cc?UC;OPWB_edW+oAi6T$HZWSGU8TbrQ%+zbPOBBBc`}k?M2Hf);
z@Y6N~0;>X-eVh__(Z?q}P9Z-Dj?gOW6|D%o20XmjW-qs4UjrD(li^iv8@eK9k+ZFm
zVRFymFOPAzG5-%Pn|1W;U4vNroTa&AxDScmEA~{ri9gr1^c?U@uwSpaNnw8l_>cP1
zd;)kMQS_;jeRSUEM_*s96y65j1$)tOrwdK{YIQMt92l|D^(E_=$Rjw{b!QT@q!)ni
zR`|5oW9X5n$Wv+HVc@|^eX5yXnsHX<gx$-tTA9oOBadXir_JPm2Y^4ct-PoO&C)tI
zGolvqOIK@duBk!Vu9{g<3;i;gJ6?~-DQ&xz!jvD&4!U-s8Os(*#?k2}f30SEXA#=i
z1-qUX+K`{!((H5w7<t$~ygD!D1{~X6)KX%$qrgY#L_{M_7A<1csY*MfP@XcB#Jxr~
zJS8&7goVS)VKE|4(h_Xlc{z{c$ApZs7riZ_QKdV_uW-M~u~<J-*#Z0?VzcZp8)p-w
zus7J7><CN2I>8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS
zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#<s%v*srlI
z{B2SKJ79W>mZ8e<cESmGBON_l0n;T7>u=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7
zqW-CFs9&fT)ZaU5gc&=gBz-D<EBz>aCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E
zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaE<h}6h3HHql{T;m+bPBU-O|^S1
z@dOw&4<!bj2G_<^#e}PL7FpY$lcrKO$i~?8Bd2y;oaL5^csibnCrF9!i%-PI;xhub
zp1k;8_$IKX1NHus6EHeD;B72SCCD@4ojP$=Mf3`Eo6yZ&eg@wTqDiZE);7u&SJ|(s
zuPF(9%D6IJ)klXF%`_Fy<tR3HxV^%Qqa?nAB97=m-uu2qcHInZ?ps8M|H3=#R%lzO
z6MgLv^}ib0hVV{&<};#;2lcwW;^(7C<OY#bI<VjS9qCKr-E_Cnc!2j+&nHAXA2%BR
zt~VMxUn2h&(Pi^LSpac(Y#S>R0004XNkl<ZI1yuD7-+zV%>f!38vkM95)u+HCc}XP
z2QbvLz-569n8wxf{25dg#Tnkd|I8pP$jiXa!Nl<P?RSQd6b7)t$Ogep1Zlp0JOixo
z=dWK3OpMG765@Oe&tAL-vjqjXzy@8p{+uB+X(Pjp8#lmunP4seIaSkg27|CLCj&bh
z8-s)d55tukPr>Ye|Nnwr^Ww!9ux6MZ5Dhl~#M!xXC)f}hpM?xRfBa+6(U4~N{rfM2
zlq5fcbI@`I$G{~Fg@uJ6rEq`}2Jhaz0~-R8HE?u?D*`cK-YafCh9Zt)07wR8h=G9t
zSi}DFdT_;W-=1WcvEnbB4`aZ+018=T=UsSU&v5hRO*lS#@gc+Q+qW4`o;(Q;K#(CA
zE&vH$xNrgN3K09mi4(w>c?-lcK;CVT5DI|107VoF$5itP7E!cVK=ua670BT9br}rj
zgXFQgVC&YcaJ?Ys;{))Nh^z>fq>;ryY*^|;7pI6107(FncMnxn#sB~S07*qoM6N<$
Eg7f6Zl>h($

literal 0
HcmV?d00001