Merge branch 'master' into custom-render

# Conflicts:
#	src/com/jaquadro/minecraft/storagedrawers/client/renderer/DrawersRenderer.java
#	src/com/jaquadro/minecraft/storagedrawers/core/ClientProxy.java

.gitignore

@@ -20,3 +20,4 @@ runtime-1.8/
 tools/TextureBuilder/TextureBuilder/bin/
 tools/TextureBuilder/TextureBuilder/obj/
 *.suo
+logs/

build.gradle

@@ -17,12 +17,12 @@ buildscript {
 
 apply plugin: 'forge'
 
-version = "1.7.10-1.5.9"
+version = "1.7.10-1.7.5"
 group= "com.jaquadro.minecraft.storagedrawers" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "StorageDrawers"
 
 minecraft {
-    version = "1.7.10-10.13.3.1408-1.7.10"
+    version = "1.7.10-10.13.4.1481-1.7.10"
     assetDir = "runtime/assets"
 
     replace '@VERSION@', project.version

packs/BiomesOPlenty/build.gradle

@@ -17,7 +17,7 @@ buildscript {
 
 apply plugin: 'forge'
 
-version = "1.7.10-1.0.1"
+version = "1.7.10-1.1.0"
 group= "com.jaquadro.minecraft.storagedrawers" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "StorageDrawers-BiomesOPlenty"
 
@@ -26,7 +26,7 @@ minecraft {
     assetDir = "../../runtime/assets"
 
     replace '@VERSION@', project.version
-    replace 'required-after:StorageDrawers', "required-after:StorageDrawers@[1.5.4,)"
+    replace 'required-after:StorageDrawers', "required-after:StorageDrawers@[1.7.5,)"
 }
 
 sourceSets.main {
@@ -39,7 +39,7 @@ sourceSets.main {
 }
 
 dependencies {
-
+    compile project(path: ':', transitive: false)
 }
 
 processResources

packs/BiomesOPlenty/src/com/jaquadro/minecraft/storagedrawers/packs/bop/StorageDrawersPack.java

@@ -1,11 +1,8 @@
 package com.jaquadro.minecraft.storagedrawers.packs.bop;
 
-import com.jaquadro.minecraft.storagedrawers.api.pack.IPackDataResolver;
-import com.jaquadro.minecraft.storagedrawers.api.pack.StandardDataResolver;
-import com.jaquadro.minecraft.storagedrawers.packs.bop.core.ModBlocks;
-import com.jaquadro.minecraft.storagedrawers.packs.bop.core.ModCreativeTabs;
-import com.jaquadro.minecraft.storagedrawers.packs.bop.core.ModRecipes;
-import com.jaquadro.minecraft.storagedrawers.packs.bop.core.RefinedRelocation;
+import com.jaquadro.minecraft.storagedrawers.api.IStorageDrawersApi;
+import com.jaquadro.minecraft.storagedrawers.api.StorageDrawersApi;
+import com.jaquadro.minecraft.storagedrawers.packs.bop.core.*;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.SidedProxy;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
@@ -20,12 +17,9 @@ public class StorageDrawersPack
     public static final String MOD_VERSION = "@VERSION@";
     public static final String SOURCE_PATH = "com.jaquadro.minecraft.storagedrawers.packs.bop.";
 
-    public IPackDataResolver resolver = new StandardDataResolver(MOD_ID, new String[] {
-        "sacredoak", "cherry", "dark", "fir", "ethereal", "magic", "mangrove", "palm", "redwood", "willow", null, "pine", "hellbark", "jacaranda", "mahogany"
-    }, ModCreativeTabs.tabStorageDrawers);
+    public DataResolver resolver = new DataResolver(MOD_ID);
 
     public ModBlocks blocks = new ModBlocks();
-    public ModRecipes recipes = new ModRecipes();
 
     @Mod.Instance(MOD_ID)
     public static StorageDrawersPack instance;
@@ -41,11 +35,13 @@ public class StorageDrawersPack
     @Mod.EventHandler
     public void init (FMLInitializationEvent event) {
         RefinedRelocation.init();
-        recipes.init();
+        resolver.init();
     }
 
     @Mod.EventHandler
     public void postInit (FMLPostInitializationEvent event) {
-        RefinedRelocation.postInit();
+        IStorageDrawersApi api = StorageDrawersApi.instance();
+        if (api != null)
+            api.registerStandardPackRecipes(resolver);
     }
 }

packs/BiomesOPlenty/src/com/jaquadro/minecraft/storagedrawers/packs/bop/core/DataResolver.java

@@ -0,0 +1,69 @@
+package com.jaquadro.minecraft.storagedrawers.packs.bop.core;
+
+import com.jaquadro.minecraft.storagedrawers.api.pack.BlockConfiguration;
+import com.jaquadro.minecraft.storagedrawers.api.pack.BlockType;
+import com.jaquadro.minecraft.storagedrawers.api.pack.ExtendedDataResolver;
+import cpw.mods.fml.common.registry.GameRegistry;
+import net.minecraft.block.Block;
+import net.minecraft.creativetab.CreativeTabs;
+
+public class DataResolver extends ExtendedDataResolver
+{
+    private static String[] textureNames = new String[] {
+        "sacredoak", "cherry", "dark", "fir", "ethereal", "magic", "mangrove", "palm", "redwood", "willow", null, "pine", "hellbark", "jacaranda", "mahogany"
+    };
+
+    public DataResolver (String modID) {
+        super(modID, textureNames);
+    }
+
+    @Override
+    public CreativeTabs getCreativeTabs (BlockType type) {
+        return ModCreativeTabs.getTabStorageDrawers();
+    }
+
+    @Override
+    public Block getBlock (BlockConfiguration blockConfig) {
+        switch (blockConfig.getBlockType()) {
+            case Drawers:
+                if (blockConfig.getDrawerCount() == 1)
+                    return ModBlocks.fullDrawers1;
+                if (blockConfig.getDrawerCount() == 2 && !blockConfig.isHalfDepth())
+                    return ModBlocks.fullDrawers2;
+                if (blockConfig.getDrawerCount() == 4 && !blockConfig.isHalfDepth())
+                    return ModBlocks.fullDrawers4;
+                if (blockConfig.getDrawerCount() == 2 && blockConfig.isHalfDepth())
+                    return ModBlocks.halfDrawers2;
+                if (blockConfig.getDrawerCount() == 4 && blockConfig.isHalfDepth())
+                    return ModBlocks.halfDrawers4;
+                break;
+            case DrawersSorting:
+                if (blockConfig.getDrawerCount() == 1)
+                    return RefinedRelocation.fullDrawers1;
+                if (blockConfig.getDrawerCount() == 2 && !blockConfig.isHalfDepth())
+                    return RefinedRelocation.fullDrawers2;
+                if (blockConfig.getDrawerCount() == 4 && !blockConfig.isHalfDepth())
+                    return RefinedRelocation.fullDrawers4;
+                if (blockConfig.getDrawerCount() == 2 && blockConfig.isHalfDepth())
+                    return RefinedRelocation.halfDrawers2;
+                if (blockConfig.getDrawerCount() == 4 && blockConfig.isHalfDepth())
+                    return RefinedRelocation.halfDrawers4;
+                break;
+            case Trim:
+                return ModBlocks.trim;
+            case TrimSorting:
+                return RefinedRelocation.trim;
+        }
+        return null;
+    }
+
+    @Override
+    public void init () {
+        for (int i = 0, p = 0, m = 0; i < 8; i++, p++, m++)
+            setPlankSlab(i, GameRegistry.findBlock("BiomesOPlenty", "planks"), p, GameRegistry.findBlock("BiomesOPlenty", "woodenSingleSlab1"), m);
+        for (int i = 8, p = 8, m = 0; i < 10; i++, p++, m++)
+            setPlankSlab(i, GameRegistry.findBlock("BiomesOPlenty", "planks"), p, GameRegistry.findBlock("BiomesOPlenty", "woodenSingleSlab2"), m);
+        for (int i = 11, p = 11, m = 3; i < textureNames.length; i++, p++, m++)
+            setPlankSlab(i, GameRegistry.findBlock("BiomesOPlenty", "planks"), p, GameRegistry.findBlock("BiomesOPlenty", "woodenSingleSlab2"), m);
+    }
+}

packs/BiomesOPlenty/src/com/jaquadro/minecraft/storagedrawers/packs/bop/core/ModBlocks.java

@@ -64,8 +64,4 @@ public class ModBlocks
     public static String getQualifiedName (Block block) {
         return GameData.getBlockRegistry().getNameForObject(block);
     }
-
-    public static String makeName (String name) {
-        return StorageDrawersPack.MOD_ID.toLowerCase() + "." + name;
-    }
 }

packs/BiomesOPlenty/src/com/jaquadro/minecraft/storagedrawers/packs/bop/core/ModCreativeTabs.java

@@ -3,6 +3,7 @@ package com.jaquadro.minecraft.storagedrawers.packs.bop.core;
 import com.jaquadro.minecraft.storagedrawers.api.IStorageDrawersApi;
 import com.jaquadro.minecraft.storagedrawers.api.StorageDrawersApi;
 import com.jaquadro.minecraft.storagedrawers.api.config.IBlockConfig;
+import com.jaquadro.minecraft.storagedrawers.api.config.IUserConfig;
 import com.jaquadro.minecraft.storagedrawers.api.pack.BlockConfiguration;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -14,18 +15,35 @@ public final class ModCreativeTabs
 {
     private ModCreativeTabs () { }
 
-    public static final CreativeTabs tabStorageDrawers = new CreativeTabs("storageDrawersBop") {
-        @Override
-        @SideOnly(Side.CLIENT)
-        public Item getTabIconItem () {
-            return getTabItem();
+    private static CreativeTabs tabStorageDrawers = null;
+
+    public static CreativeTabs getTabStorageDrawers () {
+        if (tabStorageDrawers != null)
+            return tabStorageDrawers;
+
+        IStorageDrawersApi api = StorageDrawersApi.instance();
+        if (api == null)
+            return null;
+
+        IUserConfig config = api.userConfig();
+        if (config.addonConfig().addonItemsUseSeparateTab() && config.addonConfig().showAddonItemsVanilla()) {
+            tabStorageDrawers = new CreativeTabs("storageDrawersBop")
+            {
+                @Override
+                @SideOnly(Side.CLIENT)
+                public Item getTabIconItem () {
+                    return getTabItem();
+                }
+
+                @Override
+                public int func_151243_f () {
+                    return 9;
+                }
+            };
         }
 
-        @Override
-        public int func_151243_f () {
-            return 9;
-        }
-    };
+        return tabStorageDrawers;
+    }
 
     private static Item getTabItem () {
         IStorageDrawersApi api = StorageDrawersApi.instance();

packs/BiomesOPlenty/src/com/jaquadro/minecraft/storagedrawers/packs/bop/core/ModRecipes.java

@@ -1,87 +0,0 @@
-package com.jaquadro.minecraft.storagedrawers.packs.bop.core;
-
-import com.jaquadro.minecraft.storagedrawers.api.IStorageDrawersApi;
-import com.jaquadro.minecraft.storagedrawers.api.StorageDrawersApi;
-import com.jaquadro.minecraft.storagedrawers.api.config.IBlockConfig;
-import com.jaquadro.minecraft.storagedrawers.api.pack.BlockConfiguration;
-import com.jaquadro.minecraft.storagedrawers.api.pack.IPackDataResolver;
-import com.jaquadro.minecraft.storagedrawers.packs.bop.StorageDrawersPack;
-import cpw.mods.fml.common.registry.GameRegistry;
-import net.minecraft.block.Block;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.oredict.OreDictionary;
-import net.minecraftforge.oredict.ShapedOreRecipe;
-
-public class ModRecipes
-{
-    public void init () {
-        IStorageDrawersApi api = StorageDrawersApi.instance();
-        if (api == null)
-            return;
-
-        IBlockConfig blockConfig = api.userConfig().blockConfig();
-
-        String nameFull1 = blockConfig.getBlockConfigName(BlockConfiguration.BasicFull1);
-        String nameFull2 = blockConfig.getBlockConfigName(BlockConfiguration.BasicFull2);
-        String nameFull4 = blockConfig.getBlockConfigName(BlockConfiguration.BasicFull4);
-        String nameHalf2 = blockConfig.getBlockConfigName(BlockConfiguration.BasicHalf2);
-        String nameHalf4 = blockConfig.getBlockConfigName(BlockConfiguration.BasicHalf4);
-        String nameTrim = blockConfig.getBlockConfigName(BlockConfiguration.Trim);
-
-        Block planks = GameRegistry.findBlock("BiomesOPlenty", "planks");
-        Block slab1 = GameRegistry.findBlock("BiomesOPlenty", "woodenSingleSlab1");
-        Block slab2 = GameRegistry.findBlock("BiomesOPlenty", "woodenSingleSlab2");
-
-        IPackDataResolver resolver = StorageDrawersPack.instance.resolver;
-
-        for (int i = 0; i < 16; i++) {
-            if (!resolver.isValidMetaValue(i))
-                continue;
-
-            if (planks != null) {
-                if (blockConfig.isBlockEnabled(nameFull1))
-                    GameRegistry.addRecipe(new ItemStack(ModBlocks.fullDrawers1, blockConfig.getBlockRecipeOutput(nameFull1), i), "xxx", " y ", "xxx",
-                        'x', new ItemStack(planks, 1, i), 'y', Blocks.chest);
-                if (blockConfig.isBlockEnabled(nameFull2))
-                    GameRegistry.addRecipe(new ItemStack(ModBlocks.fullDrawers2, blockConfig.getBlockRecipeOutput(nameFull2), i), "xyx", "xxx", "xyx",
-                        'x', new ItemStack(planks, 1, i), 'y', Blocks.chest);
-                if (blockConfig.isBlockEnabled(nameFull4))
-                    GameRegistry.addRecipe(new ItemStack(ModBlocks.fullDrawers4, blockConfig.getBlockRecipeOutput(nameFull4), i), "yxy", "xxx", "yxy",
-                        'x', new ItemStack(planks, 1, i), 'y', Blocks.chest);
-                if (blockConfig.isBlockEnabled(nameTrim)) {
-                    GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.trim, blockConfig.getBlockRecipeOutput(nameTrim), i), "xyx", "yyy", "xyx",
-                        'x', "stickWood", 'y', new ItemStack(planks, 1, i)));
-                }
-            }
-
-            Block recipeSlab = (i < 8) ? slab1 : slab2;
-            if (recipeSlab != null) {
-                if (blockConfig.isBlockEnabled(nameHalf2))
-                    GameRegistry.addRecipe(new ItemStack(ModBlocks.halfDrawers2, blockConfig.getBlockRecipeOutput(nameHalf2), i), "xyx", "xxx", "xyx",
-                        'x', new ItemStack(recipeSlab, 1, i), 'y', Blocks.chest);
-                if (blockConfig.isBlockEnabled(nameHalf4))
-                    GameRegistry.addRecipe(new ItemStack(ModBlocks.halfDrawers4, blockConfig.getBlockRecipeOutput(nameHalf4), i), "yxy", "xxx", "yxy",
-                        'x', new ItemStack(recipeSlab, 1, i), 'y', Blocks.chest);
-            }
-        }
-
-        ItemStack itemTemplate = new ItemStack(GameRegistry.findItem("StorageDrawers", "upgradeTemplate"), 2);
-
-        if (blockConfig.isBlockEnabled(nameFull1))
-            GameRegistry.addRecipe(new ShapedOreRecipe(itemTemplate, "xxx", "xyx", "xxx",
-                'x', "stickWood", 'y', new ItemStack(ModBlocks.fullDrawers1, 1, OreDictionary.WILDCARD_VALUE)));
-        if (blockConfig.isBlockEnabled(nameFull2))
-            GameRegistry.addRecipe(new ShapedOreRecipe(itemTemplate, "xxx", "xyx", "xxx",
-                'x', "stickWood", 'y', new ItemStack(ModBlocks.fullDrawers2, 1, OreDictionary.WILDCARD_VALUE)));
-        if (blockConfig.isBlockEnabled(nameFull4))
-            GameRegistry.addRecipe(new ShapedOreRecipe(itemTemplate, "xxx", "xyx", "xxx",
-                'x', "stickWood", 'y', new ItemStack(ModBlocks.halfDrawers2, 1, OreDictionary.WILDCARD_VALUE)));
-        if (blockConfig.isBlockEnabled(nameHalf2))
-            GameRegistry.addRecipe(new ShapedOreRecipe(itemTemplate, "xxx", "xyx", "xxx",
-                'x', "stickWood", 'y', new ItemStack(ModBlocks.fullDrawers4, 1, OreDictionary.WILDCARD_VALUE)));
-        if (blockConfig.isBlockEnabled(nameHalf4))
-            GameRegistry.addRecipe(new ShapedOreRecipe(itemTemplate, "xxx", "xyx", "xxx",
-                'x', "stickWood", 'y', new ItemStack(ModBlocks.halfDrawers4, 1, OreDictionary.WILDCARD_VALUE)));
-    }
-}

packs/BiomesOPlenty/src/com/jaquadro/minecraft/storagedrawers/packs/bop/core/RefinedRelocation.java

@@ -9,10 +9,7 @@ import com.jaquadro.minecraft.storagedrawers.api.pack.IPackBlockFactory;
 import com.jaquadro.minecraft.storagedrawers.api.pack.IPackDataResolver;
 import com.jaquadro.minecraft.storagedrawers.packs.bop.StorageDrawersPack;
 import cpw.mods.fml.common.Loader;
-import cpw.mods.fml.common.registry.GameRegistry;
 import net.minecraft.block.Block;
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemStack;
 
 public class RefinedRelocation
 {
@@ -21,6 +18,7 @@ public class RefinedRelocation
     public static Block fullDrawers4;
     public static Block halfDrawers2;
     public static Block halfDrawers4;
+    public static Block trim;
 
     public static void init () {
         IStorageDrawersApi api = StorageDrawersApi.instance();
@@ -30,7 +28,7 @@ public class RefinedRelocation
         if (!Loader.isModLoaded("RefinedRelocation") || !api.userConfig().integrationConfig().isRefinedRelocationEnabled())
             return;
 
-        IPackBlockFactory factory = StorageDrawersApi.instance().packFactory();
+        IPackBlockFactory factory = api.packFactory();
         IPackDataResolver resolver = StorageDrawersPack.instance.resolver;
 
         fullDrawers1 = factory.createBlock(BlockConfiguration.SortingFull1, resolver);
@@ -38,12 +36,14 @@ public class RefinedRelocation
         fullDrawers4 = factory.createBlock(BlockConfiguration.SortingFull4, resolver);
         halfDrawers2 = factory.createBlock(BlockConfiguration.SortingHalf2, resolver);
         halfDrawers4 = factory.createBlock(BlockConfiguration.SortingHalf4, resolver);
+        trim = factory.createBlock(BlockConfiguration.TrimSorting, resolver);
 
         factory.bindSortingBlock(ModBlocks.fullDrawers1, fullDrawers1);
         factory.bindSortingBlock(ModBlocks.fullDrawers2, fullDrawers2);
         factory.bindSortingBlock(ModBlocks.fullDrawers4, fullDrawers4);
         factory.bindSortingBlock(ModBlocks.halfDrawers2, halfDrawers2);
         factory.bindSortingBlock(ModBlocks.halfDrawers4, halfDrawers4);
+        factory.bindSortingBlock(ModBlocks.trim, trim);
 
         IUserConfig config = api.userConfig();
         IBlockConfig blockConfig = config.blockConfig();
@@ -58,6 +58,8 @@ public class RefinedRelocation
             factory.registerBlock(halfDrawers2, "halfDrawersSort2");
         if (blockConfig.isBlockEnabled(blockConfig.getBlockConfigName(BlockConfiguration.SortingHalf4)))
             factory.registerBlock(halfDrawers4, "halfDrawersSort4");
+        if (blockConfig.isBlockEnabled(blockConfig.getBlockConfigName(BlockConfiguration.TrimSorting)))
+            factory.registerBlock(trim, "trimSort");
 
         if (!config.addonConfig().showAddonItemsNEI()) {
             factory.hideBlock(ModBlocks.getQualifiedName(fullDrawers1));
@@ -65,39 +67,7 @@ public class RefinedRelocation
             factory.hideBlock(ModBlocks.getQualifiedName(fullDrawers4));
             factory.hideBlock(ModBlocks.getQualifiedName(halfDrawers2));
             factory.hideBlock(ModBlocks.getQualifiedName(halfDrawers4));
-        }
-    }
-
-    public static void postInit () {
-        IStorageDrawersApi api = StorageDrawersApi.instance();
-        if (api == null)
-            return;
-
-        if (!Loader.isModLoaded("RefinedRelocation") || !api.userConfig().integrationConfig().isRefinedRelocationEnabled())
-            return;
-
-        IPackDataResolver resolver = StorageDrawersPack.instance.resolver;
-        IBlockConfig blockConfig = api.userConfig().blockConfig();
-
-        for (int i = 0; i < 16; i++) {
-            if (!resolver.isValidMetaValue(i))
-                continue;
-
-            if (blockConfig.isBlockEnabled(blockConfig.getBlockConfigName(BlockConfiguration.SortingFull1)))
-                GameRegistry.addRecipe(new ItemStack(fullDrawers1, 1, i), "x x", " y ", "x x",
-                    'x', Items.gold_nugget, 'y', new ItemStack(ModBlocks.fullDrawers1, 1, i));
-            if (blockConfig.isBlockEnabled(blockConfig.getBlockConfigName(BlockConfiguration.SortingFull2)))
-                GameRegistry.addRecipe(new ItemStack(fullDrawers2, 1, i), "x x", " y ", "x x",
-                    'x', Items.gold_nugget, 'y', new ItemStack(ModBlocks.fullDrawers2, 1, i));
-            if (blockConfig.isBlockEnabled(blockConfig.getBlockConfigName(BlockConfiguration.SortingFull4)))
-                GameRegistry.addRecipe(new ItemStack(halfDrawers2, 1, i), "x x", " y ", "x x",
-                    'x', Items.gold_nugget, 'y', new ItemStack(ModBlocks.halfDrawers2, 1, i));
-            if (blockConfig.isBlockEnabled(blockConfig.getBlockConfigName(BlockConfiguration.SortingHalf2)))
-                GameRegistry.addRecipe(new ItemStack(fullDrawers4, 1, i), "x x", " y ", "x x",
-                    'x', Items.gold_nugget, 'y', new ItemStack(ModBlocks.fullDrawers4, 1, i));
-            if (blockConfig.isBlockEnabled(blockConfig.getBlockConfigName(BlockConfiguration.SortingHalf4)))
-                GameRegistry.addRecipe(new ItemStack(halfDrawers4, 1, i), "x x", " y ", "x x",
-                    'x', Items.gold_nugget, 'y', new ItemStack(ModBlocks.halfDrawers4, 1, i));
+            factory.hideBlock(ModBlocks.getQualifiedName(trim));
         }
     }
 }

packs/Erebus/build.gradle

@@ -17,7 +17,7 @@ buildscript {
 
 apply plugin: 'forge'
 
-version = "1.7.10-1.0.1"
+version = "1.7.10-1.1.0"
 group= "com.jaquadro.minecraft.storagedrawers" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "StorageDrawers-Erebus"
 
@@ -26,7 +26,7 @@ minecraft {
     assetDir = "../../runtime/assets"
 
     replace '@VERSION@', project.version
-    replace 'required-after:StorageDrawers', "required-after:StorageDrawers@[1.5.4,)"
+    replace 'required-after:StorageDrawers', "required-after:StorageDrawers@[1.7.5,)"
 }
 
 sourceSets.main {
@@ -39,7 +39,7 @@ sourceSets.main {
 }
 
 dependencies {
-
+    compile project(path: ':', transitive: false)
 }
 
 processResources

packs/Erebus/resources/assets/storagedrawerserebus/lang/zh_CN.lang

@@ -0,0 +1,86 @@
+itemGroup.storageDrawersErebus=储物抽屉|Erebus
+
+# Blocks
+tile.storagedrawerserebus.fullDrawers1.baobab.name=猴面包树抽屉
+tile.storagedrawerserebus.fullDrawers1.eucalyptus.name=桉树抽屉
+tile.storagedrawerserebus.fullDrawers1.mahogany.name=桃花心木抽屉
+tile.storagedrawerserebus.fullDrawers1.mossbark.name=苔皮树抽屉
+tile.storagedrawerserebus.fullDrawers1.asper.name=糙皮树抽屉
+tile.storagedrawerserebus.fullDrawers1.cypress.name=柏树抽屉
+tile.storagedrawerserebus.fullDrawers1.sap.name=Sap抽屉
+tile.storagedrawerserebus.fullDrawers1.white.name=白木抽屉
+tile.storagedrawerserebus.fullDrawers1.bamboo.name=竹抽屉
+tile.storagedrawerserebus.fullDrawers1.rotten.name=腐木抽屉
+tile.storagedrawerserebus.fullDrawers1.marshwood.name=沼泽木抽屉
+tile.storagedrawerserebus.fullDrawers1.scorched.name=焦木抽屉
+tile.storagedrawerserebus.fullDrawers1.varnished.name=漆包木抽屉
+
+tile.storagedrawerserebus.fullDrawers2.baobab.name=猴面包树抽屉(1x2)
+tile.storagedrawerserebus.fullDrawers2.eucalyptus.name=桉树抽屉(1x2)
+tile.storagedrawerserebus.fullDrawers2.mahogany.name=桃花心木抽屉(1x2)
+tile.storagedrawerserebus.fullDrawers2.mossbark.name=苔皮树抽屉(1x2)
+tile.storagedrawerserebus.fullDrawers2.asper.name=糙皮树抽屉(1x2)
+tile.storagedrawerserebus.fullDrawers2.cypress.name=柏树抽屉(1x2)
+tile.storagedrawerserebus.fullDrawers2.sap.name=Sap抽屉(1x2)
+tile.storagedrawerserebus.fullDrawers2.white.name=白木抽屉(1x2)
+tile.storagedrawerserebus.fullDrawers2.bamboo.name=竹抽屉(1x2)
+tile.storagedrawerserebus.fullDrawers2.rotten.name=腐木抽屉(1x2)
+tile.storagedrawerserebus.fullDrawers2.marshwood.name=沼泽木抽屉(1x2)
+tile.storagedrawerserebus.fullDrawers2.scorched.name=焦木抽屉(1x2)
+tile.storagedrawerserebus.fullDrawers2.varnished.name=漆包木抽屉(1x2)
+
+tile.storagedrawerserebus.fullDrawers4.baobab.name=猴面包树抽屉(2x2)
+tile.storagedrawerserebus.fullDrawers4.eucalyptus.name=桉树抽屉(2x2)
+tile.storagedrawerserebus.fullDrawers4.mahogany.name=桃花心木抽屉(2x2)
+tile.storagedrawerserebus.fullDrawers4.mossbark.name=苔皮树抽屉(2x2)
+tile.storagedrawerserebus.fullDrawers4.asper.name=糙皮树抽屉(2x2)
+tile.storagedrawerserebus.fullDrawers4.cypress.name=柏树抽屉(2x2)
+tile.storagedrawerserebus.fullDrawers4.sap.name=Sap抽屉(2x2)
+tile.storagedrawerserebus.fullDrawers4.white.name=白木抽屉(2x2)
+tile.storagedrawerserebus.fullDrawers4.bamboo.name=竹抽屉(2x2)
+tile.storagedrawerserebus.fullDrawers4.rotten.name=腐木抽屉(2x2)
+tile.storagedrawerserebus.fullDrawers4.marshwood.name=沼泽木抽屉(2x2)
+tile.storagedrawerserebus.fullDrawers4.scorched.name=焦木抽屉(2x2)
+tile.storagedrawerserebus.fullDrawers4.varnished.name=漆包木抽屉(2x2)
+
+tile.storagedrawerserebus.halfDrawers2.baobab.name=小型猴面包树抽屉(1x2)
+tile.storagedrawerserebus.halfDrawers2.eucalyptus.name=小型桉树抽屉(1x2)
+tile.storagedrawerserebus.halfDrawers2.mahogany.name=小型桃花心木抽屉(1x2)
+tile.storagedrawerserebus.halfDrawers2.mossbark.name=小型苔皮树抽屉(1x2)
+tile.storagedrawerserebus.halfDrawers2.asper.name=小型糙皮树抽屉(1x2)
+tile.storagedrawerserebus.halfDrawers2.cypress.name=小型柏树抽屉(1x2)
+tile.storagedrawerserebus.halfDrawers2.sap.name=小型Sap抽屉(1x2)
+tile.storagedrawerserebus.halfDrawers2.white.name=小型白木抽屉(1x2)
+tile.storagedrawerserebus.halfDrawers2.bamboo.name=小型竹抽屉(1x2)
+tile.storagedrawerserebus.halfDrawers2.rotten.name=小型腐木抽屉(1x2)
+tile.storagedrawerserebus.halfDrawers2.marshwood.name=小型沼泽木抽屉(1x2)
+tile.storagedrawerserebus.halfDrawers2.scorched.name=小型焦木抽屉(1x2)
+tile.storagedrawerserebus.halfDrawers2.varnished.name=小型漆包木抽屉(1x2)
+
+tile.storagedrawerserebus.halfDrawers4.baobab.name=小型猴面包树抽屉(2x2)
+tile.storagedrawerserebus.halfDrawers4.eucalyptus.name=小型桉树抽屉(2x2)
+tile.storagedrawerserebus.halfDrawers4.mahogany.name=小型桃花心木抽屉(2x2)
+tile.storagedrawerserebus.halfDrawers4.mossbark.name=小型苔皮树抽屉(2x2)
+tile.storagedrawerserebus.halfDrawers4.asper.name=小型糙皮树抽屉(2x2)
+tile.storagedrawerserebus.halfDrawers4.cypress.name=小型柏树抽屉(2x2)
+tile.storagedrawerserebus.halfDrawers4.sap.name=小型Sap抽屉(2x2)
+tile.storagedrawerserebus.halfDrawers4.white.name=小型白木抽屉(2x2)
+tile.storagedrawerserebus.halfDrawers4.bamboo.name=小型竹抽屉(2x2)
+tile.storagedrawerserebus.halfDrawers4.rotten.name=小型腐木抽屉(2x2)
+tile.storagedrawerserebus.halfDrawers4.marshwood.name=小型沼泽木抽屉(2x2)
+tile.storagedrawerserebus.halfDrawers4.scorched.name=小型焦木抽屉(2x2)
+tile.storagedrawerserebus.halfDrawers4.varnished.name=小型漆包木抽屉(2x2)
+
+tile.storagedrawerserebus.trim.baobab.name=猴面包树桥接方块
+tile.storagedrawerserebus.trim.eucalyptus.name=桉树桥接方块
+tile.storagedrawerserebus.trim.mahogany.name=桃花心木桥接方块
+tile.storagedrawerserebus.trim.mossbark.name=苔皮树桥接方块
+tile.storagedrawerserebus.trim.asper.name=糙皮树桥接方块
+tile.storagedrawerserebus.trim.cypress.name=柏树桥接方块
+tile.storagedrawerserebus.trim.sap.name=Sap桥接方块
+tile.storagedrawerserebus.trim.white.name=白木桥接方块
+tile.storagedrawerserebus.trim.bamboo.name=竹桥接方块
+tile.storagedrawerserebus.trim.rotten.name=腐木桥接方块
+tile.storagedrawerserebus.trim.marshwood.name=沼泽木桥接方块
+tile.storagedrawerserebus.trim.scorched.name=焦木桥接方块
+tile.storagedrawerserebus.trim.varnished.name=漆包木桥接方块

packs/Erebus/src/com/jaquadro/minecraft/storagedrawers/packs/erebus/StorageDrawersPack.java

@@ -1,8 +1,8 @@
 package com.jaquadro.minecraft.storagedrawers.packs.erebus;
 
-import com.jaquadro.minecraft.storagedrawers.packs.erebus.core.ModBlocks;
-import com.jaquadro.minecraft.storagedrawers.packs.erebus.core.ModRecipes;
-import com.jaquadro.minecraft.storagedrawers.packs.erebus.core.RefinedRelocation;
+import com.jaquadro.minecraft.storagedrawers.api.IStorageDrawersApi;
+import com.jaquadro.minecraft.storagedrawers.api.StorageDrawersApi;
+import com.jaquadro.minecraft.storagedrawers.packs.erebus.core.*;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.SidedProxy;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
@@ -17,8 +17,9 @@ public class StorageDrawersPack
     public static final String MOD_VERSION = "@VERSION@";
     public static final String SOURCE_PATH = "com.jaquadro.minecraft.storagedrawers.packs.erebus.";
 
+    public DataResolver resolver = new DataResolver(MOD_ID);
+
     public ModBlocks blocks = new ModBlocks();
-    public ModRecipes recipes = new ModRecipes();
 
     @Mod.Instance(MOD_ID)
     public static StorageDrawersPack instance;
@@ -34,11 +35,13 @@ public class StorageDrawersPack
     @Mod.EventHandler
     public void init (FMLInitializationEvent event) {
         RefinedRelocation.init();
-        recipes.init();
+        resolver.init();
     }
 
     @Mod.EventHandler
     public void postInit (FMLPostInitializationEvent event) {
-        RefinedRelocation.postInit();
+        IStorageDrawersApi api = StorageDrawersApi.instance();
+        if (api != null)
+            api.registerStandardPackRecipes(resolver);
     }
 }

packs/Erebus/src/com/jaquadro/minecraft/storagedrawers/packs/erebus/block/BlockDrawersPack.java

@@ -1,71 +0,0 @@
-package com.jaquadro.minecraft.storagedrawers.packs.erebus.block;
-
-import com.jaquadro.minecraft.storagedrawers.StorageDrawers;
-import com.jaquadro.minecraft.storagedrawers.block.BlockDrawers;
-import com.jaquadro.minecraft.storagedrawers.packs.erebus.StorageDrawersPack;
-import com.jaquadro.minecraft.storagedrawers.packs.erebus.core.ModCreativeTabs;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.block.material.Material;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.*;
-
-import java.util.List;
-
-public class BlockDrawersPack extends BlockDrawers
-{
-    public static String[] blockNames = new String[] { "Baobab", "Eucalyptus", "Mahogany", "Mossbark", "Asper", "Cypress", null, "White", "Bamboo", "Rotten", "Marshwood", null, null, null, "Scorched", "Varnished" };
-    public static String[] textureNames = new String[] { "baobab", "eucalyptus", "mahogany", "mossbark", "asper", "cypress", null, "white", "bamboo", "rotten", "marshwood", null, null, null, "scorched", "varnished" };
-
-    public BlockDrawersPack (String blockName, int drawerCount, boolean halfDepth) {
-        super(Material.wood, blockName, drawerCount, halfDepth);
-
-        if (StorageDrawers.config.cache.addonSeparateVanilla)
-            setCreativeTab(ModCreativeTabs.tabStorageDrawers);
-        else
-            setCreativeTab(com.jaquadro.minecraft.storagedrawers.core.ModCreativeTabs.tabStorageDrawers);
-    }
-
-    @Override
-    public void getSubBlocks (Item item, CreativeTabs creativeTabs, List list) {
-        if (!StorageDrawers.config.cache.addonShowVanilla)
-            return;
-
-        for (int i = 0; i < textureNames.length; i++) {
-            if (textureNames[i] != null)
-                list.add(new ItemStack(item, 1, i));
-        }
-    }
-
-    @Override
-    @SideOnly(Side.CLIENT)
-    public void registerBlockIcons (IIconRegister register) {
-        super.registerBlockIcons(register);
-
-        String[] subtex = textureNames;
-
-        iconSide = new IIcon[subtex.length];
-        iconSideH = new IIcon[subtex.length];
-        iconSideV = new IIcon[subtex.length];
-        iconFront1 = new IIcon[subtex.length];
-        iconFront2 = new IIcon[subtex.length];
-        iconFront4 = new IIcon[subtex.length];
-        iconTrim = new IIcon[subtex.length];
-
-        for (int i = 0; i < subtex.length; i++) {
-            if (subtex[i] == null)
-                continue;
-
-            iconFront1[i] = register.registerIcon(StorageDrawersPack.MOD_ID + ":drawers_" + subtex[i] + "_front_1");
-            iconFront2[i] = register.registerIcon(StorageDrawersPack.MOD_ID + ":drawers_" + subtex[i] + "_front_2");
-            iconFront4[i] = register.registerIcon(StorageDrawersPack.MOD_ID + ":drawers_" + subtex[i] + "_front_4");
-            iconSide[i] = register.registerIcon(StorageDrawersPack.MOD_ID + ":drawers_" + subtex[i] + "_side");
-            iconSideV[i] = register.registerIcon(StorageDrawersPack.MOD_ID + ":drawers_" + subtex[i] + "_side_v");
-            iconSideH[i] = register.registerIcon(StorageDrawersPack.MOD_ID + ":drawers_" + subtex[i] + "_side_h");
-            iconTrim[i] = register.registerIcon(StorageDrawersPack.MOD_ID + ":drawers_" + subtex[i] + "_trim");
-        }
-    }
-}

packs/Erebus/src/com/jaquadro/minecraft/storagedrawers/packs/erebus/block/BlockSortingDrawersPack.java

@@ -1,69 +0,0 @@
-package com.jaquadro.minecraft.storagedrawers.packs.erebus.block;
-
-import com.jaquadro.minecraft.storagedrawers.StorageDrawers;
-import com.jaquadro.minecraft.storagedrawers.integration.refinedrelocation.BlockSortingDrawers;
-import com.jaquadro.minecraft.storagedrawers.packs.erebus.StorageDrawersPack;
-import com.jaquadro.minecraft.storagedrawers.packs.erebus.core.ModCreativeTabs;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.*;
-
-import java.util.List;
-
-public class BlockSortingDrawersPack extends BlockSortingDrawers
-{
-    public BlockSortingDrawersPack (String blockName, int drawerCount, boolean halfDepth) {
-        super(blockName, drawerCount, halfDepth);
-
-        if (StorageDrawers.config.cache.addonSeparateVanilla)
-            setCreativeTab(ModCreativeTabs.tabStorageDrawers);
-        else
-            setCreativeTab(com.jaquadro.minecraft.storagedrawers.core.ModCreativeTabs.tabStorageDrawers);
-    }
-
-    @Override
-    public void getSubBlocks (Item item, CreativeTabs creativeTabs, List list) {
-        if (!StorageDrawers.config.cache.addonShowVanilla)
-            return;
-
-        for (int i = 0; i < BlockDrawersPack.textureNames.length; i++) {
-            if (BlockDrawersPack.textureNames[i] != null)
-                list.add(new ItemStack(item, 1, i));
-        }
-    }
-
-    @Override
-    @SideOnly(Side.CLIENT)
-    public void registerBlockIcons (IIconRegister register) {
-        super.registerBlockIcons(register);
-
-        String[] subtex = BlockDrawersPack.textureNames;
-
-        iconSide = new IIcon[subtex.length];
-        iconSideH = new IIcon[subtex.length];
-        iconSideV = new IIcon[subtex.length];
-        iconFront1 = new IIcon[subtex.length];
-        iconFront2 = new IIcon[subtex.length];
-        iconFront4 = new IIcon[subtex.length];
-        iconTrim = new IIcon[subtex.length];
-        iconSort = new IIcon[subtex.length];
-
-        for (int i = 0; i < subtex.length; i++) {
-            if (subtex[i] == null)
-                continue;
-
-            iconFront1[i] = register.registerIcon(StorageDrawersPack.MOD_ID + ":drawers_" + subtex[i] + "_front_1");
-            iconFront2[i] = register.registerIcon(StorageDrawersPack.MOD_ID + ":drawers_" + subtex[i] + "_front_2");
-            iconFront4[i] = register.registerIcon(StorageDrawersPack.MOD_ID + ":drawers_" + subtex[i] + "_front_4");
-            iconSide[i] = register.registerIcon(StorageDrawersPack.MOD_ID + ":drawers_" + subtex[i] + "_side");
-            iconSideV[i] = register.registerIcon(StorageDrawersPack.MOD_ID + ":drawers_" + subtex[i] + "_side_v");
-            iconSideH[i] = register.registerIcon(StorageDrawersPack.MOD_ID + ":drawers_" + subtex[i] + "_side_h");
-            iconTrim[i] = register.registerIcon(StorageDrawersPack.MOD_ID + ":drawers_" + subtex[i] + "_trim");
-            iconSort[i] = register.registerIcon(StorageDrawersPack.MOD_ID + ":drawers_" + subtex[i] + "_sort");
-        }
-    }
-}

packs/Erebus/src/com/jaquadro/minecraft/storagedrawers/packs/erebus/block/BlockTrimPack.java

@@ -1,43 +0,0 @@
-package com.jaquadro.minecraft.storagedrawers.packs.erebus.block;
-
-import com.jaquadro.minecraft.storagedrawers.StorageDrawers;
-import com.jaquadro.minecraft.storagedrawers.block.BlockTrim;
-import com.jaquadro.minecraft.storagedrawers.packs.erebus.core.ModBlocks;
-import com.jaquadro.minecraft.storagedrawers.packs.erebus.core.ModCreativeTabs;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
-
-import java.util.List;
-
-public class BlockTrimPack extends BlockTrim
-{
-    public BlockTrimPack (String name) {
-        super(name);
-
-        if (StorageDrawers.config.cache.addonSeparateVanilla)
-            setCreativeTab(ModCreativeTabs.tabStorageDrawers);
-        else
-            setCreativeTab(com.jaquadro.minecraft.storagedrawers.core.ModCreativeTabs.tabStorageDrawers);
-    }
-
-    @Override
-    public void getSubBlocks (Item item, CreativeTabs creativeTabs, List list) {
-        if (!StorageDrawers.config.cache.addonShowVanilla)
-            return;
-
-        for (int i = 0; i < BlockDrawersPack.textureNames.length; i++) {
-            if (BlockDrawersPack.textureNames[i] != null)
-                list.add(new ItemStack(item, 1, i));
-        }
-    }
-
-    @Override
-    @SideOnly(Side.CLIENT)
-    public IIcon getIcon (int side, int meta) {
-        return ModBlocks.fullDrawers1.getIcon(0, meta);
-    }
-}

packs/Erebus/src/com/jaquadro/minecraft/storagedrawers/packs/erebus/core/DataResolver.java

@@ -0,0 +1,84 @@
+package com.jaquadro.minecraft.storagedrawers.packs.erebus.core;
+
+import com.jaquadro.minecraft.storagedrawers.api.pack.BlockConfiguration;
+import com.jaquadro.minecraft.storagedrawers.api.pack.BlockType;
+import com.jaquadro.minecraft.storagedrawers.api.pack.ExtendedDataResolver;
+import com.jaquadro.minecraft.storagedrawers.api.pack.StandardDataResolver;
+import cpw.mods.fml.common.registry.GameRegistry;
+import net.minecraft.block.Block;
+import net.minecraft.creativetab.CreativeTabs;
+
+public class DataResolver extends ExtendedDataResolver
+{
+    public static String[] blockNames = new String[] { "Baobab", "Eucalyptus", "Mahogany", "Mossbark", "Asper", "Cypress", null, "White", "Bamboo", "Rotten", "Marshwood", null, null, null, "Scorched", "Varnished" };
+    public static String[] textureNames = new String[] { "baobab", "eucalyptus", "mahogany", "mossbark", "asper", "cypress", null, "white", "bamboo", "rotten", "marshwood", null, null, null, "scorched", "varnished" };
+
+    public DataResolver (String modID) {
+        super(modID, blockNames);
+    }
+
+    @Override
+    public CreativeTabs getCreativeTabs (BlockType type) {
+        return ModCreativeTabs.getTabStorageDrawers();
+    }
+
+    @Override
+    public String getUnlocalizedName (int meta) {
+        if (!isValidMetaValue(meta))
+            return null;
+
+        return textureNames[meta];
+    }
+
+    @Override
+    public Block getBlock (BlockConfiguration blockConfig) {
+        switch (blockConfig.getBlockType()) {
+            case Drawers:
+                if (blockConfig.getDrawerCount() == 1)
+                    return ModBlocks.fullDrawers1;
+                if (blockConfig.getDrawerCount() == 2 && !blockConfig.isHalfDepth())
+                    return ModBlocks.fullDrawers2;
+                if (blockConfig.getDrawerCount() == 4 && !blockConfig.isHalfDepth())
+                    return ModBlocks.fullDrawers4;
+                if (blockConfig.getDrawerCount() == 2 && blockConfig.isHalfDepth())
+                    return ModBlocks.halfDrawers2;
+                if (blockConfig.getDrawerCount() == 4 && blockConfig.isHalfDepth())
+                    return ModBlocks.halfDrawers4;
+                break;
+            case DrawersSorting:
+                if (blockConfig.getDrawerCount() == 1)
+                    return RefinedRelocation.fullDrawers1;
+                if (blockConfig.getDrawerCount() == 2 && !blockConfig.isHalfDepth())
+                    return RefinedRelocation.fullDrawers2;
+                if (blockConfig.getDrawerCount() == 4 && !blockConfig.isHalfDepth())
+                    return RefinedRelocation.fullDrawers4;
+                if (blockConfig.getDrawerCount() == 2 && blockConfig.isHalfDepth())
+                    return RefinedRelocation.halfDrawers2;
+                if (blockConfig.getDrawerCount() == 4 && blockConfig.isHalfDepth())
+                    return RefinedRelocation.halfDrawers4;
+                break;
+            case Trim:
+                return ModBlocks.trim;
+            case TrimSorting:
+                return RefinedRelocation.trim;
+        }
+        return null;
+    }
+
+    @Override
+    public void init () {
+        Block planks = GameRegistry.findBlock("erebus", "planks");
+        for (int i = 0, p = 0; i < 6; i++, p++)
+            setPlankSlab(i, planks, p, GameRegistry.findBlock("erebus", getPlankName(getUnlocalizedName(i))), 0);
+        for (int i = 7, p = 7; i < 11; i++, p++)
+            setPlankSlab(i, planks, p, GameRegistry.findBlock("erebus", getPlankName(getUnlocalizedName(i))), 0);
+        for (int i = 14, p = 14; i < 15; i++, p++)
+            setPlankSlab(i, GameRegistry.findBlock("erebus", "planks_scorched"), p, GameRegistry.findBlock("erebus", getPlankName(getUnlocalizedName(i))), 0);
+        for (int i = 15, p = 15; i < 16; i++, p++)
+            setPlankSlab(i, GameRegistry.findBlock("erebus", "planks_varnished"), p, GameRegistry.findBlock("erebus", getPlankName(getUnlocalizedName(i))), 0);
+    }
+
+    private String getPlankName (String name) {
+        return "slabPlanks" + Character.toUpperCase(name.charAt(0)) + name.substring(1);
+    }
+}

packs/Erebus/src/com/jaquadro/minecraft/storagedrawers/packs/erebus/core/ModBlocks.java

@@ -1,57 +1,63 @@
 package com.jaquadro.minecraft.storagedrawers.packs.erebus.core;
 
-import com.jaquadro.minecraft.storagedrawers.StorageDrawers;
-import com.jaquadro.minecraft.storagedrawers.block.*;
-import com.jaquadro.minecraft.storagedrawers.config.ConfigManager;
-import com.jaquadro.minecraft.storagedrawers.integration.notenoughitems.NEIStorageDrawersConfig;
+import com.jaquadro.minecraft.storagedrawers.api.IStorageDrawersApi;
+import com.jaquadro.minecraft.storagedrawers.api.StorageDrawersApi;
+import com.jaquadro.minecraft.storagedrawers.api.config.IBlockConfig;
+import com.jaquadro.minecraft.storagedrawers.api.config.IUserConfig;
+import com.jaquadro.minecraft.storagedrawers.api.pack.BlockConfiguration;
+import com.jaquadro.minecraft.storagedrawers.api.pack.IPackBlockFactory;
+import com.jaquadro.minecraft.storagedrawers.api.pack.IPackDataResolver;
 import com.jaquadro.minecraft.storagedrawers.packs.erebus.StorageDrawersPack;
-import com.jaquadro.minecraft.storagedrawers.packs.erebus.block.BlockDrawersPack;
-import com.jaquadro.minecraft.storagedrawers.packs.erebus.block.BlockTrimPack;
-import com.jaquadro.minecraft.storagedrawers.packs.erebus.item.ItemDrawersPack;
-import com.jaquadro.minecraft.storagedrawers.packs.erebus.item.ItemTrimPack;
 import cpw.mods.fml.common.registry.GameData;
-import cpw.mods.fml.common.registry.GameRegistry;
 import net.minecraft.block.Block;
 
 public class ModBlocks
 {
-    public static BlockDrawers fullDrawers1;
-    public static BlockDrawers fullDrawers2;
-    public static BlockDrawers fullDrawers4;
-    public static BlockDrawers halfDrawers2;
-    public static BlockDrawers halfDrawers4;
-    public static BlockTrim trim;
+    public static Block fullDrawers1;
+    public static Block fullDrawers2;
+    public static Block fullDrawers4;
+    public static Block halfDrawers2;
+    public static Block halfDrawers4;
+    public static Block trim;
 
     public void init () {
-        fullDrawers1 = new BlockDrawersPack(makeName("fullDrawers1"), 1, false);
-        fullDrawers2 = new BlockDrawersPack(makeName("fullDrawers2"), 2, false);
-        fullDrawers4 = new BlockDrawersPack(makeName("fullDrawers4"), 4, false);
-        halfDrawers2 = new BlockDrawersPack(makeName("halfDrawers2"), 2, true);
-        halfDrawers4 = new BlockDrawersPack(makeName("halfDrawers4"), 4, true);
-        trim = new BlockTrimPack(makeName("trim"));
+        IStorageDrawersApi api = StorageDrawersApi.instance();
+        if (api == null)
+            return;
 
-        ConfigManager config = StorageDrawers.config;
+        IPackBlockFactory factory = api.packFactory();
+        IPackDataResolver resolver = StorageDrawersPack.instance.resolver;
 
-        if (config.isBlockEnabled("fulldrawers1"))
-            GameRegistry.registerBlock(fullDrawers1, ItemDrawersPack.class, "fullDrawers1");
-        if (config.isBlockEnabled("fulldrawers2"))
-            GameRegistry.registerBlock(fullDrawers2, ItemDrawersPack.class, "fullDrawers2");
-        if (config.isBlockEnabled("fulldrawers4"))
-            GameRegistry.registerBlock(fullDrawers4, ItemDrawersPack.class, "fullDrawers4");
-        if (config.isBlockEnabled("halfdrawers2"))
-            GameRegistry.registerBlock(halfDrawers2, ItemDrawersPack.class, "halfDrawers2");
-        if (config.isBlockEnabled("halfdrawers4"))
-            GameRegistry.registerBlock(halfDrawers4, ItemDrawersPack.class, "halfDrawers4");
-        if (config.isBlockEnabled("trim"))
-            GameRegistry.registerBlock(trim, ItemTrimPack.class, "trim");
+        fullDrawers1 = factory.createBlock(BlockConfiguration.BasicFull1, resolver);
+        fullDrawers2 = factory.createBlock(BlockConfiguration.BasicFull2, resolver);
+        fullDrawers4 = factory.createBlock(BlockConfiguration.BasicFull4, resolver);
+        halfDrawers2 = factory.createBlock(BlockConfiguration.BasicHalf2, resolver);
+        halfDrawers4 = factory.createBlock(BlockConfiguration.BasicHalf4, resolver);
+        trim = factory.createBlock(BlockConfiguration.Trim, resolver);
 
-        if (!config.cache.addonShowNEI) {
-            NEIStorageDrawersConfig.hideBlock(getQualifiedName(fullDrawers1));
-            NEIStorageDrawersConfig.hideBlock(getQualifiedName(fullDrawers2));
-            NEIStorageDrawersConfig.hideBlock(getQualifiedName(fullDrawers4));
-            NEIStorageDrawersConfig.hideBlock(getQualifiedName(halfDrawers2));
-            NEIStorageDrawersConfig.hideBlock(getQualifiedName(halfDrawers4));
-            NEIStorageDrawersConfig.hideBlock(getQualifiedName(trim));
+        IUserConfig config = api.userConfig();
+        IBlockConfig blockConfig = config.blockConfig();
+
+        if (blockConfig.isBlockEnabled(blockConfig.getBlockConfigName(BlockConfiguration.BasicFull1)))
+            factory.registerBlock(fullDrawers1, "fullDrawers1");
+        if (blockConfig.isBlockEnabled(blockConfig.getBlockConfigName(BlockConfiguration.BasicFull2)))
+            factory.registerBlock(fullDrawers2, "fullDrawers2");
+        if (blockConfig.isBlockEnabled(blockConfig.getBlockConfigName(BlockConfiguration.BasicFull4)))
+            factory.registerBlock(fullDrawers4, "fullDrawers4");
+        if (blockConfig.isBlockEnabled(blockConfig.getBlockConfigName(BlockConfiguration.BasicHalf2)))
+            factory.registerBlock(halfDrawers2, "halfDrawers2");
+        if (blockConfig.isBlockEnabled(blockConfig.getBlockConfigName(BlockConfiguration.BasicHalf4)))
+            factory.registerBlock(halfDrawers4, "halfDrawers4");
+        if (blockConfig.isBlockEnabled(blockConfig.getBlockConfigName(BlockConfiguration.Trim)))
+            factory.registerBlock(trim, "trim");
+
+        if (!config.addonConfig().showAddonItemsNEI()) {
+            factory.hideBlock(getQualifiedName(fullDrawers1));
+            factory.hideBlock(getQualifiedName(fullDrawers2));
+            factory.hideBlock(getQualifiedName(fullDrawers4));
+            factory.hideBlock(getQualifiedName(halfDrawers2));
+            factory.hideBlock(getQualifiedName(halfDrawers4));
+            factory.hideBlock(getQualifiedName(trim));
         }
     }
 

packs/Erebus/src/com/jaquadro/minecraft/storagedrawers/packs/erebus/core/ModCreativeTabs.java

@@ -1,7 +1,10 @@
 package com.jaquadro.minecraft.storagedrawers.packs.erebus.core;
 
-import com.jaquadro.minecraft.storagedrawers.StorageDrawers;
-import com.jaquadro.minecraft.storagedrawers.config.ConfigManager;
+import com.jaquadro.minecraft.storagedrawers.api.IStorageDrawersApi;
+import com.jaquadro.minecraft.storagedrawers.api.StorageDrawersApi;
+import com.jaquadro.minecraft.storagedrawers.api.config.IBlockConfig;
+import com.jaquadro.minecraft.storagedrawers.api.config.IUserConfig;
+import com.jaquadro.minecraft.storagedrawers.api.pack.BlockConfiguration;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.creativetab.CreativeTabs;
@@ -12,26 +15,47 @@ public final class ModCreativeTabs
 {
     private ModCreativeTabs () { }
 
-    public static final CreativeTabs tabStorageDrawers = new CreativeTabs("storageDrawersErebus") {
-        @Override
-        @SideOnly(Side.CLIENT)
-        public Item getTabIconItem () {
-            return getTabItem();
+    private static CreativeTabs tabStorageDrawers = null;
+
+    public static CreativeTabs getTabStorageDrawers () {
+        if (tabStorageDrawers != null)
+            return tabStorageDrawers;
+
+        IStorageDrawersApi api = StorageDrawersApi.instance();
+        if (api == null)
+            return null;
+
+        IUserConfig config = api.userConfig();
+        if (config.addonConfig().addonItemsUseSeparateTab() && config.addonConfig().showAddonItemsVanilla()) {
+            tabStorageDrawers = new CreativeTabs("storageDrawersErebus")
+            {
+                @Override
+                @SideOnly(Side.CLIENT)
+                public Item getTabIconItem () {
+                    return getTabItem();
+                }
+            };
         }
-    };
+
+        return tabStorageDrawers;
+    }
 
     private static Item getTabItem () {
-        ConfigManager config = StorageDrawers.config;
+        IStorageDrawersApi api = StorageDrawersApi.instance();
+        if (api == null)
+            return Item.getItemFromBlock(Blocks.chest);
 
-        if (config.isBlockEnabled("fulldrawers2"))
+        IBlockConfig blockConfig = api.userConfig().blockConfig();
+
+        if (blockConfig.isBlockEnabled(blockConfig.getBlockConfigName(BlockConfiguration.BasicFull2)))
             return Item.getItemFromBlock(ModBlocks.fullDrawers2);
-        if (config.isBlockEnabled("fulldrawers4"))
+        if (blockConfig.isBlockEnabled(blockConfig.getBlockConfigName(BlockConfiguration.BasicFull4)))
             return Item.getItemFromBlock(ModBlocks.fullDrawers4);
-        if (config.isBlockEnabled("fulldrawers1"))
+        if (blockConfig.isBlockEnabled(blockConfig.getBlockConfigName(BlockConfiguration.BasicFull1)))
             return Item.getItemFromBlock(ModBlocks.fullDrawers1);
-        if (config.isBlockEnabled("halfdrawers2"))
+        if (blockConfig.isBlockEnabled(blockConfig.getBlockConfigName(BlockConfiguration.BasicHalf2)))
             return Item.getItemFromBlock(ModBlocks.halfDrawers2);
-        if (config.isBlockEnabled("halfdrawers4"))
+        if (blockConfig.isBlockEnabled(blockConfig.getBlockConfigName(BlockConfiguration.BasicHalf4)))
             return Item.getItemFromBlock(ModBlocks.halfDrawers4);
 
         return Item.getItemFromBlock(Blocks.chest);

packs/Erebus/src/com/jaquadro/minecraft/storagedrawers/packs/erebus/core/ModRecipes.java

@@ -1,74 +0,0 @@
-package com.jaquadro.minecraft.storagedrawers.packs.erebus.core;
-
-import com.jaquadro.minecraft.storagedrawers.StorageDrawers;
-import com.jaquadro.minecraft.storagedrawers.config.ConfigManager;
-import com.jaquadro.minecraft.storagedrawers.core.ModItems;
-import com.jaquadro.minecraft.storagedrawers.packs.erebus.block.BlockDrawersPack;
-import cpw.mods.fml.common.registry.GameRegistry;
-import net.minecraft.block.Block;
-import net.minecraft.init.Blocks;
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.oredict.OreDictionary;
-
-public class ModRecipes
-{
-    public void init () {
-        ConfigManager config = StorageDrawers.config;
-
-        Block planks = GameRegistry.findBlock("erebus", "planks");
-
-        for (int i = 0; i < BlockDrawersPack.blockNames.length; i++) {
-            if (BlockDrawersPack.blockNames[i] == null)
-                continue;
-
-            if (BlockDrawersPack.blockNames[i].equals("Scorched"))
-                planks = GameRegistry.findBlock("erebus", "planks_scorched");
-            else if (BlockDrawersPack.blockNames[i].equals("Varnished"))
-                planks = GameRegistry.findBlock("erebus", "planks_varnished");
-
-            if (planks != null) {
-                if (config.isBlockEnabled("fulldrawers1"))
-                    GameRegistry.addRecipe(new ItemStack(ModBlocks.fullDrawers1, config.getBlockRecipeOutput("fulldrawers1"), i), "xxx", " y ", "xxx",
-                        'x', new ItemStack(planks, 1, i), 'y', Blocks.chest);
-                if (config.isBlockEnabled("fulldrawers2"))
-                    GameRegistry.addRecipe(new ItemStack(ModBlocks.fullDrawers2, config.getBlockRecipeOutput("fulldrawers2"), i), "xyx", "xxx", "xyx",
-                        'x', new ItemStack(planks, 1, i), 'y', Blocks.chest);
-                if (config.isBlockEnabled("fulldrawers4"))
-                    GameRegistry.addRecipe(new ItemStack(ModBlocks.fullDrawers4, config.getBlockRecipeOutput("fulldrawers4"), i), "yxy", "xxx", "yxy",
-                        'x', new ItemStack(planks, 1, i), 'y', Blocks.chest);
-                if (config.isBlockEnabled("trim")) {
-                    GameRegistry.addRecipe(new ItemStack(ModBlocks.trim, config.getBlockRecipeOutput("trim"), i), "xyx", "yyy", "xyx",
-                        'x', Items.stick, 'y', new ItemStack(planks, 1, i));
-                }
-            }
-
-            Block slab = GameRegistry.findBlock("erebus", "slabPlanks" + BlockDrawersPack.blockNames[i]);
-
-            if (slab != null) {
-                if (config.isBlockEnabled("halfdrawers2"))
-                    GameRegistry.addRecipe(new ItemStack(ModBlocks.halfDrawers2, config.getBlockRecipeOutput("halfdrawers2"), i), "xyx", "xxx", "xyx",
-                        'x', new ItemStack(slab, 1, i), 'y', Blocks.chest);
-                if (config.isBlockEnabled("halfdrawers4"))
-                    GameRegistry.addRecipe(new ItemStack(ModBlocks.halfDrawers4, config.getBlockRecipeOutput("halfdrawers4"), i), "yxy", "xxx", "yxy",
-                        'x', new ItemStack(slab, 1, i), 'y', Blocks.chest);
-            }
-        }
-
-        if (config.isBlockEnabled("fulldrawers1"))
-            GameRegistry.addRecipe(new ItemStack(ModItems.upgradeTemplate, 2), "xxx", "xyx", "xxx",
-                'x', Items.stick, 'y', new ItemStack(ModBlocks.fullDrawers1, 1, OreDictionary.WILDCARD_VALUE));
-        if (config.isBlockEnabled("fulldrawers2"))
-            GameRegistry.addRecipe(new ItemStack(ModItems.upgradeTemplate, 2), "xxx", "xyx", "xxx",
-                'x', Items.stick, 'y', new ItemStack(ModBlocks.fullDrawers2, 1, OreDictionary.WILDCARD_VALUE));
-        if (config.isBlockEnabled("halfdrawers2"))
-            GameRegistry.addRecipe(new ItemStack(ModItems.upgradeTemplate, 2), "xxx", "xyx", "xxx",
-                'x', Items.stick, 'y', new ItemStack(ModBlocks.halfDrawers2, 1, OreDictionary.WILDCARD_VALUE));
-        if (config.isBlockEnabled("fulldrawers4"))
-            GameRegistry.addRecipe(new ItemStack(ModItems.upgradeTemplate, 2), "xxx", "xyx", "xxx",
-                'x', Items.stick, 'y', new ItemStack(ModBlocks.fullDrawers4, 1, OreDictionary.WILDCARD_VALUE));
-        if (config.isBlockEnabled("halfdrawers4"))
-            GameRegistry.addRecipe(new ItemStack(ModItems.upgradeTemplate, 2), "xxx", "xyx", "xxx",
-                'x', Items.stick, 'y', new ItemStack(ModBlocks.halfDrawers4, 1, OreDictionary.WILDCARD_VALUE));
-    }
-}

packs/Erebus/src/com/jaquadro/minecraft/storagedrawers/packs/erebus/core/RefinedRelocation.java

@@ -1,83 +1,73 @@
 package com.jaquadro.minecraft.storagedrawers.packs.erebus.core;
 
-import com.jaquadro.minecraft.storagedrawers.StorageDrawers;
-import com.jaquadro.minecraft.storagedrawers.config.ConfigManager;
-import com.jaquadro.minecraft.storagedrawers.integration.notenoughitems.NEIStorageDrawersConfig;
-import com.jaquadro.minecraft.storagedrawers.integration.refinedrelocation.*;
-import com.jaquadro.minecraft.storagedrawers.packs.erebus.block.BlockDrawersPack;
-import com.jaquadro.minecraft.storagedrawers.packs.erebus.block.BlockSortingDrawersPack;
-import com.jaquadro.minecraft.storagedrawers.packs.erebus.item.ItemSortingDrawersPack;
+import com.jaquadro.minecraft.storagedrawers.api.IStorageDrawersApi;
+import com.jaquadro.minecraft.storagedrawers.api.StorageDrawersApi;
+import com.jaquadro.minecraft.storagedrawers.api.config.IBlockConfig;
+import com.jaquadro.minecraft.storagedrawers.api.config.IUserConfig;
+import com.jaquadro.minecraft.storagedrawers.api.pack.BlockConfiguration;
+import com.jaquadro.minecraft.storagedrawers.api.pack.IPackBlockFactory;
+import com.jaquadro.minecraft.storagedrawers.api.pack.IPackDataResolver;
+import com.jaquadro.minecraft.storagedrawers.packs.erebus.StorageDrawersPack;
 import cpw.mods.fml.common.Loader;
-import cpw.mods.fml.common.registry.GameRegistry;
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemStack;
+import net.minecraft.block.Block;
 
 public class RefinedRelocation
 {
-    public static BlockSortingDrawersPack fullDrawers1;
-    public static BlockSortingDrawersPack fullDrawers2;
-    public static BlockSortingDrawersPack fullDrawers4;
-    public static BlockSortingDrawersPack halfDrawers2;
-    public static BlockSortingDrawersPack halfDrawers4;
+    public static Block fullDrawers1;
+    public static Block fullDrawers2;
+    public static Block fullDrawers4;
+    public static Block halfDrawers2;
+    public static Block halfDrawers4;
+    public static Block trim;
 
     public static void init () {
-        ConfigManager config = StorageDrawers.config;
-        if (!Loader.isModLoaded("RefinedRelocation") || !config.cache.enableRefinedRelocationIntegration)
+        IStorageDrawersApi api = StorageDrawersApi.instance();
+        if (api == null)
             return;
 
-        fullDrawers1 = new BlockSortingDrawersPack(ModBlocks.makeName("fullDrawers1"), 1, false);
-        fullDrawers2 = new BlockSortingDrawersPack(ModBlocks.makeName("fullDrawers2"), 2, false);
-        fullDrawers4 = new BlockSortingDrawersPack(ModBlocks.makeName("fullDrawers4"), 4, false);
-        halfDrawers2 = new BlockSortingDrawersPack(ModBlocks.makeName("halfDrawers2"), 2, true);
-        halfDrawers4 = new BlockSortingDrawersPack(ModBlocks.makeName("halfDrawers4"), 4, true);
-
-        SortingBlockRegistry.register(ModBlocks.fullDrawers1, fullDrawers1);
-        SortingBlockRegistry.register(ModBlocks.fullDrawers2, fullDrawers2);
-        SortingBlockRegistry.register(ModBlocks.fullDrawers4, fullDrawers4);
-        SortingBlockRegistry.register(ModBlocks.halfDrawers2, halfDrawers2);
-        SortingBlockRegistry.register(ModBlocks.halfDrawers4, halfDrawers4);
-
-        if (config.isBlockEnabled("fulldrawers1"))
-            GameRegistry.registerBlock(fullDrawers1, ItemSortingDrawersPack.class, "fullDrawersSort1");
-        if (config.isBlockEnabled("fulldrawers2"))
-            GameRegistry.registerBlock(fullDrawers2, ItemSortingDrawersPack.class, "fullDrawersSort2");
-        if (config.isBlockEnabled("fulldrawers4"))
-            GameRegistry.registerBlock(fullDrawers4, ItemSortingDrawersPack.class, "fullDrawersSort4");
-        if (config.isBlockEnabled("halfdrawers2"))
-            GameRegistry.registerBlock(halfDrawers2, ItemSortingDrawersPack.class, "halfDrawersSort2");
-        if (config.isBlockEnabled("halfdrawers4"))
-            GameRegistry.registerBlock(halfDrawers4, ItemSortingDrawersPack.class, "halfDrawersSort4");
-
-        if (!config.cache.addonShowNEI) {
-            NEIStorageDrawersConfig.hideBlock(ModBlocks.getQualifiedName(fullDrawers1));
-            NEIStorageDrawersConfig.hideBlock(ModBlocks.getQualifiedName(fullDrawers2));
-            NEIStorageDrawersConfig.hideBlock(ModBlocks.getQualifiedName(fullDrawers4));
-            NEIStorageDrawersConfig.hideBlock(ModBlocks.getQualifiedName(halfDrawers2));
-            NEIStorageDrawersConfig.hideBlock(ModBlocks.getQualifiedName(halfDrawers4));
-        }
-    }
-
-    public static void postInit () {
-        ConfigManager config = StorageDrawers.config;
-        if (!Loader.isModLoaded("RefinedRelocation") || !config.cache.enableRefinedRelocationIntegration)
+        if (!Loader.isModLoaded("RefinedRelocation") || !api.userConfig().integrationConfig().isRefinedRelocationEnabled())
             return;
 
-        for (int i = 0; i < BlockDrawersPack.textureNames.length; i++) {
-            if (config.isBlockEnabled("fulldrawers1"))
-                GameRegistry.addRecipe(new ItemStack(fullDrawers1, 1, i), "x x", " y ", "x x",
-                    'x', Items.gold_nugget, 'y', new ItemStack(ModBlocks.fullDrawers1, 1, i));
-            if (config.isBlockEnabled("fulldrawers2"))
-                GameRegistry.addRecipe(new ItemStack(fullDrawers2, 1, i), "x x", " y ", "x x",
-                    'x', Items.gold_nugget, 'y', new ItemStack(ModBlocks.fullDrawers2, 1, i));
-            if (config.isBlockEnabled("halfdrawers2"))
-                GameRegistry.addRecipe(new ItemStack(halfDrawers2, 1, i), "x x", " y ", "x x",
-                    'x', Items.gold_nugget, 'y', new ItemStack(ModBlocks.halfDrawers2, 1, i));
-            if (config.isBlockEnabled("fulldrawers4"))
-                GameRegistry.addRecipe(new ItemStack(fullDrawers4, 1, i), "x x", " y ", "x x",
-                    'x', Items.gold_nugget, 'y', new ItemStack(ModBlocks.fullDrawers4, 1, i));
-            if (config.isBlockEnabled("halfdrawers4"))
-                GameRegistry.addRecipe(new ItemStack(halfDrawers4, 1, i), "x x", " y ", "x x",
-                    'x', Items.gold_nugget, 'y', new ItemStack(ModBlocks.halfDrawers4, 1, i));
+        IPackBlockFactory factory = api.packFactory();
+        IPackDataResolver resolver = StorageDrawersPack.instance.resolver;
+
+        fullDrawers1 = factory.createBlock(BlockConfiguration.SortingFull1, resolver);
+        fullDrawers2 = factory.createBlock(BlockConfiguration.SortingFull2, resolver);
+        fullDrawers4 = factory.createBlock(BlockConfiguration.SortingFull4, resolver);
+        halfDrawers2 = factory.createBlock(BlockConfiguration.SortingHalf2, resolver);
+        halfDrawers4 = factory.createBlock(BlockConfiguration.SortingHalf4, resolver);
+        trim = factory.createBlock(BlockConfiguration.TrimSorting, resolver);
+
+        factory.bindSortingBlock(ModBlocks.fullDrawers1, fullDrawers1);
+        factory.bindSortingBlock(ModBlocks.fullDrawers2, fullDrawers2);
+        factory.bindSortingBlock(ModBlocks.fullDrawers4, fullDrawers4);
+        factory.bindSortingBlock(ModBlocks.halfDrawers2, halfDrawers2);
+        factory.bindSortingBlock(ModBlocks.halfDrawers4, halfDrawers4);
+        factory.bindSortingBlock(ModBlocks.trim, trim);
+
+        IUserConfig config = api.userConfig();
+        IBlockConfig blockConfig = config.blockConfig();
+
+        if (blockConfig.isBlockEnabled(blockConfig.getBlockConfigName(BlockConfiguration.SortingFull1)))
+            factory.registerBlock(fullDrawers1, "fullDrawersSort1");
+        if (blockConfig.isBlockEnabled(blockConfig.getBlockConfigName(BlockConfiguration.SortingFull2)))
+            factory.registerBlock(fullDrawers2, "fullDrawersSort2");
+        if (blockConfig.isBlockEnabled(blockConfig.getBlockConfigName(BlockConfiguration.SortingFull4)))
+            factory.registerBlock(fullDrawers4, "fullDrawersSort4");
+        if (blockConfig.isBlockEnabled(blockConfig.getBlockConfigName(BlockConfiguration.SortingHalf2)))
+            factory.registerBlock(halfDrawers2, "halfDrawersSort2");
+        if (blockConfig.isBlockEnabled(blockConfig.getBlockConfigName(BlockConfiguration.SortingHalf4)))
+            factory.registerBlock(halfDrawers4, "halfDrawersSort4");
+        if (blockConfig.isBlockEnabled(blockConfig.getBlockConfigName(BlockConfiguration.TrimSorting)))
+            factory.registerBlock(trim, "trimSort");
+
+        if (!config.addonConfig().showAddonItemsNEI()) {
+            factory.hideBlock(ModBlocks.getQualifiedName(fullDrawers1));
+            factory.hideBlock(ModBlocks.getQualifiedName(fullDrawers2));
+            factory.hideBlock(ModBlocks.getQualifiedName(fullDrawers4));
+            factory.hideBlock(ModBlocks.getQualifiedName(halfDrawers2));
+            factory.hideBlock(ModBlocks.getQualifiedName(halfDrawers4));
+            factory.hideBlock(ModBlocks.getQualifiedName(trim));
         }
     }
 }

packs/Erebus/src/com/jaquadro/minecraft/storagedrawers/packs/erebus/item/ItemDrawersPack.java

@@ -1,33 +0,0 @@
-package com.jaquadro.minecraft.storagedrawers.packs.erebus.item;
-
-import com.jaquadro.minecraft.storagedrawers.StorageDrawers;
-import com.jaquadro.minecraft.storagedrawers.config.ConfigManager;
-import com.jaquadro.minecraft.storagedrawers.item.ItemDrawers;
-import com.jaquadro.minecraft.storagedrawers.packs.erebus.block.BlockDrawersPack;
-import com.jaquadro.minecraft.storagedrawers.packs.erebus.core.ModBlocks;
-import net.minecraft.block.Block;
-
-public class ItemDrawersPack extends ItemDrawers
-{
-    public ItemDrawersPack (Block block) {
-        super(block, BlockDrawersPack.textureNames);
-    }
-
-    protected int getCapacityForBlock (Block block) {
-        ConfigManager config = StorageDrawers.config;
-        int count = 0;
-
-        if (block == ModBlocks.fullDrawers1)
-            count = config.getBlockBaseStorage("fulldrawers1");
-        else if (block == ModBlocks.fullDrawers2)
-            count = config.getBlockBaseStorage("fulldrawers2");
-        else if (block == ModBlocks.fullDrawers4)
-            count = config.getBlockBaseStorage("fulldrawers4");
-        else if (block == ModBlocks.halfDrawers2)
-            count = config.getBlockBaseStorage("halfdrawers2");
-        else if (block == ModBlocks.halfDrawers4)
-            count = config.getBlockBaseStorage("halfdrawers4");
-
-        return count;
-    }
-}

packs/Erebus/src/com/jaquadro/minecraft/storagedrawers/packs/erebus/item/ItemSortingDrawersPack.java

@@ -1,49 +0,0 @@
-package com.jaquadro.minecraft.storagedrawers.packs.erebus.item;
-
-import com.jaquadro.minecraft.storagedrawers.StorageDrawers;
-import com.jaquadro.minecraft.storagedrawers.config.ConfigManager;
-import com.jaquadro.minecraft.storagedrawers.packs.erebus.core.RefinedRelocation;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.block.Block;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.StatCollector;
-
-import java.util.List;
-
-public class ItemSortingDrawersPack extends ItemDrawersPack
-{
-    public ItemSortingDrawersPack (Block block) {
-        super(block);
-    }
-
-    @Override
-    @SideOnly(Side.CLIENT)
-    public void addInformation (ItemStack itemStack, EntityPlayer player, List list, boolean par4) {
-        super.addInformation(itemStack, player, list, par4);
-
-        Block block = Block.getBlockFromItem(itemStack.getItem());
-        list.add(EnumChatFormatting.YELLOW + StatCollector.translateToLocalFormatted("storageDrawers.waila.sorting"));
-    }
-
-    @Override
-    protected int getCapacityForBlock (Block block) {
-        ConfigManager config = StorageDrawers.config;
-        int count = 0;
-
-        if (block == RefinedRelocation.fullDrawers1)
-            count = config.getBlockBaseStorage("fulldrawers1");
-        else if (block == RefinedRelocation.fullDrawers2)
-            count = config.getBlockBaseStorage("fulldrawers2");
-        else if (block == RefinedRelocation.fullDrawers4)
-            count = config.getBlockBaseStorage("fulldrawers4");
-        else if (block == RefinedRelocation.halfDrawers2)
-            count = config.getBlockBaseStorage("halfdrawers2");
-        else if (block == RefinedRelocation.halfDrawers4)
-            count = config.getBlockBaseStorage("halfdrawers4");
-
-        return count;
-    }
-}

packs/Erebus/src/com/jaquadro/minecraft/storagedrawers/packs/erebus/item/ItemTrimPack.java

@@ -1,12 +0,0 @@
-package com.jaquadro.minecraft.storagedrawers.packs.erebus.item;
-
-import com.jaquadro.minecraft.storagedrawers.item.ItemTrim;
-import com.jaquadro.minecraft.storagedrawers.packs.erebus.block.BlockDrawersPack;
-import net.minecraft.block.Block;
-
-public class ItemTrimPack extends ItemTrim
-{
-    public ItemTrimPack (Block block) {
-        super(block, BlockDrawersPack.textureNames);
-    }
-}

packs/Forestry/build.gradle

@@ -17,7 +17,7 @@ buildscript {
 
 apply plugin: 'forge'
 
-version = "1.7.10-1.0.1"
+version = "1.7.10-1.1.0"
 group= "com.jaquadro.minecraft.storagedrawers" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "StorageDrawers-Forestry"
 
@@ -26,7 +26,7 @@ minecraft {
     assetDir = "../../runtime/assets"
 
     replace '@VERSION@', project.version
-    replace 'required-after:StorageDrawers', "required-after:StorageDrawers@[1.5.4,)"
+    replace 'required-after:StorageDrawers', "required-after:StorageDrawers@[1.7.5,)"
 }
 
 sourceSets.main {
@@ -39,7 +39,7 @@ sourceSets.main {
 }
 
 dependencies {
-
+    compile project(path: ':', transitive: false)
 }
 
 processResources

packs/Forestry/src/com/jaquadro/minecraft/storagedrawers/packs/forestry/StorageDrawersPack.java

@@ -1,7 +1,10 @@
 package com.jaquadro.minecraft.storagedrawers.packs.forestry;
 
+import com.jaquadro.minecraft.storagedrawers.api.IStorageDrawersApi;
+import com.jaquadro.minecraft.storagedrawers.api.StorageDrawersApi;
+import com.jaquadro.minecraft.storagedrawers.api.pack.IExtendedDataResolver;
+import com.jaquadro.minecraft.storagedrawers.packs.forestry.core.DataResolver;
 import com.jaquadro.minecraft.storagedrawers.packs.forestry.core.ModBlocks;
-import com.jaquadro.minecraft.storagedrawers.packs.forestry.core.ModRecipes;
 import com.jaquadro.minecraft.storagedrawers.packs.forestry.core.RefinedRelocation;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.SidedProxy;
@@ -17,8 +20,12 @@ public class StorageDrawersPack
     public static final String MOD_VERSION = "@VERSION@";
     public static final String SOURCE_PATH = "com.jaquadro.minecraft.storagedrawers.packs.forestry.";
 
+    public DataResolver[] resolvers = new DataResolver[] {
+        new DataResolver(MOD_ID, 0),
+        new DataResolver(MOD_ID, 1)
+    };
+
     public ModBlocks blocks = new ModBlocks();
-    public ModRecipes recipes = new ModRecipes();
 
     @Mod.Instance(MOD_ID)
     public static StorageDrawersPack instance;
@@ -34,11 +41,16 @@ public class StorageDrawersPack
     @Mod.EventHandler
     public void init (FMLInitializationEvent event) {
         RefinedRelocation.init();
-        recipes.init();
+        for (DataResolver resolver : resolvers)
+            resolver.init();
     }
 
     @Mod.EventHandler
     public void postInit (FMLPostInitializationEvent event) {
-        RefinedRelocation.postInit();
+        IStorageDrawersApi api = StorageDrawersApi.instance();
+        if (api != null) {
+            for (IExtendedDataResolver resolver : resolvers)
+                api.registerStandardPackRecipes(resolver);
+        }
     }
 }

packs/Forestry/src/com/jaquadro/minecraft/storagedrawers/packs/forestry/block/BlockDrawersPack.java

@@ -1,78 +0,0 @@
-package com.jaquadro.minecraft.storagedrawers.packs.forestry.block;
-
-import com.jaquadro.minecraft.storagedrawers.StorageDrawers;
-import com.jaquadro.minecraft.storagedrawers.block.BlockDrawers;
-import com.jaquadro.minecraft.storagedrawers.packs.forestry.StorageDrawersPack;
-import com.jaquadro.minecraft.storagedrawers.packs.forestry.core.ModCreativeTabs;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.block.material.Material;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.*;
-
-import java.util.List;
-
-public class BlockDrawersPack extends BlockDrawers
-{
-    public static String[] textureNames1 = new String[] { "larch", "teak", "acacia", "lime", "chestnut", "wenge", "baobab", "sequoia", "kapok", "ebony", "mahogany", "balsa", "willow", "walnut", "greenheart", "cherry"};
-    public static String[] textureNames2 = new String[] { "mahoe", "poplar", "palm", "papaya", "pine", "plum", "maple", "citrus", "giganteum", "ipe", "padauk", "cocobolo", "zebrawood" };
-
-    private String[] blockTextures;
-
-    public BlockDrawersPack (String blockName, int drawerCount, boolean halfDepth, int textureGroup) {
-        super(Material.wood, blockName, drawerCount, halfDepth);
-
-        if (textureGroup == 0)
-            blockTextures = textureNames1;
-        else if (textureGroup == 1)
-            blockTextures = textureNames2;
-
-        if (StorageDrawers.config.cache.addonSeparateVanilla)
-            setCreativeTab(ModCreativeTabs.tabStorageDrawers);
-        else
-            setCreativeTab(com.jaquadro.minecraft.storagedrawers.core.ModCreativeTabs.tabStorageDrawers);
-    }
-
-    @Override
-    public void getSubBlocks (Item item, CreativeTabs creativeTabs, List list) {
-        if (!StorageDrawers.config.cache.addonShowVanilla)
-            return;
-
-        for (int i = 0; i < blockTextures.length; i++) {
-            if (blockTextures[i] != null)
-                list.add(new ItemStack(item, 1, i));
-        }
-    }
-
-    @Override
-    @SideOnly(Side.CLIENT)
-    public void registerBlockIcons (IIconRegister register) {
-        super.registerBlockIcons(register);
-
-        String[] subtex = blockTextures;
-
-        iconSide = new IIcon[subtex.length];
-        iconSideH = new IIcon[subtex.length];
-        iconSideV = new IIcon[subtex.length];
-        iconFront1 = new IIcon[subtex.length];
-        iconFront2 = new IIcon[subtex.length];
-        iconFront4 = new IIcon[subtex.length];
-        iconTrim = new IIcon[subtex.length];
-
-        for (int i = 0; i < subtex.length; i++) {
-            if (subtex[i] == null)
-                continue;
-
-            iconFront1[i] = register.registerIcon(StorageDrawersPack.MOD_ID + ":drawers_" + subtex[i] + "_front_1");
-            iconFront2[i] = register.registerIcon(StorageDrawersPack.MOD_ID + ":drawers_" + subtex[i] + "_front_2");
-            iconFront4[i] = register.registerIcon(StorageDrawersPack.MOD_ID + ":drawers_" + subtex[i] + "_front_4");
-            iconSide[i] = register.registerIcon(StorageDrawersPack.MOD_ID + ":drawers_" + subtex[i] + "_side");
-            iconSideV[i] = register.registerIcon(StorageDrawersPack.MOD_ID + ":drawers_" + subtex[i] + "_side_v");
-            iconSideH[i] = register.registerIcon(StorageDrawersPack.MOD_ID + ":drawers_" + subtex[i] + "_side_h");
-            iconTrim[i] = register.registerIcon(StorageDrawersPack.MOD_ID + ":drawers_" + subtex[i] + "_trim");
-        }
-    }
-}

packs/Forestry/src/com/jaquadro/minecraft/storagedrawers/packs/forestry/block/BlockSortingDrawersPack.java

@@ -1,76 +0,0 @@
-package com.jaquadro.minecraft.storagedrawers.packs.forestry.block;
-
-import com.jaquadro.minecraft.storagedrawers.StorageDrawers;
-import com.jaquadro.minecraft.storagedrawers.integration.refinedrelocation.BlockSortingDrawers;
-import com.jaquadro.minecraft.storagedrawers.packs.forestry.core.ModCreativeTabs;
-import com.jaquadro.minecraft.storagedrawers.packs.forestry.StorageDrawersPack;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.*;
-
-import java.util.List;
-
-public class BlockSortingDrawersPack extends BlockSortingDrawers
-{
-    private String[] blockTextures;
-
-    public BlockSortingDrawersPack (String blockName, int drawerCount, boolean halfDepth, int textureGroup) {
-        super(blockName, drawerCount, halfDepth);
-
-        if (textureGroup == 0)
-            blockTextures = BlockDrawersPack.textureNames1;
-        else if (textureGroup == 1)
-            blockTextures = BlockDrawersPack.textureNames2;
-
-        if (StorageDrawers.config.cache.addonSeparateVanilla)
-            setCreativeTab(ModCreativeTabs.tabStorageDrawers);
-        else
-            setCreativeTab(com.jaquadro.minecraft.storagedrawers.core.ModCreativeTabs.tabStorageDrawers);
-    }
-
-    @Override
-    public void getSubBlocks (Item item, CreativeTabs creativeTabs, List list) {
-        if (!StorageDrawers.config.cache.addonShowVanilla)
-            return;
-
-        for (int i = 0; i < blockTextures.length; i++) {
-            if (blockTextures[i] != null)
-                list.add(new ItemStack(item, 1, i));
-        }
-    }
-
-    @Override
-    @SideOnly(Side.CLIENT)
-    public void registerBlockIcons (IIconRegister register) {
-        super.registerBlockIcons(register);
-
-        String[] subtex = blockTextures;
-
-        iconSide = new IIcon[subtex.length];
-        iconSideH = new IIcon[subtex.length];
-        iconSideV = new IIcon[subtex.length];
-        iconFront1 = new IIcon[subtex.length];
-        iconFront2 = new IIcon[subtex.length];
-        iconFront4 = new IIcon[subtex.length];
-        iconTrim = new IIcon[subtex.length];
-        iconSort = new IIcon[subtex.length];
-
-        for (int i = 0; i < subtex.length; i++) {
-            if (subtex[i] == null)
-                continue;
-
-            iconFront1[i] = register.registerIcon(StorageDrawersPack.MOD_ID + ":drawers_" + subtex[i] + "_front_1");
-            iconFront2[i] = register.registerIcon(StorageDrawersPack.MOD_ID + ":drawers_" + subtex[i] + "_front_2");
-            iconFront4[i] = register.registerIcon(StorageDrawersPack.MOD_ID + ":drawers_" + subtex[i] + "_front_4");
-            iconSide[i] = register.registerIcon(StorageDrawersPack.MOD_ID + ":drawers_" + subtex[i] + "_side");
-            iconSideV[i] = register.registerIcon(StorageDrawersPack.MOD_ID + ":drawers_" + subtex[i] + "_side_v");
-            iconSideH[i] = register.registerIcon(StorageDrawersPack.MOD_ID + ":drawers_" + subtex[i] + "_side_h");
-            iconTrim[i] = register.registerIcon(StorageDrawersPack.MOD_ID + ":drawers_" + subtex[i] + "_trim");
-            iconSort[i] = register.registerIcon(StorageDrawersPack.MOD_ID + ":drawers_" + subtex[i] + "_sort");
-        }
-    }
-}

packs/Forestry/src/com/jaquadro/minecraft/storagedrawers/packs/forestry/block/BlockTrimPack.java

@@ -1,53 +0,0 @@
-package com.jaquadro.minecraft.storagedrawers.packs.forestry.block;
-
-import com.jaquadro.minecraft.storagedrawers.StorageDrawers;
-import com.jaquadro.minecraft.storagedrawers.block.BlockTrim;
-import com.jaquadro.minecraft.storagedrawers.packs.forestry.core.ModBlocks;
-import com.jaquadro.minecraft.storagedrawers.packs.forestry.core.ModCreativeTabs;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
-
-import java.util.List;
-
-public class BlockTrimPack extends BlockTrim
-{
-    private String[] blockTextures;
-
-    public BlockTrimPack (String name, int textureGroup) {
-        super(name);
-
-        if (textureGroup == 0)
-            blockTextures = BlockDrawersPack.textureNames1;
-        else if (textureGroup == 1)
-            blockTextures = BlockDrawersPack.textureNames2;
-
-        if (StorageDrawers.config.cache.addonSeparateVanilla)
-            setCreativeTab(ModCreativeTabs.tabStorageDrawers);
-        else
-            setCreativeTab(com.jaquadro.minecraft.storagedrawers.core.ModCreativeTabs.tabStorageDrawers);
-    }
-
-    @Override
-    public void getSubBlocks (Item item, CreativeTabs creativeTabs, List list) {
-        if (!StorageDrawers.config.cache.addonShowVanilla)
-            return;
-
-        for (int i = 0; i < blockTextures.length; i++) {
-            if (blockTextures[i] != null)
-                list.add(new ItemStack(item, 1, i));
-        }
-    }
-
-    @Override
-    @SideOnly(Side.CLIENT)
-    public IIcon getIcon (int side, int meta) {
-        if (blockTextures == BlockDrawersPack.textureNames1)
-            return ModBlocks.fullDrawers1A.getIcon(0, meta);
-        else
-            return ModBlocks.fullDrawers1B.getIcon(0, meta);
-    }
-}

packs/Forestry/src/com/jaquadro/minecraft/storagedrawers/packs/forestry/core/DataResolver.java

@@ -0,0 +1,81 @@
+package com.jaquadro.minecraft.storagedrawers.packs.forestry.core;
+
+import com.jaquadro.minecraft.storagedrawers.api.pack.BlockConfiguration;
+import com.jaquadro.minecraft.storagedrawers.api.pack.BlockType;
+import com.jaquadro.minecraft.storagedrawers.api.pack.ExtendedDataResolver;
+import cpw.mods.fml.common.registry.GameRegistry;
+import net.minecraft.block.Block;
+import net.minecraft.creativetab.CreativeTabs;
+
+public class DataResolver extends ExtendedDataResolver
+{
+    public static String[][] textureBank = new String[][] {
+        new String[] { "larch", "teak", "acacia", "lime", "chestnut", "wenge", "baobab", "sequoia", "kapok", "ebony", "mahogany", "balsa", "willow", "walnut", "greenheart", "cherry" },
+        new String[] { "mahoe", "poplar", "palm", "papaya", "pine", "plum", "maple", "citrus", "giganteum", "ipe", "padauk", "cocobolo", "zebrawood" }
+    };
+
+    private int bank;
+
+    public DataResolver (String modID, int bankNumber) {
+        super(modID, textureBank[bankNumber]);
+        bank = bankNumber;
+    }
+
+    @Override
+    public CreativeTabs getCreativeTabs (BlockType type) {
+        return ModCreativeTabs.getTabStorageDrawers();
+    }
+
+    @Override
+    public Block getBlock (BlockConfiguration blockConfig) {
+        switch (blockConfig.getBlockType()) {
+            case Drawers:
+                if (blockConfig.getDrawerCount() == 1)
+                    return ModBlocks.fullDrawers1[bank];
+                if (blockConfig.getDrawerCount() == 2 && !blockConfig.isHalfDepth())
+                    return ModBlocks.fullDrawers2[bank];
+                if (blockConfig.getDrawerCount() == 4 && !blockConfig.isHalfDepth())
+                    return ModBlocks.fullDrawers4[bank];
+                if (blockConfig.getDrawerCount() == 2 && blockConfig.isHalfDepth())
+                    return ModBlocks.halfDrawers2[bank];
+                if (blockConfig.getDrawerCount() == 4 && blockConfig.isHalfDepth())
+                    return ModBlocks.halfDrawers4[bank];
+                break;
+            case DrawersSorting:
+                if (blockConfig.getDrawerCount() == 1)
+                    return RefinedRelocation.fullDrawers1[bank];
+                if (blockConfig.getDrawerCount() == 2 && !blockConfig.isHalfDepth())
+                    return RefinedRelocation.fullDrawers2[bank];
+                if (blockConfig.getDrawerCount() == 4 && !blockConfig.isHalfDepth())
+                    return RefinedRelocation.fullDrawers4[bank];
+                if (blockConfig.getDrawerCount() == 2 && blockConfig.isHalfDepth())
+                    return RefinedRelocation.halfDrawers2[bank];
+                if (blockConfig.getDrawerCount() == 4 && blockConfig.isHalfDepth())
+                    return RefinedRelocation.halfDrawers4[bank];
+                break;
+            case Trim:
+                return ModBlocks.trim[bank];
+            case TrimSorting:
+                return RefinedRelocation.trim[bank];
+        }
+        return null;
+    }
+
+    @Override
+    public void init () {
+        switch (bank) {
+            case 0:
+                for (int i = 0, p = 0, m = 0; i < 8; i++, p++, m++)
+                    setPlankSlab(i, GameRegistry.findBlock("Forestry", "planks"), p, GameRegistry.findBlock("Forestry", "slabs1"), m);
+                for (int i = 8, p = 8, m = 0; i < textureBank[0].length; i++, p++, m++)
+                    setPlankSlab(i, GameRegistry.findBlock("Forestry", "planks"), p, GameRegistry.findBlock("Forestry", "slabs2"), m);
+                break;
+            case 1:
+                for (int i = 0, p = 0, m = 0; i < 8; i++, p++, m++)
+                    setPlankSlab(i, GameRegistry.findBlock("Forestry", "planks2"), p, GameRegistry.findBlock("Forestry", "slabs3"), m);
+                for (int i = 8, p = 8, m = 0; i < textureBank[1].length; i++, p++, m++)
+                    setPlankSlab(i, GameRegistry.findBlock("Forestry", "planks2"), p, GameRegistry.findBlock("Forestry", "slabs4"), m);
+                break;
+        }
+    }
+}

packs/Forestry/src/com/jaquadro/minecraft/storagedrawers/packs/forestry/core/ModBlocks.java

@@ -1,98 +1,94 @@
 package com.jaquadro.minecraft.storagedrawers.packs.forestry.core;
 
-import com.jaquadro.minecraft.storagedrawers.StorageDrawers;
-import com.jaquadro.minecraft.storagedrawers.block.*;
-import com.jaquadro.minecraft.storagedrawers.config.ConfigManager;
-import com.jaquadro.minecraft.storagedrawers.integration.notenoughitems.NEIStorageDrawersConfig;
-import com.jaquadro.minecraft.storagedrawers.packs.forestry.block.BlockDrawersPack;
-import com.jaquadro.minecraft.storagedrawers.packs.forestry.item.ItemDrawersPack;
-import com.jaquadro.minecraft.storagedrawers.packs.forestry.item.ItemTrimPack;
+import com.jaquadro.minecraft.storagedrawers.api.IStorageDrawersApi;
+import com.jaquadro.minecraft.storagedrawers.api.StorageDrawersApi;
+import com.jaquadro.minecraft.storagedrawers.api.config.IBlockConfig;
+import com.jaquadro.minecraft.storagedrawers.api.config.IUserConfig;
+import com.jaquadro.minecraft.storagedrawers.api.pack.BlockConfiguration;
+import com.jaquadro.minecraft.storagedrawers.api.pack.IPackBlockFactory;
+import com.jaquadro.minecraft.storagedrawers.api.pack.IPackDataResolver;
 import com.jaquadro.minecraft.storagedrawers.packs.forestry.StorageDrawersPack;
-import com.jaquadro.minecraft.storagedrawers.packs.forestry.block.BlockTrimPack;
 import cpw.mods.fml.common.registry.GameData;
-import cpw.mods.fml.common.registry.GameRegistry;
 import net.minecraft.block.Block;
 
 public class ModBlocks
 {
-    public static BlockDrawers fullDrawers1A;
-    public static BlockDrawers fullDrawers2A;
-    public static BlockDrawers fullDrawers4A;
-    public static BlockDrawers halfDrawers2A;
-    public static BlockDrawers halfDrawers4A;
-    public static BlockTrim trimA;
-
-    public static BlockDrawers fullDrawers1B;
-    public static BlockDrawers fullDrawers2B;
-    public static BlockDrawers fullDrawers4B;
-    public static BlockDrawers halfDrawers2B;
-    public static BlockDrawers halfDrawers4B;
-    public static BlockTrim trimB;
+    public static Block[] fullDrawers1;
+    public static Block[] fullDrawers2;
+    public static Block[] fullDrawers4;
+    public static Block[] halfDrawers2;
+    public static Block[] halfDrawers4;
+    public static Block[] trim;
 
     public void init () {
-        fullDrawers1A = new BlockDrawersPack(makeName("fullDrawers1"), 1, false, 0);
-        fullDrawers2A = new BlockDrawersPack(makeName("fullDrawers2"), 2, false, 0);
-        fullDrawers4A = new BlockDrawersPack(makeName("fullDrawers4"), 4, false, 0);
-        halfDrawers2A = new BlockDrawersPack(makeName("halfDrawers2"), 2, true, 0);
-        halfDrawers4A = new BlockDrawersPack(makeName("halfDrawers4"), 4, true, 0);
-        trimA = new BlockTrimPack(makeName("trim"), 0);
+        IStorageDrawersApi api = StorageDrawersApi.instance();
+        if (api == null)
+            return;
 
-        fullDrawers1B = new BlockDrawersPack(makeName("fullDrawers1"), 1, false, 1);
-        fullDrawers2B = new BlockDrawersPack(makeName("fullDrawers2"), 2, false, 1);
-        fullDrawers4B = new BlockDrawersPack(makeName("fullDrawers4"), 4, false, 1);
-        halfDrawers2B = new BlockDrawersPack(makeName("halfDrawers2"), 2, true, 1);
-        halfDrawers4B = new BlockDrawersPack(makeName("halfDrawers4"), 4, true, 1);
-        trimB = new BlockTrimPack(makeName("trim"), 1);
+        IPackBlockFactory factory = api.packFactory();
+        IPackDataResolver[] resolvers = StorageDrawersPack.instance.resolvers;
 
-        ConfigManager config = StorageDrawers.config;
+        fullDrawers1 = new Block[resolvers.length];
+        fullDrawers2 = new Block[resolvers.length];
+        fullDrawers4 = new Block[resolvers.length];
+        halfDrawers2 = new Block[resolvers.length];
+        halfDrawers4 = new Block[resolvers.length];
+        trim = new Block[resolvers.length];
 
-        if (config.isBlockEnabled("fulldrawers1")) {
-            GameRegistry.registerBlock(fullDrawers1A, ItemDrawersPack.class, "fullDrawers1A");
-            GameRegistry.registerBlock(fullDrawers1B, ItemDrawersPack.class, "fullDrawers1B");
-        }
-        if (config.isBlockEnabled("fulldrawers2")) {
-            GameRegistry.registerBlock(fullDrawers2A, ItemDrawersPack.class, "fullDrawers2A");
-            GameRegistry.registerBlock(fullDrawers2B, ItemDrawersPack.class, "fullDrawers2B");
-        }
-        if (config.isBlockEnabled("fulldrawers4")) {
-            GameRegistry.registerBlock(fullDrawers4A, ItemDrawersPack.class, "fullDrawers4A");
-            GameRegistry.registerBlock(fullDrawers4B, ItemDrawersPack.class, "fullDrawers4B");
-        }
-        if (config.isBlockEnabled("halfdrawers2")) {
-            GameRegistry.registerBlock(halfDrawers2A, ItemDrawersPack.class, "halfDrawers2A");
-            GameRegistry.registerBlock(halfDrawers2B, ItemDrawersPack.class, "halfDrawers2B");
-        }
-        if (config.isBlockEnabled("halfdrawers4")) {
-            GameRegistry.registerBlock(halfDrawers4A, ItemDrawersPack.class, "halfDrawers4A");
-            GameRegistry.registerBlock(halfDrawers4B, ItemDrawersPack.class, "halfDrawers4B");
-        }
-        if (config.isBlockEnabled("trim")) {
-            GameRegistry.registerBlock(trimA, ItemTrimPack.class, "trimA");
-            GameRegistry.registerBlock(trimB, ItemTrimPack.class, "trimB");
+        for (int i = 0; i < resolvers.length; i++) {
+            IPackDataResolver resolver = resolvers[i];
+
+            fullDrawers1[i] = factory.createBlock(BlockConfiguration.BasicFull1, resolver);
+            fullDrawers2[i] = factory.createBlock(BlockConfiguration.BasicFull2, resolver);
+            fullDrawers4[i] = factory.createBlock(BlockConfiguration.BasicFull4, resolver);
+            halfDrawers2[i] = factory.createBlock(BlockConfiguration.BasicHalf2, resolver);
+            halfDrawers4[i] = factory.createBlock(BlockConfiguration.BasicHalf4, resolver);
+            trim[i] = factory.createBlock(BlockConfiguration.Trim, resolver);
         }
 
-        if (!config.cache.addonShowNEI) {
-            NEIStorageDrawersConfig.hideBlock(getQualifiedName(fullDrawers1A));
-            NEIStorageDrawersConfig.hideBlock(getQualifiedName(fullDrawers2A));
-            NEIStorageDrawersConfig.hideBlock(getQualifiedName(fullDrawers4A));
-            NEIStorageDrawersConfig.hideBlock(getQualifiedName(halfDrawers2A));
-            NEIStorageDrawersConfig.hideBlock(getQualifiedName(halfDrawers4A));
-            NEIStorageDrawersConfig.hideBlock(getQualifiedName(trimA));
+        IUserConfig config = api.userConfig();
+        IBlockConfig blockConfig = config.blockConfig();
 
-            NEIStorageDrawersConfig.hideBlock(getQualifiedName(fullDrawers1B));
-            NEIStorageDrawersConfig.hideBlock(getQualifiedName(fullDrawers2B));
-            NEIStorageDrawersConfig.hideBlock(getQualifiedName(fullDrawers4B));
-            NEIStorageDrawersConfig.hideBlock(getQualifiedName(halfDrawers2B));
-            NEIStorageDrawersConfig.hideBlock(getQualifiedName(halfDrawers4B));
-            NEIStorageDrawersConfig.hideBlock(getQualifiedName(trimB));
+        char[] tail = new char[] { 'A', 'B' };
+
+        if (blockConfig.isBlockEnabled(blockConfig.getBlockConfigName(BlockConfiguration.BasicFull1))) {
+            for (int i = 0; i < resolvers.length; i++)
+                factory.registerBlock(fullDrawers1[i], "fullDrawers1" + tail[i]);
+        }
+        if (blockConfig.isBlockEnabled(blockConfig.getBlockConfigName(BlockConfiguration.BasicFull2))) {
+            for (int i = 0; i < resolvers.length; i++)
+                factory.registerBlock(fullDrawers2[i], "fullDrawers2" + tail[i]);
+        }
+        if (blockConfig.isBlockEnabled(blockConfig.getBlockConfigName(BlockConfiguration.BasicFull4))) {
+            for (int i = 0; i < resolvers.length; i++)
+                factory.registerBlock(fullDrawers4[i], "fullDrawers4" + tail[i]);
+        }
+        if (blockConfig.isBlockEnabled(blockConfig.getBlockConfigName(BlockConfiguration.BasicHalf2))) {
+            for (int i = 0; i < resolvers.length; i++)
+                factory.registerBlock(halfDrawers2[i], "halfDrawers2" + tail[i]);
+        }
+        if (blockConfig.isBlockEnabled(blockConfig.getBlockConfigName(BlockConfiguration.BasicHalf4))) {
+            for (int i = 0; i < resolvers.length; i++)
+                factory.registerBlock(halfDrawers4[i], "halfDrawers4" + tail[i]);
+        }
+        if (blockConfig.isBlockEnabled(blockConfig.getBlockConfigName(BlockConfiguration.Trim))) {
+            for (int i = 0; i < resolvers.length; i++)
+                factory.registerBlock(trim[i], "trim" + tail[i]);
+        }
+
+        if (!config.addonConfig().showAddonItemsNEI()) {
+            for (int i = 0; i < resolvers.length; i++) {
+                factory.hideBlock(getQualifiedName(fullDrawers1[i]));
+                factory.hideBlock(getQualifiedName(fullDrawers2[i]));
+                factory.hideBlock(getQualifiedName(fullDrawers4[i]));
+                factory.hideBlock(getQualifiedName(halfDrawers2[i]));
+                factory.hideBlock(getQualifiedName(halfDrawers4[i]));
+                factory.hideBlock(getQualifiedName(trim[i]));
+            }
         }
     }
 
     public static String getQualifiedName (Block block) {
         return GameData.getBlockRegistry().getNameForObject(block);
     }
-
-    public static String makeName (String name) {
-        return StorageDrawersPack.MOD_ID.toLowerCase() + "." + name;
-    }
 }

packs/Forestry/src/com/jaquadro/minecraft/storagedrawers/packs/forestry/core/ModCreativeTabs.java

@@ -1,7 +1,10 @@
 package com.jaquadro.minecraft.storagedrawers.packs.forestry.core;
 
-import com.jaquadro.minecraft.storagedrawers.StorageDrawers;
-import com.jaquadro.minecraft.storagedrawers.config.ConfigManager;
+import com.jaquadro.minecraft.storagedrawers.api.IStorageDrawersApi;
+import com.jaquadro.minecraft.storagedrawers.api.StorageDrawersApi;
+import com.jaquadro.minecraft.storagedrawers.api.config.IBlockConfig;
+import com.jaquadro.minecraft.storagedrawers.api.config.IUserConfig;
+import com.jaquadro.minecraft.storagedrawers.api.pack.BlockConfiguration;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.creativetab.CreativeTabs;
@@ -12,32 +15,53 @@ public final class ModCreativeTabs
 {
     private ModCreativeTabs () { }
 
-    public static final CreativeTabs tabStorageDrawers = new CreativeTabs("storageDrawersForestry") {
-        @Override
-        @SideOnly(Side.CLIENT)
-        public Item getTabIconItem () {
-            return getTabItem();
+    private static CreativeTabs tabStorageDrawers = null;
+
+    public static CreativeTabs getTabStorageDrawers () {
+        if (tabStorageDrawers != null)
+            return tabStorageDrawers;
+
+        IStorageDrawersApi api = StorageDrawersApi.instance();
+        if (api == null)
+            return null;
+
+        IUserConfig config = api.userConfig();
+        if (config.addonConfig().addonItemsUseSeparateTab() && config.addonConfig().showAddonItemsVanilla()) {
+            tabStorageDrawers = new CreativeTabs("storageDrawersForestry")
+            {
+                @Override
+                @SideOnly(Side.CLIENT)
+                public Item getTabIconItem () {
+                    return getTabItem();
+                }
+
+                @Override
+                public int func_151243_f () {
+                    return 1;
+                }
+            };
         }
 
-        @Override
-        public int func_151243_f () {
-            return 1;
-        }
-    };
+        return tabStorageDrawers;
+    }
 
     private static Item getTabItem () {
-        ConfigManager config = StorageDrawers.config;
+        IStorageDrawersApi api = StorageDrawersApi.instance();
+        if (api == null)
+            return Item.getItemFromBlock(Blocks.chest);
 
-        if (config.isBlockEnabled("fulldrawers2"))
-            return Item.getItemFromBlock(ModBlocks.fullDrawers2A);
-        if (config.isBlockEnabled("fulldrawers4"))
-            return Item.getItemFromBlock(ModBlocks.fullDrawers4A);
-        if (config.isBlockEnabled("fulldrawers1"))
-            return Item.getItemFromBlock(ModBlocks.fullDrawers1A);
-        if (config.isBlockEnabled("halfdrawers2"))
-            return Item.getItemFromBlock(ModBlocks.halfDrawers2A);
-        if (config.isBlockEnabled("halfdrawers4"))
-            return Item.getItemFromBlock(ModBlocks.halfDrawers4A);
+        IBlockConfig blockConfig = api.userConfig().blockConfig();
+
+        if (blockConfig.isBlockEnabled(blockConfig.getBlockConfigName(BlockConfiguration.BasicFull2)))
+            return Item.getItemFromBlock(ModBlocks.fullDrawers2[0]);
+        if (blockConfig.isBlockEnabled(blockConfig.getBlockConfigName(BlockConfiguration.BasicFull4)))
+            return Item.getItemFromBlock(ModBlocks.fullDrawers4[0]);
+        if (blockConfig.isBlockEnabled(blockConfig.getBlockConfigName(BlockConfiguration.BasicFull1)))
+            return Item.getItemFromBlock(ModBlocks.fullDrawers1[0]);
+        if (blockConfig.isBlockEnabled(blockConfig.getBlockConfigName(BlockConfiguration.BasicHalf2)))
+            return Item.getItemFromBlock(ModBlocks.halfDrawers2[0]);
+        if (blockConfig.isBlockEnabled(blockConfig.getBlockConfigName(BlockConfiguration.BasicHalf4)))
+            return Item.getItemFromBlock(ModBlocks.halfDrawers4[0]);
 
         return Item.getItemFromBlock(Blocks.chest);
     }

packs/Forestry/src/com/jaquadro/minecraft/storagedrawers/packs/forestry/core/ModRecipes.java

@@ -1,113 +0,0 @@
-package com.jaquadro.minecraft.storagedrawers.packs.forestry.core;
-
-import com.jaquadro.minecraft.storagedrawers.StorageDrawers;
-import com.jaquadro.minecraft.storagedrawers.config.ConfigManager;
-import com.jaquadro.minecraft.storagedrawers.core.ModItems;
-import com.jaquadro.minecraft.storagedrawers.packs.forestry.block.BlockDrawersPack;
-import cpw.mods.fml.common.registry.GameRegistry;
-import net.minecraft.block.Block;
-import net.minecraft.init.Blocks;
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.oredict.OreDictionary;
-
-public class ModRecipes
-{
-    public void init () {
-        ConfigManager config = StorageDrawers.config;
-
-        String[][] textureNames = new String[][] {
-            BlockDrawersPack.textureNames1,
-            BlockDrawersPack.textureNames2
-        };
-
-        Block[] planksSet = new Block[] {
-            GameRegistry.findBlock("Forestry", "planks"),
-            GameRegistry.findBlock("Forestry", "planks2")
-        };
-
-        Block[][] slabsSet = new Block[][] {
-            new Block[] {
-                GameRegistry.findBlock("Forestry", "slabs1"),
-                GameRegistry.findBlock("Forestry", "slabs2")
-            },
-            new Block[]{
-                GameRegistry.findBlock("Forestry", "slabs3"),
-                GameRegistry.findBlock("Forestry", "slabs4")
-            }
-        };
-
-        Block[] fullDrawers1 = new Block[] { ModBlocks.fullDrawers1A, ModBlocks.fullDrawers1B };
-        Block[] fullDrawers2 = new Block[] { ModBlocks.fullDrawers2A, ModBlocks.fullDrawers2B };
-        Block[] fullDrawers4 = new Block[] { ModBlocks.fullDrawers4A, ModBlocks.fullDrawers4B };
-        Block[] halfDrawers2 = new Block[] { ModBlocks.halfDrawers2A, ModBlocks.halfDrawers2B };
-        Block[] halfDrawers4 = new Block[] { ModBlocks.halfDrawers4A, ModBlocks.halfDrawers4B };
-        Block[] trim = new Block[] { ModBlocks.trimA, ModBlocks.trimB };
-
-        for (int p = 0; p < planksSet.length; p++) {
-            Block planks = planksSet[p];
-
-            for (int i = 0; i < textureNames[p].length; i++) {
-                if (textureNames[p][i] == null)
-                    continue;
-
-                if (planks != null) {
-                    if (config.isBlockEnabled("fulldrawers1"))
-                        GameRegistry.addRecipe(new ItemStack(fullDrawers1[p], config.getBlockRecipeOutput("fulldrawers1"), i), "xxx", " y ", "xxx",
-                            'x', new ItemStack(planks, 1, i), 'y', Blocks.chest);
-                    if (config.isBlockEnabled("fulldrawers2"))
-                        GameRegistry.addRecipe(new ItemStack(fullDrawers2[p], config.getBlockRecipeOutput("fulldrawers2"), i), "xyx", "xxx", "xyx",
-                            'x', new ItemStack(planks, 1, i), 'y', Blocks.chest);
-                    if (config.isBlockEnabled("fulldrawers4"))
-                        GameRegistry.addRecipe(new ItemStack(fullDrawers4[p], config.getBlockRecipeOutput("fulldrawers4"), i), "yxy", "xxx", "yxy",
-                            'x', new ItemStack(planks, 1, i), 'y', Blocks.chest);
-                    if (config.isBlockEnabled("trim")) {
-                        GameRegistry.addRecipe(new ItemStack(trim[p], config.getBlockRecipeOutput("trim"), i), "xyx", "yyy", "xyx",
-                            'x', Items.stick, 'y', new ItemStack(planks, 1, i));
-                    }
-                }
-
-                Block recipeSlab = (i < 8) ? slabsSet[p][0] : slabsSet[p][1];
-                if (recipeSlab != null) {
-                    if (config.isBlockEnabled("halfdrawers2"))
-                        GameRegistry.addRecipe(new ItemStack(halfDrawers2[p], config.getBlockRecipeOutput("halfdrawers2"), i), "xyx", "xxx", "xyx",
-                            'x', new ItemStack(recipeSlab, 1, i), 'y', Blocks.chest);
-                    if (config.isBlockEnabled("halfdrawers4"))
-                        GameRegistry.addRecipe(new ItemStack(halfDrawers4[p], config.getBlockRecipeOutput("halfdrawers4"), i), "yxy", "xxx", "yxy",
-                            'x', new ItemStack(recipeSlab, 1, i), 'y', Blocks.chest);
-                }
-            }
-        }
-
-        if (config.isBlockEnabled("fulldrawers1")) {
-            GameRegistry.addRecipe(new ItemStack(ModItems.upgradeTemplate, 2), "xxx", "xyx", "xxx",
-                'x', Items.stick, 'y', new ItemStack(ModBlocks.fullDrawers1A, 1, OreDictionary.WILDCARD_VALUE));
-            GameRegistry.addRecipe(new ItemStack(ModItems.upgradeTemplate, 2), "xxx", "xyx", "xxx",
-                'x', Items.stick, 'y', new ItemStack(ModBlocks.fullDrawers1B, 1, OreDictionary.WILDCARD_VALUE));
-        }
-        if (config.isBlockEnabled("fulldrawers2")) {
-            GameRegistry.addRecipe(new ItemStack(ModItems.upgradeTemplate, 2), "xxx", "xyx", "xxx",
-                'x', Items.stick, 'y', new ItemStack(ModBlocks.fullDrawers2A, 1, OreDictionary.WILDCARD_VALUE));
-            GameRegistry.addRecipe(new ItemStack(ModItems.upgradeTemplate, 2), "xxx", "xyx", "xxx",
-                'x', Items.stick, 'y', new ItemStack(ModBlocks.fullDrawers2B, 1, OreDictionary.WILDCARD_VALUE));
-        }
-        if (config.isBlockEnabled("halfdrawers2")) {
-            GameRegistry.addRecipe(new ItemStack(ModItems.upgradeTemplate, 2), "xxx", "xyx", "xxx",
-                'x', Items.stick, 'y', new ItemStack(ModBlocks.halfDrawers2A, 1, OreDictionary.WILDCARD_VALUE));
-            GameRegistry.addRecipe(new ItemStack(ModItems.upgradeTemplate, 2), "xxx", "xyx", "xxx",
-                'x', Items.stick, 'y', new ItemStack(ModBlocks.halfDrawers2B, 1, OreDictionary.WILDCARD_VALUE));
-        }
-        if (config.isBlockEnabled("fulldrawers4")) {
-            GameRegistry.addRecipe(new ItemStack(ModItems.upgradeTemplate, 2), "xxx", "xyx", "xxx",
-                'x', Items.stick, 'y', new ItemStack(ModBlocks.fullDrawers4A, 1, OreDictionary.WILDCARD_VALUE));
-            GameRegistry.addRecipe(new ItemStack(ModItems.upgradeTemplate, 2), "xxx", "xyx", "xxx",
-                'x', Items.stick, 'y', new ItemStack(ModBlocks.fullDrawers4B, 1, OreDictionary.WILDCARD_VALUE));
-        }
-        if (config.isBlockEnabled("halfdrawers4")) {
-            GameRegistry.addRecipe(new ItemStack(ModItems.upgradeTemplate, 2), "xxx", "xyx", "xxx",
-                'x', Items.stick, 'y', new ItemStack(ModBlocks.halfDrawers4A, 1, OreDictionary.WILDCARD_VALUE));
-            GameRegistry.addRecipe(new ItemStack(ModItems.upgradeTemplate, 2), "xxx", "xyx", "xxx",
-                'x', Items.stick, 'y', new ItemStack(ModBlocks.halfDrawers4B, 1, OreDictionary.WILDCARD_VALUE));
-        }
-    }
-}

packs/Forestry/src/com/jaquadro/minecraft/storagedrawers/packs/forestry/core/RefinedRelocation.java

@@ -1,131 +1,99 @@
 package com.jaquadro.minecraft.storagedrawers.packs.forestry.core;
 
-import com.jaquadro.minecraft.storagedrawers.StorageDrawers;
-import com.jaquadro.minecraft.storagedrawers.config.ConfigManager;
-import com.jaquadro.minecraft.storagedrawers.integration.notenoughitems.NEIStorageDrawersConfig;
-import com.jaquadro.minecraft.storagedrawers.integration.refinedrelocation.*;
-import com.jaquadro.minecraft.storagedrawers.packs.forestry.block.BlockDrawersPack;
-import com.jaquadro.minecraft.storagedrawers.packs.forestry.block.BlockSortingDrawersPack;
-import com.jaquadro.minecraft.storagedrawers.packs.forestry.item.ItemSortingDrawersPack;
+import com.jaquadro.minecraft.storagedrawers.api.IStorageDrawersApi;
+import com.jaquadro.minecraft.storagedrawers.api.StorageDrawersApi;
+import com.jaquadro.minecraft.storagedrawers.api.config.IBlockConfig;
+import com.jaquadro.minecraft.storagedrawers.api.config.IUserConfig;
+import com.jaquadro.minecraft.storagedrawers.api.pack.BlockConfiguration;
+import com.jaquadro.minecraft.storagedrawers.api.pack.IPackBlockFactory;
+import com.jaquadro.minecraft.storagedrawers.api.pack.IPackDataResolver;
+import com.jaquadro.minecraft.storagedrawers.packs.forestry.StorageDrawersPack;
 import cpw.mods.fml.common.Loader;
-import cpw.mods.fml.common.registry.GameRegistry;
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemStack;
+import net.minecraft.block.Block;
 
 public class RefinedRelocation
 {
-    public static BlockSortingDrawersPack fullDrawers1A;
-    public static BlockSortingDrawersPack fullDrawers2A;
-    public static BlockSortingDrawersPack fullDrawers4A;
-    public static BlockSortingDrawersPack halfDrawers2A;
-    public static BlockSortingDrawersPack halfDrawers4A;
-
-    public static BlockSortingDrawersPack fullDrawers1B;
-    public static BlockSortingDrawersPack fullDrawers2B;
-    public static BlockSortingDrawersPack fullDrawers4B;
-    public static BlockSortingDrawersPack halfDrawers2B;
-    public static BlockSortingDrawersPack halfDrawers4B;
+    public static Block[] fullDrawers1;
+    public static Block[] fullDrawers2;
+    public static Block[] fullDrawers4;
+    public static Block[] halfDrawers2;
+    public static Block[] halfDrawers4;
+    public static Block[] trim;
 
     public static void init () {
-        ConfigManager config = StorageDrawers.config;
-        if (!Loader.isModLoaded("RefinedRelocation") || !config.cache.enableRefinedRelocationIntegration)
+        IStorageDrawersApi api = StorageDrawersApi.instance();
+        if (api == null)
             return;
 
-        fullDrawers1A = new BlockSortingDrawersPack(ModBlocks.makeName("fullDrawers1"), 1, false, 0);
-        fullDrawers2A = new BlockSortingDrawersPack(ModBlocks.makeName("fullDrawers2"), 2, false, 0);
-        fullDrawers4A = new BlockSortingDrawersPack(ModBlocks.makeName("fullDrawers4"), 4, false, 0);
-        halfDrawers2A = new BlockSortingDrawersPack(ModBlocks.makeName("halfDrawers2"), 2, true, 0);
-        halfDrawers4A = new BlockSortingDrawersPack(ModBlocks.makeName("halfDrawers4"), 4, true, 0);
-
-        fullDrawers1B = new BlockSortingDrawersPack(ModBlocks.makeName("fullDrawers1"), 1, false, 1);
-        fullDrawers2B = new BlockSortingDrawersPack(ModBlocks.makeName("fullDrawers2"), 2, false, 1);
-        fullDrawers4B = new BlockSortingDrawersPack(ModBlocks.makeName("fullDrawers4"), 4, false, 1);
-        halfDrawers2B = new BlockSortingDrawersPack(ModBlocks.makeName("halfDrawers2"), 2, true, 1);
-        halfDrawers4B = new BlockSortingDrawersPack(ModBlocks.makeName("halfDrawers4"), 4, true, 1);
-
-        SortingBlockRegistry.register(ModBlocks.fullDrawers1A, fullDrawers1A);
-        SortingBlockRegistry.register(ModBlocks.fullDrawers2A, fullDrawers2A);
-        SortingBlockRegistry.register(ModBlocks.fullDrawers4A, fullDrawers4A);
-        SortingBlockRegistry.register(ModBlocks.halfDrawers2A, halfDrawers2A);
-        SortingBlockRegistry.register(ModBlocks.halfDrawers4A, halfDrawers4A);
-
-        SortingBlockRegistry.register(ModBlocks.fullDrawers1B, fullDrawers1B);
-        SortingBlockRegistry.register(ModBlocks.fullDrawers2B, fullDrawers2B);
-        SortingBlockRegistry.register(ModBlocks.fullDrawers4B, fullDrawers4B);
-        SortingBlockRegistry.register(ModBlocks.halfDrawers2B, halfDrawers2B);
-        SortingBlockRegistry.register(ModBlocks.halfDrawers4B, halfDrawers4B);
-
-        if (config.isBlockEnabled("fulldrawers1")) {
-            GameRegistry.registerBlock(fullDrawers1A, ItemSortingDrawersPack.class, "fullDrawersSort1A");
-            GameRegistry.registerBlock(fullDrawers1B, ItemSortingDrawersPack.class, "fullDrawersSort1B");
-        }
-        if (config.isBlockEnabled("fulldrawers2")) {
-            GameRegistry.registerBlock(fullDrawers2A, ItemSortingDrawersPack.class, "fullDrawersSort2A");
-            GameRegistry.registerBlock(fullDrawers2B, ItemSortingDrawersPack.class, "fullDrawersSort2B");
-        }
-        if (config.isBlockEnabled("fulldrawers4")) {
-            GameRegistry.registerBlock(fullDrawers4A, ItemSortingDrawersPack.class, "fullDrawersSort4A");
-            GameRegistry.registerBlock(fullDrawers4B, ItemSortingDrawersPack.class, "fullDrawersSort4B");
-        }
-        if (config.isBlockEnabled("halfdrawers2")) {
-            GameRegistry.registerBlock(halfDrawers2A, ItemSortingDrawersPack.class, "halfDrawersSort2A");
-            GameRegistry.registerBlock(halfDrawers2B, ItemSortingDrawersPack.class, "halfDrawersSort2B");
-        }
-        if (config.isBlockEnabled("halfdrawers4")) {
-            GameRegistry.registerBlock(halfDrawers4A, ItemSortingDrawersPack.class, "halfDrawersSort4A");
-            GameRegistry.registerBlock(halfDrawers4B, ItemSortingDrawersPack.class, "halfDrawersSort4B");
-        }
-
-        if (!config.cache.addonShowNEI) {
-            NEIStorageDrawersConfig.hideBlock(ModBlocks.getQualifiedName(fullDrawers1A));
-            NEIStorageDrawersConfig.hideBlock(ModBlocks.getQualifiedName(fullDrawers2A));
-            NEIStorageDrawersConfig.hideBlock(ModBlocks.getQualifiedName(fullDrawers4A));
-            NEIStorageDrawersConfig.hideBlock(ModBlocks.getQualifiedName(halfDrawers2A));
-            NEIStorageDrawersConfig.hideBlock(ModBlocks.getQualifiedName(halfDrawers4A));
-
-            NEIStorageDrawersConfig.hideBlock(ModBlocks.getQualifiedName(fullDrawers1B));
-            NEIStorageDrawersConfig.hideBlock(ModBlocks.getQualifiedName(fullDrawers2B));
-            NEIStorageDrawersConfig.hideBlock(ModBlocks.getQualifiedName(fullDrawers4B));
-            NEIStorageDrawersConfig.hideBlock(ModBlocks.getQualifiedName(halfDrawers2B));
-            NEIStorageDrawersConfig.hideBlock(ModBlocks.getQualifiedName(halfDrawers4B));
-        }
-    }
-
-    public static void postInit () {
-        ConfigManager config = StorageDrawers.config;
-        if (!Loader.isModLoaded("RefinedRelocation") || !config.cache.enableRefinedRelocationIntegration)
+        if (!Loader.isModLoaded("RefinedRelocation") || !api.userConfig().integrationConfig().isRefinedRelocationEnabled())
             return;
 
-        for (int i = 0; i < BlockDrawersPack.textureNames1.length; i++) {
-            if (config.isBlockEnabled("fulldrawers1")) {
-                GameRegistry.addRecipe(new ItemStack(fullDrawers1A, 1, i), "x x", " y ", "x x",
-                    'x', Items.gold_nugget, 'y', new ItemStack(ModBlocks.fullDrawers1A, 1, i));
-                GameRegistry.addRecipe(new ItemStack(fullDrawers1B, 1, i), "x x", " y ", "x x",
-                    'x', Items.gold_nugget, 'y', new ItemStack(ModBlocks.fullDrawers1B, 1, i));
-            }
-            if (config.isBlockEnabled("fulldrawers2")) {
-                GameRegistry.addRecipe(new ItemStack(fullDrawers2A, 1, i), "x x", " y ", "x x",
-                    'x', Items.gold_nugget, 'y', new ItemStack(ModBlocks.fullDrawers2A, 1, i));
-                GameRegistry.addRecipe(new ItemStack(fullDrawers2B, 1, i), "x x", " y ", "x x",
-                    'x', Items.gold_nugget, 'y', new ItemStack(ModBlocks.fullDrawers2B, 1, i));
-            }
-            if (config.isBlockEnabled("halfdrawers2")) {
-                GameRegistry.addRecipe(new ItemStack(halfDrawers2A, 1, i), "x x", " y ", "x x",
-                    'x', Items.gold_nugget, 'y', new ItemStack(ModBlocks.halfDrawers2A, 1, i));
-                GameRegistry.addRecipe(new ItemStack(halfDrawers2B, 1, i), "x x", " y ", "x x",
-                    'x', Items.gold_nugget, 'y', new ItemStack(ModBlocks.halfDrawers2B, 1, i));
-            }
-            if (config.isBlockEnabled("fulldrawers4")) {
-                GameRegistry.addRecipe(new ItemStack(fullDrawers4A, 1, i), "x x", " y ", "x x",
-                    'x', Items.gold_nugget, 'y', new ItemStack(ModBlocks.fullDrawers4A, 1, i));
-                GameRegistry.addRecipe(new ItemStack(fullDrawers4B, 1, i), "x x", " y ", "x x",
-                    'x', Items.gold_nugget, 'y', new ItemStack(ModBlocks.fullDrawers4B, 1, i));
-            }
-            if (config.isBlockEnabled("halfdrawers4")) {
-                GameRegistry.addRecipe(new ItemStack(halfDrawers4A, 1, i), "x x", " y ", "x x",
-                    'x', Items.gold_nugget, 'y', new ItemStack(ModBlocks.halfDrawers4A, 1, i));
-                GameRegistry.addRecipe(new ItemStack(halfDrawers4B, 1, i), "x x", " y ", "x x",
-                    'x', Items.gold_nugget, 'y', new ItemStack(ModBlocks.halfDrawers4B, 1, i));
+        IPackBlockFactory factory = api.packFactory();
+        IPackDataResolver[] resolvers = StorageDrawersPack.instance.resolvers;
+
+        fullDrawers1 = new Block[resolvers.length];
+        fullDrawers2 = new Block[resolvers.length];
+        fullDrawers4 = new Block[resolvers.length];
+        halfDrawers2 = new Block[resolvers.length];
+        halfDrawers4 = new Block[resolvers.length];
+        trim = new Block[resolvers.length];
+
+        for (int i = 0; i < resolvers.length; i++) {
+            IPackDataResolver resolver = resolvers[i];
+
+            fullDrawers1[i] = factory.createBlock(BlockConfiguration.SortingFull1, resolver);
+            fullDrawers2[i] = factory.createBlock(BlockConfiguration.SortingFull2, resolver);
+            fullDrawers4[i] = factory.createBlock(BlockConfiguration.SortingFull4, resolver);
+            halfDrawers2[i] = factory.createBlock(BlockConfiguration.SortingHalf2, resolver);
+            halfDrawers4[i] = factory.createBlock(BlockConfiguration.SortingHalf4, resolver);
+            trim[i] = factory.createBlock(BlockConfiguration.TrimSorting, resolver);
+
+            factory.bindSortingBlock(ModBlocks.fullDrawers1[i], fullDrawers1[i]);
+            factory.bindSortingBlock(ModBlocks.fullDrawers2[i], fullDrawers2[i]);
+            factory.bindSortingBlock(ModBlocks.fullDrawers4[i], fullDrawers4[i]);
+            factory.bindSortingBlock(ModBlocks.halfDrawers2[i], halfDrawers2[i]);
+            factory.bindSortingBlock(ModBlocks.halfDrawers4[i], halfDrawers4[i]);
+            factory.bindSortingBlock(ModBlocks.trim[i], trim[i]);
+        }
+
+        IUserConfig config = api.userConfig();
+        IBlockConfig blockConfig = config.blockConfig();
+
+        char[] tail = new char[] { 'A', 'B' };
+
+        if (blockConfig.isBlockEnabled(blockConfig.getBlockConfigName(BlockConfiguration.SortingFull1))) {
+            for (int i = 0; i < resolvers.length; i++)
+                factory.registerBlock(fullDrawers1[i], "fullDrawersSort1" + tail[i]);
+        }
+        if (blockConfig.isBlockEnabled(blockConfig.getBlockConfigName(BlockConfiguration.SortingFull2))) {
+            for (int i = 0; i < resolvers.length; i++)
+                factory.registerBlock(fullDrawers2[i], "fullDrawersSort2" + tail[i]);
+        }
+        if (blockConfig.isBlockEnabled(blockConfig.getBlockConfigName(BlockConfiguration.SortingFull4))) {
+            for (int i = 0; i < resolvers.length; i++)
+                factory.registerBlock(fullDrawers4[i], "fullDrawersSort4" + tail[i]);
+        }
+        if (blockConfig.isBlockEnabled(blockConfig.getBlockConfigName(BlockConfiguration.SortingHalf2))) {
+            for (int i = 0; i < resolvers.length; i++)
+                factory.registerBlock(halfDrawers2[i], "halfDrawersSort2" + tail[i]);
+        }
+        if (blockConfig.isBlockEnabled(blockConfig.getBlockConfigName(BlockConfiguration.SortingHalf4))) {
+            for (int i = 0; i < resolvers.length; i++)
+                factory.registerBlock(halfDrawers4[i], "halfDrawersSort4" + tail[i]);
+        }
+        if (blockConfig.isBlockEnabled(blockConfig.getBlockConfigName(BlockConfiguration.TrimSorting))) {
+            for (int i = 0; i < resolvers.length; i++)
+                factory.registerBlock(trim[i], "trimSort" + tail[i]);
+        }
+
+        if (!config.addonConfig().showAddonItemsNEI()) {
+            for (int i = 0; i < resolvers.length; i++) {
+                factory.hideBlock(ModBlocks.getQualifiedName(fullDrawers1[i]));
+                factory.hideBlock(ModBlocks.getQualifiedName(fullDrawers2[i]));
+                factory.hideBlock(ModBlocks.getQualifiedName(fullDrawers4[i]));
+                factory.hideBlock(ModBlocks.getQualifiedName(halfDrawers2[i]));
+                factory.hideBlock(ModBlocks.getQualifiedName(halfDrawers4[i]));
+                factory.hideBlock(ModBlocks.getQualifiedName(trim[i]));
             }
         }
     }

packs/Forestry/src/com/jaquadro/minecraft/storagedrawers/packs/forestry/item/ItemDrawersPack.java

@@ -1,48 +0,0 @@
-package com.jaquadro.minecraft.storagedrawers.packs.forestry.item;
-
-import com.jaquadro.minecraft.storagedrawers.StorageDrawers;
-import com.jaquadro.minecraft.storagedrawers.config.ConfigManager;
-import com.jaquadro.minecraft.storagedrawers.item.ItemDrawers;
-import com.jaquadro.minecraft.storagedrawers.packs.forestry.block.BlockDrawersPack;
-import com.jaquadro.minecraft.storagedrawers.packs.forestry.core.ModBlocks;
-import net.minecraft.block.Block;
-
-public class ItemDrawersPack extends ItemDrawers
-{
-    public ItemDrawersPack (Block block) {
-        super(block, getTextureGroupForBlock(block));
-    }
-
-    protected ItemDrawersPack (Block block, String[] names) {
-        super(block, names);
-    }
-
-    private static String[] getTextureGroupForBlock (Block block) {
-        if (block == ModBlocks.fullDrawers1A ||
-            block == ModBlocks.fullDrawers2A ||
-            block == ModBlocks.fullDrawers4A ||
-            block == ModBlocks.halfDrawers2A ||
-            block == ModBlocks.halfDrawers4A)
-            return BlockDrawersPack.textureNames1;
-        else
-            return BlockDrawersPack.textureNames2;
-    }
-
-    protected int getCapacityForBlock (Block block) {
-        ConfigManager config = StorageDrawers.config;
-        int count = 0;
-
-        if (block == ModBlocks.fullDrawers1A || block == ModBlocks.fullDrawers1B)
-            count = config.getBlockBaseStorage("fulldrawers1");
-        else if (block == ModBlocks.fullDrawers2A || block == ModBlocks.fullDrawers2B)
-            count = config.getBlockBaseStorage("fulldrawers2");
-        else if (block == ModBlocks.fullDrawers4A || block == ModBlocks.fullDrawers4B)
-            count = config.getBlockBaseStorage("fulldrawers4");
-        else if (block == ModBlocks.halfDrawers2A || block == ModBlocks.halfDrawers2B)
-            count = config.getBlockBaseStorage("halfdrawers2");
-        else if (block == ModBlocks.halfDrawers4A || block == ModBlocks.halfDrawers4B)
-            count = config.getBlockBaseStorage("halfdrawers4");
-
-        return count;
-    }
-}

packs/Forestry/src/com/jaquadro/minecraft/storagedrawers/packs/forestry/item/ItemSortingDrawersPack.java

@@ -1,62 +0,0 @@
-package com.jaquadro.minecraft.storagedrawers.packs.forestry.item;
-
-import com.jaquadro.minecraft.storagedrawers.StorageDrawers;
-import com.jaquadro.minecraft.storagedrawers.config.ConfigManager;
-import com.jaquadro.minecraft.storagedrawers.packs.forestry.block.BlockDrawersPack;
-import com.jaquadro.minecraft.storagedrawers.packs.forestry.core.ModBlocks;
-import com.jaquadro.minecraft.storagedrawers.packs.forestry.core.RefinedRelocation;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.block.Block;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.StatCollector;
-
-import java.util.List;
-
-public class ItemSortingDrawersPack extends ItemDrawersPack
-{
-    public ItemSortingDrawersPack (Block block) {
-        super(block, getTextureGroupForBlock(block));
-    }
-
-    private static String[] getTextureGroupForBlock (Block block) {
-        if (block == RefinedRelocation.fullDrawers1A ||
-            block == RefinedRelocation.fullDrawers2A ||
-            block == RefinedRelocation.fullDrawers4A ||
-            block == RefinedRelocation.halfDrawers2A ||
-            block == RefinedRelocation.halfDrawers4A)
-            return BlockDrawersPack.textureNames1;
-        else
-            return BlockDrawersPack.textureNames2;
-    }
-
-    @Override
-    @SideOnly(Side.CLIENT)
-    public void addInformation (ItemStack itemStack, EntityPlayer player, List list, boolean par4) {
-        super.addInformation(itemStack, player, list, par4);
-
-        Block block = Block.getBlockFromItem(itemStack.getItem());
-        list.add(EnumChatFormatting.YELLOW + StatCollector.translateToLocalFormatted("storageDrawers.waila.sorting"));
-    }
-
-    @Override
-    protected int getCapacityForBlock (Block block) {
-        ConfigManager config = StorageDrawers.config;
-        int count = 0;
-
-        if (block == RefinedRelocation.fullDrawers1A || block == RefinedRelocation.fullDrawers1B)
-            count = config.getBlockBaseStorage("fulldrawers1");
-        else if (block == RefinedRelocation.fullDrawers2A || block == RefinedRelocation.fullDrawers2B)
-            count = config.getBlockBaseStorage("fulldrawers2");
-        else if (block == RefinedRelocation.fullDrawers4A || block == RefinedRelocation.fullDrawers4B)
-            count = config.getBlockBaseStorage("fulldrawers4");
-        else if (block == RefinedRelocation.halfDrawers2A || block == RefinedRelocation.halfDrawers2B)
-            count = config.getBlockBaseStorage("halfdrawers2");
-        else if (block == RefinedRelocation.halfDrawers4A || block == RefinedRelocation.halfDrawers4B)
-            count = config.getBlockBaseStorage("halfdrawers4");
-
-        return count;
-    }
-}

packs/Forestry/src/com/jaquadro/minecraft/storagedrawers/packs/forestry/item/ItemTrimPack.java

@@ -1,20 +0,0 @@
-package com.jaquadro.minecraft.storagedrawers.packs.forestry.item;
-
-import com.jaquadro.minecraft.storagedrawers.item.ItemTrim;
-import com.jaquadro.minecraft.storagedrawers.packs.forestry.block.BlockDrawersPack;
-import com.jaquadro.minecraft.storagedrawers.packs.forestry.core.ModBlocks;
-import net.minecraft.block.Block;
-
-public class ItemTrimPack extends ItemTrim
-{
-    public ItemTrimPack (Block block) {
-        super(block, getTextureGroupForBlock(block));
-    }
-
-    private static String[] getTextureGroupForBlock (Block block) {
-        if (block == ModBlocks.trimA)
-            return BlockDrawersPack.textureNames1;
-        else
-            return BlockDrawersPack.textureNames2;
-    }
-}

packs/Misc/build.gradle

@@ -0,0 +1,72 @@
+buildscript {
+    repositories {
+        mavenCentral()
+        maven {
+            name = "forge"
+            url = "http://files.minecraftforge.net/maven"
+        }
+        maven {
+            name = "sonatype"
+            url = "https://oss.sonatype.org/content/repositories/snapshots/"
+        }
+    }
+    dependencies {
+        classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
+    }
+}
+
+apply plugin: 'forge'
+
+version = "1.7.10-1.1.0"
+group= "com.jaquadro.minecraft.storagedrawers" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
+archivesBaseName = "StorageDrawers-Misc"
+
+minecraft {
+    version = "1.7.10-10.13.3.1408-1.7.10"
+    assetDir = "../../runtime/assets"
+
+    replace '@VERSION@', project.version
+    replace 'required-after:StorageDrawers', "required-after:StorageDrawers@[1.7.5,)"
+}
+
+sourceSets.main {
+    java {
+        srcDirs project.projectDir.getPath() + '/src'
+    }
+    resources {
+        srcDirs project.projectDir.getPath() + '/resources'
+    }
+}
+
+dependencies {
+    compile project(path: ':', transitive: false)
+}
+
+processResources
+{
+    // this will ensure that this task is redone when the versions change.
+    inputs.property "version", project.version
+    inputs.property "mcversion", project.minecraft.version
+
+    // replace stuff in mcmod.info, nothing else
+    from(sourceSets.main.resources.srcDirs) {
+        include 'mcmod.info'
+                
+        // replace version and mcversion
+        expand 'version':project.version, 'mcversion':project.minecraft.version
+    }
+        
+    // copy everything else, thats not the mcmod.info
+    from(sourceSets.main.resources.srcDirs) {
+        exclude 'mcmod.info'
+    }
+}
+
+task deobfJar(type: Jar) {
+    from sourceSets.main.output
+    classifier = 'dev'
+}
+
+artifacts {
+    archives deobfJar
+}

packs/Misc/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,6 @@
+#Wed Jul 02 15:54:47 CDT 2014
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip

packs/Misc/gradlew

@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

packs/Misc/gradlew.bat

@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

packs/Misc/resources/assets/storagedrawersmisc/lang/en_US.lang

@@ -0,0 +1,134 @@
+itemGroup.storageDrawersMisc=Storage Drawers: Misc
+
+# Blocks
+tile.storagedrawersmisc.fullDrawers1.ebxl_acacia.name=Acacia Drawer
+tile.storagedrawersmisc.fullDrawers1.ebxl_autumn.name=Autumn Drawer
+tile.storagedrawersmisc.fullDrawers1.ebxl_baldcypress.name=Bald Cypress Drawer
+tile.storagedrawersmisc.fullDrawers1.ebxl_cypress.name=Cypress Drawer
+tile.storagedrawersmisc.fullDrawers1.ebxl_fir.name=Fir Drawer
+tile.storagedrawersmisc.fullDrawers1.ebxl_japanesemaple.name=Japanese Maple Drawer
+tile.storagedrawersmisc.fullDrawers1.ebxl_rainboweucalyptus.name=Rainbow Eucalyptus Drawer
+tile.storagedrawersmisc.fullDrawers1.ebxl_redwood.name=Redwood Drawer
+tile.storagedrawersmisc.fullDrawers1.ebxl_sakura.name=Sakura Drawer
+tile.storagedrawersmisc.fullDrawers1.hl_white.name=White Drawer
+tile.storagedrawersmisc.fullDrawers1.hl_grey.name=Grey Drawer
+tile.storagedrawersmisc.fullDrawers1.hl_red.name=Red Drawer
+tile.storagedrawersmisc.fullDrawers1.hl_yellow.name=Yellow Drawer
+tile.storagedrawersmisc.fullDrawers1.tc_greatwood.name=Greatwood Drawer
+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.fullDrawers1.botania_livingwood.name=Livingwood Drawer
+tile.storagedrawersmisc.fullDrawers1.botania_dreamwood.name=Dreamwood Drawer
+
+tile.storagedrawersmisc.fullDrawers2.ebxl_acacia.name=Acacia Drawers 1x2
+tile.storagedrawersmisc.fullDrawers2.ebxl_autumn.name=Autumn Drawers 1x2
+tile.storagedrawersmisc.fullDrawers2.ebxl_baldcypress.name=Bald Cypress Drawers 1x2
+tile.storagedrawersmisc.fullDrawers2.ebxl_cypress.name=Cypress Drawers 1x2
+tile.storagedrawersmisc.fullDrawers2.ebxl_fir.name=Fir Drawers 1x2
+tile.storagedrawersmisc.fullDrawers2.ebxl_japanesemaple.name=Japanese Maple Drawers 1x2
+tile.storagedrawersmisc.fullDrawers2.ebxl_rainboweucalyptus.name=Rainbow Eucalyptus Drawers 1x2
+tile.storagedrawersmisc.fullDrawers2.ebxl_redwood.name=Redwood Drawers 1x2
+tile.storagedrawersmisc.fullDrawers2.ebxl_sakura.name=Sakura Drawers 1x2
+tile.storagedrawersmisc.fullDrawers2.hl_white.name=White Drawers 1x2
+tile.storagedrawersmisc.fullDrawers2.hl_grey.name=Grey Drawers 1x2
+tile.storagedrawersmisc.fullDrawers2.hl_red.name=Red Drawers 1x2
+tile.storagedrawersmisc.fullDrawers2.hl_yellow.name=Yellow Drawers 1x2
+tile.storagedrawersmisc.fullDrawers2.tc_greatwood.name=Greatwood Drawers 1x2
+tile.storagedrawersmisc.fullDrawers2.tc_silverwood.name=Silverwood Drawers 1x2
+tile.storagedrawersmisc.fullDrawers2.witchery_alder.name=Alder Drawers 1x2
+tile.storagedrawersmisc.fullDrawers2.witchery_hawthorn.name=Hawthorn Drawers 1x2
+tile.storagedrawersmisc.fullDrawers2.witchery_rowan.name=Rowan Drawers 1x2
+tile.storagedrawersmisc.fullDrawers2.immeng_treated.name=Treated Wood Drawers 1x2
+tile.storagedrawersmisc.fullDrawers2.botania_livingwood.name=Livingwood Drawers 1x2
+tile.storagedrawersmisc.fullDrawers2.botania_dreamwood.name=Dreamwood Drawers 1x2
+
+tile.storagedrawersmisc.fullDrawers4.ebxl_acacia.name=Acacia Drawers 2x2
+tile.storagedrawersmisc.fullDrawers4.ebxl_autumn.name=Autumn Drawers 2x2
+tile.storagedrawersmisc.fullDrawers4.ebxl_baldcypress.name=Bald Cypress Drawers 2x2
+tile.storagedrawersmisc.fullDrawers4.ebxl_cypress.name=Cypress Drawers 2x2
+tile.storagedrawersmisc.fullDrawers4.ebxl_fir.name=Fir Drawers 2x2
+tile.storagedrawersmisc.fullDrawers4.ebxl_japanesemaple.name=Japanese Maple Drawers 2x2
+tile.storagedrawersmisc.fullDrawers4.ebxl_rainboweucalyptus.name=Rainbow Eucalyptus Drawers 2x2
+tile.storagedrawersmisc.fullDrawers4.ebxl_redwood.name=Redwood Drawers 2x2
+tile.storagedrawersmisc.fullDrawers4.ebxl_sakura.name=Sakura Drawers 2x2
+tile.storagedrawersmisc.fullDrawers4.hl_white.name=White Drawers 2x2
+tile.storagedrawersmisc.fullDrawers4.hl_grey.name=Grey Drawers 2x2
+tile.storagedrawersmisc.fullDrawers4.hl_red.name=Red Drawers 2x2
+tile.storagedrawersmisc.fullDrawers4.hl_yellow.name=Yellow Drawers 2x2
+tile.storagedrawersmisc.fullDrawers4.tc_greatwood.name=Greatwood Drawers 2x2
+tile.storagedrawersmisc.fullDrawers4.tc_silverwood.name=Silverwood Drawers 2x2
+tile.storagedrawersmisc.fullDrawers4.witchery_alder.name=Alder Drawers 2x2
+tile.storagedrawersmisc.fullDrawers4.witchery_hawthorn.name=Hawthorn Drawers 2x2
+tile.storagedrawersmisc.fullDrawers4.witchery_rowan.name=Rowan Drawers 2x2
+tile.storagedrawersmisc.fullDrawers4.immeng_treated.name=Treated Wood Drawers 2x2
+tile.storagedrawersmisc.fullDrawers4.botania_livingwood.name=Livingwood Drawers 2x2
+tile.storagedrawersmisc.fullDrawers4.botania_dreamwood.name=Dreamwood Drawers 2x2
+
+tile.storagedrawersmisc.halfDrawers2.ebxl_acacia.name=Compact Acacia Drawers 1x2
+tile.storagedrawersmisc.halfDrawers2.ebxl_autumn.name=Compact Autumn Drawers 1x2
+tile.storagedrawersmisc.halfDrawers2.ebxl_baldcypress.name=Compact Bald Cypress Drawers 1x2
+tile.storagedrawersmisc.halfDrawers2.ebxl_cypress.name=Compact Cypress Drawers 1x2
+tile.storagedrawersmisc.halfDrawers2.ebxl_fir.name=Compact Fir Drawers 1x2
+tile.storagedrawersmisc.halfDrawers2.ebxl_japanesemaple.name=Compact Japanese Maple Drawers 1x2
+tile.storagedrawersmisc.halfDrawers2.ebxl_rainboweucalyptus.name=Compact Rainbow Eucalyptus Drawers 1x2
+tile.storagedrawersmisc.halfDrawers2.ebxl_redwood.name=Compact Redwood Drawers 1x2
+tile.storagedrawersmisc.halfDrawers2.ebxl_sakura.name=Compact Sakura Drawers 1x2
+tile.storagedrawersmisc.halfDrawers2.hl_white.name=Compact White Drawers 1x2
+tile.storagedrawersmisc.halfDrawers2.hl_grey.name=Compact Grey Drawers 1x2
+tile.storagedrawersmisc.halfDrawers2.hl_red.name=Compact Red Drawers 1x2
+tile.storagedrawersmisc.halfDrawers2.hl_yellow.name=Compact Yellow Drawers 1x2
+tile.storagedrawersmisc.halfDrawers2.tc_greatwood.name=Compact Greatwood Drawers 1x2
+tile.storagedrawersmisc.halfDrawers2.tc_silverwood.name=Compact Silverwood Drawers 1x2
+tile.storagedrawersmisc.halfDrawers2.witchery_alder.name=Compact Alder Drawers 1x2
+tile.storagedrawersmisc.halfDrawers2.witchery_hawthorn.name=Compact Hawthorn Drawers 1x2
+tile.storagedrawersmisc.halfDrawers2.witchery_rowan.name=Compact Rowan Drawers 1x2
+tile.storagedrawersmisc.halfDrawers2.immeng_treated.name=Compact Treated Wood Drawers 1x2
+tile.storagedrawersmisc.halfDrawers2.botania_livingwood.name=Compact Livingwood Drawers 1x2
+tile.storagedrawersmisc.halfDrawers2.botania_dreamwood.name=Compact Dreamwood Drawers 1x2
+
+tile.storagedrawersmisc.halfDrawers4.ebxl_acacia.name=Compact Acacia Drawers 2x2
+tile.storagedrawersmisc.halfDrawers4.ebxl_autumn.name=Compact Autumn Drawers 2x2
+tile.storagedrawersmisc.halfDrawers4.ebxl_baldcypress.name=Compact Bald Cypress Drawers 2x2
+tile.storagedrawersmisc.halfDrawers4.ebxl_cypress.name=Compact Cypress Drawers 2x2
+tile.storagedrawersmisc.halfDrawers4.ebxl_fir.name=Compact Fir Drawers 2x2
+tile.storagedrawersmisc.halfDrawers4.ebxl_japanesemaple.name=Compact Japanese Maple Drawers 2x2
+tile.storagedrawersmisc.halfDrawers4.ebxl_rainboweucalyptus.name=Compact Rainbow Eucalyptus Drawers 2x2
+tile.storagedrawersmisc.halfDrawers4.ebxl_redwood.name=Compact Redwood Drawers 2x2
+tile.storagedrawersmisc.halfDrawers4.ebxl_sakura.name=Compact Sakura Drawers 2x2
+tile.storagedrawersmisc.halfDrawers4.hl_white.name=Compact White Drawers 2x2
+tile.storagedrawersmisc.halfDrawers4.hl_grey.name=Compact Grey Drawers 2x2
+tile.storagedrawersmisc.halfDrawers4.hl_red.name=Compact Red Drawers 2x2
+tile.storagedrawersmisc.halfDrawers4.hl_yellow.name=Compact Yellow Drawers 2x2
+tile.storagedrawersmisc.halfDrawers4.tc_greatwood.name=Compact Greatwood Drawers 2x2
+tile.storagedrawersmisc.halfDrawers4.tc_silverwood.name=Compact Silverwood Drawers 2x2
+tile.storagedrawersmisc.halfDrawers4.witchery_alder.name=Compact Alder Drawers 2x2
+tile.storagedrawersmisc.halfDrawers4.witchery_hawthorn.name=Compact Hawthorn Drawers 2x2
+tile.storagedrawersmisc.halfDrawers4.witchery_rowan.name=Compact Rowan Drawers 2x2
+tile.storagedrawersmisc.halfDrawers4.immeng_treated.name=Compact Treated Wood Drawers 2x2
+tile.storagedrawersmisc.halfDrawers4.botania_livingwood.name=Compact Livingwood Drawers 2x2
+tile.storagedrawersmisc.halfDrawers4.botania_dreamwood.name=Compact Dreamwood Drawers 2x2
+
+tile.storagedrawersmisc.trim.ebxl_acacia.name=Acacia Trim
+tile.storagedrawersmisc.trim.ebxl_autumn.name=Autumn Trim
+tile.storagedrawersmisc.trim.ebxl_baldcypress.name=Bald Cypress Trim
+tile.storagedrawersmisc.trim.ebxl_cypress.name=Cypress Trim
+tile.storagedrawersmisc.trim.ebxl_fir.name=Fir Trim
+tile.storagedrawersmisc.trim.ebxl_japanesemaple.name=Japanese Maple Trim
+tile.storagedrawersmisc.trim.ebxl_rainboweucalyptus.name=Rainbow Eucalyptus Trim
+tile.storagedrawersmisc.trim.ebxl_redwood.name=Redwood Trim
+tile.storagedrawersmisc.trim.ebxl_sakura.name=Sakura Trim
+tile.storagedrawersmisc.trim.hl_white.name=White Trim
+tile.storagedrawersmisc.trim.hl_grey.name=Grey Trim
+tile.storagedrawersmisc.trim.hl_red.name=Red Trim
+tile.storagedrawersmisc.trim.hl_yellow.name=Yellow Trim
+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
+tile.storagedrawersmisc.trim.immeng_treated.name=Treated Wood Trim
+tile.storagedrawersmisc.trim.botania_livingwood.name=Livingwood Trim
+tile.storagedrawersmisc.trim.botania_dreamwood.name=Dreamwood Trim

packs/Misc/resources/assets/storagedrawersmisc/lang/zh_CN.lang

@@ -0,0 +1,122 @@
+itemGroup.storageDrawersMisc=储物抽屉|杂项
+
+# Blocks
+tile.storagedrawersmisc.fullDrawers1.ebxl_acacia.name=刺槐抽屉
+tile.storagedrawersmisc.fullDrawers1.ebxl_autumn.name=秋树抽屉
+tile.storagedrawersmisc.fullDrawers1.ebxl_baldcypress.name=落羽松抽屉
+tile.storagedrawersmisc.fullDrawers1.ebxl_cypress.name=柏树抽屉
+tile.storagedrawersmisc.fullDrawers1.ebxl_fir.name=冷杉抽屉
+tile.storagedrawersmisc.fullDrawers1.ebxl_japanesemaple.name=日本枫树抽屉
+tile.storagedrawersmisc.fullDrawers1.ebxl_rainboweucalyptus.name=彩虹桉树抽屉
+tile.storagedrawersmisc.fullDrawers1.ebxl_redwood.name=红木抽屉
+tile.storagedrawersmisc.fullDrawers1.ebxl_sakura.name=樱花树抽屉
+tile.storagedrawersmisc.fullDrawers1.hl_white.name=白色木抽屉
+tile.storagedrawersmisc.fullDrawers1.hl_grey.name=灰色木抽屉
+tile.storagedrawersmisc.fullDrawers1.hl_red.name=红色木抽屉
+tile.storagedrawersmisc.fullDrawers1.hl_yellow.name=黄色木抽屉
+tile.storagedrawersmisc.fullDrawers1.tc_greatwood.name=宏伟之木抽屉
+tile.storagedrawersmisc.fullDrawers1.tc_silverwood.name=银木抽屉
+tile.storagedrawersmisc.fullDrawers1.witchery_alder.name=赤杨木抽屉
+tile.storagedrawersmisc.fullDrawers1.witchery_hawthorn.name=山楂木抽屉
+tile.storagedrawersmisc.fullDrawers1.witchery_rowan.name=山梨木抽屉
+tile.storagedrawersmisc.fullDrawers1.immeng_treated.name=防腐木抽屉
+
+tile.storagedrawersmisc.fullDrawers2.ebxl_acacia.name=刺槐抽屉(1x2)
+tile.storagedrawersmisc.fullDrawers2.ebxl_autumn.name=秋树抽屉(1x2)
+tile.storagedrawersmisc.fullDrawers2.ebxl_baldcypress.name=落羽松抽屉(1x2)
+tile.storagedrawersmisc.fullDrawers2.ebxl_cypress.name=柏树抽屉(1x2)
+tile.storagedrawersmisc.fullDrawers2.ebxl_fir.name=冷杉抽屉(1x2)
+tile.storagedrawersmisc.fullDrawers2.ebxl_japanesemaple.name=日本枫树抽屉(1x2)
+tile.storagedrawersmisc.fullDrawers2.ebxl_rainboweucalyptus.name=彩虹桉树抽屉(1x2)
+tile.storagedrawersmisc.fullDrawers2.ebxl_redwood.name=红木抽屉(1x2)
+tile.storagedrawersmisc.fullDrawers2.ebxl_sakura.name=樱花树抽屉(1x2)
+tile.storagedrawersmisc.fullDrawers2.hl_white.name=白色木抽屉(1x2)
+tile.storagedrawersmisc.fullDrawers2.hl_grey.name=灰色木抽屉(1x2)
+tile.storagedrawersmisc.fullDrawers2.hl_red.name=红色木抽屉(1x2)
+tile.storagedrawersmisc.fullDrawers2.hl_yellow.name=黄色木抽屉(1x2)
+tile.storagedrawersmisc.fullDrawers2.tc_greatwood.name=宏伟之木抽屉(1x2)
+tile.storagedrawersmisc.fullDrawers2.tc_silverwood.name=银木抽屉(1x2)
+tile.storagedrawersmisc.fullDrawers2.witchery_alder.name=赤杨木抽屉(1x2)
+tile.storagedrawersmisc.fullDrawers2.witchery_hawthorn.name=山楂木抽屉(1x2)
+tile.storagedrawersmisc.fullDrawers2.witchery_rowan.name=山梨木抽屉(1x2)
+tile.storagedrawersmisc.fullDrawers2.immeng_treated.name=防腐木抽屉(1x2)
+
+tile.storagedrawersmisc.fullDrawers4.ebxl_acacia.name=刺槐抽屉(2x2)
+tile.storagedrawersmisc.fullDrawers4.ebxl_autumn.name=秋树抽屉(2x2)
+tile.storagedrawersmisc.fullDrawers4.ebxl_baldcypress.name=落羽松抽屉(2x2)
+tile.storagedrawersmisc.fullDrawers4.ebxl_cypress.name=柏树抽屉(2x2)
+tile.storagedrawersmisc.fullDrawers4.ebxl_fir.name=冷杉抽屉(2x2)
+tile.storagedrawersmisc.fullDrawers4.ebxl_japanesemaple.name=日本枫树抽屉(2x2)
+tile.storagedrawersmisc.fullDrawers4.ebxl_rainboweucalyptus.name=彩虹桉树抽屉(2x2)
+tile.storagedrawersmisc.fullDrawers4.ebxl_redwood.name=红木抽屉(2x2)
+tile.storagedrawersmisc.fullDrawers4.ebxl_sakura.name=樱花树抽屉(2x2)
+tile.storagedrawersmisc.fullDrawers4.hl_white.name=白色木抽屉(2x2)
+tile.storagedrawersmisc.fullDrawers4.hl_grey.name=灰色木抽屉(2x2)
+tile.storagedrawersmisc.fullDrawers4.hl_red.name=红色木抽屉(2x2)
+tile.storagedrawersmisc.fullDrawers4.hl_yellow.name=黄色木抽屉(2x2)
+tile.storagedrawersmisc.fullDrawers4.tc_greatwood.name=宏伟之木抽屉(2x2)
+tile.storagedrawersmisc.fullDrawers4.tc_silverwood.name=银木抽屉(2x2)
+tile.storagedrawersmisc.fullDrawers4.witchery_alder.name=赤杨木抽屉(2x2)
+tile.storagedrawersmisc.fullDrawers4.witchery_hawthorn.name=山楂木抽屉(2x2)
+tile.storagedrawersmisc.fullDrawers4.witchery_rowan.name=山梨木抽屉(2x2)
+tile.storagedrawersmisc.fullDrawers4.immeng_treated.name=防腐木抽屉(2x2)
+
+tile.storagedrawersmisc.halfDrawers2.ebxl_acacia.name=小型刺槐抽屉(1x2)
+tile.storagedrawersmisc.halfDrawers2.ebxl_autumn.name=小型秋树抽屉(1x2)
+tile.storagedrawersmisc.halfDrawers2.ebxl_baldcypress.name=小型落羽松抽屉(1x2)
+tile.storagedrawersmisc.halfDrawers2.ebxl_cypress.name=小型柏树抽屉(1x2)
+tile.storagedrawersmisc.halfDrawers2.ebxl_fir.name=小型冷杉抽屉(1x2)
+tile.storagedrawersmisc.halfDrawers2.ebxl_japanesemaple.name=小型日本枫树抽屉(1x2)
+tile.storagedrawersmisc.halfDrawers2.ebxl_rainboweucalyptus.name=小型彩虹桉树抽屉(1x2)
+tile.storagedrawersmisc.halfDrawers2.ebxl_redwood.name=小型红木抽屉(1x2)
+tile.storagedrawersmisc.halfDrawers2.ebxl_sakura.name=小型樱花树抽屉(1x2)
+tile.storagedrawersmisc.halfDrawers2.hl_white.name=小型白色木抽屉(1x2)
+tile.storagedrawersmisc.halfDrawers2.hl_grey.name=小型灰色木抽屉(1x2)
+tile.storagedrawersmisc.halfDrawers2.hl_red.name=小型红色木抽屉(1x2)
+tile.storagedrawersmisc.halfDrawers2.hl_yellow.name=小型黄色木抽屉(1x2)
+tile.storagedrawersmisc.halfDrawers2.tc_greatwood.name=小型宏伟之木抽屉(1x2)
+tile.storagedrawersmisc.halfDrawers2.tc_silverwood.name=小型银木抽屉(1x2)
+tile.storagedrawersmisc.halfDrawers2.witchery_alder.name=小型赤杨木抽屉(1x2)
+tile.storagedrawersmisc.halfDrawers2.witchery_hawthorn.name=小型山楂木抽屉(1x2)
+tile.storagedrawersmisc.halfDrawers2.witchery_rowan.name=小型山梨木抽屉(1x2)
+tile.storagedrawersmisc.halfDrawers2.immeng_treated.name=小型防腐木抽屉(1x2)
+
+tile.storagedrawersmisc.halfDrawers4.ebxl_acacia.name=小型刺槐抽屉(2x2)
+tile.storagedrawersmisc.halfDrawers4.ebxl_autumn.name=小型秋树抽屉(2x2)
+tile.storagedrawersmisc.halfDrawers4.ebxl_baldcypress.name=小型落羽松抽屉(2x2)
+tile.storagedrawersmisc.halfDrawers4.ebxl_cypress.name=小型柏树抽屉(2x2)
+tile.storagedrawersmisc.halfDrawers4.ebxl_fir.name=小型冷杉抽屉(2x2)
+tile.storagedrawersmisc.halfDrawers4.ebxl_japanesemaple.name=小型日本枫树抽屉(2x2)
+tile.storagedrawersmisc.halfDrawers4.ebxl_rainboweucalyptus.name=小型彩虹桉树抽屉(2x2)
+tile.storagedrawersmisc.halfDrawers4.ebxl_redwood.name=小型红木抽屉(2x2)
+tile.storagedrawersmisc.halfDrawers4.ebxl_sakura.name=小型樱花树抽屉(2x2)
+tile.storagedrawersmisc.halfDrawers4.hl_white.name=小型白色木抽屉(2x2)
+tile.storagedrawersmisc.halfDrawers4.hl_grey.name=小型灰色木抽屉(2x2)
+tile.storagedrawersmisc.halfDrawers4.hl_red.name=小型红色木抽屉(2x2)
+tile.storagedrawersmisc.halfDrawers4.hl_yellow.name=小型黄色木抽屉(2x2)
+tile.storagedrawersmisc.halfDrawers4.tc_greatwood.name=小型宏伟之木抽屉(2x2)
+tile.storagedrawersmisc.halfDrawers4.tc_silverwood.name=小型银木抽屉(2x2)
+tile.storagedrawersmisc.halfDrawers4.witchery_alder.name=小型赤杨木抽屉(2x2)
+tile.storagedrawersmisc.halfDrawers4.witchery_hawthorn.name=小型山楂木抽屉(2x2)
+tile.storagedrawersmisc.halfDrawers4.witchery_rowan.name=小型山梨木抽屉(2x2)
+tile.storagedrawersmisc.halfDrawers4.immeng_treated.name=小型防腐木抽屉(2x2)
+
+tile.storagedrawersmisc.trim.ebxl_acacia.name=刺槐桥接方块
+tile.storagedrawersmisc.trim.ebxl_autumn.name=秋树桥接方块
+tile.storagedrawersmisc.trim.ebxl_baldcypress.name=落羽松桥接方块
+tile.storagedrawersmisc.trim.ebxl_cypress.name=柏树桥接方块
+tile.storagedrawersmisc.trim.ebxl_fir.name=冷杉桥接方块
+tile.storagedrawersmisc.trim.ebxl_japanesemaple.name=日本枫树桥接方块
+tile.storagedrawersmisc.trim.ebxl_rainboweucalyptus.name=彩虹桉树桥接方块
+tile.storagedrawersmisc.trim.ebxl_redwood.name=红木桥接方块
+tile.storagedrawersmisc.trim.ebxl_sakura.name=樱花树桥接方块
+tile.storagedrawersmisc.trim.hl_white.name=白色木桥接方块
+tile.storagedrawersmisc.trim.hl_grey.name=灰色木桥接方块
+tile.storagedrawersmisc.trim.hl_red.name=红色木桥接方块
+tile.storagedrawersmisc.trim.hl_yellow.name=黄色木桥接方块
+tile.storagedrawersmisc.trim.tc_greatwood.name=宏伟之木桥接方块
+tile.storagedrawersmisc.trim.tc_silverwood.name=银木桥接方块
+tile.storagedrawersmisc.trim.witchery_alder.name=赤杨木桥接方块
+tile.storagedrawersmisc.trim.witchery_hawthorn.name=山楂木桥接方块
+tile.storagedrawersmisc.trim.witchery_rowan.name=山梨木桥接方块
+tile.storagedrawersmisc.trim.immeng_treated.name=防腐木桥接方块