From 2590a8b61506f91f5aead6a61e0b610914e9761c Mon Sep 17 00:00:00 2001 From: mezz Date: Sun, 9 Dec 2018 11:33:38 -0800 Subject: [PATCH] Organize ingredients into subfolders --- .../mezz/jei/gui/ingredients/GuiFluidStackGroup.java | 2 +- .../mezz/jei/gui/ingredients/GuiItemStackGroup.java | 2 +- .../java/mezz/jei/plugins/vanilla/VanillaPlugin.java | 12 ++++++------ .../ingredients/{ => fluid}/FluidStackHelper.java | 2 +- .../{ => fluid}/FluidStackListFactory.java | 2 +- .../ingredients/{ => fluid}/FluidStackRenderer.java | 2 +- .../vanilla/ingredients/fluid/package-info.java | 9 +++++++++ .../ingredients/{ => item}/ItemStackHelper.java | 2 +- .../ingredients/{ => item}/ItemStackListFactory.java | 2 +- .../ingredients/{ => item}/ItemStackRenderer.java | 2 +- .../vanilla/ingredients/item/package-info.java | 9 +++++++++ 11 files changed, 32 insertions(+), 14 deletions(-) rename src/main/java/mezz/jei/plugins/vanilla/ingredients/{ => fluid}/FluidStackHelper.java (98%) rename src/main/java/mezz/jei/plugins/vanilla/ingredients/{ => fluid}/FluidStackListFactory.java (94%) rename src/main/java/mezz/jei/plugins/vanilla/ingredients/{ => fluid}/FluidStackRenderer.java (99%) create mode 100644 src/main/java/mezz/jei/plugins/vanilla/ingredients/fluid/package-info.java rename src/main/java/mezz/jei/plugins/vanilla/ingredients/{ => item}/ItemStackHelper.java (98%) rename src/main/java/mezz/jei/plugins/vanilla/ingredients/{ => item}/ItemStackListFactory.java (99%) rename src/main/java/mezz/jei/plugins/vanilla/ingredients/{ => item}/ItemStackRenderer.java (98%) create mode 100644 src/main/java/mezz/jei/plugins/vanilla/ingredients/item/package-info.java diff --git a/src/main/java/mezz/jei/gui/ingredients/GuiFluidStackGroup.java b/src/main/java/mezz/jei/gui/ingredients/GuiFluidStackGroup.java index 34df68fb6..0991b142f 100644 --- a/src/main/java/mezz/jei/gui/ingredients/GuiFluidStackGroup.java +++ b/src/main/java/mezz/jei/gui/ingredients/GuiFluidStackGroup.java @@ -6,7 +6,7 @@ import mezz.jei.api.gui.IGuiFluidStackGroup; import mezz.jei.api.ingredients.VanillaTypes; import mezz.jei.api.recipe.IFocus; -import mezz.jei.plugins.vanilla.ingredients.FluidStackRenderer; +import mezz.jei.plugins.vanilla.ingredients.fluid.FluidStackRenderer; import net.minecraftforge.fluids.FluidStack; public class GuiFluidStackGroup extends GuiIngredientGroup implements IGuiFluidStackGroup { diff --git a/src/main/java/mezz/jei/gui/ingredients/GuiItemStackGroup.java b/src/main/java/mezz/jei/gui/ingredients/GuiItemStackGroup.java index 7b61e086f..5bd3e70cf 100644 --- a/src/main/java/mezz/jei/gui/ingredients/GuiItemStackGroup.java +++ b/src/main/java/mezz/jei/gui/ingredients/GuiItemStackGroup.java @@ -5,7 +5,7 @@ import mezz.jei.api.gui.IGuiItemStackGroup; import mezz.jei.api.ingredients.VanillaTypes; import mezz.jei.api.recipe.IFocus; -import mezz.jei.plugins.vanilla.ingredients.ItemStackRenderer; +import mezz.jei.plugins.vanilla.ingredients.item.ItemStackRenderer; import net.minecraft.item.ItemStack; public class GuiItemStackGroup extends GuiIngredientGroup implements IGuiItemStackGroup { diff --git a/src/main/java/mezz/jei/plugins/vanilla/VanillaPlugin.java b/src/main/java/mezz/jei/plugins/vanilla/VanillaPlugin.java index da7684f3f..58a94485b 100644 --- a/src/main/java/mezz/jei/plugins/vanilla/VanillaPlugin.java +++ b/src/main/java/mezz/jei/plugins/vanilla/VanillaPlugin.java @@ -31,12 +31,12 @@ import mezz.jei.plugins.vanilla.furnace.FurnaceFuelCategory; import mezz.jei.plugins.vanilla.furnace.FurnaceSmeltingCategory; import mezz.jei.plugins.vanilla.furnace.SmeltingRecipeMaker; -import mezz.jei.plugins.vanilla.ingredients.FluidStackHelper; -import mezz.jei.plugins.vanilla.ingredients.FluidStackListFactory; -import mezz.jei.plugins.vanilla.ingredients.FluidStackRenderer; -import mezz.jei.plugins.vanilla.ingredients.ItemStackHelper; -import mezz.jei.plugins.vanilla.ingredients.ItemStackListFactory; -import mezz.jei.plugins.vanilla.ingredients.ItemStackRenderer; +import mezz.jei.plugins.vanilla.ingredients.fluid.FluidStackHelper; +import mezz.jei.plugins.vanilla.ingredients.fluid.FluidStackListFactory; +import mezz.jei.plugins.vanilla.ingredients.fluid.FluidStackRenderer; +import mezz.jei.plugins.vanilla.ingredients.item.ItemStackHelper; +import mezz.jei.plugins.vanilla.ingredients.item.ItemStackListFactory; +import mezz.jei.plugins.vanilla.ingredients.item.ItemStackRenderer; import mezz.jei.startup.StackHelper; import mezz.jei.transfer.PlayerRecipeTransferHandler; import net.minecraft.client.gui.GuiRepair; diff --git a/src/main/java/mezz/jei/plugins/vanilla/ingredients/FluidStackHelper.java b/src/main/java/mezz/jei/plugins/vanilla/ingredients/fluid/FluidStackHelper.java similarity index 98% rename from src/main/java/mezz/jei/plugins/vanilla/ingredients/FluidStackHelper.java rename to src/main/java/mezz/jei/plugins/vanilla/ingredients/fluid/FluidStackHelper.java index 2da672795..a9847a882 100644 --- a/src/main/java/mezz/jei/plugins/vanilla/ingredients/FluidStackHelper.java +++ b/src/main/java/mezz/jei/plugins/vanilla/ingredients/fluid/FluidStackHelper.java @@ -1,4 +1,4 @@ -package mezz.jei.plugins.vanilla.ingredients; +package mezz.jei.plugins.vanilla.ingredients.fluid; import javax.annotation.Nullable; import java.awt.Color; diff --git a/src/main/java/mezz/jei/plugins/vanilla/ingredients/FluidStackListFactory.java b/src/main/java/mezz/jei/plugins/vanilla/ingredients/fluid/FluidStackListFactory.java similarity index 94% rename from src/main/java/mezz/jei/plugins/vanilla/ingredients/FluidStackListFactory.java rename to src/main/java/mezz/jei/plugins/vanilla/ingredients/fluid/FluidStackListFactory.java index 27fbc28ae..c3b4b976b 100644 --- a/src/main/java/mezz/jei/plugins/vanilla/ingredients/FluidStackListFactory.java +++ b/src/main/java/mezz/jei/plugins/vanilla/ingredients/fluid/FluidStackListFactory.java @@ -1,4 +1,4 @@ -package mezz.jei.plugins.vanilla.ingredients; +package mezz.jei.plugins.vanilla.ingredients.fluid; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/mezz/jei/plugins/vanilla/ingredients/FluidStackRenderer.java b/src/main/java/mezz/jei/plugins/vanilla/ingredients/fluid/FluidStackRenderer.java similarity index 99% rename from src/main/java/mezz/jei/plugins/vanilla/ingredients/FluidStackRenderer.java rename to src/main/java/mezz/jei/plugins/vanilla/ingredients/fluid/FluidStackRenderer.java index a6d58e03d..e58609ae4 100644 --- a/src/main/java/mezz/jei/plugins/vanilla/ingredients/FluidStackRenderer.java +++ b/src/main/java/mezz/jei/plugins/vanilla/ingredients/fluid/FluidStackRenderer.java @@ -1,4 +1,4 @@ -package mezz.jei.plugins.vanilla.ingredients; +package mezz.jei.plugins.vanilla.ingredients.fluid; import javax.annotation.Nullable; import java.util.ArrayList; diff --git a/src/main/java/mezz/jei/plugins/vanilla/ingredients/fluid/package-info.java b/src/main/java/mezz/jei/plugins/vanilla/ingredients/fluid/package-info.java new file mode 100644 index 000000000..f836a5e90 --- /dev/null +++ b/src/main/java/mezz/jei/plugins/vanilla/ingredients/fluid/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@FieldsAreNonnullByDefault +@MethodsReturnNonnullByDefault +package mezz.jei.plugins.vanilla.ingredients.fluid; + +import mcp.MethodsReturnNonnullByDefault; +import mezz.jei.util.FieldsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/mezz/jei/plugins/vanilla/ingredients/ItemStackHelper.java b/src/main/java/mezz/jei/plugins/vanilla/ingredients/item/ItemStackHelper.java similarity index 98% rename from src/main/java/mezz/jei/plugins/vanilla/ingredients/ItemStackHelper.java rename to src/main/java/mezz/jei/plugins/vanilla/ingredients/item/ItemStackHelper.java index f301836a6..a1a5c8bc2 100644 --- a/src/main/java/mezz/jei/plugins/vanilla/ingredients/ItemStackHelper.java +++ b/src/main/java/mezz/jei/plugins/vanilla/ingredients/item/ItemStackHelper.java @@ -1,4 +1,4 @@ -package mezz.jei.plugins.vanilla.ingredients; +package mezz.jei.plugins.vanilla.ingredients.item; import javax.annotation.Nullable; import java.awt.Color; diff --git a/src/main/java/mezz/jei/plugins/vanilla/ingredients/ItemStackListFactory.java b/src/main/java/mezz/jei/plugins/vanilla/ingredients/item/ItemStackListFactory.java similarity index 99% rename from src/main/java/mezz/jei/plugins/vanilla/ingredients/ItemStackListFactory.java rename to src/main/java/mezz/jei/plugins/vanilla/ingredients/item/ItemStackListFactory.java index 9811cd5c5..631f153ff 100644 --- a/src/main/java/mezz/jei/plugins/vanilla/ingredients/ItemStackListFactory.java +++ b/src/main/java/mezz/jei/plugins/vanilla/ingredients/item/ItemStackListFactory.java @@ -1,4 +1,4 @@ -package mezz.jei.plugins.vanilla.ingredients; +package mezz.jei.plugins.vanilla.ingredients.item; import javax.annotation.Nullable; import java.util.ArrayList; diff --git a/src/main/java/mezz/jei/plugins/vanilla/ingredients/ItemStackRenderer.java b/src/main/java/mezz/jei/plugins/vanilla/ingredients/item/ItemStackRenderer.java similarity index 98% rename from src/main/java/mezz/jei/plugins/vanilla/ingredients/ItemStackRenderer.java rename to src/main/java/mezz/jei/plugins/vanilla/ingredients/item/ItemStackRenderer.java index dcd6e9335..934fad7a0 100644 --- a/src/main/java/mezz/jei/plugins/vanilla/ingredients/ItemStackRenderer.java +++ b/src/main/java/mezz/jei/plugins/vanilla/ingredients/item/ItemStackRenderer.java @@ -1,4 +1,4 @@ -package mezz.jei.plugins.vanilla.ingredients; +package mezz.jei.plugins.vanilla.ingredients.item; import javax.annotation.Nullable; import java.util.ArrayList; diff --git a/src/main/java/mezz/jei/plugins/vanilla/ingredients/item/package-info.java b/src/main/java/mezz/jei/plugins/vanilla/ingredients/item/package-info.java new file mode 100644 index 000000000..377c94cc8 --- /dev/null +++ b/src/main/java/mezz/jei/plugins/vanilla/ingredients/item/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@FieldsAreNonnullByDefault +@MethodsReturnNonnullByDefault +package mezz.jei.plugins.vanilla.ingredients.item; + +import mcp.MethodsReturnNonnullByDefault; +import mezz.jei.util.FieldsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file