diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/IRSAPI.java b/src/main/java/com/raoulvdberge/refinedstorage/api/IRSAPI.java index 129835bdb..132f0ac65 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/IRSAPI.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/IRSAPI.java @@ -4,9 +4,9 @@ import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPatternRenderHa import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElementList; import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElementRegistry; import com.raoulvdberge.refinedstorage.api.autocrafting.preview.ICraftingPreviewElementRegistry; -import com.raoulvdberge.refinedstorage.api.autocrafting.registry.ICraftingTaskRegistry; import com.raoulvdberge.refinedstorage.api.autocrafting.task.CraftingTaskReadException; import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingRequestInfo; +import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTaskRegistry; import com.raoulvdberge.refinedstorage.api.network.INetworkManager; import com.raoulvdberge.refinedstorage.api.network.grid.ICraftingGridBehavior; import com.raoulvdberge.refinedstorage.api.network.grid.IGridManager; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/ICraftingPattern.java b/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/ICraftingPattern.java index 4a882095f..30b85bf08 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/ICraftingPattern.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/ICraftingPattern.java @@ -1,5 +1,6 @@ package com.raoulvdberge.refinedstorage.api.autocrafting; +import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTaskRegistry; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; @@ -77,9 +78,9 @@ public interface ICraftingPattern { NonNullList getFluidOutputs(); /** - * @return the id of the factory that creates a crafting task for this pattern, as defined in the {@link com.raoulvdberge.refinedstorage.api.autocrafting.registry.ICraftingTaskRegistry} + * @return the id of the factory that creates a crafting task for this pattern, as defined in the {@link ICraftingTaskRegistry} */ - ResourceLocation getId(); + ResourceLocation getCraftingTaskFactoryId(); /** * @param other the other pattern diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/task/CraftingTaskReadException.java b/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/task/CraftingTaskReadException.java index ad3ee809f..4ef1f66b3 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/task/CraftingTaskReadException.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/task/CraftingTaskReadException.java @@ -3,7 +3,7 @@ package com.raoulvdberge.refinedstorage.api.autocrafting.task; import com.raoulvdberge.refinedstorage.api.network.INetwork; /** - * Gets thrown from {@link com.raoulvdberge.refinedstorage.api.autocrafting.registry.ICraftingTaskFactory#createFromNbt(INetwork, net.minecraft.nbt.CompoundNBT)}. + * Gets thrown from {@link ICraftingTaskFactory#createFromNbt(INetwork, net.minecraft.nbt.CompoundNBT)}. */ public class CraftingTaskReadException extends Exception { /** diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/registry/ICraftingTaskFactory.java b/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/task/ICraftingTaskFactory.java old mode 100755 new mode 100644 similarity index 76% rename from src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/registry/ICraftingTaskFactory.java rename to src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/task/ICraftingTaskFactory.java index c0def4d37..038d8f366 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/registry/ICraftingTaskFactory.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/task/ICraftingTaskFactory.java @@ -1,9 +1,6 @@ -package com.raoulvdberge.refinedstorage.api.autocrafting.registry; +package com.raoulvdberge.refinedstorage.api.autocrafting.task; import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern; -import com.raoulvdberge.refinedstorage.api.autocrafting.task.CraftingTaskReadException; -import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingRequestInfo; -import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTask; import com.raoulvdberge.refinedstorage.api.network.INetwork; import net.minecraft.nbt.CompoundNBT; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/registry/ICraftingTaskRegistry.java b/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/task/ICraftingTaskRegistry.java old mode 100755 new mode 100644 similarity index 92% rename from src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/registry/ICraftingTaskRegistry.java rename to src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/task/ICraftingTaskRegistry.java index 5d6596d92..fc8da1d75 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/registry/ICraftingTaskRegistry.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/task/ICraftingTaskRegistry.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.api.autocrafting.registry; +package com.raoulvdberge.refinedstorage.api.autocrafting.task; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/API.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/API.java index 1b1ffc6de..4ec4b01f0 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/API.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/API.java @@ -6,9 +6,9 @@ import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPatternRenderHa import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElementList; import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElementRegistry; import com.raoulvdberge.refinedstorage.api.autocrafting.preview.ICraftingPreviewElementRegistry; -import com.raoulvdberge.refinedstorage.api.autocrafting.registry.ICraftingTaskRegistry; import com.raoulvdberge.refinedstorage.api.autocrafting.task.CraftingTaskReadException; import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingRequestInfo; +import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTaskRegistry; import com.raoulvdberge.refinedstorage.api.network.INetworkManager; import com.raoulvdberge.refinedstorage.api.network.grid.ICraftingGridBehavior; import com.raoulvdberge.refinedstorage.api.network.grid.IGridManager; @@ -24,11 +24,11 @@ import com.raoulvdberge.refinedstorage.api.storage.externalstorage.IExternalStor import com.raoulvdberge.refinedstorage.api.util.IComparer; import com.raoulvdberge.refinedstorage.api.util.IQuantityFormatter; import com.raoulvdberge.refinedstorage.api.util.IStackList; -import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.CraftingRequestInfo; import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.craftingmonitor.CraftingMonitorElementList; import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.craftingmonitor.CraftingMonitorElementRegistry; import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.preview.CraftingPreviewElementRegistry; -import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.registry.CraftingTaskRegistry; +import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.CraftingRequestInfo; +import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.CraftingTaskRegistry; import com.raoulvdberge.refinedstorage.apiimpl.network.NetworkManager; import com.raoulvdberge.refinedstorage.apiimpl.network.NetworkNodeManager; import com.raoulvdberge.refinedstorage.apiimpl.network.NetworkNodeRegistry; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingManager.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingManager.java index 8bd2e9be8..c6339818b 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingManager.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingManager.java @@ -5,10 +5,10 @@ import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern; import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPatternChainList; import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPatternContainer; import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorListener; -import com.raoulvdberge.refinedstorage.api.autocrafting.registry.ICraftingTaskFactory; import com.raoulvdberge.refinedstorage.api.autocrafting.task.CraftingTaskReadException; import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTask; import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTaskError; +import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTaskFactory; import com.raoulvdberge.refinedstorage.api.network.INetwork; import com.raoulvdberge.refinedstorage.api.network.node.INetworkNode; import com.raoulvdberge.refinedstorage.api.util.IComparer; @@ -98,7 +98,7 @@ public class CraftingManager implements ICraftingManager { return null; } - ICraftingTaskFactory factory = API.instance().getCraftingTaskRegistry().get(pattern.getId()); + ICraftingTaskFactory factory = API.instance().getCraftingTaskRegistry().get(pattern.getCraftingTaskFactoryId()); if (factory == null) { return null; } @@ -114,7 +114,7 @@ public class CraftingManager implements ICraftingManager { return null; } - ICraftingTaskFactory factory = API.instance().getCraftingTaskRegistry().get(pattern.getId()); + ICraftingTaskFactory factory = API.instance().getCraftingTaskRegistry().get(pattern.getCraftingTaskFactoryId()); if (factory == null) { return null; } @@ -202,7 +202,7 @@ public class CraftingManager implements ICraftingManager { for (ICraftingTask task : tasks.values()) { CompoundNBT taskTag = new CompoundNBT(); - taskTag.putString(NBT_TASK_TYPE, task.getPattern().getId().toString()); + taskTag.putString(NBT_TASK_TYPE, task.getPattern().getCraftingTaskFactoryId().toString()); taskTag.put(NBT_TASK_DATA, task.writeToNbt(new CompoundNBT())); list.add(taskTag); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPattern.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPattern.java index 6dd890334..5b1d15f7d 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPattern.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPattern.java @@ -4,7 +4,7 @@ import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern; import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPatternContainer; import com.raoulvdberge.refinedstorage.api.util.IComparer; import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.registry.CraftingTaskFactory; +import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.v5.CraftingTaskFactory; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.CraftingInventory; import net.minecraft.inventory.container.Container; @@ -164,7 +164,7 @@ public class CraftingPattern implements ICraftingPattern { } @Override - public ResourceLocation getId() { + public ResourceLocation getCraftingTaskFactoryId() { return CraftingTaskFactory.ID; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingRequestInfo.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingRequestInfo.java similarity index 96% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingRequestInfo.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingRequestInfo.java index d2db8e839..c63674db1 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingRequestInfo.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingRequestInfo.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.apiimpl.autocrafting; +package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task; import com.raoulvdberge.refinedstorage.api.autocrafting.task.CraftingTaskReadException; import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingRequestInfo; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/registry/CraftingTaskRegistry.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingTaskRegistry.java old mode 100755 new mode 100644 similarity index 68% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/registry/CraftingTaskRegistry.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingTaskRegistry.java index bcafb9d11..d5c5f4ed4 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/registry/CraftingTaskRegistry.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingTaskRegistry.java @@ -1,7 +1,7 @@ -package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.registry; +package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task; -import com.raoulvdberge.refinedstorage.api.autocrafting.registry.ICraftingTaskFactory; -import com.raoulvdberge.refinedstorage.api.autocrafting.registry.ICraftingTaskRegistry; +import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTaskFactory; +import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTaskRegistry; import net.minecraft.util.ResourceLocation; import javax.annotation.Nullable; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/Crafting.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v5/Crafting.java similarity index 99% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/Crafting.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v5/Crafting.java index 901a916a9..7e24670af 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/Crafting.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v5/Crafting.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task; +package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.v5; import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern; import com.raoulvdberge.refinedstorage.api.autocrafting.task.CraftingTaskReadException; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingTask.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v5/CraftingTask.java old mode 100755 new mode 100644 similarity index 99% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingTask.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v5/CraftingTask.java index 686da85b7..a9cfda09a --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingTask.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v5/CraftingTask.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task; +package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.v5; import com.google.common.collect.Maps; import com.raoulvdberge.refinedstorage.RS; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingTaskError.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v5/CraftingTaskError.java similarity index 99% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingTaskError.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v5/CraftingTaskError.java index 73fa4e063..b94816996 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingTaskError.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v5/CraftingTaskError.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task; +package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.v5; import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern; import com.raoulvdberge.refinedstorage.api.autocrafting.task.CraftingTaskErrorType; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/registry/CraftingTaskFactory.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v5/CraftingTaskFactory.java old mode 100755 new mode 100644 similarity index 80% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/registry/CraftingTaskFactory.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v5/CraftingTaskFactory.java index d4ed86471..6946e807b --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/registry/CraftingTaskFactory.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v5/CraftingTaskFactory.java @@ -1,20 +1,19 @@ -package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.registry; +package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.v5; import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern; -import com.raoulvdberge.refinedstorage.api.autocrafting.registry.ICraftingTaskFactory; import com.raoulvdberge.refinedstorage.api.autocrafting.task.CraftingTaskReadException; import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingRequestInfo; import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTask; +import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTaskFactory; import com.raoulvdberge.refinedstorage.api.network.INetwork; -import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.CraftingTask; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.ResourceLocation; import javax.annotation.Nonnull; public class CraftingTaskFactory implements ICraftingTaskFactory { - public static final ResourceLocation ID = new ResourceLocation(RS.ID, "default"); + public static final ResourceLocation ID = new ResourceLocation(RS.ID, "v5"); @Nonnull @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/Processing.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v5/Processing.java similarity index 99% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/Processing.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v5/Processing.java index 7c6c76cc5..b10bc1e40 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/Processing.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v5/Processing.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task; +package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.v5; import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern; import com.raoulvdberge.refinedstorage.api.autocrafting.task.CraftingTaskReadException; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/ProcessingState.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v5/ProcessingState.java similarity index 96% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/ProcessingState.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v5/ProcessingState.java index bec94ee3c..9d1d1aaa9 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/ProcessingState.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v5/ProcessingState.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task; +package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.v5; enum ProcessingState { READY, diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v5/README.md b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v5/README.md new file mode 100644 index 000000000..996b142b8 --- /dev/null +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/v5/README.md @@ -0,0 +1,12 @@ +# Autocrafting v5 +This is the fifth iteration of the autocrafting code. + +Some history: + +|------|---| +|v0.6 |v1 | +|v1.0 |v2 | +|v1.2 |v3 | +|v1.6 |v4 | +|v1.6.4|v5 | +|------|---| \ No newline at end of file diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/FluidGridHandler.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/FluidGridHandler.java index 8813935e5..b63f96584 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/FluidGridHandler.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/FluidGridHandler.java @@ -15,6 +15,7 @@ import com.raoulvdberge.refinedstorage.util.StackUtils; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.inventory.InventoryHelper; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidAttributes; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; @@ -127,10 +128,13 @@ public class FluidGridHandler implements IFluidGridHandler { ICraftingTaskError error = task.calculate(); + ResourceLocation factoryId = task.getPattern().getCraftingTaskFactoryId(); + if (error != null) { RS.NETWORK_HANDLER.sendTo( player, new GridCraftingPreviewResponseMessage( + factoryId, Collections.singletonList(new ErrorCraftingPreviewElement(error.getType(), error.getRecursedPattern() == null ? ItemStack.EMPTY : error.getRecursedPattern().getStack())), id, quantity, @@ -145,6 +149,7 @@ public class FluidGridHandler implements IFluidGridHandler { RS.NETWORK_HANDLER.sendTo( player, new GridCraftingPreviewResponseMessage( + factoryId, task.getPreviewStacks(), id, quantity, diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/ItemGridHandler.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/ItemGridHandler.java index 16957b115..4b98664e0 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/ItemGridHandler.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/ItemGridHandler.java @@ -14,6 +14,7 @@ import com.raoulvdberge.refinedstorage.network.grid.GridCraftingStartResponseMes import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.Direction; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.ItemHandlerHelper; @@ -165,10 +166,13 @@ public class ItemGridHandler implements IItemGridHandler { ICraftingTaskError error = task.calculate(); + ResourceLocation factoryId = task.getPattern().getCraftingTaskFactoryId(); + if (error != null) { RS.NETWORK_HANDLER.sendTo( player, new GridCraftingPreviewResponseMessage( + factoryId, Collections.singletonList(new ErrorCraftingPreviewElement(error.getType(), error.getRecursedPattern() == null ? ItemStack.EMPTY : error.getRecursedPattern().getStack())), id, quantity, @@ -183,6 +187,7 @@ public class ItemGridHandler implements IItemGridHandler { RS.NETWORK_HANDLER.sendTo( player, new GridCraftingPreviewResponseMessage( + factoryId, task.getPreviewStacks(), id, quantity, diff --git a/src/main/java/com/raoulvdberge/refinedstorage/command/PatternDumpCommand.java b/src/main/java/com/raoulvdberge/refinedstorage/command/PatternDumpCommand.java index ee6a0a148..6efc316f7 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/command/PatternDumpCommand.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/command/PatternDumpCommand.java @@ -34,7 +34,7 @@ public class PatternDumpCommand implements Command { CraftingPattern pattern = PatternItem.fromCache(context.getSource().getWorld(), stack); - context.getSource().sendFeedback(new StringTextComponent("Crafting ID: ").setStyle(Styles.YELLOW).appendSibling(new StringTextComponent(pattern.getId().toString()).setStyle(Styles.WHITE)), false); + context.getSource().sendFeedback(new StringTextComponent("Crafting task factory ID: ").setStyle(Styles.YELLOW).appendSibling(new StringTextComponent(pattern.getCraftingTaskFactoryId().toString()).setStyle(Styles.WHITE)), false); if (!pattern.isValid()) { context.getSource().sendFeedback(new StringTextComponent("Pattern is invalid! Reason: ").appendSibling(pattern.getErrorMessage()).setStyle(Styles.RED), false); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/ClientProxy.java b/src/main/java/com/raoulvdberge/refinedstorage/network/ClientProxy.java index e97c9671c..801e5a3a8 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/ClientProxy.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/network/ClientProxy.java @@ -19,7 +19,15 @@ public class ClientProxy { screen = ((CraftingSettingsScreen) screen).getParent(); } - Minecraft.getInstance().displayGuiScreen(new CraftingPreviewScreen(screen, message.getStacks(), message.getId(), message.getQuantity(), message.isFluids(), new TranslationTextComponent("gui.refinedstorage.crafting_preview"))); + Minecraft.getInstance().displayGuiScreen(new CraftingPreviewScreen( + screen, + message.getFactoryId(), + message.getStacks(), + message.getId(), + message.getQuantity(), + message.isFluids(), + new TranslationTextComponent("gui.refinedstorage.crafting_preview") + )); } public static void onReceivedCraftingStartResponseMessage(GridCraftingStartResponseMessage message) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridCraftingPreviewResponseMessage.java b/src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridCraftingPreviewResponseMessage.java index c99ee6653..ceb28d804 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridCraftingPreviewResponseMessage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridCraftingPreviewResponseMessage.java @@ -13,18 +13,24 @@ import java.util.UUID; import java.util.function.Supplier; public class GridCraftingPreviewResponseMessage { + private ResourceLocation factoryId; private List stacks; private UUID id; private int quantity; private boolean fluids; - public GridCraftingPreviewResponseMessage(List stacks, UUID id, int quantity, boolean fluids) { + public GridCraftingPreviewResponseMessage(ResourceLocation factoryId, List stacks, UUID id, int quantity, boolean fluids) { + this.factoryId = factoryId; this.stacks = stacks; this.id = id; this.quantity = quantity; this.fluids = fluids; } + public ResourceLocation getFactoryId() { + return factoryId; + } + public List getStacks() { return stacks; } @@ -42,6 +48,7 @@ public class GridCraftingPreviewResponseMessage { } public static GridCraftingPreviewResponseMessage decode(PacketBuffer buf) { + ResourceLocation factoryId = buf.readResourceLocation(); UUID id = buf.readUniqueId(); int quantity = buf.readInt(); boolean fluids = buf.readBoolean(); @@ -55,10 +62,11 @@ public class GridCraftingPreviewResponseMessage { stacks.add(API.instance().getCraftingPreviewElementRegistry().get(type).apply(buf)); } - return new GridCraftingPreviewResponseMessage(stacks, id, quantity, fluids); + return new GridCraftingPreviewResponseMessage(factoryId, stacks, id, quantity, fluids); } public static void encode(GridCraftingPreviewResponseMessage message, PacketBuffer buf) { + buf.writeResourceLocation(message.factoryId); buf.writeUniqueId(message.id); buf.writeInt(message.quantity); buf.writeBoolean(message.fluids); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/CraftingPreviewScreen.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/CraftingPreviewScreen.java index e8c44e160..418e92777 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/CraftingPreviewScreen.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/CraftingPreviewScreen.java @@ -1,6 +1,5 @@ package com.raoulvdberge.refinedstorage.screen.grid; -import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern; @@ -13,6 +12,7 @@ import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.preview.ItemCrafting import com.raoulvdberge.refinedstorage.apiimpl.render.CraftingPreviewElementDrawers; import com.raoulvdberge.refinedstorage.item.PatternItem; import com.raoulvdberge.refinedstorage.network.grid.GridCraftingStartRequestMessage; +import com.raoulvdberge.refinedstorage.render.RenderSettings; import com.raoulvdberge.refinedstorage.screen.BaseScreen; import com.raoulvdberge.refinedstorage.screen.widget.ScrollbarWidget; import com.raoulvdberge.refinedstorage.util.RenderUtils; @@ -25,6 +25,7 @@ import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.container.Container; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.ITextComponent; import net.minecraftforge.fluids.FluidStack; import org.lwjgl.glfw.GLFW; @@ -40,6 +41,7 @@ public class CraftingPreviewScreen extends BaseScreen { private final List stacks; private final Screen parent; + private final ResourceLocation factoryId; private final ScrollbarWidget scrollbar; @@ -52,7 +54,7 @@ public class CraftingPreviewScreen extends BaseScreen { private IElementDrawers drawers = new CraftingPreviewElementDrawers(this, font); - public CraftingPreviewScreen(Screen parent, List stacks, UUID id, int quantity, boolean fluids, ITextComponent title) { + public CraftingPreviewScreen(Screen parent, ResourceLocation factoryId, List stacks, UUID id, int quantity, boolean fluids, ITextComponent title) { super(new Container(null, 0) { @Override public boolean canInteractWith(PlayerEntity player) { @@ -62,6 +64,7 @@ public class CraftingPreviewScreen extends BaseScreen { this.stacks = new ArrayList<>(stacks); this.parent = parent; + this.factoryId = factoryId; this.id = id; this.quantity = quantity; @@ -72,10 +75,12 @@ public class CraftingPreviewScreen extends BaseScreen { @Override public void onPostInit(int x, int y) { - addButton(x + 55, y + 201 - 20 - 7, 50, 20, I18n.format("gui.cancel"), true, true, btn -> close()); + int btnYPos = y + 201 - 20 - 7; - Button startButton = addButton(x + 129, y + 201 - 20 - 7, 50, 20, I18n.format("misc.refinedstorage.start"), true, true, btn -> startRequest()); + Button startButton = addButton(x + 7, btnYPos, 50, 20, I18n.format("misc.refinedstorage.start"), true, true, btn -> startRequest()); startButton.active = stacks.stream().noneMatch(ICraftingPreviewElement::hasMissing) && getErrorType() == null; + + addButton(startButton.x + startButton.getWidth() + 5, btnYPos, 50, 20, I18n.format("gui.cancel"), true, true, btn -> close()); } @Override @@ -110,6 +115,8 @@ public class CraftingPreviewScreen extends BaseScreen { public void renderForeground(int mouseX, int mouseY) { renderString(7, 7, title.getFormattedText()); + font.drawStringWithShadow(factoryId.toString(), xSize - font.getStringWidth(factoryId.toString()) - 7, 201 - 21, RenderSettings.INSTANCE.getSecondaryColor()); + int x = 7; int y = 15; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/setup/CommonSetup.java b/src/main/java/com/raoulvdberge/refinedstorage/setup/CommonSetup.java index a33b8f769..873952b4f 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/setup/CommonSetup.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/setup/CommonSetup.java @@ -13,7 +13,7 @@ import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.craftingmonitor.Item import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.preview.ErrorCraftingPreviewElement; import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.preview.FluidCraftingPreviewElement; import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.preview.ItemCraftingPreviewElement; -import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.registry.CraftingTaskFactory; +import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.v5.CraftingTaskFactory; import com.raoulvdberge.refinedstorage.apiimpl.network.NetworkListener; import com.raoulvdberge.refinedstorage.apiimpl.network.NetworkNodeListener; import com.raoulvdberge.refinedstorage.apiimpl.network.grid.factory.*;