From 2cf27c698dff6271fa228ee5356ad762117293c7 Mon Sep 17 00:00:00 2001
From: Aidan Brady <aidancbrady@aol.com>
Date: Thu, 2 Jan 2014 23:46:23 -0500
Subject: [PATCH] Added Compressed Redstone as an efficient means of obtaining
 redstone infuse

---
 common/mekanism/common/Mekanism.java             |   7 ++++++-
 .../textures/items/CompressedRedstone.png        | Bin 0 -> 1545 bytes
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 resources/assets/mekanism/textures/items/CompressedRedstone.png

diff --git a/common/mekanism/common/Mekanism.java b/common/mekanism/common/Mekanism.java
index 81c2376d6..627c05009 100644
--- a/common/mekanism/common/Mekanism.java
+++ b/common/mekanism/common/Mekanism.java
@@ -165,6 +165,7 @@ public class Mekanism
 	public static Item Balloon;
 	public static Item Shard;
 	public static Item ElectrolyticCore;
+	public static Item CompressedRedstone;
 
 	//Blocks
 	public static Block BasicBlock;
@@ -519,6 +520,7 @@ public class Mekanism
         RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Block.obsidian), new ItemStack(DirtyDust, 1, 6));
 		RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Item.coal, 1, 0), new ItemStack(CompressedCarbon));
 		RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Item.coal, 1, 1), new ItemStack(CompressedCarbon));
+		RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Item.redstone), new ItemStack(CompressedRedstone));
 		RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Block.oreLapis), new ItemStack(Item.dyePowder, 12, 4));
 		RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Block.oreCoal), new ItemStack(Item.coal, 2));
 		RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Block.oreDiamond), new ItemStack(Item.diamond, 2));
@@ -586,6 +588,7 @@ public class Mekanism
         InfuseRegistry.registerInfuseObject(new ItemStack(Item.coal, 1, 1), new InfuseObject(InfuseRegistry.get("CARBON"), 20));
         InfuseRegistry.registerInfuseObject(new ItemStack(CompressedCarbon), new InfuseObject(InfuseRegistry.get("CARBON"), 100));
         InfuseRegistry.registerInfuseObject(new ItemStack(Item.redstone), new InfuseObject(InfuseRegistry.get("REDSTONE"), 10));
+        InfuseRegistry.registerInfuseObject(new ItemStack(CompressedRedstone), new InfuseObject(InfuseRegistry.get("REDSTONE"), 100));
 	}
 	
 	/**
@@ -623,7 +626,8 @@ public class Mekanism
 		PartTransmitter = new ItemPartTransmitter(configuration.getItem("MultipartTransmitter", 11225).getInt()).setUnlocalizedName("MultipartTransmitter");
 		Balloon = new ItemBalloon(configuration.getItem("Balloon", 11226).getInt()).setUnlocalizedName("Balloon");
 		Shard = new ItemShard(configuration.getItem("Shard", 11227).getInt());
-		ElectrolyticCore = new ItemMekanism(configuration.getItem("ElectrolyticCore", 11302).getInt()).setUnlocalizedName("ElectrolyticCore");
+		ElectrolyticCore = new ItemMekanism(configuration.getItem("ElectrolyticCore", 11228).getInt()).setUnlocalizedName("ElectrolyticCore");
+		CompressedRedstone = new ItemMekanism(configuration.getItem("CompressedRedstone", 11229).getInt()).setUnlocalizedName("CompressedRedstone");
 
 		configuration.save();
 		
@@ -656,6 +660,7 @@ public class Mekanism
 		GameRegistry.registerItem(Balloon, "Balloon");
 		GameRegistry.registerItem(Shard, "Shard");
 		GameRegistry.registerItem(ElectrolyticCore, "ElectrolyticCore");
+		GameRegistry.registerItem(CompressedRedstone, "CompressedRedstone");
 	}
 	
 	/**
diff --git a/resources/assets/mekanism/textures/items/CompressedRedstone.png b/resources/assets/mekanism/textures/items/CompressedRedstone.png
new file mode 100644
index 0000000000000000000000000000000000000000..f2f640b5e8f8a704aaedf4a9ae79e265a9ea2081
GIT binary patch
literal 1545
zcmV+k2KM=hP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000CeX+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>R0004?Nkl<ZSPAWw!A-<45JeqC4Iptrv_K_PLlIO%
z7u;w8aY2G6mU*nd7>}ITNxVWrYiZXTdpz%ZzOzp0-2P()?ovAN>Dk-V6SO7<@IyML
zeKrkmDL>3487e^Vj|{u9z9nLqfC$%yTOuwLxTp8<tDNXH9|5X?CB)Piy9IbSfUius
zH|S%we@VntQ`I{b;jCllz}2XTMAhurT!9GJZao|kg7f>O;=(2Y5l-?amt10W4w!$p
z`A_TPYx!F%qB>fH$CB4l%)yCWB_P5*%zN#}m*B*8Tj1e()jY_1t@#$bTY!hNNHBRV
zA@ZF09ysfo7DPCUqVKW%z3`@h2#=sBgoJD0ivl8?;8t4;Ctvjtdbsyl9!rRy+X5%g
zq-5$nTw|?%E1bMV1zK?JSg#og_P|+RQ~&|jHh62pI&igv#zNX&I5{r)Qp^9-c5ica
zAGO8HMX@8`<SHy+01;do0Mt}^9l}v?@)s5eNbl|N<0IkZEiCXLDq+u7hQrU9U~V*=
voU;O$^dfk!-RF#-ykQ5QlY`EHzo@`B!APwU=vvWJ00000NkvXXu0mjfS|jR!

literal 0
HcmV?d00001