Organize ingredients into subfolders

mezz · Dec 9, 2018 · 2590a8b · 2590a8b
1 parent 37c3ea7
commit 2590a8b
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 14 deletions.
diff --git 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<FluidStack> implements IGuiFluidStackGroup {

diff --git 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<ItemStack> implements IGuiItemStackGroup {

diff --git 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/...vanilla/ingredients/FluidStackHelper.java → ...a/ingredients/fluid/FluidStackHelper.java b/...vanilla/ingredients/FluidStackHelper.java → ...a/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/...la/ingredients/FluidStackListFactory.java → ...redients/fluid/FluidStackListFactory.java b/...la/ingredients/FluidStackListFactory.java → ...redients/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/...nilla/ingredients/FluidStackRenderer.java → ...ingredients/fluid/FluidStackRenderer.java b/...nilla/ingredients/FluidStackRenderer.java → ...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
@@ -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;
diff --git a/.../vanilla/ingredients/ItemStackHelper.java → ...lla/ingredients/item/ItemStackHelper.java b/.../vanilla/ingredients/ItemStackHelper.java → ...lla/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/...lla/ingredients/ItemStackListFactory.java → ...ngredients/item/ItemStackListFactory.java b/...lla/ingredients/ItemStackListFactory.java → ...ngredients/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/...anilla/ingredients/ItemStackRenderer.java → ...a/ingredients/item/ItemStackRenderer.java b/...anilla/ingredients/ItemStackRenderer.java → ...a/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
@@ -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;