Ported to 1.12

Author: jaquadro

build.gradle

@@ -7,7 +7,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
     }
 }
 

gradle.properties

@@ -1,7 +1,7 @@
 org.gradle.jvmargs=-Xmx3G
 
-minecraft_base_version=1.11
-minecraft_version=1.11.2
-mod_version=2.0.0
-storagedrawers_version=4.0.0
-storagedrawers_max_version=5.0.0
+minecraft_base_version=1.12
+minecraft_version=1.12
+mod_version=3.0.0
+storagedrawers_version=5.0.0
+storagedrawers_max_version=6.0.0

src/com/jaquadro/minecraft/storagedrawersextra/StorageDrawersExtra.java

@@ -20,7 +20,7 @@
 @Mod(modid = StorageDrawersExtra.MOD_ID, name = StorageDrawersExtra.MOD_NAME, version = StorageDrawersExtra.MOD_VERSION,
     dependencies = "required-after:storagedrawers;required-after:chameleon;after:waila;",
     guiFactory = StorageDrawersExtra.SOURCE_PATH + "core.ModGuiFactory",
-    acceptedMinecraftVersions = "[1.11,1.12)")
+    acceptedMinecraftVersions = "[1.12,1.13)")
 public class StorageDrawersExtra
 {
     public static final String MOD_ID = "storagedrawersextra";

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

@@ -11,7 +11,6 @@
 import net.minecraft.block.state.BlockStateContainer;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.NonNullList;
@@ -58,7 +57,7 @@ protected ItemStack getMainDrop (IBlockAccess world, BlockPos pos, IBlockState s
     }
 
     @Override
-    public void getSubBlocks (Item item, CreativeTabs creativeTabs, NonNullList<ItemStack> list) {
+    public void getSubBlocks (CreativeTabs creativeTabs, NonNullList<ItemStack> list) {
         ConfigManagerExt configExt = StorageDrawersExtra.config;
 
         for (EnumBasicDrawer type : EnumBasicDrawer.values()) {
@@ -70,7 +69,7 @@ public void getSubBlocks (Item item, CreativeTabs creativeTabs, NonNullList<Item
                 if (mod == null || !mod.isEnabled(configExt.getModToggleState(mod)))
                     continue;
 
-                ItemStack stack = new ItemStack(item, 1, type.getMetadata());
+                ItemStack stack = new ItemStack(this, 1, type.getMetadata());
 
                 NBTTagCompound data = new NBTTagCompound();
                 data.setString("material", material.getResource().toString());

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

@@ -77,7 +77,7 @@ public List<ItemStack> getDrops (IBlockAccess world, BlockPos pos, IBlockState s
     }
 
     @Override
-    public void getSubBlocks (Item item, CreativeTabs creativeTabs, NonNullList<ItemStack> list) {
+    public void getSubBlocks (CreativeTabs creativeTabs, NonNullList<ItemStack> list) {
         ConfigManagerExt configExt = StorageDrawersExtra.config;
 
         for (EnumVariant variant : EnumVariant.values()) {
@@ -89,7 +89,7 @@ public void getSubBlocks (Item item, CreativeTabs creativeTabs, NonNullList<Item
                 continue;
 
             if (group == variant.getGroupIndex())
-                list.add(new ItemStack(item, 1, variant.getGroupMeta()));
+                list.add(new ItemStack(this, 1, variant.getGroupMeta()));
         }
     }
 

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

@@ -20,8 +20,6 @@ private ModCreativeTabs () { }
         @Nonnull
         @SideOnly(Side.CLIENT)
         public ItemStack getTabIconItem () {
-            @Nonnull ItemStack stack = new ItemStack(Item.getItemFromBlock(ModBlocks.extraDrawers), 1, 1);
-
             EnumVariant material = EnumVariant.DEFAULT;
             for (EnumMod mod : EnumMod.values()) {
                 if (mod.isLoaded()) {
@@ -30,6 +28,11 @@ public ItemStack getTabIconItem () {
                 }
             }
 
+            if (material == EnumVariant.DEFAULT)
+                return com.jaquadro.minecraft.storagedrawers.core.ModCreativeTabs.tabStorageDrawers.getTabIconItem();
+
+            @Nonnull ItemStack stack = new ItemStack(Item.getItemFromBlock(ModBlocks.extraDrawers), 1, 1);
+
             NBTTagCompound tag = new NBTTagCompound();
             tag.setString("material", material.getResource().toString());
             stack.setTagCompound(tag);

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

@@ -14,12 +14,12 @@ public void initialize (Minecraft minecraftInstance) { }
 
     @Override
     public boolean hasConfigGui () {
-        return false;
+        return true;
     }
 
     @Override
     public GuiScreen createConfigGui (GuiScreen parentScreen) {
-        return null;
+        return new ModConfigGui(parentScreen);
     }
 
     @Override

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

@@ -3,6 +3,7 @@
 import com.jaquadro.minecraft.storagedrawers.StorageDrawers;
 import com.jaquadro.minecraft.storagedrawers.api.storage.EnumBasicDrawer;
 import com.jaquadro.minecraft.storagedrawers.config.ConfigManager;
+import com.jaquadro.minecraft.storagedrawers.util.RecipeHelper;
 import com.jaquadro.minecraft.storagedrawersextra.StorageDrawersExtra;
 import com.jaquadro.minecraft.storagedrawersextra.block.EnumMod;
 import com.jaquadro.minecraft.storagedrawersextra.block.EnumVariant;
@@ -56,29 +57,34 @@ public void init () {
 
             String material = variant.getResource().toString();
 
+            String ch = "chestWood";
+            String st = "stickWood";
+            ItemStack pl = plankStack;
+            ItemStack sl = slabStack;
+
             if (config.isBlockEnabled(EnumBasicDrawer.FULL1.getUnlocalizedName()) && !plankStack.isEmpty()) {
                 @Nonnull ItemStack result = makeBasicDrawerItemStack(EnumBasicDrawer.FULL1, material, config.getBlockRecipeOutput(EnumBasicDrawer.FULL1.getUnlocalizedName()));
-                GameRegistry.addRecipe(new ShapedOreRecipe(result, "xxx", " y ", "xxx", 'x', plankStack, 'y', "chestWood"));
+                RecipeHelper.addShapedRecipe(result, 3, 3, pl, pl, pl, null, ch, null, pl, pl, pl);
             }
             if (config.isBlockEnabled(EnumBasicDrawer.FULL2.getUnlocalizedName()) && !plankStack.isEmpty()) {
                 @Nonnull ItemStack result = makeBasicDrawerItemStack(EnumBasicDrawer.FULL2, material, config.getBlockRecipeOutput(EnumBasicDrawer.FULL2.getUnlocalizedName()));
-                GameRegistry.addRecipe(new ShapedOreRecipe(result, "xyx", "xxx", "xyx", 'x', plankStack, 'y', "chestWood"));
+                RecipeHelper.addShapedRecipe(result, 3, 3, pl, ch, pl, pl, pl, pl, pl, ch, pl);
             }
             if (config.isBlockEnabled(EnumBasicDrawer.FULL4.getUnlocalizedName()) && !plankStack.isEmpty()) {
                 @Nonnull ItemStack result = makeBasicDrawerItemStack(EnumBasicDrawer.FULL4, material, config.getBlockRecipeOutput(EnumBasicDrawer.FULL4.getUnlocalizedName()));
-                GameRegistry.addRecipe(new ShapedOreRecipe(result, "yxy", "xxx", "yxy", 'x', plankStack, 'y', "chestWood"));
+                RecipeHelper.addShapedRecipe(result, 3, 3, ch, pl, ch, pl, pl, pl, ch, pl, ch);
             }
             if (config.isBlockEnabled(EnumBasicDrawer.HALF2.getUnlocalizedName()) && !slabStack.isEmpty()) {
                 @Nonnull ItemStack result = makeBasicDrawerItemStack(EnumBasicDrawer.HALF2, material, config.getBlockRecipeOutput(EnumBasicDrawer.HALF2.getUnlocalizedName()));
-                GameRegistry.addRecipe(new ShapedOreRecipe(result, "xyx", "xxx", "xyx", 'x', slabStack, 'y', "chestWood"));
+                RecipeHelper.addShapedRecipe(result, 3, 3, sl, ch, sl, sl, sl, sl, sl, ch, sl);
             }
             if (config.isBlockEnabled(EnumBasicDrawer.HALF4.getUnlocalizedName()) && !slabStack.isEmpty()) {
                 @Nonnull ItemStack result = makeBasicDrawerItemStack(EnumBasicDrawer.HALF4, material, config.getBlockRecipeOutput(EnumBasicDrawer.HALF4.getUnlocalizedName()));
-                GameRegistry.addRecipe(new ShapedOreRecipe(result, "yxy", "xxx", "yxy", 'x', slabStack, 'y', "chestWood"));
+                RecipeHelper.addShapedRecipe(result, 3, 3, ch, sl, ch, sl, sl, sl, ch, sl, ch);
             }
             if (config.isBlockEnabled("trim") && !plankStack.isEmpty()) {
                 @Nonnull ItemStack result = new ItemStack(ModBlocks.extraTrim[variant.getGroupIndex()], config.getBlockRecipeOutput("trim"), variant.getGroupMeta());
-                GameRegistry.addRecipe(new ShapedOreRecipe(result, "xyx", "yyy", "xyx", 'x', "stickWood", 'y', plankStack));
+                RecipeHelper.addShapedRecipe(result, 3, 3, st, pl, st, pl, pl, pl, st, pl, st);
             }
         }
     }

src/com/jaquadro/minecraft/storagedrawersextra/item/ItemTrimExtra.java

@@ -4,13 +4,15 @@
 import com.jaquadro.minecraft.storagedrawersextra.block.EnumVariant;
 import net.minecraft.block.Block;
 import net.minecraft.client.resources.I18n;
-import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.client.util.ITooltipFlag;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import java.util.List;
 
 public class ItemTrimExtra extends ItemBlock
@@ -33,7 +35,7 @@ public String getUnlocalizedName (@Nonnull ItemStack stack) {
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void addInformation (@Nonnull ItemStack itemStack, EntityPlayer player, List<String> list, boolean par4) {
+    public void addInformation (@Nonnull ItemStack itemStack, @Nullable World world, List<String> list, ITooltipFlag advanced) {
         Block block = Block.getBlockFromItem(itemStack.getItem());
         if (block instanceof BlockTrimExtra) {
             BlockTrimExtra trim = (BlockTrimExtra)block;