From d4031c19e1985eff91d232de9d072b3b3d0797b2 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Thu, 7 May 2020 15:48:46 +0200 Subject: [PATCH] move containers package to the right place --- src/main/java/de/ellpeck/prettypipes/Registry.java | 2 +- src/main/java/de/ellpeck/prettypipes/items/IModule.java | 2 +- src/main/java/de/ellpeck/prettypipes/items/ModuleItem.java | 5 +---- .../java/de/ellpeck/prettypipes/packets/PacketButton.java | 2 +- .../java/de/ellpeck/prettypipes/pipe/PipeTileEntity.java | 2 +- .../pipe/{modules => }/containers/AbstractPipeContainer.java | 2 +- .../pipe/{modules => }/containers/AbstractPipeGui.java | 3 +-- .../pipe/{modules => }/containers/MainPipeContainer.java | 2 +- .../pipe/{modules => }/containers/MainPipeGui.java | 2 +- .../pipe/modules/extraction/ExtractionModuleContainer.java | 2 +- .../pipe/modules/extraction/ExtractionModuleGui.java | 2 +- .../pipe/modules/extraction/ExtractionModuleItem.java | 2 +- .../pipe/modules/insertion/FilterModuleContainer.java | 2 +- .../prettypipes/pipe/modules/insertion/FilterModuleGui.java | 2 +- .../prettypipes/pipe/modules/insertion/FilterModuleItem.java | 2 +- .../pipe/modules/retrieval/RetrievalModuleContainer.java | 2 +- .../pipe/modules/retrieval/RetrievalModuleGui.java | 3 +-- .../pipe/modules/retrieval/RetrievalModuleItem.java | 5 +---- .../pipe/modules/stacksize/StackSizeModuleContainer.java | 2 +- .../pipe/modules/stacksize/StackSizeModuleGui.java | 3 +-- .../pipe/modules/stacksize/StackSizeModuleItem.java | 3 +-- 21 files changed, 21 insertions(+), 31 deletions(-) rename src/main/java/de/ellpeck/prettypipes/pipe/{modules => }/containers/AbstractPipeContainer.java (98%) rename src/main/java/de/ellpeck/prettypipes/pipe/{modules => }/containers/AbstractPipeGui.java (98%) rename src/main/java/de/ellpeck/prettypipes/pipe/{modules => }/containers/MainPipeContainer.java (92%) rename src/main/java/de/ellpeck/prettypipes/pipe/{modules => }/containers/MainPipeGui.java (85%) diff --git a/src/main/java/de/ellpeck/prettypipes/Registry.java b/src/main/java/de/ellpeck/prettypipes/Registry.java index 12e7d12..9326054 100644 --- a/src/main/java/de/ellpeck/prettypipes/Registry.java +++ b/src/main/java/de/ellpeck/prettypipes/Registry.java @@ -13,7 +13,7 @@ import de.ellpeck.prettypipes.pipe.modules.extraction.ExtractionModuleItem; import de.ellpeck.prettypipes.network.PipeNetwork; import de.ellpeck.prettypipes.packets.PacketHandler; import de.ellpeck.prettypipes.pipe.*; -import de.ellpeck.prettypipes.pipe.modules.containers.*; +import de.ellpeck.prettypipes.pipe.containers.*; import de.ellpeck.prettypipes.pipe.modules.insertion.FilterModuleContainer; import de.ellpeck.prettypipes.pipe.modules.insertion.FilterModuleGui; import de.ellpeck.prettypipes.pipe.modules.insertion.FilterModuleItem; diff --git a/src/main/java/de/ellpeck/prettypipes/items/IModule.java b/src/main/java/de/ellpeck/prettypipes/items/IModule.java index f4f5b17..149fe16 100644 --- a/src/main/java/de/ellpeck/prettypipes/items/IModule.java +++ b/src/main/java/de/ellpeck/prettypipes/items/IModule.java @@ -1,6 +1,6 @@ package de.ellpeck.prettypipes.items; -import de.ellpeck.prettypipes.pipe.modules.containers.AbstractPipeContainer; +import de.ellpeck.prettypipes.pipe.containers.AbstractPipeContainer; import de.ellpeck.prettypipes.pipe.PipeTileEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; diff --git a/src/main/java/de/ellpeck/prettypipes/items/ModuleItem.java b/src/main/java/de/ellpeck/prettypipes/items/ModuleItem.java index 35de046..f28f5b2 100644 --- a/src/main/java/de/ellpeck/prettypipes/items/ModuleItem.java +++ b/src/main/java/de/ellpeck/prettypipes/items/ModuleItem.java @@ -1,12 +1,9 @@ package de.ellpeck.prettypipes.items; -import de.ellpeck.prettypipes.PrettyPipes; import de.ellpeck.prettypipes.Registry; import de.ellpeck.prettypipes.Utility; -import de.ellpeck.prettypipes.pipe.modules.containers.AbstractPipeContainer; +import de.ellpeck.prettypipes.pipe.containers.AbstractPipeContainer; import de.ellpeck.prettypipes.pipe.PipeTileEntity; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.resources.I18n; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; diff --git a/src/main/java/de/ellpeck/prettypipes/packets/PacketButton.java b/src/main/java/de/ellpeck/prettypipes/packets/PacketButton.java index 78b5d07..eb707d8 100644 --- a/src/main/java/de/ellpeck/prettypipes/packets/PacketButton.java +++ b/src/main/java/de/ellpeck/prettypipes/packets/PacketButton.java @@ -5,7 +5,7 @@ import de.ellpeck.prettypipes.items.IModule; import de.ellpeck.prettypipes.misc.ItemFilter; import de.ellpeck.prettypipes.misc.ItemFilter.IFilteredContainer; import de.ellpeck.prettypipes.pipe.PipeTileEntity; -import de.ellpeck.prettypipes.pipe.modules.containers.AbstractPipeContainer; +import de.ellpeck.prettypipes.pipe.containers.AbstractPipeContainer; import de.ellpeck.prettypipes.pipe.modules.stacksize.StackSizeModuleItem; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.PlayerEntity; diff --git a/src/main/java/de/ellpeck/prettypipes/pipe/PipeTileEntity.java b/src/main/java/de/ellpeck/prettypipes/pipe/PipeTileEntity.java index af42612..47e613f 100644 --- a/src/main/java/de/ellpeck/prettypipes/pipe/PipeTileEntity.java +++ b/src/main/java/de/ellpeck/prettypipes/pipe/PipeTileEntity.java @@ -5,7 +5,7 @@ import de.ellpeck.prettypipes.Registry; import de.ellpeck.prettypipes.items.IModule; import de.ellpeck.prettypipes.network.PipeItem; import de.ellpeck.prettypipes.network.PipeNetwork; -import de.ellpeck.prettypipes.pipe.modules.containers.MainPipeContainer; +import de.ellpeck.prettypipes.pipe.containers.MainPipeContainer; import net.minecraft.block.BlockState; import net.minecraft.block.ChestBlock; import net.minecraft.entity.player.PlayerEntity; diff --git a/src/main/java/de/ellpeck/prettypipes/pipe/modules/containers/AbstractPipeContainer.java b/src/main/java/de/ellpeck/prettypipes/pipe/containers/AbstractPipeContainer.java similarity index 98% rename from src/main/java/de/ellpeck/prettypipes/pipe/modules/containers/AbstractPipeContainer.java rename to src/main/java/de/ellpeck/prettypipes/pipe/containers/AbstractPipeContainer.java index 89a3e43..b574f12 100644 --- a/src/main/java/de/ellpeck/prettypipes/pipe/modules/containers/AbstractPipeContainer.java +++ b/src/main/java/de/ellpeck/prettypipes/pipe/containers/AbstractPipeContainer.java @@ -1,4 +1,4 @@ -package de.ellpeck.prettypipes.pipe.modules.containers; +package de.ellpeck.prettypipes.pipe.containers; import de.ellpeck.prettypipes.Utility; import de.ellpeck.prettypipes.items.IModule; diff --git a/src/main/java/de/ellpeck/prettypipes/pipe/modules/containers/AbstractPipeGui.java b/src/main/java/de/ellpeck/prettypipes/pipe/containers/AbstractPipeGui.java similarity index 98% rename from src/main/java/de/ellpeck/prettypipes/pipe/modules/containers/AbstractPipeGui.java rename to src/main/java/de/ellpeck/prettypipes/pipe/containers/AbstractPipeGui.java index 054c2ac..9c7bb84 100644 --- a/src/main/java/de/ellpeck/prettypipes/pipe/modules/containers/AbstractPipeGui.java +++ b/src/main/java/de/ellpeck/prettypipes/pipe/containers/AbstractPipeGui.java @@ -1,4 +1,4 @@ -package de.ellpeck.prettypipes.pipe.modules.containers; +package de.ellpeck.prettypipes.pipe.containers; import de.ellpeck.prettypipes.PrettyPipes; import de.ellpeck.prettypipes.Registry; @@ -9,7 +9,6 @@ import net.minecraft.client.audio.SimpleSound; import net.minecraft.client.gui.screen.inventory.ContainerScreen; import net.minecraft.client.gui.widget.Widget; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.inventory.container.ClickType; import net.minecraft.inventory.container.Slot; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/de/ellpeck/prettypipes/pipe/modules/containers/MainPipeContainer.java b/src/main/java/de/ellpeck/prettypipes/pipe/containers/MainPipeContainer.java similarity index 92% rename from src/main/java/de/ellpeck/prettypipes/pipe/modules/containers/MainPipeContainer.java rename to src/main/java/de/ellpeck/prettypipes/pipe/containers/MainPipeContainer.java index 94599db..d927219 100644 --- a/src/main/java/de/ellpeck/prettypipes/pipe/modules/containers/MainPipeContainer.java +++ b/src/main/java/de/ellpeck/prettypipes/pipe/containers/MainPipeContainer.java @@ -1,4 +1,4 @@ -package de.ellpeck.prettypipes.pipe.modules.containers; +package de.ellpeck.prettypipes.pipe.containers; import de.ellpeck.prettypipes.items.IModule; import net.minecraft.entity.player.PlayerEntity; diff --git a/src/main/java/de/ellpeck/prettypipes/pipe/modules/containers/MainPipeGui.java b/src/main/java/de/ellpeck/prettypipes/pipe/containers/MainPipeGui.java similarity index 85% rename from src/main/java/de/ellpeck/prettypipes/pipe/modules/containers/MainPipeGui.java rename to src/main/java/de/ellpeck/prettypipes/pipe/containers/MainPipeGui.java index a50077b..9a44072 100644 --- a/src/main/java/de/ellpeck/prettypipes/pipe/modules/containers/MainPipeGui.java +++ b/src/main/java/de/ellpeck/prettypipes/pipe/containers/MainPipeGui.java @@ -1,4 +1,4 @@ -package de.ellpeck.prettypipes.pipe.modules.containers; +package de.ellpeck.prettypipes.pipe.containers; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.text.ITextComponent; diff --git a/src/main/java/de/ellpeck/prettypipes/pipe/modules/extraction/ExtractionModuleContainer.java b/src/main/java/de/ellpeck/prettypipes/pipe/modules/extraction/ExtractionModuleContainer.java index a2f0963..ea015a8 100644 --- a/src/main/java/de/ellpeck/prettypipes/pipe/modules/extraction/ExtractionModuleContainer.java +++ b/src/main/java/de/ellpeck/prettypipes/pipe/modules/extraction/ExtractionModuleContainer.java @@ -2,7 +2,7 @@ package de.ellpeck.prettypipes.pipe.modules.extraction; import de.ellpeck.prettypipes.misc.ItemFilter; import de.ellpeck.prettypipes.misc.ItemFilter.IFilteredContainer; -import de.ellpeck.prettypipes.pipe.modules.containers.AbstractPipeContainer; +import de.ellpeck.prettypipes.pipe.containers.AbstractPipeContainer; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.container.ContainerType; import net.minecraft.inventory.container.Slot; diff --git a/src/main/java/de/ellpeck/prettypipes/pipe/modules/extraction/ExtractionModuleGui.java b/src/main/java/de/ellpeck/prettypipes/pipe/modules/extraction/ExtractionModuleGui.java index 4495baf..0735ace 100644 --- a/src/main/java/de/ellpeck/prettypipes/pipe/modules/extraction/ExtractionModuleGui.java +++ b/src/main/java/de/ellpeck/prettypipes/pipe/modules/extraction/ExtractionModuleGui.java @@ -1,6 +1,6 @@ package de.ellpeck.prettypipes.pipe.modules.extraction; -import de.ellpeck.prettypipes.pipe.modules.containers.AbstractPipeGui; +import de.ellpeck.prettypipes.pipe.containers.AbstractPipeGui; import net.minecraft.client.gui.widget.Widget; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.text.ITextComponent; diff --git a/src/main/java/de/ellpeck/prettypipes/pipe/modules/extraction/ExtractionModuleItem.java b/src/main/java/de/ellpeck/prettypipes/pipe/modules/extraction/ExtractionModuleItem.java index 051568b..d77a924 100644 --- a/src/main/java/de/ellpeck/prettypipes/pipe/modules/extraction/ExtractionModuleItem.java +++ b/src/main/java/de/ellpeck/prettypipes/pipe/modules/extraction/ExtractionModuleItem.java @@ -7,7 +7,7 @@ import de.ellpeck.prettypipes.pipe.PipeTileEntity; import de.ellpeck.prettypipes.items.IModule; import de.ellpeck.prettypipes.items.ModuleTier; import de.ellpeck.prettypipes.network.PipeNetwork; -import de.ellpeck.prettypipes.pipe.modules.containers.AbstractPipeContainer; +import de.ellpeck.prettypipes.pipe.containers.AbstractPipeContainer; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/prettypipes/pipe/modules/insertion/FilterModuleContainer.java b/src/main/java/de/ellpeck/prettypipes/pipe/modules/insertion/FilterModuleContainer.java index f3a5bb5..efb358e 100644 --- a/src/main/java/de/ellpeck/prettypipes/pipe/modules/insertion/FilterModuleContainer.java +++ b/src/main/java/de/ellpeck/prettypipes/pipe/modules/insertion/FilterModuleContainer.java @@ -2,7 +2,7 @@ package de.ellpeck.prettypipes.pipe.modules.insertion; import de.ellpeck.prettypipes.misc.ItemFilter; import de.ellpeck.prettypipes.misc.ItemFilter.IFilteredContainer; -import de.ellpeck.prettypipes.pipe.modules.containers.AbstractPipeContainer; +import de.ellpeck.prettypipes.pipe.containers.AbstractPipeContainer; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.container.ContainerType; import net.minecraft.inventory.container.Slot; diff --git a/src/main/java/de/ellpeck/prettypipes/pipe/modules/insertion/FilterModuleGui.java b/src/main/java/de/ellpeck/prettypipes/pipe/modules/insertion/FilterModuleGui.java index 8eb3789..84cdbb4 100644 --- a/src/main/java/de/ellpeck/prettypipes/pipe/modules/insertion/FilterModuleGui.java +++ b/src/main/java/de/ellpeck/prettypipes/pipe/modules/insertion/FilterModuleGui.java @@ -1,6 +1,6 @@ package de.ellpeck.prettypipes.pipe.modules.insertion; -import de.ellpeck.prettypipes.pipe.modules.containers.AbstractPipeGui; +import de.ellpeck.prettypipes.pipe.containers.AbstractPipeGui; import net.minecraft.client.gui.widget.Widget; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.math.MathHelper; diff --git a/src/main/java/de/ellpeck/prettypipes/pipe/modules/insertion/FilterModuleItem.java b/src/main/java/de/ellpeck/prettypipes/pipe/modules/insertion/FilterModuleItem.java index d434433..a51db4e 100644 --- a/src/main/java/de/ellpeck/prettypipes/pipe/modules/insertion/FilterModuleItem.java +++ b/src/main/java/de/ellpeck/prettypipes/pipe/modules/insertion/FilterModuleItem.java @@ -6,7 +6,7 @@ import de.ellpeck.prettypipes.items.ModuleItem; import de.ellpeck.prettypipes.items.ModuleTier; import de.ellpeck.prettypipes.misc.ItemFilter; import de.ellpeck.prettypipes.pipe.PipeTileEntity; -import de.ellpeck.prettypipes.pipe.modules.containers.AbstractPipeContainer; +import de.ellpeck.prettypipes.pipe.containers.AbstractPipeContainer; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/prettypipes/pipe/modules/retrieval/RetrievalModuleContainer.java b/src/main/java/de/ellpeck/prettypipes/pipe/modules/retrieval/RetrievalModuleContainer.java index 2a482c5..da756c2 100644 --- a/src/main/java/de/ellpeck/prettypipes/pipe/modules/retrieval/RetrievalModuleContainer.java +++ b/src/main/java/de/ellpeck/prettypipes/pipe/modules/retrieval/RetrievalModuleContainer.java @@ -2,7 +2,7 @@ package de.ellpeck.prettypipes.pipe.modules.retrieval; import de.ellpeck.prettypipes.misc.ItemFilter; import de.ellpeck.prettypipes.misc.ItemFilter.IFilteredContainer; -import de.ellpeck.prettypipes.pipe.modules.containers.AbstractPipeContainer; +import de.ellpeck.prettypipes.pipe.containers.AbstractPipeContainer; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.container.ContainerType; import net.minecraft.inventory.container.Slot; diff --git a/src/main/java/de/ellpeck/prettypipes/pipe/modules/retrieval/RetrievalModuleGui.java b/src/main/java/de/ellpeck/prettypipes/pipe/modules/retrieval/RetrievalModuleGui.java index 578e2db..639a52a 100644 --- a/src/main/java/de/ellpeck/prettypipes/pipe/modules/retrieval/RetrievalModuleGui.java +++ b/src/main/java/de/ellpeck/prettypipes/pipe/modules/retrieval/RetrievalModuleGui.java @@ -1,7 +1,6 @@ package de.ellpeck.prettypipes.pipe.modules.retrieval; -import de.ellpeck.prettypipes.pipe.modules.containers.AbstractPipeGui; -import de.ellpeck.prettypipes.pipe.modules.extraction.ExtractionModuleContainer; +import de.ellpeck.prettypipes.pipe.containers.AbstractPipeGui; import net.minecraft.client.gui.widget.Widget; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.text.ITextComponent; diff --git a/src/main/java/de/ellpeck/prettypipes/pipe/modules/retrieval/RetrievalModuleItem.java b/src/main/java/de/ellpeck/prettypipes/pipe/modules/retrieval/RetrievalModuleItem.java index ddee637..1108381 100644 --- a/src/main/java/de/ellpeck/prettypipes/pipe/modules/retrieval/RetrievalModuleItem.java +++ b/src/main/java/de/ellpeck/prettypipes/pipe/modules/retrieval/RetrievalModuleItem.java @@ -9,14 +9,11 @@ import de.ellpeck.prettypipes.network.NetworkLocation; import de.ellpeck.prettypipes.network.PipeItem; import de.ellpeck.prettypipes.network.PipeNetwork; import de.ellpeck.prettypipes.pipe.PipeTileEntity; -import de.ellpeck.prettypipes.pipe.modules.containers.AbstractPipeContainer; +import de.ellpeck.prettypipes.pipe.containers.AbstractPipeContainer; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.item.ItemStack; -import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; -import net.minecraftforge.items.IItemHandler; -import org.apache.commons.lang3.tuple.Pair; import java.util.List; diff --git a/src/main/java/de/ellpeck/prettypipes/pipe/modules/stacksize/StackSizeModuleContainer.java b/src/main/java/de/ellpeck/prettypipes/pipe/modules/stacksize/StackSizeModuleContainer.java index 5fdedec..532b717 100644 --- a/src/main/java/de/ellpeck/prettypipes/pipe/modules/stacksize/StackSizeModuleContainer.java +++ b/src/main/java/de/ellpeck/prettypipes/pipe/modules/stacksize/StackSizeModuleContainer.java @@ -1,6 +1,6 @@ package de.ellpeck.prettypipes.pipe.modules.stacksize; -import de.ellpeck.prettypipes.pipe.modules.containers.AbstractPipeContainer; +import de.ellpeck.prettypipes.pipe.containers.AbstractPipeContainer; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.container.ContainerType; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/de/ellpeck/prettypipes/pipe/modules/stacksize/StackSizeModuleGui.java b/src/main/java/de/ellpeck/prettypipes/pipe/modules/stacksize/StackSizeModuleGui.java index bb04597..ba018cb 100644 --- a/src/main/java/de/ellpeck/prettypipes/pipe/modules/stacksize/StackSizeModuleGui.java +++ b/src/main/java/de/ellpeck/prettypipes/pipe/modules/stacksize/StackSizeModuleGui.java @@ -3,8 +3,7 @@ package de.ellpeck.prettypipes.pipe.modules.stacksize; import de.ellpeck.prettypipes.PrettyPipes; import de.ellpeck.prettypipes.packets.PacketButton; import de.ellpeck.prettypipes.packets.PacketButton.ButtonResult; -import de.ellpeck.prettypipes.packets.PacketHandler; -import de.ellpeck.prettypipes.pipe.modules.containers.AbstractPipeGui; +import de.ellpeck.prettypipes.pipe.containers.AbstractPipeGui; import net.minecraft.client.gui.widget.TextFieldWidget; import net.minecraft.client.gui.widget.button.Button; import net.minecraft.client.resources.I18n; diff --git a/src/main/java/de/ellpeck/prettypipes/pipe/modules/stacksize/StackSizeModuleItem.java b/src/main/java/de/ellpeck/prettypipes/pipe/modules/stacksize/StackSizeModuleItem.java index 2a6e3f6..11c94e8 100644 --- a/src/main/java/de/ellpeck/prettypipes/pipe/modules/stacksize/StackSizeModuleItem.java +++ b/src/main/java/de/ellpeck/prettypipes/pipe/modules/stacksize/StackSizeModuleItem.java @@ -4,11 +4,10 @@ import de.ellpeck.prettypipes.Registry; import de.ellpeck.prettypipes.items.IModule; import de.ellpeck.prettypipes.items.ModuleItem; import de.ellpeck.prettypipes.pipe.PipeTileEntity; -import de.ellpeck.prettypipes.pipe.modules.containers.AbstractPipeContainer; +import de.ellpeck.prettypipes.pipe.containers.AbstractPipeContainer; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; import net.minecraftforge.items.IItemHandler; public class StackSizeModuleItem extends ModuleItem {