From 93b7321dea768e3e0d24b4565bac08d0c526bcb3 Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Sat, 18 Jan 2014 15:10:17 -0500 Subject: [PATCH] T3 ore processing now uses Hydrogen Chloride --- ...ChemicalInjectionChamberRecipeHandler.java | 4 +++- common/mekanism/common/Mekanism.java | 6 +++--- .../common/integration/OreDictManager.java | 14 +++++++------- .../mekanism/textures/blocks/DynamicTank.png | Bin 1207 -> 1201 bytes .../mekanism/textures/blocks/DynamicValve.png | Bin 1315 -> 1308 bytes .../textures/blocks/SalinationBlock.png | Bin 1416 -> 1206 bytes .../textures/blocks/SalinationController.png | Bin 1813 -> 1802 bytes .../blocks/SalinationControllerOn.png | Bin 1987 -> 1952 bytes .../textures/blocks/SalinationValve.png | Bin 1447 -> 1316 bytes 9 files changed, 13 insertions(+), 11 deletions(-) diff --git a/common/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java b/common/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java index 6ba787f6b..2ab6dfcb7 100644 --- a/common/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java +++ b/common/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java @@ -60,7 +60,9 @@ public class ChemicalInjectionChamberRecipeHandler extends AdvancedMachineRecipe } else if(gasType == GasRegistry.getGas("hydrogenChloride")) { - return ListUtils.asList(MekanismUtils.getFullGasTank(GasRegistry.getGas("hydrogenChloride"))); + List fuels = OreDictionary.getOres("dustSalt"); + fuels.add(MekanismUtils.getFullGasTank(GasRegistry.getGas("hydrogenChloride"))); + return fuels; } return new ArrayList(); diff --git a/common/mekanism/common/Mekanism.java b/common/mekanism/common/Mekanism.java index e5cfbc03c..e0195fdef 100644 --- a/common/mekanism/common/Mekanism.java +++ b/common/mekanism/common/Mekanism.java @@ -623,7 +623,7 @@ public class Mekanism //Enrichment Chamber Recipes RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Block.oreRedstone), new ItemStack(Item.redstone, 12)); - RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Block.obsidian), new ItemStack(DirtyDust, 1, 6)); + RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Block.obsidian), new ItemStack(DirtyDust, 2, 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)); @@ -660,11 +660,11 @@ public class Mekanism RecipeHandler.addCrusherRecipe(new ItemStack(Item.flint, 4), new ItemStack(Item.gunpowder)); //Purification Chamber Recipes - RecipeHandler.addPurificationChamberRecipe(new ItemStack(Block.obsidian), new ItemStack(Clump, 2, 6)); + RecipeHandler.addPurificationChamberRecipe(new ItemStack(Block.obsidian), new ItemStack(Clump, 3, 6)); RecipeHandler.addPurificationChamberRecipe(new ItemStack(Block.gravel), new ItemStack(Item.flint)); //Chemical Injection Chamber Recipes - RecipeHandler.addChemicalInjectionChamberRecipe(new AdvancedInput(new ItemStack(Block.obsidian), GasRegistry.getGas("sulfuricAcid")), new ItemStack(Shard, 3, 6)); + RecipeHandler.addChemicalInjectionChamberRecipe(new AdvancedInput(new ItemStack(Block.obsidian), GasRegistry.getGas("hydrogenChloride")), new ItemStack(Shard, 4, 6)); RecipeHandler.addChemicalInjectionChamberRecipe(new AdvancedInput(new ItemStack(Block.dirt), GasRegistry.getGas("water")), new ItemStack(Block.blockClay)); RecipeHandler.addChemicalInjectionChamberRecipe(new AdvancedInput(new ItemStack(Item.gunpowder), GasRegistry.getGas("hydrogenChloride")), new ItemStack(Mekanism.Dust, 1, 10)); diff --git a/common/mekanism/common/integration/OreDictManager.java b/common/mekanism/common/integration/OreDictManager.java index 5176993d5..e63529286 100644 --- a/common/mekanism/common/integration/OreDictManager.java +++ b/common/mekanism/common/integration/OreDictManager.java @@ -219,49 +219,49 @@ public final class OreDictManager { RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.Dust, 2, 6)); RecipeHandler.addPurificationChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.Clump, 3, 3)); - RecipeHandler.addChemicalInjectionChamberRecipe(new AdvancedInput(MekanismUtils.size(ore, 1), GasRegistry.getGas("sulfuricAcid")), new ItemStack(Mekanism.Shard, 4, 3)); + RecipeHandler.addChemicalInjectionChamberRecipe(new AdvancedInput(MekanismUtils.size(ore, 1), GasRegistry.getGas("hydrogenChloride")), new ItemStack(Mekanism.Shard, 4, 3)); } for(ItemStack ore : OreDictionary.getOres("oreTin")) { RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.Dust, 2, 7)); RecipeHandler.addPurificationChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.Clump, 3, 4)); - RecipeHandler.addChemicalInjectionChamberRecipe(new AdvancedInput(MekanismUtils.size(ore, 1), GasRegistry.getGas("sulfuricAcid")), new ItemStack(Mekanism.Shard, 4, 4)); + RecipeHandler.addChemicalInjectionChamberRecipe(new AdvancedInput(MekanismUtils.size(ore, 1), GasRegistry.getGas("hydrogenChloride")), new ItemStack(Mekanism.Shard, 4, 4)); } for(ItemStack ore : OreDictionary.getOres("oreOsmium")) { RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.Dust, 2, 2)); RecipeHandler.addPurificationChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.Clump, 3, 2)); - RecipeHandler.addChemicalInjectionChamberRecipe(new AdvancedInput(MekanismUtils.size(ore, 1), GasRegistry.getGas("sulfuricAcid")), new ItemStack(Mekanism.Shard, 4, 2)); + RecipeHandler.addChemicalInjectionChamberRecipe(new AdvancedInput(MekanismUtils.size(ore, 1), GasRegistry.getGas("hydrogenChloride")), new ItemStack(Mekanism.Shard, 4, 2)); } for(ItemStack ore : OreDictionary.getOres("oreIron")) { RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.Dust, 2, 0)); RecipeHandler.addPurificationChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.Clump, 3, 0)); - RecipeHandler.addChemicalInjectionChamberRecipe(new AdvancedInput(MekanismUtils.size(ore, 1), GasRegistry.getGas("sulfuricAcid")), new ItemStack(Mekanism.Shard, 4, 0)); + RecipeHandler.addChemicalInjectionChamberRecipe(new AdvancedInput(MekanismUtils.size(ore, 1), GasRegistry.getGas("hydrogenChloride")), new ItemStack(Mekanism.Shard, 4, 0)); } for(ItemStack ore : OreDictionary.getOres("oreGold")) { RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.Dust, 2, 1)); RecipeHandler.addPurificationChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.Clump, 3, 1)); - RecipeHandler.addChemicalInjectionChamberRecipe(new AdvancedInput(MekanismUtils.size(ore, 1), GasRegistry.getGas("sulfuricAcid")), new ItemStack(Mekanism.Shard, 4, 1)); + RecipeHandler.addChemicalInjectionChamberRecipe(new AdvancedInput(MekanismUtils.size(ore, 1), GasRegistry.getGas("hydrogenChloride")), new ItemStack(Mekanism.Shard, 4, 1)); } for(ItemStack ore : OreDictionary.getOres("oreSilver")) { RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.Dust, 2, 8)); RecipeHandler.addPurificationChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.Clump, 3, 5)); - RecipeHandler.addChemicalInjectionChamberRecipe(new AdvancedInput(MekanismUtils.size(ore, 1), GasRegistry.getGas("sulfuricAcid")), new ItemStack(Mekanism.Shard, 4, 5)); + RecipeHandler.addChemicalInjectionChamberRecipe(new AdvancedInput(MekanismUtils.size(ore, 1), GasRegistry.getGas("hydrogenChloride")), new ItemStack(Mekanism.Shard, 4, 5)); } for(ItemStack ore : OreDictionary.getOres("oreLead")) { RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.Dust, 2, 9)); RecipeHandler.addPurificationChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.Clump, 3, 7)); - RecipeHandler.addChemicalInjectionChamberRecipe(new AdvancedInput(MekanismUtils.size(ore, 1), GasRegistry.getGas("sulfuricAcid")), new ItemStack(Mekanism.Shard, 4, 7)); + RecipeHandler.addChemicalInjectionChamberRecipe(new AdvancedInput(MekanismUtils.size(ore, 1), GasRegistry.getGas("hydrogenChloride")), new ItemStack(Mekanism.Shard, 4, 7)); } for(ItemStack ore : OreDictionary.getOres("oreNickel")) diff --git a/resources/assets/mekanism/textures/blocks/DynamicTank.png b/resources/assets/mekanism/textures/blocks/DynamicTank.png index 435860705dc072d00d37e61c57bec61665ff0445..ca24627d38846b7094bc1edc385f96f0cb818ec8 100644 GIT binary patch delta 101 zcmdnaxsh{22urMor;B4q1n1l9j=T&89L|B;6qtm+>T?O|sC>R~`nbc(-CsRst>U_# vTE2Tza(8_6FaBqYECLP;$V8F(qGCn+`|0d=;y%XtGXR07tDnm{r-UW|I_4s` delta 107 zcmdnUxt()E2ure`r;B4q1n1l97daUeI9vm}!vtau{S6nAS)_66;olhX9aaBiX6{rz zBoZ9DZCCWgy0g_krd+L`!7AXuz{r9`M7+y8#s8C`aW2bP0l+XkK D(n2Rl diff --git a/resources/assets/mekanism/textures/blocks/DynamicValve.png b/resources/assets/mekanism/textures/blocks/DynamicValve.png index 47c7695f4d96eb09078a61dcdd7c322dea2dab55..b053a882cf2ccfa3543e4e7ece57a20ddee34216 100644 GIT binary patch delta 209 zcmV;?051Qd3Y-eCR0MysNklMCsB@&0plXx;@HbfXUttu04xj_*0JsCk?k1E{62{o& zHShgp?q6bCKx>UCr3mMI;tL^6*b3Md&11R9p4D|jQV}>@D zQik|$@JK+6apLb7rF6nqz_x&#^NMpTk3)zKpabXtI`Cb^kU!)PE-fP)GAjx&00000 LNkvXXu0mjfdm>$6 delta 216 zcmV;}04M*P3Zn|JR0MyzNkl&C|IcG4&G}=&F>jvKi(`Nt;Jeq-e zzuUGo*PK#n@Lll8z`pODe&r~o9e+g(8;CJpX%5wK2r&Un029Cj2zIq_hV-ECoW((eRcVLwo`d*6OPYhJ5#pe=wdzz m-o}dpcnC(Z0Qo|N>JtoQt2tU#4=yZW00K`}KbLh*2~7a7gC?B- delta 319 zcmV-F0l@yY35W}@Qv`njA4x<(R9Fesm$43lFc5|<#rOm+K8%Ua;^5o5xw|+zkPryc zf=SCi+(lX-fu1Zsb~*LC8CTPGKYJhcnR`AK&$S}&8SAI@Z;{ZpjU3Zm z&qv%kEoy4ayKG6kF*J@~Q5oC@_5LhfJiP8a#nYmaf}svHN9 zIp6Jg9wVQ+`!OC=jsshh%X0u3LDyPyj1QHw2eu*xIaH1V$Y?G7u)inH5Aq#Y`i0}f z+*#X6I}z~=*CNMR5cA2|151fP5?gch<0{7ip4nJ?E-7F0n$;Em<3Nm@lfpqxY=?>n zak&n}h(Qn|=fpRtr*!6P#qW6Uy_fl}BHDYsZcT9=L;c1`lQ~#Yqm+70G`jb}3y0LL5Or2lpHc zK9rUOjH0A{CfPsm8h=568@PP<{Hv~v^#AJF10}K`AW!|bi$HPO zm-1vDUI}Hxa^Q(7OgAD&MZJIYuy+un5n%AYe}3N{fg#|`PRu}Fe*RNOsJ+au>#*La z`;3AZuDicq6X<`CbvE^bO(6iINt%F$uCpl~Y=a1xfJ`<7-9`2iXagFWWPM}=0ne%T zd%eTHfb_V~1%V`O4hS@kC2_cMd_iC=Fg9%x^>Ab@~xPnM`E zGEO#%4kg~2qn14+);1pWgH#BtH!19t7fn*ymPP#I5+;9*T{xE&e_GGp#8TVmGj)~I ztRVj3LL&%V#QirJ29#6Po!I4VNTxyM?Mc=9G(i9(zT8e(xK{UUQ=njK(|qPsB;?FC z`L@{vfqzj=oq<1oA9f=;eH50L*o62p<9oYZSV2e-U<1IHOLHQk6U)_VRT3p)5?QXU zyX?p7Ef;?zrC-h-7i|R_*H6#SDv6tT9B3nObk`;2Wdw$t z*}SfOh2J9hmQCOQ)<>*n1T{~y!@#A@c6#PB>P$Ny0;|{|7KW`^}Hl+pqut002ovPDHLkV1gtWRWSen delta 718 zcmV;<0x|uH4wVkDR0MylNklKBB*XzY0^-lW(+s0fS=V)GYO?;EtM2*?z;rQYAX(SF!KQzxi_+no!5@aL*_erL2!_k+ zeK4Qz(JVtRi2Weg6@jZbXVHL8s9CBL*J0vEMp~bN=xq~408e~fg>1;XA(%SigkDJk zD*Glw5x9&bbpZbGWmre_=20m6$CT~+4x9Nh1>2HP1YjeAFPG**Y&u`9R)Q#FKmsee zX~*kkzCnMd7p0a#+{W11^HT;O=L;#}dU1MQ>h1`cWm_h@c1^BG1keIt{0A#RiiMD$ zBv>RC0PqYKHl%)1H0dYKvG=bQ@Z*<C6!NnS{UJb~wB7}M8^^N$18PqPar4xyEdT%j07*qoM6N<$f;lT! Al>h($ diff --git a/resources/assets/mekanism/textures/blocks/SalinationControllerOn.png b/resources/assets/mekanism/textures/blocks/SalinationControllerOn.png index 7314c5c5a63065aac212339092b17de79ad98e09..7769211beb7fbfb6d3efeef9f822a134871d3a7e 100644 GIT binary patch delta 858 zcmV-g1Eu`K513|lAIJr1};IT8~-MQVh!#PL6u9WP~!!zH`j@P^6 zy?T5(yS{%${Hqpx`MxN8`+i5HX=21tCpSK55x~R)l!NoppeuitQHrc%J%HGz*(QW` z2mp893p~^jQJfWHWq*HlXdu)lX$kuj^z z2!PI!j%RaZlGOq*Icl0@CdbGp0KK5x?@@q#TaM5k?+HK@S04zj)HaPDH?T_p+IC{H zw_u-p+KS61D8Ki*kA}(MN%;f-4L!X%#i7zKqqRaKvD|;K7lu7#$u=H*4toW_Y8@kA zq*;}ezUK+}K?|dbPs;gV*e|2k@l^SEpssS9WCDJ8pdkRim-QzZa44s0x8vuhAsL3q zPfsdcM-c#=@zEw^;Y!`Jb%sWLUyKJq0Yc7fovw*T0Ddh>=-~Lnw~SVao&yyEKqRTU?y?@Nx7;u(hk5j%u@$UTKVLg2 zoXjR=4-O{>vx0Xn@8fvO#jZ>%BP9YT0cYM1Q8>vadH=O^23HtxJVZsQ=QBkS&KT*0 zMZ|l4Ym!}=4#nT(z{CBJUZ=gTJ_k$yE}rcQS}g=)D`PZc*X-^O)MFlDfF_AZA>`;`+&Tu$k#2K0gM9I!7S%|P8R_1hRlVhK?jh4 zu08;vcJ%>FI9DIQNSs!0{2I0a04_CkZD#;XH!2QjX8@Yss0e_o5Ae0&v@W5Vt~0kK z)3j0qGLw&Wj&wZ!Tobw$fXPwQB&!2K09<{bE>vyFU44K@l1{}SaPpF delta 893 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