diff --git a/build.gradle b/build.gradle
index 11f6d5358..7b2189646 100755
--- a/build.gradle
+++ b/build.gradle
@@ -33,8 +33,8 @@ ext.apiForestry = "./api/forestry"
ext.apiRedstoneFlux = "./api/redstoneflux"
// java version
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
minecraft {
version = mcversion + "-" + forgeversion
@@ -50,7 +50,8 @@ sourceSets {
main {
java {
srcDir project.apiForestry
- srcDir project.apiRedstoneFlux + "/src/main/java"
+ srcDir project.apiRedstoneFlux
+ srcDir "./api/buildcraft"
}
resources {
srcDir project.dirLang
@@ -117,7 +118,11 @@ jar {
from project.apiRedstoneFlux + "/LICENSE - LGPLv3.txt"
}
into ('invtweaks/api') {
- from "./src/main/java/invtweaks/LICENSE.txt"
+ from "./src/api/java/invtweaks/LICENSE.txt"
+ }
+
+ into ('buildcraft/api') {
+ from "./src/api/java/buildcraft/LICENSE"
}
configurations.shade.each{ dep ->
@@ -130,7 +135,6 @@ jar {
task mainJar(type: Jar, dependsOn: 'reobf') {
from (zipTree(jar.getArchivePath())) {
include '**'
- exclude '**/uristqwerty/**'
}
destinationDir = file(dirDest)
@@ -143,9 +147,7 @@ task mainJar(type: Jar, dependsOn: 'reobf') {
}
task devJar(type: Jar, dependsOn: 'classes') {
- from (sourceSets.main.output) {
- exclude '**/uristqwerty/**'
- }
+ from sourceSets.main.output
destinationDir = file(dirDest)
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
@@ -168,9 +170,7 @@ task apiJar(type: Jar, dependsOn: 'classes') {
}
task srcJar(type: Jar, dependsOn: 'classes') {
- from (sourceSets.main.allSource) {
- exclude '**/uristqwerty/**'
- }
+ from sourceSets.main.allSource
destinationDir = file(dirDest)
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
diff --git a/src/main/java/cofh/LICENSE - LGPLv3.txt b/src/main/java/cofh/LICENSE - LGPLv3.txt
deleted file mode 100644
index 65c5ca88a..000000000
--- a/src/main/java/cofh/LICENSE - LGPLv3.txt
+++ /dev/null
@@ -1,165 +0,0 @@
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc.
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
- This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
- 0. Additional Definitions.
-
- As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
- "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
- An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
- A "Combined Work" is a work produced by combining or linking an
-Application with the Library. The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
- The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
- The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
- 1. Exception to Section 3 of the GNU GPL.
-
- You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
- 2. Conveying Modified Versions.
-
- If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
- a) under this License, provided that you make a good faith effort to
- ensure that, in the event an Application does not supply the
- function or data, the facility still operates, and performs
- whatever part of its purpose remains meaningful, or
-
- b) under the GNU GPL, with none of the additional permissions of
- this License applicable to that copy.
-
- 3. Object Code Incorporating Material from Library Header Files.
-
- The object code form of an Application may incorporate material from
-a header file that is part of the Library. You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
- a) Give prominent notice with each copy of the object code that the
- Library is used in it and that the Library and its use are
- covered by this License.
-
- b) Accompany the object code with a copy of the GNU GPL and this license
- document.
-
- 4. Combined Works.
-
- You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
- a) Give prominent notice with each copy of the Combined Work that
- the Library is used in it and that the Library and its use are
- covered by this License.
-
- b) Accompany the Combined Work with a copy of the GNU GPL and this license
- document.
-
- c) For a Combined Work that displays copyright notices during
- execution, include the copyright notice for the Library among
- these notices, as well as a reference directing the user to the
- copies of the GNU GPL and this license document.
-
- d) Do one of the following:
-
- 0) Convey the Minimal Corresponding Source under the terms of this
- License, and the Corresponding Application Code in a form
- suitable for, and under terms that permit, the user to
- recombine or relink the Application with a modified version of
- the Linked Version to produce a modified Combined Work, in the
- manner specified by section 6 of the GNU GPL for conveying
- Corresponding Source.
-
- 1) Use a suitable shared library mechanism for linking with the
- Library. A suitable mechanism is one that (a) uses at run time
- a copy of the Library already present on the user's computer
- system, and (b) will operate properly with a modified version
- of the Library that is interface-compatible with the Linked
- Version.
-
- e) Provide Installation Information, but only if you would otherwise
- be required to provide such information under section 6 of the
- GNU GPL, and only to the extent that such information is
- necessary to install and execute a modified version of the
- Combined Work produced by recombining or relinking the
- Application with a modified version of the Linked Version. (If
- you use option 4d0, the Installation Information must accompany
- the Minimal Corresponding Source and Corresponding Application
- Code. If you use option 4d1, you must provide the Installation
- Information in the manner specified by section 6 of the GNU GPL
- for conveying Corresponding Source.)
-
- 5. Combined Libraries.
-
- You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
- a) Accompany the combined library with a copy of the same work based
- on the Library, uncombined with any other library facilities,
- conveyed under the terms of this License.
-
- b) Give prominent notice with the combined library that part of it
- is a work based on the Library, and explaining where to find the
- accompanying uncombined form of the same work.
-
- 6. Revised Versions of the GNU Lesser General Public License.
-
- The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
- Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
- If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.
diff --git a/src/main/java/cofh/README.md b/src/main/java/cofh/README.md
deleted file mode 100644
index 3f855b753..000000000
--- a/src/main/java/cofh/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-Redstone Flux API
-====================================
-This is the standalone CoFH Energy API - also known as the "Redstone Flux" API.
-
-Make great use of it.
-
-You are of course free to modify any/all of this code and even repackage it, but then it wouldn't be an awesome crossmod API anymore, now would it?
-
-Don't be a jerk.
-
-~Team CoFH
\ No newline at end of file
diff --git a/src/main/java/cofh/api/CoFHAPIProps.java b/src/main/java/cofh/api/CoFHAPIProps.java
deleted file mode 100644
index eb2e05ade..000000000
--- a/src/main/java/cofh/api/CoFHAPIProps.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package cofh.api;
-
-public class CoFHAPIProps {
-
- private CoFHAPIProps() {
-
- }
-
- public static final String VERSION = "1.8.9R1.2.0B1";
-
-}
diff --git a/src/main/java/cofh/api/energy/EnergyStorage.java b/src/main/java/cofh/api/energy/EnergyStorage.java
deleted file mode 100644
index dd7dd3e02..000000000
--- a/src/main/java/cofh/api/energy/EnergyStorage.java
+++ /dev/null
@@ -1,162 +0,0 @@
-package cofh.api.energy;
-
-import net.minecraft.nbt.NBTTagCompound;
-
-/**
- * Reference implementation of {@link IEnergyStorage}. Use/extend this or implement your own.
- *
- * @author King Lemming
- *
- */
-public class EnergyStorage implements IEnergyStorage {
-
- protected int energy;
- protected int capacity;
- protected int maxReceive;
- protected int maxExtract;
-
- public EnergyStorage(int capacity) {
-
- this(capacity, capacity, capacity);
- }
-
- public EnergyStorage(int capacity, int maxTransfer) {
-
- this(capacity, maxTransfer, maxTransfer);
- }
-
- public EnergyStorage(int capacity, int maxReceive, int maxExtract) {
-
- this.capacity = capacity;
- this.maxReceive = maxReceive;
- this.maxExtract = maxExtract;
- }
-
- public EnergyStorage readFromNBT(NBTTagCompound nbt) {
-
- this.energy = nbt.getInteger("Energy");
-
- if (energy > capacity) {
- energy = capacity;
- }
- return this;
- }
-
- public NBTTagCompound writeToNBT(NBTTagCompound nbt) {
-
- if (energy < 0) {
- energy = 0;
- }
- nbt.setInteger("Energy", energy);
- return nbt;
- }
-
- public EnergyStorage setCapacity(int capacity) {
-
- this.capacity = capacity;
-
- if (energy > capacity) {
- energy = capacity;
- }
- return this;
- }
-
- public EnergyStorage setMaxTransfer(int maxTransfer) {
-
- setMaxReceive(maxTransfer);
- setMaxExtract(maxTransfer);
- return this;
- }
-
- public EnergyStorage setMaxReceive(int maxReceive) {
-
- this.maxReceive = maxReceive;
- return this;
- }
-
- public EnergyStorage setMaxExtract(int maxExtract) {
-
- this.maxExtract = maxExtract;
- return this;
- }
-
- public int getMaxReceive() {
-
- return maxReceive;
- }
-
- public int getMaxExtract() {
-
- return maxExtract;
- }
-
- /**
- * This function is included to allow for server to client sync. Do not call this externally to the containing Tile Entity, as not all IEnergyHandlers
- * are guaranteed to have it.
- *
- * @param energy
- */
- public void setEnergyStored(int energy) {
-
- this.energy = energy;
-
- if (this.energy > capacity) {
- this.energy = capacity;
- } else if (this.energy < 0) {
- this.energy = 0;
- }
- }
-
- /**
- * This function is included to allow the containing tile to directly and efficiently modify the energy contained in the EnergyStorage. Do not rely on this
- * externally, as not all IEnergyHandlers are guaranteed to have it.
- *
- * @param energy
- */
- public void modifyEnergyStored(int energy) {
-
- this.energy += energy;
-
- if (this.energy > capacity) {
- this.energy = capacity;
- } else if (this.energy < 0) {
- this.energy = 0;
- }
- }
-
- /* IEnergyStorage */
- @Override
- public int receiveEnergy(int maxReceive, boolean simulate) {
-
- int energyReceived = Math.min(capacity - energy, Math.min(this.maxReceive, maxReceive));
-
- if (!simulate) {
- energy += energyReceived;
- }
- return energyReceived;
- }
-
- @Override
- public int extractEnergy(int maxExtract, boolean simulate) {
-
- int energyExtracted = Math.min(energy, Math.min(this.maxExtract, maxExtract));
-
- if (!simulate) {
- energy -= energyExtracted;
- }
- return energyExtracted;
- }
-
- @Override
- public int getEnergyStored() {
-
- return energy;
- }
-
- @Override
- public int getMaxEnergyStored() {
-
- return capacity;
- }
-
-}
diff --git a/src/main/java/cofh/api/energy/IEnergyConnection.java b/src/main/java/cofh/api/energy/IEnergyConnection.java
deleted file mode 100644
index 29ef0a1ce..000000000
--- a/src/main/java/cofh/api/energy/IEnergyConnection.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package cofh.api.energy;
-
-import net.minecraft.util.EnumFacing;
-
-
-/**
- * Implement this interface on TileEntities which should connect to energy transportation blocks. This is intended for blocks which generate energy but do not
- * accept it; otherwise just use IEnergyHandler.
- *
- * Note that {@link IEnergyHandler} is an extension of this.
- *
- * @author King Lemming
- *
- */
-public interface IEnergyConnection {
-
- /**
- * Returns TRUE if the TileEntity can connect on a given side.
- */
- boolean canConnectEnergy(EnumFacing from);
-
-}
diff --git a/src/main/java/cofh/api/energy/IEnergyContainerItem.java b/src/main/java/cofh/api/energy/IEnergyContainerItem.java
deleted file mode 100644
index 3ef725765..000000000
--- a/src/main/java/cofh/api/energy/IEnergyContainerItem.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package cofh.api.energy;
-
-import net.minecraft.item.ItemStack;
-
-/**
- * Implement this interface on Item classes that support external manipulation of their internal energy storages.
- *
- * A reference implementation is provided {@link ItemEnergyContainer}.
- *
- * @author King Lemming
- *
- */
-public interface IEnergyContainerItem {
-
- /**
- * Adds energy to a container item. Returns the quantity of energy that was accepted. This should always return 0 if the item cannot be externally charged.
- *
- * @param container
- * ItemStack to be charged.
- * @param maxReceive
- * Maximum amount of energy to be sent into the item.
- * @param simulate
- * If TRUE, the charge will only be simulated.
- * @return Amount of energy that was (or would have been, if simulated) received by the item.
- */
- int receiveEnergy(ItemStack container, int maxReceive, boolean simulate);
-
- /**
- * Removes energy from a container item. Returns the quantity of energy that was removed. This should always return 0 if the item cannot be externally
- * discharged.
- *
- * @param container
- * ItemStack to be discharged.
- * @param maxExtract
- * Maximum amount of energy to be extracted from the item.
- * @param simulate
- * If TRUE, the discharge will only be simulated.
- * @return Amount of energy that was (or would have been, if simulated) extracted from the item.
- */
- int extractEnergy(ItemStack container, int maxExtract, boolean simulate);
-
- /**
- * Get the amount of energy currently stored in the container item.
- */
- int getEnergyStored(ItemStack container);
-
- /**
- * Get the max amount of energy that can be stored in the container item.
- */
- int getMaxEnergyStored(ItemStack container);
-
-}
diff --git a/src/main/java/cofh/api/energy/IEnergyHandler.java b/src/main/java/cofh/api/energy/IEnergyHandler.java
deleted file mode 100644
index 16b236e7a..000000000
--- a/src/main/java/cofh/api/energy/IEnergyHandler.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package cofh.api.energy;
-
-import net.minecraft.util.EnumFacing;
-
-/**
- * Implement this interface on Tile Entities which should handle energy, generally storing it in one or more internal {@link IEnergyStorage} objects.
- *
- * A reference implementation is provided {@link TileEnergyHandler}.
- *
- * Note that {@link IEnergyReceiver} and {@link IEnergyProvider} are extensions of this.
- *
- * @author King Lemming
- *
- */
-public interface IEnergyHandler extends IEnergyConnection {
-
- /**
- * Returns the amount of energy currently stored.
- */
- int getEnergyStored(EnumFacing from);
-
- /**
- * Returns the maximum amount of energy that can be stored.
- */
- int getMaxEnergyStored(EnumFacing from);
-
-}
diff --git a/src/main/java/cofh/api/energy/IEnergyProvider.java b/src/main/java/cofh/api/energy/IEnergyProvider.java
deleted file mode 100644
index ef0e09d06..000000000
--- a/src/main/java/cofh/api/energy/IEnergyProvider.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package cofh.api.energy;
-
-import net.minecraft.util.EnumFacing;
-
-
-/**
- * Implement this interface on Tile Entities which should provide energy, generally storing it in one or more internal {@link IEnergyStorage} objects.
- *
- * A reference implementation is provided {@link TileEnergyHandler}.
- *
- * @author King Lemming
- *
- */
-public interface IEnergyProvider extends IEnergyHandler {
-
- /**
- * Remove energy from an IEnergyProvider, internal distribution is left entirely to the IEnergyProvider.
- *
- * @param from
- * Orientation the energy is extracted from.
- * @param maxExtract
- * Maximum amount of energy to extract.
- * @param simulate
- * If TRUE, the extraction will only be simulated.
- * @return Amount of energy that was (or would have been, if simulated) extracted.
- */
- int extractEnergy(EnumFacing from, int maxExtract, boolean simulate);
-
-}
diff --git a/src/main/java/cofh/api/energy/IEnergyReceiver.java b/src/main/java/cofh/api/energy/IEnergyReceiver.java
deleted file mode 100644
index 989e9baa5..000000000
--- a/src/main/java/cofh/api/energy/IEnergyReceiver.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package cofh.api.energy;
-
-import net.minecraft.util.EnumFacing;
-
-
-/**
- * Implement this interface on Tile Entities which should receive energy, generally storing it in one or more internal {@link IEnergyStorage} objects.
- *
- * A reference implementation is provided {@link TileEnergyHandler}.
- *
- * @author King Lemming
- *
- */
-public interface IEnergyReceiver extends IEnergyHandler {
-
- /**
- * Add energy to an IEnergyReceiver, internal distribution is left entirely to the IEnergyReceiver.
- *
- * @param from
- * Orientation the energy is received from.
- * @param maxReceive
- * Maximum amount of energy to receive.
- * @param simulate
- * If TRUE, the charge will only be simulated.
- * @return Amount of energy that was (or would have been, if simulated) received.
- */
- int receiveEnergy(EnumFacing from, int maxReceive, boolean simulate);
-
-}
diff --git a/src/main/java/cofh/api/energy/IEnergyStorage.java b/src/main/java/cofh/api/energy/IEnergyStorage.java
deleted file mode 100644
index 414b26566..000000000
--- a/src/main/java/cofh/api/energy/IEnergyStorage.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package cofh.api.energy;
-
-/**
- * An energy storage is the unit of interaction with Energy inventories.
- * This is not to be implemented on TileEntities. This is for internal use only.
- *
- * A reference implementation can be found at {@link EnergyStorage}.
- *
- * @author King Lemming
- *
- */
-public interface IEnergyStorage {
-
- /**
- * Adds energy to the storage. Returns quantity of energy that was accepted.
- *
- * @param maxReceive
- * Maximum amount of energy to be inserted.
- * @param simulate
- * If TRUE, the insertion will only be simulated.
- * @return Amount of energy that was (or would have been, if simulated) accepted by the storage.
- */
- int receiveEnergy(int maxReceive, boolean simulate);
-
- /**
- * Removes energy from the storage. Returns quantity of energy that was removed.
- *
- * @param maxExtract
- * Maximum amount of energy to be extracted.
- * @param simulate
- * If TRUE, the extraction will only be simulated.
- * @return Amount of energy that was (or would have been, if simulated) extracted from the storage.
- */
- int extractEnergy(int maxExtract, boolean simulate);
-
- /**
- * Returns the amount of energy currently stored.
- */
- int getEnergyStored();
-
- /**
- * Returns the maximum amount of energy that can be stored.
- */
- int getMaxEnergyStored();
-
-}
diff --git a/src/main/java/cofh/api/energy/ItemEnergyContainer.java b/src/main/java/cofh/api/energy/ItemEnergyContainer.java
deleted file mode 100644
index 0fb36dab6..000000000
--- a/src/main/java/cofh/api/energy/ItemEnergyContainer.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package cofh.api.energy;
-
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-
-/**
- * Reference implementation of {@link IEnergyContainerItem}. Use/extend this or implement your own.
- *
- * @author King Lemming
- *
- */
-public class ItemEnergyContainer extends Item implements IEnergyContainerItem {
-
- protected int capacity;
- protected int maxReceive;
- protected int maxExtract;
-
- public ItemEnergyContainer() {
-
- }
-
- public ItemEnergyContainer(int capacity) {
-
- this(capacity, capacity, capacity);
- }
-
- public ItemEnergyContainer(int capacity, int maxTransfer) {
-
- this(capacity, maxTransfer, maxTransfer);
- }
-
- public ItemEnergyContainer(int capacity, int maxReceive, int maxExtract) {
-
- this.capacity = capacity;
- this.maxReceive = maxReceive;
- this.maxExtract = maxExtract;
- }
-
- public ItemEnergyContainer setCapacity(int capacity) {
-
- this.capacity = capacity;
- return this;
- }
-
- public ItemEnergyContainer setMaxTransfer(int maxTransfer) {
-
- setMaxReceive(maxTransfer);
- setMaxExtract(maxTransfer);
- return this;
- }
-
- public ItemEnergyContainer setMaxReceive(int maxReceive) {
-
- this.maxReceive = maxReceive;
- return this;
- }
-
- public ItemEnergyContainer setMaxExtract(int maxExtract) {
-
- this.maxExtract = maxExtract;
- return this;
- }
-
- /* IEnergyContainerItem */
- @Override
- public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) {
-
- if (!container.hasTagCompound()) {
- container.setTagCompound(new NBTTagCompound());
- }
- int energy = container.getTagCompound().getInteger("Energy");
- int energyReceived = Math.min(capacity - energy, Math.min(this.maxReceive, maxReceive));
-
- if (!simulate) {
- energy += energyReceived;
- container.getTagCompound().setInteger("Energy", energy);
- }
- return energyReceived;
- }
-
- @Override
- public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) {
-
- if (container.getTagCompound() == null || !container.getTagCompound().hasKey("Energy")) {
- return 0;
- }
- int energy = container.getTagCompound().getInteger("Energy");
- int energyExtracted = Math.min(energy, Math.min(this.maxExtract, maxExtract));
-
- if (!simulate) {
- energy -= energyExtracted;
- container.getTagCompound().setInteger("Energy", energy);
- }
- return energyExtracted;
- }
-
- @Override
- public int getEnergyStored(ItemStack container) {
-
- if (container.getTagCompound() == null || !container.getTagCompound().hasKey("Energy")) {
- return 0;
- }
- return container.getTagCompound().getInteger("Energy");
- }
-
- @Override
- public int getMaxEnergyStored(ItemStack container) {
-
- return capacity;
- }
-
-}
diff --git a/src/main/java/cofh/api/energy/TileEnergyHandler.java b/src/main/java/cofh/api/energy/TileEnergyHandler.java
deleted file mode 100644
index 3ba60a664..000000000
--- a/src/main/java/cofh/api/energy/TileEnergyHandler.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package cofh.api.energy;
-
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.EnumFacing;
-
-/**
- * Reference implementation of {@link IEnergyReceiver} and {@link IEnergyProvider}. Use/extend this or implement your own.
- *
- * This class is really meant to summarize how each interface is properly used.
- *
- * @author King Lemming
- *
- */
-public class TileEnergyHandler extends TileEntity implements IEnergyReceiver, IEnergyProvider {
-
- protected EnergyStorage storage = new EnergyStorage(32000);
-
- @Override
- public void readFromNBT(NBTTagCompound nbt) {
-
- super.readFromNBT(nbt);
- storage.readFromNBT(nbt);
- }
-
- @Override
- public void writeToNBT(NBTTagCompound nbt) {
-
- super.writeToNBT(nbt);
- storage.writeToNBT(nbt);
- }
-
- /* IEnergyConnection */
- @Override
- public boolean canConnectEnergy(EnumFacing from) {
-
- return true;
- }
-
- /* IEnergyReceiver */
- @Override
- public int receiveEnergy(EnumFacing from, int maxReceive, boolean simulate) {
-
- return storage.receiveEnergy(maxReceive, simulate);
- }
-
- /* IEnergyProvider */
- @Override
- public int extractEnergy(EnumFacing from, int maxExtract, boolean simulate) {
-
- return storage.extractEnergy(maxExtract, simulate);
- }
-
- /* IEnergyHandler */
- @Override
- public int getEnergyStored(EnumFacing from) {
-
- return storage.getEnergyStored();
- }
-
- @Override
- public int getMaxEnergyStored(EnumFacing from) {
-
- return storage.getMaxEnergyStored();
- }
-
-}
diff --git a/src/main/java/cofh/api/energy/package-info.java b/src/main/java/cofh/api/energy/package-info.java
deleted file mode 100644
index da8566735..000000000
--- a/src/main/java/cofh/api/energy/package-info.java
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * (C) 2014-2016 Team CoFH / CoFH / Cult of the Full Hub
- * http://www.teamcofh.com
- */
-@API(apiVersion = CoFHAPIProps.VERSION, owner = "CoFHAPI", provides = "CoFHAPI|energy")
-package cofh.api.energy;
-
-import net.minecraftforge.fml.common.API;
-import cofh.api.CoFHAPIProps;
-
diff --git a/src/main/java/cofh/api/package-info.java b/src/main/java/cofh/api/package-info.java
deleted file mode 100644
index e2847daad..000000000
--- a/src/main/java/cofh/api/package-info.java
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * (C) 2014-2016 Team CoFH / CoFH / Cult of the Full Hub
- * http://www.teamcofh.com
- */
-@API(apiVersion = CoFHAPIProps.VERSION, owner = "CoFHLib", provides = "CoFHAPI")
-package cofh.api;
-
-import net.minecraftforge.fml.common.API;
-
diff --git a/src/main/java/invtweaks/LICENSE.txt b/src/main/java/invtweaks/LICENSE.txt
deleted file mode 100644
index fe92f2884..000000000
--- a/src/main/java/invtweaks/LICENSE.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-## Inventory Tweaks Mod license (MIT)
-
-Copyright (c) 2011-2013 Marwane Kalam-Alami
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
\ No newline at end of file
diff --git a/src/main/java/invtweaks/api/IItemTree.java b/src/main/java/invtweaks/api/IItemTree.java
deleted file mode 100644
index 9653087fe..000000000
--- a/src/main/java/invtweaks/api/IItemTree.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2013 Andrew Crocker
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-package invtweaks.api;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Random;
-
-@SuppressWarnings("unused")
-public interface IItemTree {
- void registerOre(String category, String name, String oreName, int order);
-
- boolean matches(List items, String keyword);
-
- boolean isKeywordValid(String keyword);
-
- Collection getAllCategories();
-
- IItemTreeCategory getRootCategory();
-
- void setRootCategory(IItemTreeCategory category);
-
- IItemTreeCategory getCategory(String keyword);
-
- boolean isItemUnknown(String id, int damage);
-
- List getItems(String id, int damage);
-
- List getItems(String name);
-
- IItemTreeItem getRandomItem(Random r);
-
- boolean containsItem(String name);
-
- boolean containsCategory(String name);
-
- IItemTreeCategory addCategory(String parentCategory, String newCategory) throws NullPointerException;
-
- void addCategory(String parentCategory, IItemTreeCategory newCategory) throws NullPointerException;
-
- IItemTreeItem addItem(String parentCategory, String name, String id, int damage, int order)
- throws NullPointerException;
-
- void addItem(String parentCategory, IItemTreeItem newItem) throws NullPointerException;
-
- int getKeywordDepth(String keyword);
-
- int getKeywordOrder(String keyword);
-}
diff --git a/src/main/java/invtweaks/api/IItemTreeCategory.java b/src/main/java/invtweaks/api/IItemTreeCategory.java
deleted file mode 100644
index 5e79c3636..000000000
--- a/src/main/java/invtweaks/api/IItemTreeCategory.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2013 Andrew Crocker
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-package invtweaks.api;
-
-import java.util.Collection;
-import java.util.List;
-
-@SuppressWarnings("unused")
-public interface IItemTreeCategory {
- boolean contains(IItemTreeItem item);
-
- void addCategory(IItemTreeCategory category);
-
- void addItem(IItemTreeItem item);
-
- Collection getSubCategories();
-
- Collection> getItems();
-
- String getName();
-
- int getCategoryOrder();
-
- int findCategoryOrder(String keyword);
-
- int findKeywordDepth(String keyword);
-}
diff --git a/src/main/java/invtweaks/api/IItemTreeItem.java b/src/main/java/invtweaks/api/IItemTreeItem.java
deleted file mode 100644
index b050b68f4..000000000
--- a/src/main/java/invtweaks/api/IItemTreeItem.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2013 Andrew Crocker
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-package invtweaks.api;
-
-@SuppressWarnings("unused")
-public interface IItemTreeItem extends Comparable {
- String getName();
-
- String getId();
-
- int getDamage();
-
- int getOrder();
-}
diff --git a/src/main/java/invtweaks/api/IItemTreeListener.java b/src/main/java/invtweaks/api/IItemTreeListener.java
deleted file mode 100644
index e63cc6f2c..000000000
--- a/src/main/java/invtweaks/api/IItemTreeListener.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2013 Andrew Crocker
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-package invtweaks.api;
-
-import java.util.EventListener;
-
-@SuppressWarnings("unused")
-public interface IItemTreeListener extends EventListener {
- void onTreeLoaded(IItemTree tree);
-}
diff --git a/src/main/java/invtweaks/api/InvTweaksAPI.java b/src/main/java/invtweaks/api/InvTweaksAPI.java
deleted file mode 100644
index 318610f22..000000000
--- a/src/main/java/invtweaks/api/InvTweaksAPI.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 2013 Andrew Crocker
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-package invtweaks.api;
-
-import invtweaks.api.container.ContainerSection;
-import net.minecraft.item.ItemStack;
-
-/**
- * Interface to access functions exposed by Inventory Tweaks
- *
- * The main @Mod instance of the mod implements this interface, so a refernce to it can
- * be obtained via @Instance("inventorytweaks") or methods in net.minecraftforge.fml.common.Loader
- *
- * All of these functions currently have no effect if called on a dedicated server.
- */
-@SuppressWarnings("unused")
-public interface InvTweaksAPI {
- /**
- * Add a listener for ItemTree load events
- */
- void addOnLoadListener(IItemTreeListener listener);
-
- /**
- * Remove a listener for ItemTree load events
- *
- * @return true if the listener was previously added
- */
- boolean removeOnLoadListener(IItemTreeListener listener);
-
- /**
- * Toggle sorting shortcut state.
- */
- void setSortKeyEnabled(boolean enabled);
-
- /**
- * Toggle sorting shortcut supression.
- * Unlike setSortKeyEnabled, this flag is automatically cleared when GUIs are closed.
- */
- void setTextboxMode(boolean enabled);
-
- /**
- * Compare two items using the default (non-rule based) algorithm,
- * sutable for an implementation of Comparator<ItemStack>.
- *
- * @param i
- * @param j
- * @return A value with a sign representing the relative order of the item stacks
- */
- int compareItems(ItemStack i, ItemStack j);
-
- /**
- * Initiate a sort as if the player had clicked on a sorting button or pressed the sort key.
- */
- void sort(ContainerSection section, SortingMethod method);
-}
diff --git a/src/main/java/invtweaks/api/SortingMethod.java b/src/main/java/invtweaks/api/SortingMethod.java
deleted file mode 100644
index 8f61b5f67..000000000
--- a/src/main/java/invtweaks/api/SortingMethod.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2013 Andrew Crocker
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-package invtweaks.api;
-
-@SuppressWarnings("unused")
-public enum SortingMethod {
- /**
- * Standard 'r' sorting for generic inventories
- */
- DEFAULT,
- /**
- * Sort method creating vertical columns of items.
- * Used for chests only, requires container to have a valid row size for correct results.
- */
- VERTICAL,
- /**
- * Sort method creating horizontal rows of items.
- * Used for chests only, requires container to have a valid row size for correct results.
- */
- HORIZONTAL,
- /**
- * Sort method for player inventory.
- * Applies to extra player-specified sorting rules for the main inventory.
- * Will always operate on main inventory.
- */
- INVENTORY,
- /**
- * Attempts to even the number of items in each stack of the same type of item, without moving full stacks.
- * Used in crafting grid sorting.
- */
- EVEN_STACKS,
-}
diff --git a/src/main/java/invtweaks/api/container/ChestContainer.java b/src/main/java/invtweaks/api/container/ChestContainer.java
deleted file mode 100644
index a85c412a1..000000000
--- a/src/main/java/invtweaks/api/container/ChestContainer.java
+++ /dev/null
@@ -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)
- @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)
- @interface IsLargeCallback {
- }
-}
diff --git a/src/main/java/invtweaks/api/container/ContainerSection.java b/src/main/java/invtweaks/api/container/ContainerSection.java
deleted file mode 100644
index 85f5ce66c..000000000
--- a/src/main/java/invtweaks/api/container/ContainerSection.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (c) 2013 Andrew Crocker
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-package invtweaks.api.container;
-
-/**
- * Names for specific parts of containers. For unknown container types (such as mod containers), only INVENTORY and
- * CHEST sections are available.
- */
-@SuppressWarnings("unused")
-public enum ContainerSection {
- /**
- * The player's inventory
- */
- INVENTORY,
- /**
- * The player's inventory (only the hotbar)
- */
- INVENTORY_HOTBAR,
- /**
- * The player's inventory (all except the hotbar)
- */
- INVENTORY_NOT_HOTBAR,
- /**
- * The chest or dispenser contents. Also used for unknown container contents.
- */
- CHEST,
- /**
- * The crafting input
- */
- CRAFTING_IN,
- /**
- * The crafting input, for containters that store it internally
- */
- CRAFTING_IN_PERSISTENT,
- /**
- * The crafting output
- */
- CRAFTING_OUT,
- /**
- * The armor slots
- */
- ARMOR,
- /**
- * The furnace input
- */
- FURNACE_IN,
- /**
- * The furnace output
- */
- FURNACE_OUT,
- /**
- * The furnace fuel
- */
- FURNACE_FUEL,
- /**
- * The enchantment table slot
- */
- ENCHANTMENT,
- /**
- * The three bottles slots in brewing tables
- * NOTE: Do not use without also using BREWING_INGREDIENT.
- */
- BREWING_BOTTLES,
- /**
- * The top slot in brewing tables
- * NOTE: Do not use without also using BREWING_BOTTLES.
- */
- BREWING_INGREDIENT
-}
diff --git a/src/main/java/invtweaks/api/container/ContainerSectionCallback.java b/src/main/java/invtweaks/api/container/ContainerSectionCallback.java
deleted file mode 100644
index 379206b37..000000000
--- a/src/main/java/invtweaks/api/container/ContainerSectionCallback.java
+++ /dev/null
@@ -1,16 +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 a method to call which returns the set of ContainerSections for this container.
- *
- * Signature of the method should be Map> func()
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-public @interface ContainerSectionCallback {
-}
diff --git a/src/main/java/invtweaks/api/container/IgnoreContainer.java b/src/main/java/invtweaks/api/container/IgnoreContainer.java
deleted file mode 100644
index 86e8aea12..000000000
--- a/src/main/java/invtweaks/api/container/IgnoreContainer.java
+++ /dev/null
@@ -1,15 +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;
-
-/**
- * Use this annotation to override inherited annotation properties and mark a Container as unsortable.
- * This effect is inherited as well.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-public @interface IgnoreContainer {
-}
diff --git a/src/main/java/invtweaks/api/container/InventoryContainer.java b/src/main/java/invtweaks/api/container/InventoryContainer.java
deleted file mode 100644
index d5a45b912..000000000
--- a/src/main/java/invtweaks/api/container/InventoryContainer.java
+++ /dev/null
@@ -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.
- *
- * 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;
-}