Add Aether mod support + Fixed Immersive Engineering crafting

resources/assets/storagedrawersextra/lang/en_US.lang

@@ -8,68 +8,74 @@ tile.extraDrawers.halfdrawers4.name=Half Drawers 2x2
 tile.extraTrim.name=Storage Trim
 
 # Materials (Natura)
-storagedrawers.material.natura:eucalyptus=Eucalyptus
-storagedrawers.material.natura:sakura=Sakura
-storagedrawers.material.natura:ghostwood=Ghostwood
-storagedrawers.material.natura:redwood=Redwood
-storagedrawers.material.natura:bloodwood=Bloodwood
-storagedrawers.material.natura:hopseed=Hopseed
-storagedrawers.material.natura:maple=Maple
-storagedrawers.material.natura:silverbell=Silverbell
-storagedrawers.material.natura:purpleheart=Amaranth
-storagedrawers.material.natura:tigerwood=Tigerwood
-storagedrawers.material.natura:willow=Willow
-storagedrawers.material.natura:darkwood=Darkwood
-storagedrawers.material.natura:fusewood=Fusewood
+storagedrawers.material.natura.eucalyptus=Eucalyptus
+storagedrawers.material.natura.sakura=Sakura
+storagedrawers.material.natura.ghostwood=Ghostwood
+storagedrawers.material.natura.redwood=Redwood
+storagedrawers.material.natura.bloodwood=Bloodwood
+storagedrawers.material.natura.hopseed=Hopseed
+storagedrawers.material.natura.maple=Maple
+storagedrawers.material.natura.silverbell=Silverbell
+storagedrawers.material.natura.purpleheart=Amaranth
+storagedrawers.material.natura.tigerwood=Tigerwood
+storagedrawers.material.natura.willow=Willow
+storagedrawers.material.natura.darkwood=Darkwood
+storagedrawers.material.natura.fusewood=Fusewood
 
 # Materials (Biomes O' Plenty)
-storagedrawers.material.biomesoplenty:sacredoak=Sacred Oak
-storagedrawers.material.biomesoplenty:cherry=Cherry
-storagedrawers.material.biomesoplenty:dark=Umbran
-storagedrawers.material.biomesoplenty:fir=Fir
-storagedrawers.material.biomesoplenty:ethereal=Ethereal
-storagedrawers.material.biomesoplenty:magic=Magic
-storagedrawers.material.biomesoplenty:mangrove=Mangrove
-storagedrawers.material.biomesoplenty:palm=Palm
-storagedrawers.material.biomesoplenty:redwood=Redwood
-storagedrawers.material.biomesoplenty:willow=Willow
-storagedrawers.material.biomesoplenty:pine=Pine
-storagedrawers.material.biomesoplenty:hellbark=Hellbark
-storagedrawers.material.biomesoplenty:jacaranda=Jacaranda
-storagedrawers.material.biomesoplenty:mahogany=Mahogany
-storagedrawers.material.biomesoplenty:ebony=Ebony
-storagedrawers.material.biomesoplenty:eucalyptus=Eucalyptus
+storagedrawers.material.biomesoplenty.sacredoak=Sacred Oak
+storagedrawers.material.biomesoplenty.cherry=Cherry
+storagedrawers.material.biomesoplenty.dark=Umbran
+storagedrawers.material.biomesoplenty.fir=Fir
+storagedrawers.material.biomesoplenty.ethereal=Ethereal
+storagedrawers.material.biomesoplenty.magic=Magic
+storagedrawers.material.biomesoplenty.mangrove=Mangrove
+storagedrawers.material.biomesoplenty.palm=Palm
+storagedrawers.material.biomesoplenty.redwood=Redwood
+storagedrawers.material.biomesoplenty.willow=Willow
+storagedrawers.material.biomesoplenty.pine=Pine
+storagedrawers.material.biomesoplenty.hellbark=Hellbark
+storagedrawers.material.biomesoplenty.jacaranda=Jacaranda
+storagedrawers.material.biomesoplenty.mahogany=Mahogany
+storagedrawers.material.biomesoplenty.ebony=Ebony
+storagedrawers.material.biomesoplenty.eucalyptus=Eucalyptus
 
 # Materials (Forestry)
-storagedrawers.material.forestry:larch=Larch
-storagedrawers.material.forestry:teak=Teak
-storagedrawers.material.forestry:acacia=Acacia
-storagedrawers.material.forestry:lime=Lime
-storagedrawers.material.forestry:chestnut=Chestnut
-storagedrawers.material.forestry:wenge=Wenge
-storagedrawers.material.forestry:baobab=Baobab
-storagedrawers.material.forestry:sequoia=Sequoia
-storagedrawers.material.forestry:kapok=Kapok
-storagedrawers.material.forestry:ebony=Ebony
-storagedrawers.material.forestry:mahogany=Mahogany
-storagedrawers.material.forestry:balsa=Balsa
-storagedrawers.material.forestry:willow=Willow
-storagedrawers.material.forestry:walnut=Walnut
-storagedrawers.material.forestry:greenheart=Greenheart
-storagedrawers.material.forestry:cherry=Cherry
-storagedrawers.material.forestry:mahoe=Mahoe
-storagedrawers.material.forestry:poplar=Poplar
-storagedrawers.material.forestry:palm=Palm
-storagedrawers.material.forestry:papaya=Papaya
-storagedrawers.material.forestry:pine=Pine
-storagedrawers.material.forestry:plum=Plum
-storagedrawers.material.forestry:maple=Maple
-storagedrawers.material.forestry:citrus=Citrus
-storagedrawers.material.forestry:giganteum=Giant Sequoia
-storagedrawers.material.forestry:ipe=Ipe
-storagedrawers.material.forestry:padauk=Padauk
-storagedrawers.material.forestry:cocobolo=Cocobolo
-storagedrawers.material.forestry:zebrawood=Zebrawood
+storagedrawers.material.forestry.larch=Larch
+storagedrawers.material.forestry.teak=Teak
+storagedrawers.material.forestry.acacia=Acacia
+storagedrawers.material.forestry.lime=Lime
+storagedrawers.material.forestry.chestnut=Chestnut
+storagedrawers.material.forestry.wenge=Wenge
+storagedrawers.material.forestry.baobab=Baobab
+storagedrawers.material.forestry.sequoia=Sequoia
+storagedrawers.material.forestry.kapok=Kapok
+storagedrawers.material.forestry.ebony=Ebony
+storagedrawers.material.forestry.mahogany=Mahogany
+storagedrawers.material.forestry.balsa=Balsa
+storagedrawers.material.forestry.willow=Willow
+storagedrawers.material.forestry.walnut=Walnut
+storagedrawers.material.forestry.greenheart=Greenheart
+storagedrawers.material.forestry.cherry=Cherry
+storagedrawers.material.forestry.mahoe=Mahoe
+storagedrawers.material.forestry.poplar=Poplar
+storagedrawers.material.forestry.palm=Palm
+storagedrawers.material.forestry.papaya=Papaya
+storagedrawers.material.forestry.pine=Pine
+storagedrawers.material.forestry.plum=Plum
+storagedrawers.material.forestry.maple=Maple
+storagedrawers.material.forestry.citrus=Citrus
+storagedrawers.material.forestry.giganteum=Giant Sequoia
+storagedrawers.material.forestry.ipe=Ipe
+storagedrawers.material.forestry.padauk=Padauk
+storagedrawers.material.forestry.cocobolo=Cocobolo
+storagedrawers.material.forestry.zebrawood=Zebrawood
 
 # Materials (Immersive Engineering)
-storagedrawers.material.immersiveengineering:immeng_treated=Treated Wood
+storagedrawers.material.immersiveengineering.immeng_treated=Treated Wood
+
+# Materials (Aether)
+storagedrawers.material.aether.skyroot=Skyroot
+storagedrawers.material.aether.greatroot=Greatroot
+storagedrawers.material.aether.wisproot=Wisproot
+storagedrawers.material.aether.therawood=Therawood

src/com/jaquadro/minecraft/storagedrawersextra/block/BlockExtraDrawers.java

@@ -20,6 +20,7 @@
 import net.minecraftforge.common.property.IExtendedBlockState;
 import net.minecraftforge.common.property.IUnlistedProperty;
 import net.minecraftforge.common.property.Properties;
+import net.minecraftforge.fml.common.Loader;
 
 import javax.annotation.Nonnull;
 
@@ -68,6 +69,10 @@ public void getSubBlocks (CreativeTabs creativeTabs, NonNullList<ItemStack> list
                 EnumMod mod = material.getMod();
                 if (mod == null || !mod.isEnabled(configExt.getModToggleState(mod)))
                     continue;
+                // only add skyroot if Aether 2 is not installed
+                if (mod == EnumMod.AETHER && material != EnumVariant.AETHER_SKYROOT
+                		&& !Loader.isModLoaded("aether"))
+                	continue;
 
                 ItemStack stack = new ItemStack(this, 1, type.getMetadata());
 

src/com/jaquadro/minecraft/storagedrawersextra/block/BlockTrimExtra.java

@@ -25,6 +25,7 @@
 import net.minecraftforge.common.property.IExtendedBlockState;
 import net.minecraftforge.common.property.IUnlistedProperty;
 import net.minecraftforge.common.property.Properties;
+import net.minecraftforge.fml.common.Loader;
 
 import javax.annotation.Nonnull;
 import java.util.ArrayList;
@@ -87,6 +88,10 @@ public void getSubBlocks (CreativeTabs creativeTabs, NonNullList<ItemStack> list
             EnumMod mod = variant.getMod();
             if (mod == null || !mod.isEnabled(configExt.getModToggleState(mod)))
                 continue;
+         // only add skyroot if Aether 2 is not installed
+            if (mod == EnumMod.AETHER && variant != EnumVariant.AETHER_SKYROOT
+            		&& !Loader.isModLoaded("aether"))
+            	continue;
 
             if (group == variant.getGroupIndex())
                 list.add(new ItemStack(this, 1, variant.getGroupMeta()));

src/com/jaquadro/minecraft/storagedrawersextra/block/EnumMod.java

@@ -11,7 +11,12 @@ public enum EnumMod implements IStringSerializable
     NATURA("natura", EnumVariant.NATURA_WILLOW),
     BOP("biomesoplenty", EnumVariant.BOP_WILLOW),
     FORESTRY("forestry", EnumVariant.FORESTRY_WILLOW),
-    IMMENG("immersiveengineering", EnumVariant.IMMENG_TREATED)
+    IMMENG("immersiveengineering", EnumVariant.IMMENG_TREATED),
+    AETHER("aether", EnumVariant.AETHER_SKYROOT) {
+    	public boolean isLoaded() {
+    		return Loader.isModLoaded("aether") || Loader.isModLoaded("aether_legacy");
+    	}
+    }
     ;
 
     private String id;

src/com/jaquadro/minecraft/storagedrawersextra/block/EnumVariant.java

@@ -1,13 +1,15 @@
 package com.jaquadro.minecraft.storagedrawersextra.block;
 
-import com.jaquadro.minecraft.storagedrawersextra.StorageDrawersExtra;
-import net.minecraft.util.IStringSerializable;
-import net.minecraft.util.ResourceLocation;
+import java.util.HashMap;
+import java.util.Map;
 
 import javax.annotation.Nonnull;
 
-import java.util.HashMap;
-import java.util.Map;
+import com.jaquadro.minecraft.storagedrawersextra.StorageDrawersExtra;
+
+import net.minecraft.util.IStringSerializable;
+import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.oredict.OreDictionary;
 
 public enum EnumVariant implements IStringSerializable
 {
@@ -74,7 +76,12 @@ public enum EnumVariant implements IStringSerializable
     FORESTRY_COCOBOLO(ID.FORESTRY, "cocobolo", 57, "planks.1", 11, "slabs.3", 3),
     FORESTRY_ZEBRAWOOD(ID.FORESTRY, "zebrawood", 58, "planks.1", 12, "slabs.3", 4),
 
-    IMMENG_TREATED(ID.IMMENG, "immeng_treated", 59, "treatedWood", 0, "treatedWoodSlab", 0),
+    IMMENG_TREATED(ID.IMMENG, "immeng_treated", 59, "treated_wood", OreDictionary.WILDCARD_VALUE, "treated_wood_slab", OreDictionary.WILDCARD_VALUE),
+
+    AETHER_SKYROOT(ID.AETHER, "skyroot", 60, "skyroot_planks", 0, "skyroot_slab", 0),
+    AETHER_GREATROOT(ID.AETHER, "greatroot", 61, "dark_skyroot_planks", 0, "greatroot_slab", 0),
+    AETHER_WISPROOT(ID.AETHER, "wisproot", 62, "light_skyroot_planks", 0, "wisproot_slab", 0),
+    AETHER_THERAWOOD(ID.AETHER, "therawood", 63, "therawood_planks", 0, "therawood_slab", 0)
     ;
 
     private static final Map<ResourceLocation, EnumVariant> RESOURCE_LOOKUP;
@@ -115,7 +122,9 @@ public String getPath () {
     @Override
     @Nonnull
     public String getName () {
-        return resource.toString();
+    	// good practice to use dots to separate domain and path instead of
+    	// colon in unlocalized name, to support future versions
+        return resource.getResourceDomain() + "." + resource.getResourcePath();
     }
 
     public EnumMod getMod () {
@@ -186,5 +195,6 @@ private static class ID {
         public static final String BOP = "biomesoplenty";
         public static final String FORESTRY = "forestry";
         public static final String IMMENG = "immersiveengineering";
+        public static final String AETHER = "aether";
     }
 }

src/com/jaquadro/minecraft/storagedrawersextra/core/ModBlocks.java

@@ -87,7 +87,6 @@ public static ItemStack makeBasicDrawerItemStack (EnumBasicDrawer info, String m
         @SubscribeEvent
         public static void registerRecipes (RegistryEvent.Register<IRecipe> event) {
             IForgeRegistry<IRecipe> registry = event.getRegistry();
-            ConfigManager config = StorageDrawers.config;
             ConfigManagerExt configExt = StorageDrawersExtra.config;
 
             for (EnumVariant variant : EnumVariant.values()) {
@@ -112,40 +111,57 @@ public static void registerRecipes (RegistryEvent.Register<IRecipe> event) {
                         slabStack = new ItemStack(block, 1, variant.getSlabMeta());
                 }
 
-                String material = variant.getResource().toString();
-
-                if (config.isBlockEnabled(EnumBasicDrawer.FULL1.getUnlocalizedName()) && !plankStack.isEmpty()) {
-                    @Nonnull ItemStack result = makeBasicDrawerItemStack(EnumBasicDrawer.FULL1, material, config.getBlockRecipeOutput(EnumBasicDrawer.FULL1.getUnlocalizedName()));
-                    registry.register(new ShapedOreRecipe(EMPTY_GROUP, result, "xxx", " y ", "xxx", 'x', plankStack, 'y', "chestWood")
-                        .setRegistryName(result.getItem().getRegistryName() + "_" + EnumBasicDrawer.FULL1.getUnlocalizedName() + "_" + variant.toString()));
-                }
-                if (config.isBlockEnabled(EnumBasicDrawer.FULL2.getUnlocalizedName()) && !plankStack.isEmpty()) {
-                    @Nonnull ItemStack result = makeBasicDrawerItemStack(EnumBasicDrawer.FULL2, material, config.getBlockRecipeOutput(EnumBasicDrawer.FULL2.getUnlocalizedName()));
-                    registry.register(new ShapedOreRecipe(EMPTY_GROUP, result, "xyx", "xxx", "xyx", 'x', plankStack, 'y', "chestWood")
-                        .setRegistryName(result.getItem().getRegistryName() + "_" + EnumBasicDrawer.FULL2.getUnlocalizedName() + "_" + variant.toString()));
-                }
-                if (config.isBlockEnabled(EnumBasicDrawer.FULL4.getUnlocalizedName()) && !plankStack.isEmpty()) {
-                    @Nonnull ItemStack result = makeBasicDrawerItemStack(EnumBasicDrawer.FULL4, material, config.getBlockRecipeOutput(EnumBasicDrawer.FULL4.getUnlocalizedName()));
-                    registry.register(new ShapedOreRecipe(EMPTY_GROUP, result, "yxy", "xxx", "yxy", 'x', plankStack, 'y', "chestWood")
-                        .setRegistryName(result.getItem().getRegistryName() + "_" + EnumBasicDrawer.FULL4.getUnlocalizedName() + "_" + variant.toString()));
-                }
-                if (config.isBlockEnabled(EnumBasicDrawer.HALF2.getUnlocalizedName()) && !slabStack.isEmpty()) {
-                    @Nonnull ItemStack result = makeBasicDrawerItemStack(EnumBasicDrawer.HALF2, material, config.getBlockRecipeOutput(EnumBasicDrawer.HALF2.getUnlocalizedName()));
-                    registry.register(new ShapedOreRecipe(EMPTY_GROUP, result, "xyx", "xxx", "xyx", 'x', slabStack, 'y', "chestWood")
-                        .setRegistryName(result.getItem().getRegistryName() + "_" + EnumBasicDrawer.HALF2.getUnlocalizedName() + "_" + variant.toString()));
-                }
-                if (config.isBlockEnabled(EnumBasicDrawer.HALF4.getUnlocalizedName()) && !slabStack.isEmpty()) {
-                    @Nonnull ItemStack result = makeBasicDrawerItemStack(EnumBasicDrawer.HALF4, material, config.getBlockRecipeOutput(EnumBasicDrawer.HALF4.getUnlocalizedName()));
-                    registry.register(new ShapedOreRecipe(EMPTY_GROUP, result, "yxy", "xxx", "yxy", 'x', slabStack, 'y', "chestWood")
-                        .setRegistryName(result.getItem().getRegistryName() + "_" + EnumBasicDrawer.HALF4.getUnlocalizedName() + "_" + variant.toString()));
-                }
-                if (config.isBlockEnabled("trim") && !plankStack.isEmpty()) {
-                    @Nonnull ItemStack result = new ItemStack(ModBlocks.extraTrim[variant.getGroupIndex()], config.getBlockRecipeOutput("trim"), variant.getGroupMeta());
-                    registry.register(new ShapedOreRecipe(EMPTY_GROUP, result, "xyx", "yyy", "xyx", 'x', "stickWood", 'y', plankStack)
-                        .setRegistryName(result.getItem().getRegistryName() + "_" + variant.toString()));
+                registerRecipes(registry, variant, plankStack, slabStack);
+
+                // attempt to do Aether 1 skyroot as well
+                if (variant == EnumVariant.AETHER_SKYROOT) {
+                	Block block = Block.getBlockFromName("aether_legacy:skyroot_plank");
+                	if (block != null)
+                		plankStack = new ItemStack(block, 1, variant.getPlankMeta());
+                	block = Block.getBlockFromName("aether_legacy:skyroot_slab");
+                	if (block != null)
+                		slabStack = new ItemStack(block, 1, variant.getSlabMeta());
+
+                	registerRecipes(registry, variant, plankStack, slabStack);
                 }
             }
         }
+
+        private static void registerRecipes(IForgeRegistry<IRecipe> registry, EnumVariant variant, ItemStack plankStack, ItemStack slabStack) {
+            ConfigManager config = StorageDrawers.config;
+            String material = variant.getResource().toString();
+
+        	if (config.isBlockEnabled(EnumBasicDrawer.FULL1.getUnlocalizedName()) && !plankStack.isEmpty()) {
+                @Nonnull ItemStack result = makeBasicDrawerItemStack(EnumBasicDrawer.FULL1, material, config.getBlockRecipeOutput(EnumBasicDrawer.FULL1.getUnlocalizedName()));
+                registry.register(new ShapedOreRecipe(EMPTY_GROUP, result, "xxx", " y ", "xxx", 'x', plankStack, 'y', "chestWood")
+                    .setRegistryName(result.getItem().getRegistryName() + "_" + EnumBasicDrawer.FULL1.getUnlocalizedName() + "_" + variant.toString()));
+            }
+            if (config.isBlockEnabled(EnumBasicDrawer.FULL2.getUnlocalizedName()) && !plankStack.isEmpty()) {
+                @Nonnull ItemStack result = makeBasicDrawerItemStack(EnumBasicDrawer.FULL2, material, config.getBlockRecipeOutput(EnumBasicDrawer.FULL2.getUnlocalizedName()));
+                registry.register(new ShapedOreRecipe(EMPTY_GROUP, result, "xyx", "xxx", "xyx", 'x', plankStack, 'y', "chestWood")
+                    .setRegistryName(result.getItem().getRegistryName() + "_" + EnumBasicDrawer.FULL2.getUnlocalizedName() + "_" + variant.toString()));
+            }
+            if (config.isBlockEnabled(EnumBasicDrawer.FULL4.getUnlocalizedName()) && !plankStack.isEmpty()) {
+                @Nonnull ItemStack result = makeBasicDrawerItemStack(EnumBasicDrawer.FULL4, material, config.getBlockRecipeOutput(EnumBasicDrawer.FULL4.getUnlocalizedName()));
+                registry.register(new ShapedOreRecipe(EMPTY_GROUP, result, "yxy", "xxx", "yxy", 'x', plankStack, 'y', "chestWood")
+                    .setRegistryName(result.getItem().getRegistryName() + "_" + EnumBasicDrawer.FULL4.getUnlocalizedName() + "_" + variant.toString()));
+            }
+            if (config.isBlockEnabled(EnumBasicDrawer.HALF2.getUnlocalizedName()) && !slabStack.isEmpty()) {
+                @Nonnull ItemStack result = makeBasicDrawerItemStack(EnumBasicDrawer.HALF2, material, config.getBlockRecipeOutput(EnumBasicDrawer.HALF2.getUnlocalizedName()));
+                registry.register(new ShapedOreRecipe(EMPTY_GROUP, result, "xyx", "xxx", "xyx", 'x', slabStack, 'y', "chestWood")
+                    .setRegistryName(result.getItem().getRegistryName() + "_" + EnumBasicDrawer.HALF2.getUnlocalizedName() + "_" + variant.toString()));
+            }
+            if (config.isBlockEnabled(EnumBasicDrawer.HALF4.getUnlocalizedName()) && !slabStack.isEmpty()) {
+                @Nonnull ItemStack result = makeBasicDrawerItemStack(EnumBasicDrawer.HALF4, material, config.getBlockRecipeOutput(EnumBasicDrawer.HALF4.getUnlocalizedName()));
+                registry.register(new ShapedOreRecipe(EMPTY_GROUP, result, "yxy", "xxx", "yxy", 'x', slabStack, 'y', "chestWood")
+                    .setRegistryName(result.getItem().getRegistryName() + "_" + EnumBasicDrawer.HALF4.getUnlocalizedName() + "_" + variant.toString()));
+            }
+            if (config.isBlockEnabled("trim") && !plankStack.isEmpty()) {
+                @Nonnull ItemStack result = new ItemStack(ModBlocks.extraTrim[variant.getGroupIndex()], config.getBlockRecipeOutput("trim"), variant.getGroupMeta());
+                registry.register(new ShapedOreRecipe(EMPTY_GROUP, result, "xyx", "yyy", "xyx", 'x', "stickWood", 'y', plankStack)
+                    .setRegistryName(result.getItem().getRegistryName() + "_" + variant.toString()));
+            }
+        }
 
         @SubscribeEvent
         @SideOnly(Side.CLIENT)