diff --git a/src/main/java/cofh/api/CoFHAPIProps.java b/src/main/java/cofh/api/CoFHAPIProps.java index a13c8094e..9b528304a 100644 --- a/src/main/java/cofh/api/CoFHAPIProps.java +++ b/src/main/java/cofh/api/CoFHAPIProps.java @@ -1,13 +1,3 @@ -/* - * This file ("CoFHAPIProps.java") is part of the Actually Additions Mod for Minecraft. - * It is created and owned by Ellpeck and distributed - * under the Actually Additions License to be found at - * http://github.com/Ellpeck/ActuallyAdditions/blob/master/README.md - * View the source code at https://github.com/Ellpeck/ActuallyAdditions - * - * © 2015 Ellpeck - */ - package cofh.api; public class CoFHAPIProps { diff --git a/src/main/java/cofh/api/energy/EnergyStorage.java b/src/main/java/cofh/api/energy/EnergyStorage.java index 5423fb32f..1674c1894 100644 --- a/src/main/java/cofh/api/energy/EnergyStorage.java +++ b/src/main/java/cofh/api/energy/EnergyStorage.java @@ -1,13 +1,3 @@ -/* - * This file ("EnergyStorage.java") is part of the Actually Additions Mod for Minecraft. - * It is created and owned by Ellpeck and distributed - * under the Actually Additions License to be found at - * http://github.com/Ellpeck/ActuallyAdditions/blob/master/README.md - * View the source code at https://github.com/Ellpeck/ActuallyAdditions - * - * © 2015 Ellpeck - */ - package cofh.api.energy; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/cofh/api/energy/IEnergyConnection.java b/src/main/java/cofh/api/energy/IEnergyConnection.java index cbe914b11..79bdf77af 100644 --- a/src/main/java/cofh/api/energy/IEnergyConnection.java +++ b/src/main/java/cofh/api/energy/IEnergyConnection.java @@ -1,13 +1,3 @@ -/* - * This file ("IEnergyConnection.java") is part of the Actually Additions Mod for Minecraft. - * It is created and owned by Ellpeck and distributed - * under the Actually Additions License to be found at - * http://github.com/Ellpeck/ActuallyAdditions/blob/master/README.md - * View the source code at https://github.com/Ellpeck/ActuallyAdditions - * - * © 2015 Ellpeck - */ - package cofh.api.energy; import net.minecraftforge.common.util.ForgeDirection; diff --git a/src/main/java/cofh/api/energy/IEnergyContainerItem.java b/src/main/java/cofh/api/energy/IEnergyContainerItem.java index d007a3df7..c28455b1a 100644 --- a/src/main/java/cofh/api/energy/IEnergyContainerItem.java +++ b/src/main/java/cofh/api/energy/IEnergyContainerItem.java @@ -1,13 +1,3 @@ -/* - * This file ("IEnergyContainerItem.java") is part of the Actually Additions Mod for Minecraft. - * It is created and owned by Ellpeck and distributed - * under the Actually Additions License to be found at - * http://github.com/Ellpeck/ActuallyAdditions/blob/master/README.md - * View the source code at https://github.com/Ellpeck/ActuallyAdditions - * - * © 2015 Ellpeck - */ - package cofh.api.energy; import net.minecraft.item.ItemStack; diff --git a/src/main/java/cofh/api/energy/IEnergyHandler.java b/src/main/java/cofh/api/energy/IEnergyHandler.java index 06c10a9e0..22f2dbc62 100644 --- a/src/main/java/cofh/api/energy/IEnergyHandler.java +++ b/src/main/java/cofh/api/energy/IEnergyHandler.java @@ -1,13 +1,3 @@ -/* - * This file ("IEnergyHandler.java") is part of the Actually Additions Mod for Minecraft. - * It is created and owned by Ellpeck and distributed - * under the Actually Additions License to be found at - * http://github.com/Ellpeck/ActuallyAdditions/blob/master/README.md - * View the source code at https://github.com/Ellpeck/ActuallyAdditions - * - * © 2015 Ellpeck - */ - package cofh.api.energy; import net.minecraftforge.common.util.ForgeDirection; diff --git a/src/main/java/cofh/api/energy/IEnergyProvider.java b/src/main/java/cofh/api/energy/IEnergyProvider.java index a410e3ce9..05287b35e 100644 --- a/src/main/java/cofh/api/energy/IEnergyProvider.java +++ b/src/main/java/cofh/api/energy/IEnergyProvider.java @@ -1,13 +1,3 @@ -/* - * This file ("IEnergyProvider.java") is part of the Actually Additions Mod for Minecraft. - * It is created and owned by Ellpeck and distributed - * under the Actually Additions License to be found at - * http://github.com/Ellpeck/ActuallyAdditions/blob/master/README.md - * View the source code at https://github.com/Ellpeck/ActuallyAdditions - * - * © 2015 Ellpeck - */ - package cofh.api.energy; import net.minecraftforge.common.util.ForgeDirection; diff --git a/src/main/java/cofh/api/energy/IEnergyReceiver.java b/src/main/java/cofh/api/energy/IEnergyReceiver.java index dab8bde8e..c726e09e0 100644 --- a/src/main/java/cofh/api/energy/IEnergyReceiver.java +++ b/src/main/java/cofh/api/energy/IEnergyReceiver.java @@ -1,13 +1,3 @@ -/* - * This file ("IEnergyReceiver.java") is part of the Actually Additions Mod for Minecraft. - * It is created and owned by Ellpeck and distributed - * under the Actually Additions License to be found at - * http://github.com/Ellpeck/ActuallyAdditions/blob/master/README.md - * View the source code at https://github.com/Ellpeck/ActuallyAdditions - * - * © 2015 Ellpeck - */ - package cofh.api.energy; import net.minecraftforge.common.util.ForgeDirection; diff --git a/src/main/java/cofh/api/energy/IEnergyStorage.java b/src/main/java/cofh/api/energy/IEnergyStorage.java index 3147c26e1..bc2065607 100644 --- a/src/main/java/cofh/api/energy/IEnergyStorage.java +++ b/src/main/java/cofh/api/energy/IEnergyStorage.java @@ -1,13 +1,3 @@ -/* - * This file ("IEnergyStorage.java") is part of the Actually Additions Mod for Minecraft. - * It is created and owned by Ellpeck and distributed - * under the Actually Additions License to be found at - * http://github.com/Ellpeck/ActuallyAdditions/blob/master/README.md - * View the source code at https://github.com/Ellpeck/ActuallyAdditions - * - * © 2015 Ellpeck - */ - package cofh.api.energy; /** diff --git a/src/main/java/cofh/api/energy/ItemEnergyContainer.java b/src/main/java/cofh/api/energy/ItemEnergyContainer.java index 24cf6602d..055ae45bc 100644 --- a/src/main/java/cofh/api/energy/ItemEnergyContainer.java +++ b/src/main/java/cofh/api/energy/ItemEnergyContainer.java @@ -1,13 +1,3 @@ -/* - * This file ("ItemEnergyContainer.java") is part of the Actually Additions Mod for Minecraft. - * It is created and owned by Ellpeck and distributed - * under the Actually Additions License to be found at - * http://github.com/Ellpeck/ActuallyAdditions/blob/master/README.md - * View the source code at https://github.com/Ellpeck/ActuallyAdditions - * - * © 2015 Ellpeck - */ - package cofh.api.energy; import net.minecraft.item.Item; diff --git a/src/main/java/cofh/api/energy/TileEnergyHandler.java b/src/main/java/cofh/api/energy/TileEnergyHandler.java index 1f879d940..7cc655e92 100644 --- a/src/main/java/cofh/api/energy/TileEnergyHandler.java +++ b/src/main/java/cofh/api/energy/TileEnergyHandler.java @@ -1,13 +1,3 @@ -/* - * This file ("TileEnergyHandler.java") is part of the Actually Additions Mod for Minecraft. - * It is created and owned by Ellpeck and distributed - * under the Actually Additions License to be found at - * http://github.com/Ellpeck/ActuallyAdditions/blob/master/README.md - * View the source code at https://github.com/Ellpeck/ActuallyAdditions - * - * © 2015 Ellpeck - */ - package cofh.api.energy; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/cofh/api/energy/package-info.java b/src/main/java/cofh/api/energy/package-info.java index 448c562d0..7379702b8 100644 --- a/src/main/java/cofh/api/energy/package-info.java +++ b/src/main/java/cofh/api/energy/package-info.java @@ -1,13 +1,3 @@ -/* - * This file ("package-info.java") is part of the Actually Additions Mod for Minecraft. - * It is created and owned by Ellpeck and distributed - * under the Actually Additions License to be found at - * http://github.com/Ellpeck/ActuallyAdditions/blob/master/README.md - * View the source code at https://github.com/Ellpeck/ActuallyAdditions - * - * © 2015 Ellpeck - */ - /** * (C) 2014 Team CoFH / CoFH / Cult of the Full Hub * http://www.teamcofh.com diff --git a/src/main/java/cofh/api/package-info.java b/src/main/java/cofh/api/package-info.java index 787d57ffb..08ff5fcb6 100644 --- a/src/main/java/cofh/api/package-info.java +++ b/src/main/java/cofh/api/package-info.java @@ -1,13 +1,3 @@ -/* - * This file ("package-info.java") is part of the Actually Additions Mod for Minecraft. - * It is created and owned by Ellpeck and distributed - * under the Actually Additions License to be found at - * http://github.com/Ellpeck/ActuallyAdditions/blob/master/README.md - * View the source code at https://github.com/Ellpeck/ActuallyAdditions - * - * © 2015 Ellpeck - */ - /** * (C) 2014 Team CoFH / CoFH / Cult of the Full Hub * http://www.teamcofh.com diff --git a/src/main/java/invtweaks/api/IItemTree.java b/src/main/java/invtweaks/api/IItemTree.java index 442b752a7..5b6c0a805 100644 --- a/src/main/java/invtweaks/api/IItemTree.java +++ b/src/main/java/invtweaks/api/IItemTree.java @@ -1,13 +1,3 @@ -/* - * This file ("IItemTree.java") is part of the Actually Additions Mod for Minecraft. - * It is created and owned by Ellpeck and distributed - * under the Actually Additions License to be found at - * http://github.com/Ellpeck/ActuallyAdditions/blob/master/README.md - * View the source code at https://github.com/Ellpeck/ActuallyAdditions - * - * © 2015 Ellpeck - */ - /* * Copyright (c) 2013 Andrew Crocker * @@ -37,7 +27,7 @@ import java.util.List; import java.util.Random; public interface IItemTree { - void registerOre(String category, String name, String oreName, int order); + public void registerOre(String category, String name, String oreName, int order); boolean matches(List items, String keyword); @@ -47,8 +37,6 @@ public interface IItemTree { IItemTreeCategory getRootCategory(); - void setRootCategory(IItemTreeCategory category); - IItemTreeCategory getCategory(String keyword); boolean isItemUnknown(String id, int damage); @@ -63,6 +51,8 @@ public interface IItemTree { boolean containsCategory(String name); + void setRootCategory(IItemTreeCategory category); + IItemTreeCategory addCategory(String parentCategory, String newCategory) throws NullPointerException; void addCategory(String parentCategory, IItemTreeCategory newCategory) throws NullPointerException; diff --git a/src/main/java/invtweaks/api/IItemTreeCategory.java b/src/main/java/invtweaks/api/IItemTreeCategory.java index dc1154e64..f1b5e9554 100644 --- a/src/main/java/invtweaks/api/IItemTreeCategory.java +++ b/src/main/java/invtweaks/api/IItemTreeCategory.java @@ -1,13 +1,3 @@ -/* - * This file ("IItemTreeCategory.java") is part of the Actually Additions Mod for Minecraft. - * It is created and owned by Ellpeck and distributed - * under the Actually Additions License to be found at - * http://github.com/Ellpeck/ActuallyAdditions/blob/master/README.md - * View the source code at https://github.com/Ellpeck/ActuallyAdditions - * - * © 2015 Ellpeck - */ - /* * Copyright (c) 2013 Andrew Crocker * diff --git a/src/main/java/invtweaks/api/IItemTreeItem.java b/src/main/java/invtweaks/api/IItemTreeItem.java index 7bceb3989..2b6ae2db5 100644 --- a/src/main/java/invtweaks/api/IItemTreeItem.java +++ b/src/main/java/invtweaks/api/IItemTreeItem.java @@ -1,13 +1,3 @@ -/* - * This file ("IItemTreeItem.java") is part of the Actually Additions Mod for Minecraft. - * It is created and owned by Ellpeck and distributed - * under the Actually Additions License to be found at - * http://github.com/Ellpeck/ActuallyAdditions/blob/master/README.md - * View the source code at https://github.com/Ellpeck/ActuallyAdditions - * - * © 2015 Ellpeck - */ - /* * Copyright (c) 2013 Andrew Crocker * diff --git a/src/main/java/invtweaks/api/IItemTreeListener.java b/src/main/java/invtweaks/api/IItemTreeListener.java index db7504d5e..73a5815d5 100644 --- a/src/main/java/invtweaks/api/IItemTreeListener.java +++ b/src/main/java/invtweaks/api/IItemTreeListener.java @@ -1,13 +1,3 @@ -/* - * This file ("IItemTreeListener.java") is part of the Actually Additions Mod for Minecraft. - * It is created and owned by Ellpeck and distributed - * under the Actually Additions License to be found at - * http://github.com/Ellpeck/ActuallyAdditions/blob/master/README.md - * View the source code at https://github.com/Ellpeck/ActuallyAdditions - * - * © 2015 Ellpeck - */ - /* * Copyright (c) 2013 Andrew Crocker * diff --git a/src/main/java/invtweaks/api/InvTweaksAPI.java b/src/main/java/invtweaks/api/InvTweaksAPI.java index cd8ae9d33..33f259e4d 100644 --- a/src/main/java/invtweaks/api/InvTweaksAPI.java +++ b/src/main/java/invtweaks/api/InvTweaksAPI.java @@ -1,13 +1,3 @@ -/* - * This file ("InvTweaksAPI.java") is part of the Actually Additions Mod for Minecraft. - * It is created and owned by Ellpeck and distributed - * under the Actually Additions License to be found at - * http://github.com/Ellpeck/ActuallyAdditions/blob/master/README.md - * View the source code at https://github.com/Ellpeck/ActuallyAdditions - * - * © 2015 Ellpeck - */ - /* * Copyright (c) 2013 Andrew Crocker * @@ -39,7 +29,7 @@ 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 + * be obtained via @Instance("inventorytweaks") or methods in cpw.mods.fml.common.Loader *

* All of these functions currently have no effect if called on a dedicated server. */ diff --git a/src/main/java/invtweaks/api/SortingMethod.java b/src/main/java/invtweaks/api/SortingMethod.java index d7d4654cb..895b1713d 100644 --- a/src/main/java/invtweaks/api/SortingMethod.java +++ b/src/main/java/invtweaks/api/SortingMethod.java @@ -1,13 +1,3 @@ -/* - * This file ("SortingMethod.java") is part of the Actually Additions Mod for Minecraft. - * It is created and owned by Ellpeck and distributed - * under the Actually Additions License to be found at - * http://github.com/Ellpeck/ActuallyAdditions/blob/master/README.md - * View the source code at https://github.com/Ellpeck/ActuallyAdditions - * - * © 2015 Ellpeck - */ - /* * Copyright (c) 2013 Andrew Crocker * @@ -33,28 +23,22 @@ package invtweaks.api; public enum SortingMethod { - /** - * Standard 'r' sorting for generic inventories - */ + /** Standard 'r' sorting for generic inventories */ DEFAULT, - /** - * Sort method creating vertical columns of items. + /** 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. + /** 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. + /** 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. + /** 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 index 15e32ea9a..e505829c1 100644 --- a/src/main/java/invtweaks/api/container/ChestContainer.java +++ b/src/main/java/invtweaks/api/container/ChestContainer.java @@ -1,13 +1,3 @@ -/* - * This file ("ChestContainer.java") is part of the Actually Additions Mod for Minecraft. - * It is created and owned by Ellpeck and distributed - * under the Actually Additions License to be found at - * http://github.com/Ellpeck/ActuallyAdditions/blob/master/README.md - * View the source code at https://github.com/Ellpeck/ActuallyAdditions - * - * © 2015 Ellpeck - */ - package invtweaks.api.container; import java.lang.annotation.ElementType; @@ -36,13 +26,13 @@ public @interface ChestContainer { // Signature int func() @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.METHOD) - @interface RowSizeCallback { + public @interface RowSizeCallback { } // Annotation for method to get size of a chest row if it is not a fixed size for this container class // Signature int func() @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.METHOD) - @interface IsLargeCallback { + public @interface IsLargeCallback { } } diff --git a/src/main/java/invtweaks/api/container/ContainerSection.java b/src/main/java/invtweaks/api/container/ContainerSection.java index 689fd6244..83c2e08a4 100644 --- a/src/main/java/invtweaks/api/container/ContainerSection.java +++ b/src/main/java/invtweaks/api/container/ContainerSection.java @@ -1,13 +1,3 @@ -/* - * This file ("ContainerSection.java") is part of the Actually Additions Mod for Minecraft. - * It is created and owned by Ellpeck and distributed - * under the Actually Additions License to be found at - * http://github.com/Ellpeck/ActuallyAdditions/blob/master/README.md - * View the source code at https://github.com/Ellpeck/ActuallyAdditions - * - * © 2015 Ellpeck - */ - /* * Copyright (c) 2013 Andrew Crocker * diff --git a/src/main/java/invtweaks/api/container/ContainerSectionCallback.java b/src/main/java/invtweaks/api/container/ContainerSectionCallback.java index 680673145..379206b37 100644 --- a/src/main/java/invtweaks/api/container/ContainerSectionCallback.java +++ b/src/main/java/invtweaks/api/container/ContainerSectionCallback.java @@ -1,13 +1,3 @@ -/* - * This file ("ContainerSectionCallback.java") is part of the Actually Additions Mod for Minecraft. - * It is created and owned by Ellpeck and distributed - * under the Actually Additions License to be found at - * http://github.com/Ellpeck/ActuallyAdditions/blob/master/README.md - * View the source code at https://github.com/Ellpeck/ActuallyAdditions - * - * © 2015 Ellpeck - */ - package invtweaks.api.container; import java.lang.annotation.ElementType; diff --git a/src/main/java/invtweaks/api/container/IgnoreContainer.java b/src/main/java/invtweaks/api/container/IgnoreContainer.java index 09d8935f0..86e8aea12 100644 --- a/src/main/java/invtweaks/api/container/IgnoreContainer.java +++ b/src/main/java/invtweaks/api/container/IgnoreContainer.java @@ -1,13 +1,3 @@ -/* - * This file ("IgnoreContainer.java") is part of the Actually Additions Mod for Minecraft. - * It is created and owned by Ellpeck and distributed - * under the Actually Additions License to be found at - * http://github.com/Ellpeck/ActuallyAdditions/blob/master/README.md - * View the source code at https://github.com/Ellpeck/ActuallyAdditions - * - * © 2015 Ellpeck - */ - package invtweaks.api.container; import java.lang.annotation.ElementType; diff --git a/src/main/java/invtweaks/api/container/InventoryContainer.java b/src/main/java/invtweaks/api/container/InventoryContainer.java index ae3539ba6..d5a45b912 100644 --- a/src/main/java/invtweaks/api/container/InventoryContainer.java +++ b/src/main/java/invtweaks/api/container/InventoryContainer.java @@ -1,13 +1,3 @@ -/* - * This file ("InventoryContainer.java") is part of the Actually Additions Mod for Minecraft. - * It is created and owned by Ellpeck and distributed - * under the Actually Additions License to be found at - * http://github.com/Ellpeck/ActuallyAdditions/blob/master/README.md - * View the source code at https://github.com/Ellpeck/ActuallyAdditions - * - * © 2015 Ellpeck - */ - package invtweaks.api.container; import java.lang.annotation.ElementType;