diff --git a/botany/src/main/java/binnie/botany/blocks/BlockStainedGlass.java b/botany/src/main/java/binnie/botany/blocks/BlockStainedGlass.java index 1de09acb..a59a6668 100644 --- a/botany/src/main/java/binnie/botany/blocks/BlockStainedGlass.java +++ b/botany/src/main/java/binnie/botany/blocks/BlockStainedGlass.java @@ -36,9 +36,9 @@ import forestry.core.blocks.IColoredBlock; import binnie.botany.CreativeTabBotany; import binnie.botany.api.genetics.EnumFlowerColor; -import binnie.core.api.block.BlockMetadata; -import binnie.core.api.block.IBlockMetadata; -import binnie.core.api.block.TileEntityMetadata; +import binnie.core.block.BlockMetadata; +import binnie.core.block.IBlockMetadata; +import binnie.core.block.TileEntityMetadata; import binnie.core.util.I18N; public class BlockStainedGlass extends Block implements IBlockMetadata, IColoredBlock, IItemModelRegister { diff --git a/botany/src/main/java/binnie/botany/ceramic/CeramicColor.java b/botany/src/main/java/binnie/botany/ceramic/CeramicColor.java index a6fcf983..29903ad7 100644 --- a/botany/src/main/java/binnie/botany/ceramic/CeramicColor.java +++ b/botany/src/main/java/binnie/botany/ceramic/CeramicColor.java @@ -7,7 +7,7 @@ import net.minecraft.item.ItemStack; import binnie.botany.api.genetics.EnumFlowerColor; import binnie.botany.modules.ModuleCeramic; -import binnie.core.api.block.TileEntityMetadata; +import binnie.core.block.TileEntityMetadata; import binnie.extratrees.api.IDesignMaterial; public class CeramicColor implements IDesignMaterial { diff --git a/botany/src/main/java/binnie/botany/ceramic/brick/CeramicBrickType.java b/botany/src/main/java/binnie/botany/ceramic/brick/CeramicBrickType.java index 922bcff8..66f46a9d 100644 --- a/botany/src/main/java/binnie/botany/ceramic/brick/CeramicBrickType.java +++ b/botany/src/main/java/binnie/botany/ceramic/brick/CeramicBrickType.java @@ -14,7 +14,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import binnie.botany.api.genetics.EnumFlowerColor; import binnie.botany.items.CeramicItems; import binnie.botany.modules.ModuleCeramic; -import binnie.core.api.block.TileEntityMetadata; +import binnie.core.block.TileEntityMetadata; public enum CeramicBrickType implements IStringSerializable { TILE("tile") { diff --git a/botany/src/main/java/binnie/botany/items/ItemStainedGlass.java b/botany/src/main/java/binnie/botany/items/ItemStainedGlass.java index ec7e45bb..16c41356 100644 --- a/botany/src/main/java/binnie/botany/items/ItemStainedGlass.java +++ b/botany/src/main/java/binnie/botany/items/ItemStainedGlass.java @@ -10,7 +10,7 @@ import forestry.core.items.IColoredItem; import binnie.botany.api.genetics.EnumFlowerColor; import binnie.core.block.ItemMetadata; -import binnie.core.api.block.TileEntityMetadata; +import binnie.core.block.TileEntityMetadata; public class ItemStainedGlass extends ItemMetadata implements IColoredItem { public ItemStainedGlass(Block block) { diff --git a/botany/src/main/java/binnie/botany/modules/ModuleCeramic.java b/botany/src/main/java/binnie/botany/modules/ModuleCeramic.java index 072baebe..cc8c62a8 100644 --- a/botany/src/main/java/binnie/botany/modules/ModuleCeramic.java +++ b/botany/src/main/java/binnie/botany/modules/ModuleCeramic.java @@ -26,7 +26,7 @@ import binnie.botany.items.ItemStainedGlass; import binnie.botany.recipes.CeramicTileRecipe; import binnie.botany.recipes.PigmentRecipe; import binnie.core.Constants; -import binnie.core.api.block.TileEntityMetadata; +import binnie.core.block.TileEntityMetadata; import binnie.core.item.ItemMisc; import binnie.core.modules.BinnieModule; import binnie.core.modules.BotanyModuleUIDs; diff --git a/botany/src/main/java/binnie/botany/tile/TileCeramicBrick.java b/botany/src/main/java/binnie/botany/tile/TileCeramicBrick.java index 08d704fb..3ee483fe 100644 --- a/botany/src/main/java/binnie/botany/tile/TileCeramicBrick.java +++ b/botany/src/main/java/binnie/botany/tile/TileCeramicBrick.java @@ -8,7 +8,7 @@ import binnie.botany.ceramic.brick.CeramicBrickPair; import binnie.botany.ceramic.brick.CeramicBrickType; import binnie.botany.api.genetics.EnumFlowerColor; import binnie.botany.modules.ModuleCeramic; -import binnie.core.api.block.TileEntityMetadata; +import binnie.core.block.TileEntityMetadata; public class TileCeramicBrick extends TileEntity { private EnumFlowerColor colorFirst = EnumFlowerColor.Black; diff --git a/core/src/main/java/binnie/core/BinnieCore.java b/core/src/main/java/binnie/core/BinnieCore.java index 0a34c77a..c263fe73 100644 --- a/core/src/main/java/binnie/core/BinnieCore.java +++ b/core/src/main/java/binnie/core/BinnieCore.java @@ -27,7 +27,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.plugins.PluginManager; -import binnie.core.api.block.TileEntityMetadata; +import binnie.core.block.TileEntityMetadata; import binnie.core.gui.BinnieCoreGUI; import binnie.core.gui.BinnieGUIHandler; import binnie.core.gui.IBinnieGUID; diff --git a/core-api/src/main/java/binnie/core/api/block/BlockMetadata.java b/core/src/main/java/binnie/core/block/BlockMetadata.java similarity index 98% rename from core-api/src/main/java/binnie/core/api/block/BlockMetadata.java rename to core/src/main/java/binnie/core/block/BlockMetadata.java index 67ba7474..212e0c55 100644 --- a/core-api/src/main/java/binnie/core/api/block/BlockMetadata.java +++ b/core/src/main/java/binnie/core/block/BlockMetadata.java @@ -1,4 +1,4 @@ -package binnie.core.api.block; +package binnie.core.block; import javax.annotation.Nullable; import java.util.ArrayList; @@ -18,7 +18,6 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -// TODO: move out of API public class BlockMetadata extends BlockContainer implements IBlockMetadata { public BlockMetadata(final Material material) { super(material); diff --git a/core-api/src/main/java/binnie/core/api/block/IBlockMetadata.java b/core/src/main/java/binnie/core/block/IBlockMetadata.java similarity index 89% rename from core-api/src/main/java/binnie/core/api/block/IBlockMetadata.java rename to core/src/main/java/binnie/core/block/IBlockMetadata.java index f6bc6b7f..6e3cc667 100644 --- a/core-api/src/main/java/binnie/core/api/block/IBlockMetadata.java +++ b/core/src/main/java/binnie/core/block/IBlockMetadata.java @@ -1,4 +1,4 @@ -package binnie.core.api.block; +package binnie.core.block; import net.minecraft.block.ITileEntityProvider; import net.minecraft.block.state.IBlockState; @@ -7,7 +7,6 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -// TODO: move out of API public interface IBlockMetadata extends ITileEntityProvider { int getPlacedMeta(ItemStack itemStack, World world, BlockPos pos, EnumFacing facing); diff --git a/core/src/main/java/binnie/core/block/ItemMetadata.java b/core/src/main/java/binnie/core/block/ItemMetadata.java index 0a5024ea..a85a6ca9 100644 --- a/core/src/main/java/binnie/core/block/ItemMetadata.java +++ b/core/src/main/java/binnie/core/block/ItemMetadata.java @@ -1,7 +1,5 @@ package binnie.core.block; -import binnie.core.api.block.IBlockMetadata; -import binnie.core.api.block.TileEntityMetadata; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; diff --git a/core-api/src/main/java/binnie/core/api/block/TileEntityMetadata.java b/core/src/main/java/binnie/core/block/TileEntityMetadata.java similarity index 98% rename from core-api/src/main/java/binnie/core/api/block/TileEntityMetadata.java rename to core/src/main/java/binnie/core/block/TileEntityMetadata.java index 0a4ab305..9be053ee 100644 --- a/core-api/src/main/java/binnie/core/api/block/TileEntityMetadata.java +++ b/core/src/main/java/binnie/core/block/TileEntityMetadata.java @@ -1,4 +1,4 @@ -package binnie.core.api.block; +package binnie.core.block; import com.google.common.base.Preconditions; @@ -15,7 +15,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; -// TODO: move out of API public class TileEntityMetadata extends TileEntity { private int meta; private boolean droppedBlock; diff --git a/core/src/main/java/binnie/core/network/BinnieCorePacketID.java b/core/src/main/java/binnie/core/network/BinnieCorePacketID.java index 8585dcf0..9b519edf 100644 --- a/core/src/main/java/binnie/core/network/BinnieCorePacketID.java +++ b/core/src/main/java/binnie/core/network/BinnieCorePacketID.java @@ -8,7 +8,7 @@ import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; import net.minecraftforge.fml.relauncher.Side; import binnie.core.BinnieCore; -import binnie.core.api.block.TileEntityMetadata; +import binnie.core.block.TileEntityMetadata; import binnie.core.gui.minecraft.ContainerCraftGUI; import binnie.core.machines.IMachine; import binnie.core.machines.Machine; diff --git a/extratrees-api/src/main/java/binnie/extratrees/api/carpentry/DesignerManager.java b/extratrees-api/src/main/java/binnie/extratrees/api/carpentry/DesignerManager.java index 079e2b96..65eeb99c 100644 --- a/extratrees-api/src/main/java/binnie/extratrees/api/carpentry/DesignerManager.java +++ b/extratrees-api/src/main/java/binnie/extratrees/api/carpentry/DesignerManager.java @@ -22,8 +22,4 @@ public final class DesignerManager { public Collection getDesignSystems() { return this.systems; } - - public void addDesignSystem(final IDesignSystem system) { - this.systems.add(system); - } } diff --git a/extratrees-api/src/main/java/binnie/extratrees/api/carpentry/package-info.java b/extratrees-api/src/main/java/binnie/extratrees/api/carpentry/package-info.java new file mode 100644 index 00000000..6d83276e --- /dev/null +++ b/extratrees-api/src/main/java/binnie/extratrees/api/carpentry/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package binnie.extratrees.api.carpentry; + +import javax.annotation.ParametersAreNonnullByDefault; + +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/extratrees/src/main/java/binnie/extratrees/blocks/BlockCarpentryPanel.java b/extratrees/src/main/java/binnie/extratrees/blocks/BlockCarpentryPanel.java index eff086f2..c689b6dc 100644 --- a/extratrees/src/main/java/binnie/extratrees/blocks/BlockCarpentryPanel.java +++ b/extratrees/src/main/java/binnie/extratrees/blocks/BlockCarpentryPanel.java @@ -12,8 +12,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import binnie.core.api.block.BlockMetadata; -import binnie.core.api.block.TileEntityMetadata; +import binnie.core.block.BlockMetadata; +import binnie.core.block.TileEntityMetadata; import binnie.core.util.I18N; import binnie.extratrees.carpentry.DesignBlock; import binnie.extratrees.modules.ModuleCarpentry; diff --git a/extratrees/src/main/java/binnie/extratrees/blocks/BlockDesign.java b/extratrees/src/main/java/binnie/extratrees/blocks/BlockDesign.java index 0f95f8f4..eaf9de41 100644 --- a/extratrees/src/main/java/binnie/extratrees/blocks/BlockDesign.java +++ b/extratrees/src/main/java/binnie/extratrees/blocks/BlockDesign.java @@ -45,8 +45,8 @@ import forestry.core.blocks.properties.UnlistedBlockAccess; import forestry.core.blocks.properties.UnlistedBlockPos; import forestry.core.models.BlockModelEntry; -import binnie.core.api.block.BlockMetadata; -import binnie.core.api.block.TileEntityMetadata; +import binnie.core.block.BlockMetadata; +import binnie.core.block.TileEntityMetadata; import binnie.core.block.IMultipassBlock; import binnie.core.models.DefaultStateMapper; import binnie.core.models.ModelManager; diff --git a/extratrees/src/main/java/binnie/extratrees/blocks/BlockStainedDesign.java b/extratrees/src/main/java/binnie/extratrees/blocks/BlockStainedDesign.java index 9e3a16c2..5be7225e 100644 --- a/extratrees/src/main/java/binnie/extratrees/blocks/BlockStainedDesign.java +++ b/extratrees/src/main/java/binnie/extratrees/blocks/BlockStainedDesign.java @@ -25,7 +25,7 @@ import net.minecraftforge.event.ForgeEventFactory; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.api.block.TileEntityMetadata; +import binnie.core.block.TileEntityMetadata; import binnie.core.util.I18N; import binnie.extratrees.api.IDesign; import binnie.extratrees.carpentry.DesignBlock; diff --git a/extratrees/src/main/java/binnie/extratrees/blocks/decor/BlockMultiFence.java b/extratrees/src/main/java/binnie/extratrees/blocks/decor/BlockMultiFence.java index 7fc227ce..326e76e4 100644 --- a/extratrees/src/main/java/binnie/extratrees/blocks/decor/BlockMultiFence.java +++ b/extratrees/src/main/java/binnie/extratrees/blocks/decor/BlockMultiFence.java @@ -41,9 +41,9 @@ import forestry.core.blocks.properties.UnlistedBlockAccess; import forestry.core.blocks.properties.UnlistedBlockPos; import forestry.core.models.BlockModelEntry; -import binnie.core.api.block.BlockMetadata; -import binnie.core.api.block.IBlockMetadata; -import binnie.core.api.block.TileEntityMetadata; +import binnie.core.block.BlockMetadata; +import binnie.core.block.IBlockMetadata; +import binnie.core.block.TileEntityMetadata; import binnie.core.models.DefaultStateMapper; import binnie.core.models.ModelManager; import binnie.core.util.I18N; diff --git a/extratrees/src/main/java/binnie/extratrees/carpentry/GlassType.java b/extratrees/src/main/java/binnie/extratrees/carpentry/GlassType.java index b3c80533..44a8c360 100644 --- a/extratrees/src/main/java/binnie/extratrees/carpentry/GlassType.java +++ b/extratrees/src/main/java/binnie/extratrees/carpentry/GlassType.java @@ -12,7 +12,7 @@ import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; import binnie.botany.api.genetics.EnumFlowerColor; import binnie.core.Constants; -import binnie.core.api.block.TileEntityMetadata; +import binnie.core.block.TileEntityMetadata; import binnie.extratrees.api.IDesignMaterial; public class GlassType implements IDesignMaterial { diff --git a/extratrees/src/main/java/binnie/extratrees/items/ItemDesign.java b/extratrees/src/main/java/binnie/extratrees/items/ItemDesign.java index f17f698d..d79a4ca2 100644 --- a/extratrees/src/main/java/binnie/extratrees/items/ItemDesign.java +++ b/extratrees/src/main/java/binnie/extratrees/items/ItemDesign.java @@ -8,7 +8,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.core.items.IColoredItem; import binnie.core.block.ItemMetadata; -import binnie.core.api.block.TileEntityMetadata; +import binnie.core.block.TileEntityMetadata; import binnie.extratrees.blocks.BlockDesign; import binnie.extratrees.carpentry.DesignBlock; import binnie.extratrees.modules.ModuleCarpentry; diff --git a/extratrees/src/main/java/binnie/extratrees/models/ModelMultiFence.java b/extratrees/src/main/java/binnie/extratrees/models/ModelMultiFence.java index c995b539..83a7983f 100644 --- a/extratrees/src/main/java/binnie/extratrees/models/ModelMultiFence.java +++ b/extratrees/src/main/java/binnie/extratrees/models/ModelMultiFence.java @@ -18,7 +18,7 @@ import forestry.core.blocks.properties.UnlistedBlockAccess; import forestry.core.blocks.properties.UnlistedBlockPos; import forestry.core.models.ModelBlockCached; -import binnie.core.api.block.TileEntityMetadata; +import binnie.core.block.TileEntityMetadata; import binnie.core.models.AABBModelBaker; import binnie.core.models.ModelManager; import binnie.extratrees.wood.WoodManager; diff --git a/extratrees/src/main/java/binnie/extratrees/modules/ModuleCarpentry.java b/extratrees/src/main/java/binnie/extratrees/modules/ModuleCarpentry.java index 52cb7bd1..59692fd7 100644 --- a/extratrees/src/main/java/binnie/extratrees/modules/ModuleCarpentry.java +++ b/extratrees/src/main/java/binnie/extratrees/modules/ModuleCarpentry.java @@ -10,7 +10,7 @@ import net.minecraft.util.EnumFacing; import net.minecraftforge.common.MinecraftForge; import binnie.core.Constants; -import binnie.core.api.block.TileEntityMetadata; +import binnie.core.block.TileEntityMetadata; import binnie.extratrees.ExtraTrees; import binnie.extratrees.api.CarpentryManager; import binnie.extratrees.api.IDesign; diff --git a/extratrees/src/main/java/binnie/extratrees/wood/WoodManager.java b/extratrees/src/main/java/binnie/extratrees/wood/WoodManager.java index ccccdccc..7973c2ee 100644 --- a/extratrees/src/main/java/binnie/extratrees/wood/WoodManager.java +++ b/extratrees/src/main/java/binnie/extratrees/wood/WoodManager.java @@ -19,7 +19,7 @@ import forestry.api.arboriculture.WoodBlockKind; import forestry.arboriculture.IWoodTyped; import forestry.core.utils.Translator; -import binnie.core.api.block.TileEntityMetadata; +import binnie.core.block.TileEntityMetadata; import binnie.extratrees.api.CarpentryManager; import binnie.extratrees.api.IDesignMaterial; import binnie.extratrees.blocks.decor.FenceDescription;