diff options
Diffstat (limited to 'src/Java/miscutil/core/handler')
| -rw-r--r-- | src/Java/miscutil/core/handler/COMPAT_HANDLER.java | 7 | ||||
| -rw-r--r-- | src/Java/miscutil/core/handler/GuiHandler.java | 28 |
2 files changed, 27 insertions, 8 deletions
diff --git a/src/Java/miscutil/core/handler/COMPAT_HANDLER.java b/src/Java/miscutil/core/handler/COMPAT_HANDLER.java index 8c408bdd4f..4875ad5a08 100644 --- a/src/Java/miscutil/core/handler/COMPAT_HANDLER.java +++ b/src/Java/miscutil/core/handler/COMPAT_HANDLER.java @@ -6,7 +6,6 @@ import gregtech.api.util.GT_OreDictUnificator; import java.util.LinkedList; import java.util.Queue; -import miscutil.core.block.ModBlocks; import miscutil.core.common.compat.COMPAT_BigReactors; import miscutil.core.common.compat.COMPAT_CompactWindmills; import miscutil.core.common.compat.COMPAT_EnderIO; @@ -43,9 +42,7 @@ import miscutil.core.recipe.ShapedRecipeObject; import miscutil.core.util.Utils; import miscutil.core.util.item.UtilsItems; import miscutil.core.util.recipe.UtilsRecipe; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; public class COMPAT_HANDLER { @@ -69,8 +66,8 @@ public class COMPAT_HANDLER { GT_OreDictUnificator.registerOre("plateStaballoy", new ItemStack(ModItems.itemPlateStaballoy)); //Blocks - GT_OreDictUnificator.registerOre("blockStaballoy", new ItemStack(Item.getItemFromBlock(ModBlocks.blockStaballoy))); - OreDictionary.registerOre("blockBloodSteel", new ItemStack(ModBlocks.blockBloodSteel)); + //GT_OreDictUnificator.registerOre("blockStaballoy", new ItemStack(Item.getItemFromBlock(ModBlocks.blockStaballoy))); + //OreDictionary.registerOre("blockBloodSteel", new ItemStack(ModBlocks.blockBloodSteel)); for(int i=1; i<=10; i++){ diff --git a/src/Java/miscutil/core/handler/GuiHandler.java b/src/Java/miscutil/core/handler/GuiHandler.java index 340bd5f4a1..13693e2ffc 100644 --- a/src/Java/miscutil/core/handler/GuiHandler.java +++ b/src/Java/miscutil/core/handler/GuiHandler.java @@ -1,9 +1,12 @@ package miscutil.core.handler; import miscutil.MiscUtils; +import miscutil.core.container.Container_BackpackBase; import miscutil.core.gui.beta.Gui_ID_Registry; import miscutil.core.gui.beta.MU_GuiId; +import miscutil.core.gui.item.GuiBaseBackpack; import miscutil.core.interfaces.IGuiManager; +import miscutil.core.inventories.BaseInventoryBackpack; import miscutil.core.lib.CORE; import miscutil.core.util.Utils; import miscutil.xmod.forestry.bees.alveary.TileAlvearyFrameHousing; @@ -18,8 +21,14 @@ import cpw.mods.fml.common.network.NetworkRegistry; public class GuiHandler implements IGuiHandler { - private static final int GUI1 = 0; //Frame Alveary - private static final int GUI2 = 1; //RTG + public static final int GUI1 = 0; //Frame Alveary + public static final int GUI2 = 1; //RTG + public static final int GUI3 = 2; //BackpackHandler + public static final int GUI4 = 3; // + public static final int GUI5 = 4; // + public static final int GUI6 = 5; // + public static final int GUI7 = 6; // + public static final int GUI8 = 7; // @@ -47,7 +56,12 @@ public class GuiHandler implements IGuiHandler { } - + } + + if (ID == GUI3) + { + // Use the player's held item to create the inventory + return new Container_BackpackBase(player, player.inventory, new BaseInventoryBackpack(player.getHeldItem())); } return null; } @@ -68,6 +82,14 @@ public class GuiHandler implements IGuiHandler { //return new GUI_RTG((TileEntityRTG) te.); } } + + if (ID == GUI3) + { + // We have to cast the new container as our custom class + // and pass in currently held item for the inventory + return new GuiBaseBackpack((Container_BackpackBase) new Container_BackpackBase(player, player.inventory, new BaseInventoryBackpack(player.getHeldItem()))); + } + return null; } |