Merge pull request #10 from Nilau1998/NEI_Bookmark_Pulling

NEI Bookmark Pulling feature for compressed chests

dependencies.gradle

@@ -1,10 +1,10 @@
 // Add your dependencies here
 
 dependencies {
-    compile("com.github.GTNewHorizons:Avaritia:1.37:dev")
-    compile("com.github.GTNewHorizons:WanionLib:1.8.2:dev")
-
-    compileOnly("com.github.GTNewHorizons:inventory-tweaks:1.5.13:dev") {
+    compile("com.github.GTNewHorizons:Avaritia:1.46:dev")
+    compile("com.github.GTNewHorizons:WanionLib:1.8.4:dev")
+    implementation('com.github.GTNewHorizons:NotEnoughItems:2.4.5-GTNH:dev')
+    compileOnly("com.github.GTNewHorizons:inventory-tweaks:1.5.16:dev") {
         transitive = false
     }
 }

src/main/java/wanion/avaritiaddons/Avaritiaddons.java

@@ -13,7 +13,6 @@
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 
-import wanion.avaritiaddons.block.chest.infinity.BlockInfinityChest;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.SidedProxy;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
@@ -24,6 +23,7 @@
 import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import wanion.avaritiaddons.block.chest.infinity.BlockInfinityChest;
 
 @Mod(modid = MOD_ID, name = MOD_NAME, version = MOD_VERSION, dependencies = DEPENDENCIES)
 public final class Avaritiaddons {

src/main/java/wanion/avaritiaddons/CommonProxy.java

@@ -20,6 +20,18 @@
 import net.minecraftforge.oredict.OreDictionary;
 import net.minecraftforge.oredict.ShapedOreRecipe;
 
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.common.Loader;
+import cpw.mods.fml.common.network.NetworkRegistry;
+import cpw.mods.fml.common.network.simpleimpl.MessageContext;
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import fox.spiteful.avaritia.blocks.LudicrousBlocks;
+import fox.spiteful.avaritia.crafting.ExtremeCraftingManager;
+import fox.spiteful.avaritia.crafting.Grinder;
+import fox.spiteful.avaritia.items.LudicrousItems;
+import gnu.trove.set.TIntSet;
+import gnu.trove.set.hash.TIntHashSet;
 import wanion.avaritiaddons.block.chest.ItemBlockAvaritiaddonsChest;
 import wanion.avaritiaddons.block.chest.compressed.BlockCompressedChest;
 import wanion.avaritiaddons.block.chest.compressed.TileEntityCompressedChest;
@@ -33,18 +45,6 @@
 import wanion.avaritiaddons.network.InfinityChestSlotSync;
 import wanion.avaritiaddons.network.InfinityChestSyncAllSlots;
 import wanion.lib.common.MetaItem;
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.Loader;
-import cpw.mods.fml.common.network.NetworkRegistry;
-import cpw.mods.fml.common.network.simpleimpl.MessageContext;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.relauncher.Side;
-import fox.spiteful.avaritia.blocks.LudicrousBlocks;
-import fox.spiteful.avaritia.crafting.ExtremeCraftingManager;
-import fox.spiteful.avaritia.crafting.Grinder;
-import fox.spiteful.avaritia.items.LudicrousItems;
-import gnu.trove.set.TIntSet;
-import gnu.trove.set.hash.TIntHashSet;
 
 public class CommonProxy {
 

src/main/java/wanion/avaritiaddons/block/chest/ItemBlockAvaritiaddonsChest.java

@@ -16,10 +16,10 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 
-import wanion.avaritiaddons.block.chest.infinity.BlockInfinityChest;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import fox.spiteful.avaritia.entity.EntityImmortalItem;
+import wanion.avaritiaddons.block.chest.infinity.BlockInfinityChest;
 
 public class ItemBlockAvaritiaddonsChest extends ItemBlock {
 

src/main/java/wanion/avaritiaddons/block/chest/compressed/BlockCompressedChest.java

@@ -12,11 +12,11 @@
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 
-import wanion.avaritiaddons.Avaritiaddons;
-import wanion.avaritiaddons.block.chest.BlockAvaritiaddonsChest;
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import wanion.avaritiaddons.Avaritiaddons;
+import wanion.avaritiaddons.block.chest.BlockAvaritiaddonsChest;
 
 public final class BlockCompressedChest extends BlockAvaritiaddonsChest {
 

src/main/java/wanion/avaritiaddons/block/chest/compressed/ContainerCompressedChest.java

@@ -10,8 +10,8 @@
 
 import net.minecraft.entity.player.InventoryPlayer;
 
-import wanion.avaritiaddons.block.chest.ContainerAvaritiaddonsChest;
 import invtweaks.api.container.ChestContainer;
+import wanion.avaritiaddons.block.chest.ContainerAvaritiaddonsChest;
 
 @ChestContainer
 public final class ContainerCompressedChest extends ContainerAvaritiaddonsChest {

src/main/java/wanion/avaritiaddons/block/chest/compressed/ItemRendererCompressedChest.java

@@ -12,9 +12,9 @@
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
 
-import wanion.avaritiaddons.block.chest.RendererAvaritiaddonsChest;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import wanion.avaritiaddons.block.chest.RendererAvaritiaddonsChest;
 
 @SideOnly(Side.CLIENT)
 public final class ItemRendererCompressedChest implements IItemRenderer {

src/main/java/wanion/avaritiaddons/block/chest/compressed/TileEntityCompressedChest.java

@@ -10,10 +10,10 @@
 
 import net.minecraft.util.ResourceLocation;
 
-import wanion.avaritiaddons.block.chest.TileEntityAvaritiaddonsChest;
-import wanion.avaritiaddons.client.ClientConstants;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import wanion.avaritiaddons.block.chest.TileEntityAvaritiaddonsChest;
+import wanion.avaritiaddons.client.ClientConstants;
 
 public final class TileEntityCompressedChest extends TileEntityAvaritiaddonsChest {
 

src/main/java/wanion/avaritiaddons/block/chest/infinity/BlockInfinityChest.java

@@ -13,11 +13,11 @@
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 
-import wanion.avaritiaddons.Avaritiaddons;
-import wanion.avaritiaddons.block.chest.BlockAvaritiaddonsChest;
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import wanion.avaritiaddons.Avaritiaddons;
+import wanion.avaritiaddons.block.chest.BlockAvaritiaddonsChest;
 
 public final class BlockInfinityChest extends BlockAvaritiaddonsChest {
 

src/main/java/wanion/avaritiaddons/block/chest/infinity/ItemRendererInfinityChest.java

@@ -12,9 +12,9 @@
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
 
-import wanion.avaritiaddons.block.chest.RendererAvaritiaddonsChest;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import wanion.avaritiaddons.block.chest.RendererAvaritiaddonsChest;
 
 @SideOnly(Side.CLIENT)
 public final class ItemRendererInfinityChest implements IItemRenderer {

src/main/java/wanion/avaritiaddons/block/chest/infinity/TileEntityInfinityChest.java

@@ -13,10 +13,10 @@
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.util.ResourceLocation;
 
-import wanion.avaritiaddons.block.chest.TileEntityAvaritiaddonsChest;
-import wanion.avaritiaddons.client.ClientConstants;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import wanion.avaritiaddons.block.chest.TileEntityAvaritiaddonsChest;
+import wanion.avaritiaddons.client.ClientConstants;
 
 public final class TileEntityInfinityChest extends TileEntityAvaritiaddonsChest {
 

src/main/java/wanion/avaritiaddons/block/extremeautocrafter/BlockExtremeAutoCrafter.java

@@ -22,10 +22,10 @@
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
-import wanion.avaritiaddons.Avaritiaddons;
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import wanion.avaritiaddons.Avaritiaddons;
 
 public class BlockExtremeAutoCrafter extends BlockContainer {
 

src/main/java/wanion/avaritiaddons/block/extremeautocrafter/TileEntityExtremeAutoCrafter.java

@@ -21,10 +21,10 @@
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.MathHelper;
 
-import wanion.lib.common.MetaItem;
 import fox.spiteful.avaritia.crafting.ExtremeCraftingManager;
 import gnu.trove.map.TIntIntMap;
 import gnu.trove.map.hash.TIntIntHashMap;
+import wanion.lib.common.MetaItem;
 
 public class TileEntityExtremeAutoCrafter extends TileEntity implements ISidedInventory {
 

src/main/java/wanion/avaritiaddons/client/ClientConstants.java

@@ -8,10 +8,10 @@
 
 import net.minecraft.util.ResourceLocation;
 
-import wanion.avaritiaddons.common.Reference;
-import wanion.lib.client.animation.ComplexHalfAnimation;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import wanion.avaritiaddons.common.Reference;
+import wanion.lib.client.animation.ComplexHalfAnimation;
 
 @SideOnly(Side.CLIENT)
 public final class ClientConstants {

src/main/java/wanion/avaritiaddons/client/ClientProxy.java

@@ -11,6 +11,10 @@
 import net.minecraft.item.Item;
 import net.minecraftforge.client.MinecraftForgeClient;
 
+import cpw.mods.fml.client.registry.ClientRegistry;
+import cpw.mods.fml.common.network.simpleimpl.MessageContext;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import wanion.avaritiaddons.CommonProxy;
 import wanion.avaritiaddons.block.chest.RendererAvaritiaddonsChest;
 import wanion.avaritiaddons.block.chest.compressed.BlockCompressedChest;
@@ -20,10 +24,6 @@
 import wanion.avaritiaddons.block.chest.infinity.ItemRendererInfinityChest;
 import wanion.avaritiaddons.block.chest.infinity.TileEntityInfinityChest;
 import wanion.lib.WanionLib;
-import cpw.mods.fml.client.registry.ClientRegistry;
-import cpw.mods.fml.common.network.simpleimpl.MessageContext;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
 @SideOnly(Side.CLIENT)
 public final class ClientProxy extends CommonProxy {

src/main/java/wanion/avaritiaddons/core/GuiHandler.java

@@ -10,6 +10,7 @@
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 
+import cpw.mods.fml.common.network.IGuiHandler;
 import wanion.avaritiaddons.Avaritiaddons;
 import wanion.avaritiaddons.block.chest.compressed.ContainerCompressedChest;
 import wanion.avaritiaddons.block.chest.compressed.GuiCompressedChest;
@@ -20,7 +21,6 @@
 import wanion.avaritiaddons.block.extremeautocrafter.ContainerExtremeAutoCrafter;
 import wanion.avaritiaddons.block.extremeautocrafter.GuiExtremeAutoCrafter;
 import wanion.avaritiaddons.block.extremeautocrafter.TileEntityExtremeAutoCrafter;
-import cpw.mods.fml.common.network.IGuiHandler;
 
 public final class GuiHandler implements IGuiHandler {
 

src/main/java/wanion/avaritiaddons/network/InfinityChestClick.java

@@ -10,12 +10,12 @@
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
-import wanion.avaritiaddons.Avaritiaddons;
 import cpw.mods.fml.common.network.ByteBufUtils;
 import cpw.mods.fml.common.network.simpleimpl.IMessage;
 import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
 import cpw.mods.fml.common.network.simpleimpl.MessageContext;
 import io.netty.buffer.ByteBuf;
+import wanion.avaritiaddons.Avaritiaddons;
 
 public class InfinityChestClick implements IMessage {
 

src/main/java/wanion/avaritiaddons/network/InfinityChestConfirmation.java

@@ -9,7 +9,6 @@
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Container;
 
-import wanion.avaritiaddons.Avaritiaddons;
 import cpw.mods.fml.common.network.ByteBufUtils;
 import cpw.mods.fml.common.network.simpleimpl.IMessage;
 import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
@@ -18,6 +17,7 @@
 import gnu.trove.map.TIntShortMap;
 import gnu.trove.map.hash.TIntShortHashMap;
 import io.netty.buffer.ByteBuf;
+import wanion.avaritiaddons.Avaritiaddons;
 
 public class InfinityChestConfirmation implements IMessage {
 

src/main/java/wanion/avaritiaddons/network/InfinityChestSlotSync.java

@@ -9,13 +9,13 @@
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 
-import wanion.avaritiaddons.Avaritiaddons;
-import wanion.avaritiaddons.block.chest.infinity.ContainerInfinityChest;
 import cpw.mods.fml.common.network.ByteBufUtils;
 import cpw.mods.fml.common.network.simpleimpl.IMessage;
 import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
 import cpw.mods.fml.common.network.simpleimpl.MessageContext;
 import io.netty.buffer.ByteBuf;
+import wanion.avaritiaddons.Avaritiaddons;
+import wanion.avaritiaddons.block.chest.infinity.ContainerInfinityChest;
 
 public final class InfinityChestSlotSync implements IMessage {
 

src/main/java/wanion/avaritiaddons/network/InfinityChestSyncAllSlots.java

@@ -12,13 +12,13 @@
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
-import wanion.avaritiaddons.Avaritiaddons;
-import wanion.avaritiaddons.block.chest.infinity.ContainerInfinityChest;
 import cpw.mods.fml.common.network.ByteBufUtils;
 import cpw.mods.fml.common.network.simpleimpl.IMessage;
 import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
 import cpw.mods.fml.common.network.simpleimpl.MessageContext;
 import io.netty.buffer.ByteBuf;
+import wanion.avaritiaddons.Avaritiaddons;
+import wanion.avaritiaddons.block.chest.infinity.ContainerInfinityChest;
 
 public class InfinityChestSyncAllSlots implements IMessage {
 

src/main/java/wanion/avaritiaddons/plugins/nei/NEIConfig.java

@@ -0,0 +1,25 @@
+package wanion.avaritiaddons.plugins.nei;
+
+import codechicken.nei.DefaultBookmarkContainerHandler;
+import codechicken.nei.api.API;
+import codechicken.nei.api.IConfigureNEI;
+import wanion.avaritiaddons.block.chest.compressed.GuiCompressedChest;
+import wanion.avaritiaddons.common.Reference;
+
+public class NEIConfig implements IConfigureNEI {
+
+    @Override
+    public void loadConfig() {
+        API.registerBookmarkContainerHandler(GuiCompressedChest.class, new DefaultBookmarkContainerHandler());
+    }
+
+    @Override
+    public String getName() {
+        return Reference.MOD_NAME;
+    }
+
+    @Override
+    public String getVersion() {
+        return Reference.MOD_VERSION;
+    }
+}