Remove native invtweaks integration because it was done in a really weird way O_o

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerBreaker.java

@@ -12,14 +12,13 @@ package de.ellpeck.actuallyadditions.mod.inventory;
 
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityBreaker;
-import invtweaks.api.container.InventoryContainer;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
-@InventoryContainer
+
 public class ContainerBreaker extends Container{
 
     private TileEntityBreaker breaker;

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCanolaPress.java

@@ -14,14 +14,14 @@ import de.ellpeck.actuallyadditions.mod.items.InitItems;
 import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityCanolaPress;
-import invtweaks.api.container.InventoryContainer;
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
-@InventoryContainer
+
 public class ContainerCanolaPress extends Container{
 
     private TileEntityCanolaPress press;

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCoalGenerator.java

@@ -12,7 +12,7 @@ package de.ellpeck.actuallyadditions.mod.inventory;
 
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityCoalGenerator;
-import invtweaks.api.container.InventoryContainer;
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
@@ -20,7 +20,7 @@ import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntityFurnace;
 
-@InventoryContainer
+
 public class ContainerCoalGenerator extends Container{
 
     private TileEntityCoalGenerator generator;

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCoffeeMachine.java

@@ -16,14 +16,14 @@ import de.ellpeck.actuallyadditions.mod.items.ItemCoffee;
 import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityCoffeeMachine;
-import invtweaks.api.container.InventoryContainer;
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
-@InventoryContainer
+
 public class ContainerCoffeeMachine extends Container{
 
     private TileEntityCoffeeMachine machine;

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCrafter.java

@@ -10,7 +10,7 @@
 
 package de.ellpeck.actuallyadditions.mod.inventory;
 
-import invtweaks.api.container.InventoryContainer;
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.*;
@@ -18,7 +18,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.CraftingManager;
 import net.minecraft.world.World;
 
-@InventoryContainer
+
 public class ContainerCrafter extends Container{
 
     public final int x;

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDirectionalBreaker.java

@@ -12,14 +12,14 @@ package de.ellpeck.actuallyadditions.mod.inventory;
 
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityDirectionalBreaker;
-import invtweaks.api.container.InventoryContainer;
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
-@InventoryContainer
+
 public class ContainerDirectionalBreaker extends Container{
 
     private TileEntityDirectionalBreaker breaker;

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDrill.java

@@ -15,7 +15,7 @@ import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotImmovable;
 import de.ellpeck.actuallyadditions.mod.items.ItemDrill;
 import de.ellpeck.actuallyadditions.mod.items.ItemDrillUpgrade;
 import de.ellpeck.actuallyadditions.mod.util.StringUtil;
-import invtweaks.api.container.InventoryContainer;
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.ClickType;
@@ -26,7 +26,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.TextComponentString;
 
-@InventoryContainer
+
 public class ContainerDrill extends Container{
 
     public static final int SLOT_AMOUNT = 5;

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDropper.java

@@ -12,14 +12,14 @@ package de.ellpeck.actuallyadditions.mod.inventory;
 
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityDropper;
-import invtweaks.api.container.InventoryContainer;
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
-@InventoryContainer
+
 public class ContainerDropper extends Container{
 
     private TileEntityDropper dropper;

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnergizer.java

@@ -14,7 +14,7 @@ import cofh.api.energy.IEnergyContainerItem;
 import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotOutput;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityEnergizer;
-import invtweaks.api.container.InventoryContainer;
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
@@ -25,7 +25,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-@InventoryContainer
+
 public class ContainerEnergizer extends Container{
 
     public static final EntityEquipmentSlot[] VALID_EQUIPMENT_SLOTS = new EntityEquipmentSlot[]{EntityEquipmentSlot.HEAD, EntityEquipmentSlot.CHEST, EntityEquipmentSlot.LEGS, EntityEquipmentSlot.FEET};

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnervator.java

@@ -14,7 +14,7 @@ import cofh.api.energy.IEnergyContainerItem;
 import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotOutput;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityEnervator;
-import invtweaks.api.container.InventoryContainer;
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
@@ -25,7 +25,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-@InventoryContainer
+
 public class ContainerEnervator extends Container{
 
     private TileEntityEnervator enervator;

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFeeder.java

@@ -12,14 +12,14 @@ package de.ellpeck.actuallyadditions.mod.inventory;
 
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityFeeder;
-import invtweaks.api.container.InventoryContainer;
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
-@InventoryContainer
+
 public class ContainerFeeder extends Container{
 
     private TileEntityFeeder tileFeeder;

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFermentingBarrel.java

@@ -12,14 +12,14 @@ package de.ellpeck.actuallyadditions.mod.inventory;
 
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityFermentingBarrel;
-import invtweaks.api.container.InventoryContainer;
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
-@InventoryContainer
+
 public class ContainerFermentingBarrel extends Container{
 
     private TileEntityFermentingBarrel barrel;

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFluidCollector.java

@@ -12,14 +12,14 @@ package de.ellpeck.actuallyadditions.mod.inventory;
 
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityFluidCollector;
-import invtweaks.api.container.InventoryContainer;
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
-@InventoryContainer
+
 public class ContainerFluidCollector extends Container{
 
     private TileEntityFluidCollector collector;

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFurnaceDouble.java

@@ -12,7 +12,7 @@ package de.ellpeck.actuallyadditions.mod.inventory;
 
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityFurnaceDouble;
-import invtweaks.api.container.InventoryContainer;
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
@@ -21,7 +21,7 @@ import net.minecraft.inventory.SlotFurnaceOutput;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.FurnaceRecipes;
 
-@InventoryContainer
+
 public class ContainerFurnaceDouble extends Container{
 
     private TileEntityFurnaceDouble tileFurnace;

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerGiantChest.java

@@ -12,14 +12,12 @@ package de.ellpeck.actuallyadditions.mod.inventory;
 
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityGiantChest;
-import invtweaks.api.container.ChestContainer;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
-@ChestContainer(rowSize = 13)
 public class ContainerGiantChest extends Container{
 
     public TileEntityGiantChest tileChest;

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerGrinder.java

@@ -14,7 +14,7 @@ import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotOutput;
 import de.ellpeck.actuallyadditions.mod.recipe.CrusherRecipeRegistry;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityGrinder;
-import invtweaks.api.container.InventoryContainer;
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
@@ -22,7 +22,7 @@ import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
 
-@InventoryContainer
+
 public class ContainerGrinder extends Container{
 
     public TileEntityGrinder tileGrinder;

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerInputter.java

@@ -14,7 +14,7 @@ import de.ellpeck.actuallyadditions.mod.inventory.gui.GuiInputter;
 import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotFilter;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityInputter;
-import invtweaks.api.container.InventoryContainer;
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.ClickType;
@@ -22,7 +22,7 @@ import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
-@InventoryContainer
+
 public class ContainerInputter extends Container{
 
     private TileEntityInputter tileInputter;

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerLaserRelayItemWhitelist.java

@@ -13,7 +13,7 @@ package de.ellpeck.actuallyadditions.mod.inventory;
 import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotFilter;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityLaserRelay.TileEntityLaserRelayItemWhitelist;
-import invtweaks.api.container.InventoryContainer;
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.ClickType;
@@ -21,7 +21,7 @@ import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
-@InventoryContainer
+
 public class ContainerLaserRelayItemWhitelist extends Container{
 
     private TileEntityLaserRelayItemWhitelist tile;

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerMiner.java

@@ -12,14 +12,14 @@ package de.ellpeck.actuallyadditions.mod.inventory;
 
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityMiner;
-import invtweaks.api.container.InventoryContainer;
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
-@InventoryContainer
+
 public class ContainerMiner extends Container{
 
     private TileEntityMiner miner;

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerOilGenerator.java

@@ -12,14 +12,12 @@ package de.ellpeck.actuallyadditions.mod.inventory;
 
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityOilGenerator;
-import invtweaks.api.container.InventoryContainer;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
-@InventoryContainer
 public class ContainerOilGenerator extends Container{
 
     private TileEntityOilGenerator generator;

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerPhantomPlacer.java

@@ -12,14 +12,14 @@ package de.ellpeck.actuallyadditions.mod.inventory;
 
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityPhantomPlacer;
-import invtweaks.api.container.InventoryContainer;
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
-@InventoryContainer
+
 public class ContainerPhantomPlacer extends Container{
 
     private TileEntityPhantomPlacer placer;

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerRangedCollector.java

@@ -13,7 +13,7 @@ package de.ellpeck.actuallyadditions.mod.inventory;
 import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotFilter;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityRangedCollector;
-import invtweaks.api.container.InventoryContainer;
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.ClickType;
@@ -21,7 +21,7 @@ import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
-@InventoryContainer
+
 public class ContainerRangedCollector extends Container{
 
     private TileEntityRangedCollector collector;

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerRepairer.java

@@ -13,14 +13,14 @@ package de.ellpeck.actuallyadditions.mod.inventory;
 import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotOutput;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityItemRepairer;
-import invtweaks.api.container.InventoryContainer;
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
-@InventoryContainer
+
 public class ContainerRepairer extends Container{
 
     private TileEntityItemRepairer tileRepairer;

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerXPSolidifier.java

@@ -13,14 +13,14 @@ package de.ellpeck.actuallyadditions.mod.inventory;
 import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotOutput;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityXPSolidifier;
-import invtweaks.api.container.InventoryContainer;
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
-@InventoryContainer
+
 public class ContainerXPSolidifier extends Container{
 
     private TileEntityXPSolidifier solidifier;

src/main/java/invtweaks/api/container/ChestContainer.java

@@ -1,38 +0,0 @@
-package invtweaks.api.container;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * A marker for containers that have a chest-like persistant storage component. Enables the Inventroy Tweaks sorting
- * buttons for this container.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-public @interface ChestContainer {
-    // Set to true if the Inventory Tweaks sorting buttons should be shown for this container.
-    boolean showButtons() default true;
-
-    // Size of a chest row
-    int rowSize() default 9;
-
-    // Uses 'large chest' mode for sorting buttons
-    // (Renders buttons vertically down the right side of the GUI)
-    boolean isLargeChest() default false;
-
-    // Annotation for method to get size of a chest row if it is not a fixed size for this container class
-    // Signature int func()
-    @Retention(RetentionPolicy.RUNTIME)
-    @Target(ElementType.METHOD)
-    public @interface RowSizeCallback {
-    }
-
-    // Annotation for method to get size of a chest row if it is not a fixed size for this container class
-    // Signature int func()
-    @Retention(RetentionPolicy.RUNTIME)
-    @Target(ElementType.METHOD)
-    public @interface IsLargeCallback {
-    }
-}

src/main/java/invtweaks/api/container/InventoryContainer.java

@@ -1,20 +0,0 @@
-package invtweaks.api.container;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * A marker for containers that need special treatment, such as crafting inputs or alternate player inventory positions,
- * but do not have a chest-like component.
- * <p/>
- * Does not enable the Inventory Tweaks sorting buttons for this container.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-public @interface InventoryContainer {
-    // Set to true if the Inventory Tweaks options button should be shown for this container.
-    // (For instance, if you are replacing a vanilla container such as the player's inventory)
-    boolean showOptions() default true;
-}