From 9fb6f052c3bbae01ac2e8a5663cb7cc95df3c124 Mon Sep 17 00:00:00 2001 From: David Vierra Date: Sun, 29 Nov 2015 05:05:32 -1000 Subject: [PATCH] Add Immersive Engineering Treated Wood drawers. Added to StorageDrawers-Misc as bank 1 meta 9 --- .../assets/storagedrawersmisc/lang/en_US.lang | 8 +++++++- .../blocks/drawers_immeng_treated_front_1.png | Bin 0 -> 726 bytes .../blocks/drawers_immeng_treated_front_2.png | Bin 0 -> 742 bytes .../blocks/drawers_immeng_treated_front_4.png | Bin 0 -> 745 bytes .../blocks/drawers_immeng_treated_side.png | Bin 0 -> 670 bytes .../blocks/drawers_immeng_treated_side_h.png | Bin 0 -> 680 bytes .../blocks/drawers_immeng_treated_side_v.png | Bin 0 -> 684 bytes .../blocks/drawers_immeng_treated_sort.png | Bin 0 -> 684 bytes .../blocks/drawers_immeng_treated_trim.png | Bin 0 -> 645 bytes .../packs/misc/core/DataResolver.java | 8 ++++---- .../packs/misc/core/ModRecipes.java | 4 ++++ 11 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 packs/Misc/resources/assets/storagedrawersmisc/textures/blocks/drawers_immeng_treated_front_1.png create mode 100644 packs/Misc/resources/assets/storagedrawersmisc/textures/blocks/drawers_immeng_treated_front_2.png create mode 100644 packs/Misc/resources/assets/storagedrawersmisc/textures/blocks/drawers_immeng_treated_front_4.png create mode 100644 packs/Misc/resources/assets/storagedrawersmisc/textures/blocks/drawers_immeng_treated_side.png create mode 100644 packs/Misc/resources/assets/storagedrawersmisc/textures/blocks/drawers_immeng_treated_side_h.png create mode 100644 packs/Misc/resources/assets/storagedrawersmisc/textures/blocks/drawers_immeng_treated_side_v.png create mode 100644 packs/Misc/resources/assets/storagedrawersmisc/textures/blocks/drawers_immeng_treated_sort.png create mode 100644 packs/Misc/resources/assets/storagedrawersmisc/textures/blocks/drawers_immeng_treated_trim.png diff --git a/packs/Misc/resources/assets/storagedrawersmisc/lang/en_US.lang b/packs/Misc/resources/assets/storagedrawersmisc/lang/en_US.lang index 1965a9c..60ca105 100644 --- a/packs/Misc/resources/assets/storagedrawersmisc/lang/en_US.lang +++ b/packs/Misc/resources/assets/storagedrawersmisc/lang/en_US.lang @@ -19,6 +19,7 @@ tile.storagedrawersmisc.fullDrawers1.tc_silverwood.name=Silverwood Drawer tile.storagedrawersmisc.fullDrawers1.witchery_alder.name=Alder Drawer tile.storagedrawersmisc.fullDrawers1.witchery_hawthorn.name=Hawthorn Drawer tile.storagedrawersmisc.fullDrawers1.witchery_rowan.name=Rowan Drawer +tile.storagedrawersmisc.fullDrawers1.immeng_treated.name=Treated Wood Drawer tile.storagedrawersmisc.fullDrawers2.ebxl_acacia.name=Acacia Drawers 1x2 tile.storagedrawersmisc.fullDrawers2.ebxl_autumn.name=Autumn Drawers 1x2 @@ -38,6 +39,7 @@ tile.storagedrawersmisc.fullDrawers2.tc_silverwood.name=Silverwood Drawers 1x2 tile.storagedrawersmisc.fullDrawers2.witchery_alder.name=Alder Drawer 1x2 tile.storagedrawersmisc.fullDrawers2.witchery_hawthorn.name=Hawthorn Drawer 1x2 tile.storagedrawersmisc.fullDrawers2.witchery_rowan.name=Rowan Drawer 1x2 +tile.storagedrawersmisc.fullDrawers2.immeng_treated.name=Treated Wood Drawer 1x2 tile.storagedrawersmisc.fullDrawers4.ebxl_acacia.name=Acacia Drawers 2x2 tile.storagedrawersmisc.fullDrawers4.ebxl_autumn.name=Autumn Drawers 2x2 @@ -57,6 +59,7 @@ tile.storagedrawersmisc.fullDrawers4.tc_silverwood.name=Silverwood Drawers 2x2 tile.storagedrawersmisc.fullDrawers4.witchery_alder.name=Alder Drawer 2x2 tile.storagedrawersmisc.fullDrawers4.witchery_hawthorn.name=Hawthorn Drawer 2x2 tile.storagedrawersmisc.fullDrawers4.witchery_rowan.name=Rowan Drawer 2x2 +tile.storagedrawersmisc.fullDrawers4.immeng_treated.name=Treated Wood Drawer 2x2 tile.storagedrawersmisc.halfDrawers2.ebxl_acacia.name=Compact Acacia Drawers 1x2 tile.storagedrawersmisc.halfDrawers2.ebxl_autumn.name=Compact Autumn Drawers 1x2 @@ -76,6 +79,7 @@ tile.storagedrawersmisc.halfDrawers2.tc_silverwood.name=Compact Silverwood Drawe tile.storagedrawersmisc.halfDrawers2.witchery_alder.name=Compact Alder Drawer 1x2 tile.storagedrawersmisc.halfDrawers2.witchery_hawthorn.name=Compact Hawthorn Drawer 1x2 tile.storagedrawersmisc.halfDrawers2.witchery_rowan.name=Compact Rowan Drawer 1x2 +tile.storagedrawersmisc.halfDrawers2.immeng_treated.name=Compact Treated Wood Drawer 1x2 tile.storagedrawersmisc.halfDrawers4.ebxl_acacia.name=Compact Acacia Drawers 2x2 tile.storagedrawersmisc.halfDrawers4.ebxl_autumn.name=Compact Autumn Drawers 2x2 @@ -95,6 +99,7 @@ tile.storagedrawersmisc.halfDrawers4.tc_silverwood.name=Compact Silverwood Drawe tile.storagedrawersmisc.halfDrawers4.witchery_alder.name=Compact Alder Drawer 2x2 tile.storagedrawersmisc.halfDrawers4.witchery_hawthorn.name=Compact Hawthorn Drawer 2x2 tile.storagedrawersmisc.halfDrawers4.witchery_rowan.name=Compact Rowan Drawer 2x2 +tile.storagedrawersmisc.halfDrawers4.immeng_treated.name=Compact Treated Wood Drawer 2x2 tile.storagedrawersmisc.trim.ebxl_acacia.name=Acacia Trim tile.storagedrawersmisc.trim.ebxl_autumn.name=Autumn Trim @@ -113,4 +118,5 @@ tile.storagedrawersmisc.trim.tc_greatwood.name=Greatwood Trim tile.storagedrawersmisc.trim.tc_silverwood.name=Silverwood Trim tile.storagedrawersmisc.trim.witchery_alder.name=Alder Trim tile.storagedrawersmisc.trim.witchery_hawthorn.name=Hawthorn Trim -tile.storagedrawersmisc.trim.witchery_rowan.name=Rowan Trim \ No newline at end of file +tile.storagedrawersmisc.trim.witchery_rowan.name=Rowan Trim +tile.storagedrawersmisc.trim.immeng_treated.name=Treated Wood Trim \ No newline at end of file diff --git a/packs/Misc/resources/assets/storagedrawersmisc/textures/blocks/drawers_immeng_treated_front_1.png b/packs/Misc/resources/assets/storagedrawersmisc/textures/blocks/drawers_immeng_treated_front_1.png new file mode 100644 index 0000000000000000000000000000000000000000..c3dee1e8c53473f48273ef4ca9bfbff8f46babf9 GIT binary patch literal 726 zcmV;{0xA88P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0&7V`K~y+TMUzWY z8c`61S;i`}6eYk6%mXxNP~=S+Drk~Q)M!!&3^P2$B&+=Y?a9}pB#Tqs^qt%HoYPHa z=;t&Ha=NVK^yx6Kt7?H*&?RvcQV$QP<%xC%IQu|81Q%XTna_tsMUAp%=bonLzUIvk z1lrr((ZTB-Wr^9{S1;$DBF-!t`sICPK33l7{z1D$ta=q~x}kpet4f-l*6l#cR-i@0)1>Zba#mJ! z=IQ#VsFp(m(>12SQ>UVpeF%Q`5B1co>Q}Ey(+Yr56Lv3Hg1ci!1OGso_ujtlptI)H zxzQ&sc{S$s*{Q>8B~9!2L^LT8b@R+5417Eo;pY8`tN6SORl3t)gVvaQcIu`V7o5$l z5x=LW&k}BHj`}4S*c8TfS1Vpkm_iJU;^PbL1gzR&3iHEiYx3LUq6QufuF@$KnLwx~ z9GaEvCWs5n;_2^CScwyBikAv!4~QIZ9y@*mUaOX&4&dHj7^05MtuUyhzUH@ z*%@kIjtXkKFtF{rsTH8_r56$!n4D)x_G+Mr_}H!RK$zx+8UVhFEMqKaZ@X*<7Umo zJR>Ql)MNJi0i820F31h0*DfdaA80Tk7Hi5FZS<*xp_irbOzQ#IGHqddU{i=-XNWP` zreWVtz`rRNl|ebH3p(0tx3OQMUfN6Z0ZWrc&U)k>&~mc+3rIqrvN9?e-v9sr07*qo IM6N<$f-h!N4gdfE literal 0 HcmV?d00001 diff --git a/packs/Misc/resources/assets/storagedrawersmisc/textures/blocks/drawers_immeng_treated_front_2.png b/packs/Misc/resources/assets/storagedrawersmisc/textures/blocks/drawers_immeng_treated_front_2.png new file mode 100644 index 0000000000000000000000000000000000000000..4dc83ffcca3f2a2ccc7bc33a9ce554e777844b01 GIT binary patch literal 742 zcmVPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0((hBK~y+TRg+6s z8bJ_+*(D}slSBl80fv`~21SuqgcHzs;tS(ZVHgm^B&+=Y?afz>F0#0%s;j1}Z{4bi zbaQca^Ktcyaed!R=%kdyCe_FG3d9RBVhOC}0J(4YU2yEj6*=2XDX3;OI`B0-$Z337 z0C}ygt|<0lMNw>Y_3caES3u6Jp_N@%Uqui#?Ev6n_W+h^qL|)=-+-xYhKH_#H?A=qEXPFR!NgXU-P599&33`tG*s8o*wqI z3if?nY^7B5C}4fvQQ)~=)XY8vzgnAmZj|)9S)ynWz~~TmFL(rl9Z&6COp%Vit^suB zygD}e*hgLsd406!@mfa13OZq}m4LWuW-YXHXwXB=2^GVGEL5pZfd##W_@lkFyEr8` zwnChTd&?F^pp}7vO`(&IsRNz153(^G<98Y1S383aqjumsi*?Ygm05SW$O%(0oNaqL zFMH~<3w?J^{pX+JpV^)`Y`A#8v>~@h7u!ijnbK_~tpS2QK=(7V|MVWbd!vuwVk@ER za!Ti@e}#ZQwvswZ!@#!hvYga}#RyrX2~(IMqQPP|!T|f!C?amb`G!j#bW`Y|_2xbksyl=!%0;583m3Hf_YkDZXLEMY}w)f1t{kS*#%=yxC1JTj=^x0!v!= zz?SJ1wg+Q&Ab_1AJTi^=k@(((Ubes#j7mEjb@R8`zS>rXcxKJ{ZI;Gaa!vd?sCiNS Y1J~G>o(uvKN&o-=07*qoM6N<$f=-)QO#lD@ literal 0 HcmV?d00001 diff --git a/packs/Misc/resources/assets/storagedrawersmisc/textures/blocks/drawers_immeng_treated_front_4.png b/packs/Misc/resources/assets/storagedrawersmisc/textures/blocks/drawers_immeng_treated_front_4.png new file mode 100644 index 0000000000000000000000000000000000000000..a88579c83bbf163e46ba2039bf4eb5268e649413 GIT binary patch literal 745 zcmVPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0)9zEK~y+TRa4nk z8c`6Ox5OmAL>*a%8D;?mM38-n5JBZcktJatHc9^f7b?{kI5~N!b9-+0bXQmR)tYV) zO)rRcJc#G(FdnZAo(9@HTQT0p0=x_J6dys~1MMbp?*yTBt|OS|Y|QcwF20;VKRv;s z;9-(;)DPmH9{l>jKcy|G*_Y6s;vo!f47^u7Y$`5RMF+cT48vO!kF4HFMli`**pxkN z86&{eqihtb0@)p~Ci*uf>TUp9!?{GCbhfOz5c)jV zr6a|2Ja_?g6G2vuVpn!CFE~mw@z-5y(4v}4X7uwm)@)mp0f(fS7 zVw&BzFe7SFG7yy;tkNKzxS3IH`hc&* z8wLE4Fi^6{K*rQf8CY^`e%{5BQ`k_%Ul~ia(&4yz6zshcr?~s^3c4()rqH62y;PW& z997xj7E&-mmg}B9KeKW#Z7BaN_YeIv6L5l>yn`18E%}qr%p=lYa#Vw~rCJb%Ju;kg zk%rtCpA#ErY_g7^Z0RCm7;pR#>OSAVn430ZD?=s_Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0y9ZOK~y+Tos(O4 z(ohhE^DAtzv?Vv7J_zOBE-ebE&n|@|B#>|^zPSAVZ{xQQtv|qr%?vZ=%G8|zOqHDj;-4qJBx|Om&C5H$^mkp@u%QpP&4ma``S(qO?!T9+2OHmzdpPJ zcea0M*`KF7d&VAL@<(tYCo9aFZ_WF{Pu^?TZW38J32ieBxEwqC`!RO@ejHjkj;!L0 z{#W?LAh1u-rFk>xZ-*p@p-Yr>+fQOU(Lsl*QRMQQUSO-vjjir|%kJg-NT7gpRU9~s zn^x)|I3ndRX*v28@oEgC0qkC|1#1c}n3?w!T-dr#C%UdhAG@V%PWQBXL$`({ooi<$ zB_p2oe3xIenZb-{7F5jpK2)hrfjwGt{Iq-PE^f%JRfzvd_bed=v$%fVf^?Rk=&R6~ z;_ijEikG9MtEnST3=6Oxz=-&~g#K+&JuV?OXwB4MCG4i!-_P# z%ng-}#3beW`&-r*IvELaB%dK(u@c`=&j*n$@l!5t@CE7B~7v{yM15WDr>i_@%07*qoM6N<$ Eg2TWy{r~^~ literal 0 HcmV?d00001 diff --git a/packs/Misc/resources/assets/storagedrawersmisc/textures/blocks/drawers_immeng_treated_side_h.png b/packs/Misc/resources/assets/storagedrawersmisc/textures/blocks/drawers_immeng_treated_side_h.png new file mode 100644 index 0000000000000000000000000000000000000000..62be04dc11fb912079844248115060bb5b00f356 GIT binary patch literal 680 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 literal 0 HcmV?d00001 diff --git a/packs/Misc/src/com/jaquadro/minecraft/storagedrawers/packs/misc/core/DataResolver.java b/packs/Misc/src/com/jaquadro/minecraft/storagedrawers/packs/misc/core/DataResolver.java index ec80945..ce7c00a 100644 --- a/packs/Misc/src/com/jaquadro/minecraft/storagedrawers/packs/misc/core/DataResolver.java +++ b/packs/Misc/src/com/jaquadro/minecraft/storagedrawers/packs/misc/core/DataResolver.java @@ -8,22 +8,22 @@ public class DataResolver extends StandardDataResolver { public static String[][] textureBank = new String[][] { new String[] { "ebxl_redwood", "ebxl_fir", "ebxl_acacia", "ebxl_cypress", "ebxl_japanesemaple", "ebxl_rainboweucalyptus", "ebxl_autumn", "ebxl_baldcypress", "ebxl_sakura" }, - new String[] { "hl_yellow", "hl_white", "hl_red", "hl_grey", "tc_greatwood", "tc_silverwood", "witchery_rowan", "witchery_alder", "witchery_hawthorn", } + new String[] { "hl_yellow", "hl_white", "hl_red", "hl_grey", "tc_greatwood", "tc_silverwood", "witchery_rowan", "witchery_alder", "witchery_hawthorn", "immeng_treated" } }; public static int[][] modBankMap = new int[][] { new int[] { 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - new int[] { 1, 1, 1, 1, 2, 2, 3, 3, 3 } + new int[] { 1, 1, 1, 1, 2, 2, 3, 3, 3, 4 } }; public static int[][] modMetaMap = new int[][] { new int [] { 0, 1, 2, 3, 4, 5, 6, 7, 8 }, - new int [] { 0, 1, 2, 3, 6, 7, 0, 1, 2 } + new int [] { 0, 1, 2, 3, 6, 7, 0, 1, 2, 0 } }; public static int[][] modSlabMetaMap = new int[][] { new int[] { 0, 1, 2, 3, 4, 5, 6, 7, 8 }, - new int[] { 0, 1, 2, 3, 0, 1, 0, 1, 2 } + new int[] { 0, 1, 2, 3, 0, 1, 0, 1, 2, 2 } }; public DataResolver (String modID, int bankNumber) { diff --git a/packs/Misc/src/com/jaquadro/minecraft/storagedrawers/packs/misc/core/ModRecipes.java b/packs/Misc/src/com/jaquadro/minecraft/storagedrawers/packs/misc/core/ModRecipes.java index b0af73f..d2e9fda 100644 --- a/packs/Misc/src/com/jaquadro/minecraft/storagedrawers/packs/misc/core/ModRecipes.java +++ b/packs/Misc/src/com/jaquadro/minecraft/storagedrawers/packs/misc/core/ModRecipes.java @@ -32,6 +32,8 @@ public class ModRecipes GameRegistry.findBlock("Highlands", "hl_woodPlanks"), GameRegistry.findBlock("Thaumcraft", "blockWoodenDevice" ), // 6, 7 GameRegistry.findBlock("witchery", "witchwood"), + GameRegistry.findBlock("ImmersiveEngineering", "treatedWood"), + }; Block[][] slabs = new Block[][] { @@ -39,6 +41,8 @@ public class ModRecipes new Block[] { GameRegistry.findBlock("Highlands", "hl_woodSlab"), null }, new Block[] { GameRegistry.findBlock("Thaumcraft", "blockCosmeticSlabWood" ), null }, new Block[] { GameRegistry.findBlock("witchery", "witchwoodslab"), null }, + new Block[] { GameRegistry.findBlock("ImmersiveEngineering", "woodenDecoration"), null }, // 2 + }; IPackDataResolver[] resolvers = StorageDrawersPack.instance.resolvers;