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 0000000..c3dee1e Binary files /dev/null and b/packs/Misc/resources/assets/storagedrawersmisc/textures/blocks/drawers_immeng_treated_front_1.png differ 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 0000000..4dc83ff Binary files /dev/null and b/packs/Misc/resources/assets/storagedrawersmisc/textures/blocks/drawers_immeng_treated_front_2.png differ 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 0000000..a88579c Binary files /dev/null and b/packs/Misc/resources/assets/storagedrawersmisc/textures/blocks/drawers_immeng_treated_front_4.png differ diff --git a/packs/Misc/resources/assets/storagedrawersmisc/textures/blocks/drawers_immeng_treated_side.png b/packs/Misc/resources/assets/storagedrawersmisc/textures/blocks/drawers_immeng_treated_side.png new file mode 100644 index 0000000..38be5e1 Binary files /dev/null and b/packs/Misc/resources/assets/storagedrawersmisc/textures/blocks/drawers_immeng_treated_side.png differ 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 0000000..62be04d Binary files /dev/null and b/packs/Misc/resources/assets/storagedrawersmisc/textures/blocks/drawers_immeng_treated_side_h.png differ diff --git a/packs/Misc/resources/assets/storagedrawersmisc/textures/blocks/drawers_immeng_treated_side_v.png b/packs/Misc/resources/assets/storagedrawersmisc/textures/blocks/drawers_immeng_treated_side_v.png new file mode 100644 index 0000000..af051a5 Binary files /dev/null and b/packs/Misc/resources/assets/storagedrawersmisc/textures/blocks/drawers_immeng_treated_side_v.png differ diff --git a/packs/Misc/resources/assets/storagedrawersmisc/textures/blocks/drawers_immeng_treated_sort.png b/packs/Misc/resources/assets/storagedrawersmisc/textures/blocks/drawers_immeng_treated_sort.png new file mode 100644 index 0000000..da5b1cc Binary files /dev/null and b/packs/Misc/resources/assets/storagedrawersmisc/textures/blocks/drawers_immeng_treated_sort.png differ diff --git a/packs/Misc/resources/assets/storagedrawersmisc/textures/blocks/drawers_immeng_treated_trim.png b/packs/Misc/resources/assets/storagedrawersmisc/textures/blocks/drawers_immeng_treated_trim.png new file mode 100644 index 0000000..a0c59fe Binary files /dev/null and b/packs/Misc/resources/assets/storagedrawersmisc/textures/blocks/drawers_immeng_treated_trim.png differ 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;