From 44a0a2291d315a05a0bf51fdc1b9be1944f1e29d Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Wed, 6 Jun 2018 22:23:48 +0200 Subject: [PATCH] Package organization. --- .../apiimpl/autocrafting/task/CraftingTask.java | 5 +++++ .../autocrafting/task/{ => extractor}/CraftingExtractor.java | 2 +- .../task/{ => extractor}/CraftingExtractorItemStatus.java | 2 +- .../autocrafting/task/{ => inserter}/CraftingInserter.java | 2 +- .../task/{ => inserter}/CraftingInserterItem.java | 2 +- .../task/{ => inserter}/CraftingInserterItemStatus.java | 2 +- .../apiimpl/autocrafting/task/step/CraftingStepCraft.java | 4 ++-- .../apiimpl/autocrafting/task/step/CraftingStepProcess.java | 2 +- 8 files changed, 13 insertions(+), 8 deletions(-) rename src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/{ => extractor}/CraftingExtractor.java (99%) rename src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/{ => extractor}/CraftingExtractorItemStatus.java (93%) rename src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/{ => inserter}/CraftingInserter.java (99%) rename src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/{ => inserter}/CraftingInserterItem.java (98%) rename src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/{ => inserter}/CraftingInserterItemStatus.java (91%) diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingTask.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingTask.java index b0e4e2de8..ee1c2aa14 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingTask.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingTask.java @@ -13,6 +13,11 @@ import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.craftingmonitor.Craf import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.craftingmonitor.CraftingMonitorElementItemRender; import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.craftingmonitor.CraftingMonitorElementText; import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.preview.CraftingPreviewElementItemStack; +import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.extractor.CraftingExtractor; +import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.extractor.CraftingExtractorItemStatus; +import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.inserter.CraftingInserter; +import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.inserter.CraftingInserterItem; +import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.inserter.CraftingInserterItemStatus; import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.step.CraftingStep; import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.step.CraftingStepCraft; import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.step.CraftingStepProcess; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingExtractor.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/extractor/CraftingExtractor.java similarity index 99% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingExtractor.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/extractor/CraftingExtractor.java index bae9d1dd6..89c56c7e8 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingExtractor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/extractor/CraftingExtractor.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task; +package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.extractor; import com.raoulvdberge.refinedstorage.api.network.INetwork; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingExtractorItemStatus.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/extractor/CraftingExtractorItemStatus.java similarity index 93% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingExtractorItemStatus.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/extractor/CraftingExtractorItemStatus.java index c636a4769..6b9a26ad0 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingExtractorItemStatus.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/extractor/CraftingExtractorItemStatus.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task; +package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.extractor; public enum CraftingExtractorItemStatus { AVAILABLE, diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingInserter.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/inserter/CraftingInserter.java similarity index 99% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingInserter.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/inserter/CraftingInserter.java index b53b3898e..8454f18ae 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingInserter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/inserter/CraftingInserter.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task; +package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.inserter; import com.raoulvdberge.refinedstorage.api.network.INetwork; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingInserterItem.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/inserter/CraftingInserterItem.java similarity index 98% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingInserterItem.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/inserter/CraftingInserterItem.java index 53f217d85..86cd22cfd 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingInserterItem.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/inserter/CraftingInserterItem.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task; +package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.inserter; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingInserterItemStatus.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/inserter/CraftingInserterItemStatus.java similarity index 91% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingInserterItemStatus.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/inserter/CraftingInserterItemStatus.java index 3588584fa..2b28ba43b 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingInserterItemStatus.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/inserter/CraftingInserterItemStatus.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task; +package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.inserter; public enum CraftingInserterItemStatus { WAITING, diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/step/CraftingStepCraft.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/step/CraftingStepCraft.java index 2905b41ad..e58e20a02 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/step/CraftingStepCraft.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/step/CraftingStepCraft.java @@ -2,8 +2,8 @@ package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.step; import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern; import com.raoulvdberge.refinedstorage.api.network.INetwork; -import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.CraftingExtractor; -import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.CraftingInserter; +import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.extractor.CraftingExtractor; +import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.inserter.CraftingInserter; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/step/CraftingStepProcess.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/step/CraftingStepProcess.java index b357486a6..9dea593c8 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/step/CraftingStepProcess.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/step/CraftingStepProcess.java @@ -4,7 +4,7 @@ import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern; import com.raoulvdberge.refinedstorage.api.network.INetwork; import com.raoulvdberge.refinedstorage.api.util.IStackList; import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.CraftingExtractor; +import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.extractor.CraftingExtractor; import net.minecraft.item.ItemStack; import java.util.List;