From cbe0e497be8e466c380a5b4fa781b314ede9ada3 Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Sun, 6 Nov 2016 19:32:27 +1000 Subject: Revert "$ Cleaned up the entire project." This reverts commit 0669f5eb9d5029a8b94ec552171b0837605f7747. # Conflicts: # src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMTE_NuclearReactor.java # src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_MassFabricator.java Revert "% Cleaned up Imports." This reverts commit 3654052fb63a571c5eaca7f20714b87c17f7e966. --- .../gtPlusPlus/core/interfaces/IGuiManager.java | 8 +-- .../core/interfaces/IGuiManagerMiscUtils.java | 3 +- .../gtPlusPlus/core/interfaces/IItemBlueprint.java | 74 ++++++++++------------ 3 files changed, 37 insertions(+), 48 deletions(-) (limited to 'src/Java/gtPlusPlus/core/interfaces') diff --git a/src/Java/gtPlusPlus/core/interfaces/IGuiManager.java b/src/Java/gtPlusPlus/core/interfaces/IGuiManager.java index ad2bfcb10a..1d0ad9ed87 100644 --- a/src/Java/gtPlusPlus/core/interfaces/IGuiManager.java +++ b/src/Java/gtPlusPlus/core/interfaces/IGuiManager.java @@ -4,13 +4,13 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ChunkCoordinates; import net.minecraft.world.World; -public abstract interface IGuiManager extends IGuiManagerMiscUtils { - - public abstract Object getContainer(EntityPlayer paramEntityPlayer, int paramInt); +public abstract interface IGuiManager extends IGuiManagerMiscUtils{ public abstract ChunkCoordinates getCoordinates(); + public abstract World getWorld(); + public abstract Object getGui(EntityPlayer paramEntityPlayer, int paramInt); - public abstract World getWorld(); + public abstract Object getContainer(EntityPlayer paramEntityPlayer, int paramInt); } diff --git a/src/Java/gtPlusPlus/core/interfaces/IGuiManagerMiscUtils.java b/src/Java/gtPlusPlus/core/interfaces/IGuiManagerMiscUtils.java index 9fb2e74cb1..cf46c67a54 100644 --- a/src/Java/gtPlusPlus/core/interfaces/IGuiManagerMiscUtils.java +++ b/src/Java/gtPlusPlus/core/interfaces/IGuiManagerMiscUtils.java @@ -1,4 +1,3 @@ package gtPlusPlus.core.interfaces; -public abstract interface IGuiManagerMiscUtils { -} \ No newline at end of file +public abstract interface IGuiManagerMiscUtils {} \ No newline at end of file diff --git a/src/Java/gtPlusPlus/core/interfaces/IItemBlueprint.java b/src/Java/gtPlusPlus/core/interfaces/IItemBlueprint.java index ebdf4c2e57..90126b1e82 100644 --- a/src/Java/gtPlusPlus/core/interfaces/IItemBlueprint.java +++ b/src/Java/gtPlusPlus/core/interfaces/IItemBlueprint.java @@ -4,55 +4,45 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; public interface IItemBlueprint { - + /** - * The inventory size for the blueprint~ - */ + * The inventory size for the blueprint~ + */ public int INV_SIZE = 9; - - /** - * Gets the recipe held by the item - * - * @param stack - * yourMetaItem - * @return the blueprints contents - */ - public ItemStack[] getBlueprint(ItemStack stack); - - /** - * Does this itemstack hold a blueprint? - * - * @param stack - * yourMetaItem - * @return true if is holding a Blueprint - */ - public boolean hasBlueprint(ItemStack stack); - + /** - * Meta Compatible function to allow meta items to be blueprints - * - * @param stack - * yourMetaItem - * @return true if it is a Blueprint - */ + * Meta Compatible function to allow meta items to be blueprints + * @param stack yourMetaItem + * @return true if it is a Blueprint + */ public boolean isBlueprint(ItemStack stack); - + /** - * Sets the blueprint for this itemstack. - * - * @param stack - * yourMetaItem - * @return true if blueprint is set successfully - */ + * Sets the blueprint for this itemstack. + * @param stack yourMetaItem + * @return true if blueprint is set successfully + */ public boolean setBlueprint(ItemStack stack, IInventory craftingTable, ItemStack output); - + /** - * Sets the name of the recipe/blueprint - * - * @param String - * Blueprint Name - * @return N/A - */ + * Sets the name of the recipe/blueprint + * @param String Blueprint Name + * @return N/A + */ public void setBlueprintName(ItemStack stack, String name); + + /** + * Does this itemstack hold a blueprint? + * @param stack yourMetaItem + * @return true if is holding a Blueprint + */ + public boolean hasBlueprint(ItemStack stack); + + /** + * Gets the recipe held by the item + * @param stack yourMetaItem + * @return the blueprints contents + */ + public ItemStack[] getBlueprint(ItemStack stack); } -- cgit