From 40aa8b2f7744814bb3fc4cff5eb04e2c2d8b071a Mon Sep 17 00:00:00 2001 From: Xander Date: Tue, 25 Jul 2017 15:23:52 +0800 Subject: [PATCH] Add Storage Drawer maven --- build.gradle | 11 ++ build.properties | 1 + .../api/IStorageDrawersApi.java | 23 ---- .../storagedrawers/api/StorageDrawersApi.java | 30 ----- .../api/config/IAddonConfig.java | 21 ---- .../api/config/IBlockConfig.java | 14 --- .../api/config/IIntegrationConfig.java | 6 - .../api/config/IUserConfig.java | 18 --- .../api/config/package-info.java | 5 - .../api/event/DrawerPopulatedEvent.java | 19 --- .../api/event/package-info.java | 5 - .../api/pack/BlockConfiguration.java | 42 ------- .../storagedrawers/api/pack/BlockType.java | 7 -- .../storagedrawers/api/pack/TextureType.java | 13 -- .../storagedrawers/api/pack/package-info.java | 5 - .../storagedrawers/api/package-info.java | 4 - .../api/registry/IIngredientHandler.java | 22 ---- .../api/registry/IRecipeHandler.java | 36 ------ .../api/registry/IRecipeHandlerRegistry.java | 12 -- .../api/registry/IRenderRegistry.java | 8 -- .../api/registry/IWailaRegistry.java | 6 - .../api/registry/IWailaTooltipHandler.java | 8 -- .../api/registry/package-info.java | 5 - .../api/render/IRenderLabel.java | 9 -- .../api/render/package-info.java | 5 - .../api/security/ISecurityProvider.java | 13 -- .../api/storage/EnumBasicDrawer.java | 72 ----------- .../storagedrawers/api/storage/IDrawer.java | 119 ------------------ .../api/storage/IDrawerGeometry.java | 8 -- .../api/storage/IDrawerGroup.java | 26 ---- .../api/storage/IDrawerGroupInteractive.java | 18 --- .../api/storage/IFractionalDrawer.java | 28 ----- .../api/storage/INetworked.java | 5 - .../api/storage/IPriorityGroup.java | 10 -- .../api/storage/ISmartGroup.java | 20 --- .../api/storage/attribute/IItemLockable.java | 21 ---- .../api/storage/attribute/IProtectable.java | 38 ------ .../api/storage/attribute/IQuantifiable.java | 16 --- .../api/storage/attribute/ISealable.java | 16 --- .../api/storage/attribute/IShroudable.java | 16 --- .../api/storage/attribute/IVoidable.java | 9 -- .../api/storage/attribute/LockAttribute.java | 37 ------ .../api/storage/attribute/package-info.java | 5 - .../api/storage/package-info.java | 5 - 44 files changed, 12 insertions(+), 805 deletions(-) delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/IStorageDrawersApi.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/StorageDrawersApi.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/config/IAddonConfig.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/config/IBlockConfig.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/config/IIntegrationConfig.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/config/IUserConfig.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/config/package-info.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/event/DrawerPopulatedEvent.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/event/package-info.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/BlockConfiguration.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/BlockType.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/TextureType.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/package-info.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/package-info.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IIngredientHandler.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IRecipeHandler.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IRecipeHandlerRegistry.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IRenderRegistry.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IWailaRegistry.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IWailaTooltipHandler.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/package-info.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/render/IRenderLabel.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/render/package-info.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/security/ISecurityProvider.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/EnumBasicDrawer.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawer.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawerGeometry.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawerGroup.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawerGroupInteractive.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IFractionalDrawer.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/INetworked.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IPriorityGroup.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/ISmartGroup.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IItemLockable.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IProtectable.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IQuantifiable.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/ISealable.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IShroudable.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IVoidable.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/LockAttribute.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/package-info.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/package-info.java diff --git a/build.gradle b/build.gradle index 11dc58195..8ae2d65e7 100644 --- a/build.gradle +++ b/build.gradle @@ -61,6 +61,14 @@ repositories { name 'buildcraft' url 'https://mod-buildcraft.com/maven/' } + maven { + name 'thiakil.io' + url 'https://thiakil.github.io/maven/' + } + maven { + name 'thiakil mirror' //in case GitHub doesn't like maven being hosted in GH Pages + url 'http://maven.thiakil.com' + } } // Define properties file @@ -95,6 +103,9 @@ dependencies { compile "li.cil.oc:OpenComputers:MC${config.minecraft_version}-${config.opencomputers_version}:api" deobfCompile "mcp.mobius.waila:Hwyla:${config.hwyla_version}" deobfCompile "com.mod-buildcraft:buildcraft-api:${config.buildcraft_version}" + compile ("com.jaquadro.minecraft.storagedrawers:StorageDrawers:${config.minecraft_version}-${config.storagedrawers_version}:api") { + exclude module: "Chameleon" // we only use the API, which doesn't need Chameleon + } } processResources diff --git a/build.properties b/build.properties index d85a5e3de..5661c1a73 100644 --- a/build.properties +++ b/build.properties @@ -9,3 +9,4 @@ invtweak_version=1.62+beta.89 opencomputers_version=1.7.0.24 hwyla_version=1.8.13-B26_1.11 buildcraft_version=7.99.6 +storagedrawers_version=4.2.10 \ No newline at end of file diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/IStorageDrawersApi.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/IStorageDrawersApi.java deleted file mode 100644 index 7e0eb580e..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/IStorageDrawersApi.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api; - -import com.jaquadro.minecraft.storagedrawers.api.config.IUserConfig; -import com.jaquadro.minecraft.storagedrawers.api.registry.IRecipeHandlerRegistry; -import com.jaquadro.minecraft.storagedrawers.api.registry.IRenderRegistry; -import com.jaquadro.minecraft.storagedrawers.api.registry.IWailaRegistry; - -public interface IStorageDrawersApi -{ - /** - * Recipe handlers are used to make custom recipes compatible with compacting drawers. - */ - IRecipeHandlerRegistry recipeHandlerRegistry (); - - IRenderRegistry renderRegistry (); - - IWailaRegistry wailaRegistry (); - - /** - * User-managed configuration for the Storage Drawers mod. - */ - IUserConfig userConfig (); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/StorageDrawersApi.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/StorageDrawersApi.java deleted file mode 100644 index b078c8062..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/StorageDrawersApi.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api; - -/** - * Entry point for the public API. - */ -public class StorageDrawersApi -{ - private static IStorageDrawersApi instance; - - public static final String VERSION = "1.10.2-1.3.0"; - - /** - * API entry point. - * - * @return The {@link IStorageDrawersApi} instance or null if the API or Storage Drawers is unavailable. - */ - public static IStorageDrawersApi instance () { - if (instance == null) { - try { - Class classApi = Class.forName( "com.jaquadro.minecraft.storagedrawers.core.Api" ); - instance = (IStorageDrawersApi) classApi.getField("instance").get(null); - } - catch (Throwable t) { - return null; - } - } - - return instance; - } -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/config/IAddonConfig.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/config/IAddonConfig.java deleted file mode 100644 index ca1757971..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/config/IAddonConfig.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.config; - -public interface IAddonConfig -{ - /** - * Gets whether the user has configured a preference for addon packs to hide their blocks and items from Vanilla - * creative tabs. - */ - boolean showAddonItemsNEI (); - - /** - * Gets whether the user has configured a preference for addon packs to hide their blocks and items from NEI. - */ - boolean showAddonItemsVanilla (); - - /** - * Gets whether the user has configured a preference for addon packs to provide their blocks and items through - * their own vanilla tab. - */ - boolean addonItemsUseSeparateTab (); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/config/IBlockConfig.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/config/IBlockConfig.java deleted file mode 100644 index f4101e790..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/config/IBlockConfig.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.config; - -import com.jaquadro.minecraft.storagedrawers.api.pack.BlockConfiguration; - -public interface IBlockConfig -{ - String getBlockConfigName (BlockConfiguration blockConfig); - - boolean isBlockEnabled (String blockConfigName); - - int getBlockRecipeOutput (String blockConfigName); - - int getBaseCapacity (String blockConfigName); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/config/IIntegrationConfig.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/config/IIntegrationConfig.java deleted file mode 100644 index 28d9f132c..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/config/IIntegrationConfig.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.config; - -public interface IIntegrationConfig -{ - boolean isRefinedRelocationEnabled (); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/config/IUserConfig.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/config/IUserConfig.java deleted file mode 100644 index f8aa5e538..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/config/IUserConfig.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.config; - -/** - * The main hub for user-managed mod configuration. - */ -public interface IUserConfig -{ - /** - * Configuration options related to third party addon packs for Storage Drawers. - */ - @Deprecated - IAddonConfig addonConfig (); - - /** - * Configuration options related to individual blocks. - */ - IBlockConfig blockConfig (); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/config/package-info.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/config/package-info.java deleted file mode 100644 index 4a83dca8e..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/config/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -@API(owner = "StorageDrawersAPI", provides = "StorageDrawersAPI|config", apiVersion = StorageDrawersApi.VERSION) -package com.jaquadro.minecraft.storagedrawers.api.config; - -import com.jaquadro.minecraft.storagedrawers.api.StorageDrawersApi; -import net.minecraftforge.fml.common.API; \ No newline at end of file diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/event/DrawerPopulatedEvent.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/event/DrawerPopulatedEvent.java deleted file mode 100644 index e82953e94..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/event/DrawerPopulatedEvent.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.event; - -import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawer; -import net.minecraftforge.fml.common.eventhandler.Event; - -/** - * This event is called when a drawer has been bound to a new item. This is - * and opportunity for mods to cache extended data with the drawer. - * - * This event is also called when the drawer is changed to empty. - */ -public class DrawerPopulatedEvent extends Event -{ - public final IDrawer drawer; - - public DrawerPopulatedEvent (IDrawer drawer) { - this.drawer = drawer; - } -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/event/package-info.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/event/package-info.java deleted file mode 100644 index 517ce1760..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/event/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -@API(owner = "StorageDrawersAPI", provides = "StorageDrawersAPI|event", apiVersion = StorageDrawersApi.VERSION) -package com.jaquadro.minecraft.storagedrawers.api.event; - -import com.jaquadro.minecraft.storagedrawers.api.StorageDrawersApi; -import net.minecraftforge.fml.common.API; \ No newline at end of file diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/BlockConfiguration.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/BlockConfiguration.java deleted file mode 100644 index f0c121e2a..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/BlockConfiguration.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.pack; - -import com.jaquadro.minecraft.storagedrawers.api.storage.EnumBasicDrawer; - -public enum BlockConfiguration -{ - BasicFull1(BlockType.Drawers, EnumBasicDrawer.FULL1), - BasicFull2(BlockType.Drawers, EnumBasicDrawer.FULL2), - BasicFull4(BlockType.Drawers, EnumBasicDrawer.FULL4), - BasicHalf2(BlockType.Drawers, EnumBasicDrawer.HALF2), - BasicHalf4(BlockType.Drawers, EnumBasicDrawer.HALF4), - Trim(BlockType.Trim, null); - - private final BlockType type; - private final EnumBasicDrawer drawer; - - BlockConfiguration (BlockType type, EnumBasicDrawer drawer) { - this.type = type; - this.drawer = drawer; - } - - public BlockType getBlockType () { - return type; - } - - public int getDrawerCount () { - return (drawer != null) ? drawer.getDrawerCount() : 0; - } - - public boolean isHalfDepth () { - return (drawer != null) && drawer.isHalfDepth(); - } - - public static BlockConfiguration by (BlockType type, EnumBasicDrawer drawer) { - for (BlockConfiguration config : values()) { - if (config.type == type && config.drawer == drawer) - return config; - } - - return null; - } -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/BlockType.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/BlockType.java deleted file mode 100644 index f54d4ce8b..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/BlockType.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.pack; - -public enum BlockType -{ - Drawers, - Trim -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/TextureType.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/TextureType.java deleted file mode 100644 index 92ca51df3..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/TextureType.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.pack; - -public enum TextureType -{ - Front1, - Front2, - Front4, - Side, - SideVSplit, - SideHSplit, - TrimBorder, - TrimBlock -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/package-info.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/package-info.java deleted file mode 100644 index 2c7367e85..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -@API(owner = "StorageDrawersAPI", provides = "StorageDrawersAPI|pack", apiVersion = StorageDrawersApi.VERSION) -package com.jaquadro.minecraft.storagedrawers.api.pack; - -import com.jaquadro.minecraft.storagedrawers.api.StorageDrawersApi; -import net.minecraftforge.fml.common.API; \ No newline at end of file diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/package-info.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/package-info.java deleted file mode 100644 index 86d7280fa..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -@API(owner = "StorageDrawers", provides = "StorageDrawersAPI", apiVersion = StorageDrawersApi.VERSION) -package com.jaquadro.minecraft.storagedrawers.api; - -import net.minecraftforge.fml.common.API; \ No newline at end of file diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IIngredientHandler.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IIngredientHandler.java deleted file mode 100644 index 0f33fd5c6..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IIngredientHandler.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.registry; - -import net.minecraft.item.ItemStack; - -import javax.annotation.Nonnull; - -/** - * Ingredient handlers are used to get ItemStacks from ingredients in custom IRecipe implementations. If you have - * registered an IRecipeHandler that returns lists of objects that aren't ItemStacks, then you will need to - * implement an ingredient handler for those objects. - */ -public interface IIngredientHandler -{ - /** - * Gets an ItemStack from an object that represents an ingredient in an IRecipe. - * - * @param object An ingredient object. - * @return An ItemStack for the given ingredient. - */ - @Nonnull - ItemStack getItemStack (Object object); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IRecipeHandler.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IRecipeHandler.java deleted file mode 100644 index d4311ea8a..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IRecipeHandler.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.registry; - -import net.minecraft.item.crafting.IRecipe; - -import java.util.List; - -/** - * Recipe handlers are used by compacting drawers to find more-compressed forms of blocks and items. If your recipe - * to craft compressed items is a custom IRecipe implementation, you will need to register a handler for it. - */ -public interface IRecipeHandler -{ - /** - * Get the recipe ingredient list as an array of objects (usually used for shaped recipes). - * If your array does not contain ItemStack objects, you will need to register an {@link IIngredientHandler} to - * get an ItemStack from them. - * - * If you would prefer to return a List, return null in this method and implement {@link #getInputAsList}. - * - * @param recipe An instance of a custom {@link IRecipe}. - * @return An array of ItemStacks or objects with a registered {@link IIngredientHandler}. - */ - Object[] getInputAsArray (IRecipe recipe); - - /** - * Get the recipe ingredient list as a list of objects (usually used for shapeless recipes). - * If your list does not contain ItemStack objects, you will need to register an {@link IIngredientHandler} to - * get an ItemStack from them. - * - * If you would prefer to return an array, return null in this method and implement {@link #getInputAsArray}. - * - * @param recipe An instance of a custom {@link IRecipe}. - * @return A list of ItemStacks or objects with a registered {@link IIngredientHandler}. - */ - List getInputAsList (IRecipe recipe); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IRecipeHandlerRegistry.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IRecipeHandlerRegistry.java deleted file mode 100644 index b83d5347c..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IRecipeHandlerRegistry.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.registry; - -public interface IRecipeHandlerRegistry -{ - void registerRecipeHandler (Class clazz, IRecipeHandler handler); - - void registerIngredientHandler (Class clazz, IIngredientHandler handler); - - IRecipeHandler getRecipeHandler (Class clazz); - - IIngredientHandler getIngredientHandler (Class clazz); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IRenderRegistry.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IRenderRegistry.java deleted file mode 100644 index cfa4543a1..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IRenderRegistry.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.registry; - -import com.jaquadro.minecraft.storagedrawers.api.render.IRenderLabel; - -public interface IRenderRegistry -{ - void registerPreLabelRenderHandler (IRenderLabel renderHandler); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IWailaRegistry.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IWailaRegistry.java deleted file mode 100644 index a4ee9874a..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IWailaRegistry.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.registry; - -public interface IWailaRegistry -{ - void registerTooltipHandler (IWailaTooltipHandler handler); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IWailaTooltipHandler.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IWailaTooltipHandler.java deleted file mode 100644 index d0f3328c6..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IWailaTooltipHandler.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.registry; - -import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawer; - -public interface IWailaTooltipHandler -{ - String transformItemName (IDrawer drawer, String defaultName); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/package-info.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/package-info.java deleted file mode 100644 index 75fe1f250..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -@API(owner = "StorageDrawersAPI", provides = "StorageDrawersAPI|registry", apiVersion = StorageDrawersApi.VERSION) -package com.jaquadro.minecraft.storagedrawers.api.registry; - -import com.jaquadro.minecraft.storagedrawers.api.StorageDrawersApi; -import net.minecraftforge.fml.common.API; \ No newline at end of file diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/render/IRenderLabel.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/render/IRenderLabel.java deleted file mode 100644 index 500030aa0..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/render/IRenderLabel.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.render; - -import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawerGroup; -import net.minecraft.tileentity.TileEntity; - -public interface IRenderLabel -{ - void render (TileEntity tileEntity, IDrawerGroup drawerGroup, int slot, float brightness, float partialTickTime); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/render/package-info.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/render/package-info.java deleted file mode 100644 index 76e937caa..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/render/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -@API(owner = "StorageDrawersAPI", provides = "StorageDrawersAPI|render", apiVersion = StorageDrawersApi.VERSION) -package com.jaquadro.minecraft.storagedrawers.api.render; - -import com.jaquadro.minecraft.storagedrawers.api.StorageDrawersApi; -import net.minecraftforge.fml.common.API; \ No newline at end of file diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/security/ISecurityProvider.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/security/ISecurityProvider.java deleted file mode 100644 index 66752c0c4..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/security/ISecurityProvider.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.security; - -import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.IProtectable; -import com.mojang.authlib.GameProfile; - -public interface ISecurityProvider -{ - String getProviderID (); - - boolean hasOwnership (GameProfile profile, IProtectable target); - - boolean hasAccess (GameProfile profile, IProtectable target); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/EnumBasicDrawer.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/EnumBasicDrawer.java deleted file mode 100644 index 93117ba7b..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/EnumBasicDrawer.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.storage; - -import net.minecraft.util.IStringSerializable; - -import javax.annotation.Nonnull; - -public enum EnumBasicDrawer implements IDrawerGeometry, IStringSerializable -{ - FULL1(0, 1, false, "full1", "fulldrawers1"), - FULL2(1, 2, false, "full2", "fulldrawers2"), - FULL4(2, 4, false, "full4", "fulldrawers4"), - HALF2(3, 2, true, "half2", "halfdrawers2"), - HALF4(4, 4, true, "half4", "halfdrawers4"); - - private static final EnumBasicDrawer[] META_LOOKUP; - - private final int meta; - private final int drawerCount; - private final boolean halfDepth; - private final String name; - private final String unlocalizedName; - - EnumBasicDrawer (int meta, int drawerCount, boolean halfDepth, String name, String unlocalizedName) { - this.meta = meta; - this.name = name; - this.drawerCount = drawerCount; - this.halfDepth = halfDepth; - this.unlocalizedName = unlocalizedName; - } - - public int getMetadata () { - return meta; - } - - @Override - public int getDrawerCount () { - return drawerCount; - } - - @Override - public boolean isHalfDepth () { - return halfDepth; - } - - public String getUnlocalizedName () { - return unlocalizedName; - } - - public static EnumBasicDrawer byMetadata (int meta) { - if (meta < 0 || meta >= META_LOOKUP.length) - meta = 0; - return META_LOOKUP[meta]; - } - - @Override - public String toString () { - return getName(); - } - - @Override - @Nonnull - public String getName () { - return name; - } - - static { - META_LOOKUP = new EnumBasicDrawer[values().length]; - for (EnumBasicDrawer upgrade : values()) { - META_LOOKUP[upgrade.getMetadata()] = upgrade; - } - } -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawer.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawer.java deleted file mode 100644 index 851eb6f45..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawer.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.storage; - -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; - -import javax.annotation.Nonnull; - -public interface IDrawer -{ - /** - * Gets an ItemStack of size 1 representing the type, metadata, and tags of the stored items. - * The returned ItemStack should not be modified for any reason. Make a copy if you need to store or modify it. - */ - @Nonnull - ItemStack getStoredItemPrototype (); - - /** - * Sets the type of the stored item and initializes it to the given amount. Any existing item will be replaced. - * - * @param itemPrototype An ItemStack representing the type, metadata, and tags of the item to store. - * @param amount The amount to initialize the stored item count to. - * @return The IDrawer actually set with the prototype. Some drawer groups can redirect a set operation to another member. - */ - IDrawer setStoredItem (@Nonnull ItemStack itemPrototype, int amount); - - /** - * Gets the number of items stored in this drawer. - */ - int getStoredItemCount (); - - /** - * Sets the number of items stored in this drawer. Triggers syncing of inventories and client data. - * Setting a drawer's count to 0 may also result in the item type being cleared, depending in implementation. - * - * @param amount The new amount of items stored in this drawer. - */ - void setStoredItemCount (int amount); - - /** - * Gets the maximum number of items that can be stored in this drawer. - * This value will vary depending on the max stack size of the stored item type. - */ - int getMaxCapacity (); - - /** - * Gets the maximum number of items that could be stored in this drawer if it held the given item. - * - * @param itemPrototype The item type to query. - */ - int getMaxCapacity (@Nonnull ItemStack itemPrototype); - - /** - * Gets the maxmimum number of items that could be stored in this drawer for a standard item stack size - * of 64. - */ - int getDefaultMaxCapacity (); - - /** - * Gets the number of items that could still be added to this drawer before it is full. - */ - int getRemainingCapacity (); - - /** - * Gets the max stack size of the item type stored in this drawer. Convenience method. - */ - int getStoredItemStackSize (); - - /** - * Gets whether or not an item of the given type and data can be stored in this drawer. - * - * Stack size and available capacity are not considered. For drawers that are not empty, this - * method can allow ore-dictionary compatible items to be accepted into the drawer, as defined by what - * the drawer considers to be an equivalent item. - * For drawers that are empty, locking status is considered. - * - * @param itemPrototype An ItemStack representing the type, metadata, and tags of an item. - */ - boolean canItemBeStored (@Nonnull ItemStack itemPrototype); - - /** - * Gets whether or not an item of the given type and data can be extracted from this drawer. - * - * This is intended to allow outbound ore-dictionary conversions of compatible items, as defined by what - * the drawer considers to be an equivalent item. - * - * @param itemPrototype An ItemStack representing the type, metadata, and tags of an item. - */ - boolean canItemBeExtracted (@Nonnull ItemStack itemPrototype); - - /** - * Gets whether or not the drawer has items. - * A drawer set with an item type and 0 count is not considered empty. - */ - boolean isEmpty (); - - /** - * Gets auxiliary data that has been associated with this drawer. - * - * @param key The key used to identify the data. - * @return An opaque object that was previously stored. - */ - Object getExtendedData (String key); - - /** - * Stores auxiliary data with this drawer, mainly for use in integration. - * @param key The key to identify the data with. - * @param data The data to store. - */ - void setExtendedData (String key, Object data); - - /** - * Called when a component attribute of a drawer (such as lock or void) changes state. - */ - void attributeChanged (); - - void writeToNBT (NBTTagCompound tag); - - void readFromNBT (NBTTagCompound tag); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawerGeometry.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawerGeometry.java deleted file mode 100644 index 1dae92ad0..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawerGeometry.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.storage; - -public interface IDrawerGeometry -{ - boolean isHalfDepth (); - - int getDrawerCount (); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawerGroup.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawerGroup.java deleted file mode 100644 index bc54eb6bf..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawerGroup.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.storage; - -public interface IDrawerGroup -{ - /** - * Gets the number of drawers contained within this group. - */ - int getDrawerCount (); - - /** - * Gets the drawer at the given slot within this group. - */ - IDrawer getDrawer (int slot); - - /** - * Gets the drawer at the given slot within this group only if it is enabled. - */ - IDrawer getDrawerIfEnabled (int slot); - - /** - * Gets whether the drawer in the given slot is usable. - */ - boolean isDrawerEnabled (int slot); - - boolean markDirtyIfNeeded (); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawerGroupInteractive.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawerGroupInteractive.java deleted file mode 100644 index 362b11b2b..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawerGroupInteractive.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.storage; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; - -import javax.annotation.Nonnull; - -public interface IDrawerGroupInteractive extends IDrawerGroup -{ - @Nonnull - ItemStack takeItemsFromSlot (int slot, int count); - - int putItemsIntoSlot (int slot, @Nonnull ItemStack stack, int count); - - int interactPutCurrentItemIntoSlot (int slot, EntityPlayer player); - - int interactPutCurrentInventoryIntoSlot (int slot, EntityPlayer player); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IFractionalDrawer.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IFractionalDrawer.java deleted file mode 100644 index bd87a808b..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IFractionalDrawer.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.storage; - -/** - * Represents a drawer with items that are a fractional component of another item within the drawer group. Compacting - * Drawers are a primary example of this drawer type. - */ -public interface IFractionalDrawer extends IDrawer -{ - /** - * Gets the storage ratio between the held item and the most compressed item within the drawer group. - * - * For example, most ingots have a conversion rate of 9 compared to metal blocks, and nuggets a rate of 81. - * Actual conversion rates are implementation-defined. - */ - int getConversionRate (); - - /** - * Gets the number of items left in the drawer if the maximum number of equivalent compressed items had been removed. - * The equivalency is determined by the next compression tier, and not necessarily the conversion rate. - */ - int getStoredItemRemainder (); - - /** - * Gets whether or not the stored item represents the smallest granularity of material that can be stored within - * the drawer group. - */ - boolean isSmallestUnit (); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/INetworked.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/INetworked.java deleted file mode 100644 index fba20d40a..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/INetworked.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.storage; - -public interface INetworked -{ -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IPriorityGroup.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IPriorityGroup.java deleted file mode 100644 index 97b293e27..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IPriorityGroup.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.storage; - - -public interface IPriorityGroup -{ - /** - * Gets the list of available drawer slots in priority order. - */ - int[] getAccessibleDrawerSlots (); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/ISmartGroup.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/ISmartGroup.java deleted file mode 100644 index 8795d77a8..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/ISmartGroup.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.storage; - -import net.minecraft.item.ItemStack; - -import javax.annotation.Nonnull; - -public interface ISmartGroup -{ - /** - * Gets a lazy enumeration of all slots that will accept at least one item of the given stack, ordered by - * insertion preference. - */ - Iterable enumerateDrawersForInsertion (@Nonnull ItemStack stack, boolean strict); - - /** - * Gets a lazy enumeration of all slots that will provide at least one item of the given stack, ordered by - * extraction preference. - */ - Iterable enumerateDrawersForExtraction (@Nonnull ItemStack stack, boolean strict); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IItemLockable.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IItemLockable.java deleted file mode 100644 index 684822e65..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IItemLockable.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.storage.attribute; - -public interface IItemLockable -{ - /** - * Gets whether or not a drawer or group is locked for the given lock attribute. - */ - boolean isItemLocked (LockAttribute attr); - - /** - * Gets whether or not the lock state can be changed for the given lock attribute. - * If this method returns false, isItemLocked may still return true. - */ - boolean canItemLock (LockAttribute attr); - - /** - * Sets the lock state of a drawer or group for the given lock attribute. - * If canItemLock returns false, this is a no-op. - */ - void setItemLocked (LockAttribute attr, boolean isLocked); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IProtectable.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IProtectable.java deleted file mode 100644 index c378c04a9..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IProtectable.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.storage.attribute; - -import com.jaquadro.minecraft.storagedrawers.api.security.ISecurityProvider; -import net.minecraft.world.ILockableContainer; - -import java.util.UUID; - -public interface IProtectable -{ - /** - * Gets the owner of the drawer, or null if there is no owner. - */ - UUID getOwner (); - - /** - * Sets the owner of the drawer. Set to null to set no owner. - * @return false if the operation is not supported, true otherwise. - */ - boolean setOwner (UUID owner); - - /** - * Gets the provider managing security for the target. - * @return null to use the default provider, which enforces strict owner access. - */ - ISecurityProvider getSecurityProvider (); - - /** - * Gets the lockable interface if it exists on the protected drawer. - * @return A lockable interface, or null if lockable is not supported. - */ - ILockableContainer getLockableContainer (); - - /** - * Sets the provider managing security for the target. Set to null for default provider. - * @return false if the operation is not supported, true otherwise. - */ - boolean setSecurityProvider (ISecurityProvider provder); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IQuantifiable.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IQuantifiable.java deleted file mode 100644 index 1e37e82cb..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IQuantifiable.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.storage.attribute; - -public interface IQuantifiable -{ - /** - * Gets whether or not the drawer has the quantified attribute. - * The quantified attribute instructs the drawer to render its numerical quantity. - */ - boolean isShowingQuantity (); - - /** - * Sets whether or not the drawer is currently quantified. - * @return false if the operation is not supported, true otherwise. - */ - boolean setIsShowingQuantity (boolean state); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/ISealable.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/ISealable.java deleted file mode 100644 index 7330780e1..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/ISealable.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.storage.attribute; - -public interface ISealable -{ - /** - * Gets whether or not the drawer has the sealed attribute. - * A sealed drawer cannot be interacted with, and when broken will retain all of its items and upgrades. - */ - boolean isSealed (); - - /** - * Sets whether or not the drawer is currently sealed. - * @return false if the operation is not supported, true otherwise. - */ - boolean setIsSealed (boolean state); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IShroudable.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IShroudable.java deleted file mode 100644 index b7f0bf035..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IShroudable.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.storage.attribute; - -public interface IShroudable -{ - /** - * Gets whether or not the drawer has the shrouded attribute. - * The shrouded attribute instructs the drawer to not render its item label. - */ - boolean isShrouded (); - - /** - * Sets whether or not the drawer is currently shrouded. - * @return false if the operation is not supported, true otherwise. - */ - boolean setIsShrouded (boolean state); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IVoidable.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IVoidable.java deleted file mode 100644 index 9fc580635..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IVoidable.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.storage.attribute; - -public interface IVoidable -{ - /** - * Gets whether or not the drawer has a voiding attribute. - */ - boolean isVoid (); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/LockAttribute.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/LockAttribute.java deleted file mode 100644 index cb726b411..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/LockAttribute.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.storage.attribute; - -import java.util.EnumSet; - -public enum LockAttribute -{ - LOCK_POPULATED, - LOCK_EMPTY; - - public int getFlagValue () { - return 1 << ordinal(); - } - - public static int getBitfield (EnumSet attributes) { - int value = 0; - if (attributes == null) - return value; - - for (LockAttribute attr : attributes) - value |= attr.getFlagValue(); - - return value; - } - - public static EnumSet getEnumSet (int bitfield) { - if (bitfield == 0) - return null; - - EnumSet set = EnumSet.noneOf(LockAttribute.class); - for (LockAttribute attr : values()) { - if ((bitfield & attr.getFlagValue()) != 0) - set.add(attr); - } - - return set; - } -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/package-info.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/package-info.java deleted file mode 100644 index cbcb916aa..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -@API(owner = "StorageDrawersAPI", provides = "StorageDrawersAPI|storage-attribute", apiVersion = StorageDrawersApi.VERSION) -package com.jaquadro.minecraft.storagedrawers.api.storage.attribute; - -import com.jaquadro.minecraft.storagedrawers.api.StorageDrawersApi; -import net.minecraftforge.fml.common.API; \ No newline at end of file diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/package-info.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/package-info.java deleted file mode 100644 index c9539a2ae..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -@API(owner = "StorageDrawersAPI", provides = "StorageDrawersAPI|storage", apiVersion = StorageDrawersApi.VERSION) -package com.jaquadro.minecraft.storagedrawers.api.storage; - -import com.jaquadro.minecraft.storagedrawers.api.StorageDrawersApi; -import net.minecraftforge.fml.common.API; \ No newline at end of file